合并分支 'master-server' 到 'master'

Master server



查看合并请求 !1002

@@ -59,7 +59,7 @@ class CNoticeController extends BaseController
         $this->request->validate([
         $this->request->validate([
             'language'=>'required',
             'language'=>'required',
         ],[
         ],[
-            'language.required' => 'name不能为空',
+            'language.required' => 'language不能为空',
         ]);
         ]);
         $lang_num = count($this->param['language']);
         $lang_num = count($this->param['language']);
         $keyword_num = (new Keyword())->counts(['route'=>['!=',null]]);
         $keyword_num = (new Keyword())->counts(['route'=>['!=',null]]);
@@ -68,7 +68,7 @@ class CNoticeController extends BaseController
         if($number >= 45000){
         if($number >= 45000){
             $this->response('success',Code::SUCCESS,['msg'=>'翻译数量过多， 大概页面数量：'.$number.'， 磁盘空间占用可能会超过40G，请谨慎使用！']);
             $this->response('success',Code::SUCCESS,['msg'=>'翻译数量过多， 大概页面数量：'.$number.'， 磁盘空间占用可能会超过40G，请谨慎使用！']);
         }
         }
-        $this->response('success',Code::SUCCESS,['msg'=>'翻译数量过多， 大概页面数量：'.$number.'， 磁盘空间占用可能会超过40G，请谨慎使用！']);
+        $this->response('success');
     }
     }
 
 
     /**
     /**
@@ -124,7 +124,7 @@ class CNoticeController extends BaseController
         $newsCateList = $newsCateModel->list(['status'=>0]);
         $newsCateList = $newsCateModel->list(['status'=>0]);
         if(!empty($newsCateList)){
         if(!empty($newsCateList)){
             foreach ($newsCateList as $v){
             foreach ($newsCateList as $v){
-                $cate_num = $newsModel->counts(['cate_id'=>['like',','.$v['id'].',']]);
+                $cate_num = $newsModel->counts(['category_id'=>['like',','.$v['id'].',']]);
                 if($cate_num == 0){
                 if($cate_num == 0){
                     $number += 1;
                     $number += 1;
                 }else{
                 }else{
@@ -156,7 +156,7 @@ class CNoticeController extends BaseController
         $blogCateList = $blogCateModel->list(['status'=>0]);
         $blogCateList = $blogCateModel->list(['status'=>0]);
         if(!empty($blogCateList)){
         if(!empty($blogCateList)){
             foreach ($blogCateList as $v){
             foreach ($blogCateList as $v){
-                $cate_num = $blogModel->counts(['cate_id'=>['like',','.$v['id'].',']]);
+                $cate_num = $blogModel->counts(['category_id'=>['like',','.$v['id'].',']]);
                 if($cate_num == 0){
                 if($cate_num == 0){
                     $number += 1;
                     $number += 1;
                 }else{
                 }else{
@@ -188,7 +188,7 @@ class CNoticeController extends BaseController
         $cateList = $cateModel->list(['status'=>0]);
         $cateList = $cateModel->list(['status'=>0]);
         if(!empty($cateList)){
         if(!empty($cateList)){
             foreach ($cateList as $v){
             foreach ($cateList as $v){
-                $cate_num = $contentModel->counts(['cate_id'=>['like',','.$v['id'].',']]);
+                $cate_num = $contentModel->counts(['category_id'=>['like',','.$v['id'].',']]);
                 if($cate_num == 0){
                 if($cate_num == 0){
                     $number += 1;
                     $number += 1;
                 }else{
                 }else{

@@ -23,6 +23,7 @@ class BaseController extends Controller
     protected $row = 20;//每页条数
     protected $row = 20;//每页条数
     protected $header = [];//设置请求头参数
     protected $header = [];//设置请求头参数
     protected $order = 'created_at';
     protected $order = 'created_at';
+    protected $order_type = 'desc';
     protected $map = [];//处理后的参数
     protected $map = [];//处理后的参数
     protected $uid = 0;
     protected $uid = 0;
     protected $user = [];//当前登录用户详情
     protected $user = [];//当前登录用户详情
@@ -79,6 +80,9 @@ class BaseController extends Controller
             case "order":
             case "order":
                 $this->order = $v;
                 $this->order = $v;
                 break;
                 break;
+            case "order":
+                $this->order_type = $v;
+                break;
             case 'page':
             case 'page':
                 $this->page = $v;
                 $this->page = $v;
                 break;
                 break;

@@ -49,8 +49,8 @@ class ProductController extends BaseController
     {
     {
         $filed = ['id', 'project_id', 'title', 'sort' ,'thumb' ,'product_type' , 'route' ,
         $filed = ['id', 'project_id', 'title', 'sort' ,'thumb' ,'product_type' , 'route' ,
             'category_id', 'keyword_id', 'status', 'created_uid', 'is_upgrade' ,'created_at', 'updated_at','six_read'];
             'category_id', 'keyword_id', 'status', 'created_uid', 'is_upgrade' ,'created_at', 'updated_at','six_read'];
-        $this->order = 'sort';
-        $query = $product->orderBy($this->order ,'desc')->orderBy('id','desc');
+        $this->order = $this->order ?? 'sort';
+        $query = $product->orderBy($this->order ,$this->order_type)->orderBy('id','desc');
         $query = $this->searchParam($query);
         $query = $this->searchParam($query);
         $lists = $query->select($filed)->paginate($this->row, ['*'], 'page', $this->page);
         $lists = $query->select($filed)->paginate($this->row, ['*'], 'page', $this->page);
         if(!empty($lists)){
         if(!empty($lists)){
@@ -71,6 +71,10 @@ class ProductController extends BaseController
         }
         }
         $this->response('success',Code::SUCCESS,$lists);
         $this->response('success',Code::SUCCESS,$lists);
     }
     }
+
+    public function setOrderBy(){
+
+    }
     /**
     /**
      * @remark :列表
      * @remark :列表
      * @name   :index
      * @name   :index

@@ -31,6 +31,8 @@ class TextMail extends Mailable
      */
      */
     public function build()
     public function build()
     {
     {
-        return $this->subject($this->subject)->view('mail.text', ['text' => $this->text]);
+        return $this->subject($this->subject)->text('mail.text', ['text' => $this->text])
+            ->view('mail.html', ['text' => $this->text]); // HTML 内容
     }
     }
+
 }
 }

+<div class="editor-text-wrap">
+    {!! $text !!}
+</div>