gx

@@ -79,7 +79,6 @@ class OptimizeController extends BaseController
         $item['product_num'] = $data['product'] ?? 0;
         $item['keyword_num'] = $item['key'] ?? 0;
         $item['autologin_code'] = getAutoLoginCode($item['id']);
-//        $item['article_num'] = ($data['blog'] ?? 0) + ($data['news'] ?? 0);
         return $item;
     }
     /**

@@ -92,6 +92,25 @@ class BlogCategoryController extends BaseController
     }
 
     /**
+     * @remark :排序
+     * @name   :sort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/26 17:40
+     */
+    public function sort(BlogCategoryLogic $blogCategoryLogic){
+        $this->request->validate([
+            'id'=>'required',
+            'sort'=>'required'
+        ],[
+            'id.required' => '产品ID不能为空',
+            'sort.required'=>'排序字段不能为空'
+        ]);
+        $blogCategoryLogic->setSort();
+        $this->response('success');
+    }
+
+    /**
      * @name :删除分类
      * @author :liyuhang
      * @method

@@ -20,7 +20,7 @@ class NewsCategoryController extends BaseController
     public function lists(NewsCategoryModel $newsCategory){
         //搜索条件
         $this->map['project_id'] = $this->user['project_id'];
-        $lists = $newsCategory->lists($this->map,$this->page,$this->row,$this->order,
+        $lists = $newsCategory->lists($this->map,$this->page,$this->row,$this->order = 'sort',
             ['id','pid','name','num','alias','status','sort','remark','created_at','updated_at']);
         if(!empty($lists['list'])){
             $newsModel = new NewsModel();
@@ -91,6 +91,23 @@ class NewsCategoryController extends BaseController
     }
 
     /**
+     * @remark :排序
+     * @name   :sort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/26 17:35
+     */
+    public function sort(NewsCategoryLogic $newsCategoryLogic){
+        $this->request->validate([
+            'id'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $newsCategoryLogic->categorySort();
+        $this->response('success');
+    }
+
+    /**
      * @name :删除分类
      * @author :liyuhang
      * @method

@@ -113,6 +113,23 @@ class CategoryController extends BaseController
     }
 
     /**
+     * @remark :排序
+     * @name   :sort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/26 17:35
+     */
+    public function sort(CategoryLogic $logic){
+        $this->request->validate([
+            'id'=>['required'],
+        ],[
+            'id.required' => 'ID不能为空',
+        ]);
+        $logic->categorySort();
+        $this->response('success');
+    }
+
+    /**
      * @remark :删除数据
      * @name   :delete
      * @author :lyh

@@ -330,7 +330,21 @@ class BlogCategoryLogic extends BaseLogic
             }
             $return[] = $c_id;
         }
-
         return ','.implode(',',$return).',';
     }
+
+    /**
+     * @remark :排序
+     * @name   :setSort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/8/19 11:16
+     */
+    public function setSort(){
+        $rs = $this->model->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('error');
+        }
+        return $this->success();
+    }
 }

@@ -59,9 +59,9 @@ class NewsCategoryLogic extends BaseLogic
      */
     public function newsCategorySave(){
         //验证名称是否存在
-//        $this->verifyParamName($this->param['name']);
-//        DB::beginTransaction();
-//        try {
+        $this->verifyParamName($this->param['name']);
+        DB::beginTransaction();
+        try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
                 //验证是否可编辑
                 $this->verifyEditParam($this->param['id'],$this->param['pid']);
@@ -78,11 +78,11 @@ class NewsCategoryLogic extends BaseLogic
             }
             $route = RouteMap::setRoute(isset($this->param['alias']) ? $this->param['alias'] : $this->param['name'], RouteMap::SOURCE_NEWS_CATE, $id, $this->user['project_id']);
             $this->model->edit(['alias'=>$route],['id'=>$id]);
-//            DB::commit();
-//        }catch (\Exception $e){
-//            DB::rollBack();
-//            $this->fail('error');
-//        }
+            DB::commit();
+        }catch (\Exception $e){
+            DB::rollBack();
+            $this->fail('error');
+        }
         //更新通知记录表
         $this->updateNotify(['project_id'=>$this->user['project_id'], 'type'=>RouteMap::SOURCE_NEWS_CATE, 'route'=>$route]);
         return $this->success();
@@ -312,7 +312,21 @@ class NewsCategoryLogic extends BaseLogic
             }
             $return[] = $c_id;
         }
-
         return ','.implode(',',$return).',';
     }
+
+    /**
+     * @remark :排序
+     * @name   :categorySort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/26 17:38
+     */
+    public function categorySort(){
+        $rs = $this->model->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('系统错误，请联系管理员');
+        }
+        return $this->success();
+    }
 }

@@ -229,7 +229,21 @@ class CategoryLogic extends  BaseLogic
 
         //清除缓存
         Common::del_user_cache('product_category',$project_id);
-
         return ','.implode(',',$return).',';
     }
+
+    /**
+     * @remark :排序
+     * @name   :categorySort
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/26 17:38
+     */
+    public function categorySort(){
+        $rs = $this->model->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('系统错误，请联系管理员');
+        }
+        return $this->success();
+    }
 }

@@ -55,6 +55,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/category/edit', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'save'])->name('news_category_edit');
         Route::any('/category/del', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'del'])->name('news_category_del');
         Route::any('/category/status', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'status'])->name('news_category_status');
+        Route::any('/category/sort', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'sort'])->name('news_category_sort');
         Route::any('/category/categoryTopList', [\App\Http\Controllers\Bside\News\NewsCategoryController::class, 'categoryTopList'])->name('news_category_categoryTopList');
         //新闻
         Route::any('/', [\App\Http\Controllers\Bside\News\NewsController::class, 'lists'])->name('news_category_lists');
@@ -89,6 +90,7 @@ Route::middleware(['bloginauth'])->group(function () {
         Route::any('/category/edit', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'save'])->name('blog_category_edit');
         Route::any('/category/del', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'del'])->name('blog_category_del');
         Route::any('/category/status', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'status'])->name('blog_category_status');
+        Route::any('/category/sort', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'sort'])->name('blog_category_sort');
         Route::any('/category/categoryTopList', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'categoryTopList'])->name('blog_category_categoryTopList');
         //博客标签
         Route::any('/label/', [\App\Http\Controllers\Bside\Blog\BlogLabelController::class, 'lists'])->name('blog_lists');