周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 f74a3ce673a58b5f933924424a69719e1c760d50 1 个父辈 9655d120

gx

内嵌 并排对比
正在显示 5 个修改的文件 包含 79 行增加 和 10 行删除
@@ -7,6 +7,7 @@ use App\Http\Controllers\Bside\BaseController; @@ -7,6 +7,7 @@ use App\Http\Controllers\Bside\BaseController;
7 use App\Http\Logic\Bside\Blog\BlogCategoryLogic; 7 use App\Http\Logic\Bside\Blog\BlogCategoryLogic;
8 use App\Http\Logic\Bside\Blog\BlogLabelLogic; 8 use App\Http\Logic\Bside\Blog\BlogLabelLogic;
9 use App\Http\Logic\Bside\Blog\BlogLogic; 9 use App\Http\Logic\Bside\Blog\BlogLogic;
  10 +use App\Http\Logic\Bside\News\NewsLogic;
10 use App\Http\Requests\Bside\Blog\BlogRequest; 11 use App\Http\Requests\Bside\Blog\BlogRequest;
11 use App\Models\Blog\Blog as BlogModel; 12 use App\Models\Blog\Blog as BlogModel;
12 use App\Models\RouteMap; 13 use App\Models\RouteMap;
@@ -163,4 +164,22 @@ class BlogController extends BaseController @@ -163,4 +164,22 @@ class BlogController extends BaseController
163 $this->response('success'); 164 $this->response('success');
164 } 165 }
165 166
  167 + /**
  168 + * @remark :排序
  169 + * @name :sort
  170 + * @author :lyh
  171 + * @method :post
  172 + * @time :2023/8/22 10:24
  173 + */
  174 + public function sort(BlogLogic $logic){
  175 + $this->request->validate([
  176 + 'id'=>'required',
  177 + 'sort'=>'required'
  178 + ],[
  179 + 'id.required' => '产品ID不能为空',
  180 + 'sort.required'=>'排序字段不能为空'
  181 + ]);
  182 + $logic->setSort();
  183 + $this->response('success');
  184 + }
166 } 185 }
@@ -26,7 +26,7 @@ class NewsController extends BaseController @@ -26,7 +26,7 @@ class NewsController extends BaseController
26 */ 26 */
27 public function lists(NewsModel $news,NewsCategoryLogic $newsCategoryLogic){ 27 public function lists(NewsModel $news,NewsCategoryLogic $newsCategoryLogic){
28 $this->map['project_id'] = $this->user['project_id']; 28 $this->map['project_id'] = $this->user['project_id'];
29 - $lists = $news->lists($this->map,$this->page,$this->row,$this->order, 29 + $lists = $news->lists($this->map,$this->page,$this->row,$this->order = 'sort',
30 ['id','category_id','operator_id','status','created_at','updated_at','image','name','sort','url']); 30 ['id','category_id','operator_id','status','created_at','updated_at','image','name','sort','url']);
31 if(!empty($lists['list'])){ 31 if(!empty($lists['list'])){
32 foreach ($lists['list'] as $k => $v){ 32 foreach ($lists['list'] as $k => $v){
@@ -128,7 +128,7 @@ class NewsController extends BaseController @@ -128,7 +128,7 @@ class NewsController extends BaseController
128 } 128 }
129 129
130 /** 130 /**
131 - * @name :编辑状态/与排序 131 + * @name :编辑状态
132 * @author :liyuhang 132 * @author :liyuhang
133 * @method 133 * @method
134 */ 134 */
@@ -160,4 +160,22 @@ class NewsController extends BaseController @@ -160,4 +160,22 @@ class NewsController extends BaseController
160 $this->response('success'); 160 $this->response('success');
161 } 161 }
162 162
  163 + /**
  164 + * @remark :排序
  165 + * @name :sort
  166 + * @author :lyh
  167 + * @method :post
  168 + * @time :2023/8/22 10:24
  169 + */
  170 + public function sort(NewsLogic $newsLogic){
  171 + $this->request->validate([
  172 + 'id'=>'required',
  173 + 'sort'=>'required'
  174 + ],[
  175 + 'id.required' => '产品ID不能为空',
  176 + 'sort.required'=>'排序字段不能为空'
  177 + ]);
  178 + $newsLogic->setSort();
  179 + $this->response('success');
  180 + }
163 } 181 }
@@ -212,4 +212,19 @@ class BlogLogic extends BaseLogic @@ -212,4 +212,19 @@ class BlogLogic extends BaseLogic
212 } 212 }
213 return $this->success($data); 213 return $this->success($data);
214 } 214 }
  215 +
  216 + /**
  217 + * @remark :排序
  218 + * @name :setSort
  219 + * @author :lyh
  220 + * @method :post
  221 + * @time :2023/8/19 11:16
  222 + */
  223 + public function setSort(){
  224 + $rs = $this->model->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
  225 + if($rs === false){
  226 + $this->fail('error');
  227 + }
  228 + return $this->success();
  229 + }
215 } 230 }
@@ -208,4 +208,19 @@ class NewsLogic extends BaseLogic @@ -208,4 +208,19 @@ class NewsLogic extends BaseLogic
208 } 208 }
209 return $this->success($data); 209 return $this->success($data);
210 } 210 }
  211 +
  212 + /**
  213 + * @remark :排序
  214 + * @name :setSort
  215 + * @author :lyh
  216 + * @method :post
  217 + * @time :2023/8/19 11:16
  218 + */
  219 + public function setSort(){
  220 + $rs = $this->model->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]);
  221 + if($rs === false){
  222 + $this->fail('error');
  223 + }
  224 + return $this->success();
  225 + }
211 } 226 }
@@ -63,19 +63,12 @@ Route::middleware(['bloginauth'])->group(function () { @@ -63,19 +63,12 @@ Route::middleware(['bloginauth'])->group(function () {
63 Route::any('/edit', [\App\Http\Controllers\Bside\News\NewsController::class, 'edit'])->name('news_edit'); 63 Route::any('/edit', [\App\Http\Controllers\Bside\News\NewsController::class, 'edit'])->name('news_edit');
64 Route::any('/del', [\App\Http\Controllers\Bside\News\NewsController::class, 'del'])->name('news_del'); 64 Route::any('/del', [\App\Http\Controllers\Bside\News\NewsController::class, 'del'])->name('news_del');
65 Route::any('/status', [\App\Http\Controllers\Bside\News\NewsController::class, 'status'])->name('news_status'); 65 Route::any('/status', [\App\Http\Controllers\Bside\News\NewsController::class, 'status'])->name('news_status');
  66 + Route::any('/sort', [\App\Http\Controllers\Bside\News\NewsController::class, 'sort'])->name('news_sort');
66 Route::any('/statusNum', [\App\Http\Controllers\Bside\News\NewsController::class, 'getStatusNumber'])->name('news_statusNum'); 67 Route::any('/statusNum', [\App\Http\Controllers\Bside\News\NewsController::class, 'getStatusNumber'])->name('news_statusNum');
67 }); 68 });
68 69
69 //博客相关路由 70 //博客相关路由
70 Route::prefix('blog')->group(function () { 71 Route::prefix('blog')->group(function () {
71 - //分类  
72 - Route::any('/category/', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'lists'])->name('blog_category_lists');  
73 - Route::any('/category/add', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'add'])->name('blog_category_add');  
74 - Route::any('/category/info', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'info'])->name('blog_category_info');  
75 - Route::any('/category/edit', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'edit'])->name('blog_category_edit');  
76 - Route::any('/category/del', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'del'])->name('blog_category_del');  
77 - Route::any('/category/status', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'status'])->name('blog_category_status');  
78 - Route::any('/category/categoryTopList', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'categoryTopList'])->name('blog_category_categoryTopList');  
79 //博客 72 //博客
80 Route::any('/', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'lists'])->name('blog_lists'); 73 Route::any('/', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'lists'])->name('blog_lists');
81 Route::any('/get_category_list', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'get_category_list'])->name('blog_get_category_list'); 74 Route::any('/get_category_list', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'get_category_list'])->name('blog_get_category_list');
@@ -85,7 +78,16 @@ Route::middleware(['bloginauth'])->group(function () { @@ -85,7 +78,16 @@ Route::middleware(['bloginauth'])->group(function () {
85 Route::any('/edit_seo', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'edit_seo'])->name('blog_edit_seo'); 78 Route::any('/edit_seo', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'edit_seo'])->name('blog_edit_seo');
86 Route::any('/del', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'del'])->name('blog_del'); 79 Route::any('/del', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'del'])->name('blog_del');
87 Route::any('/status', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'status'])->name('blog_status'); 80 Route::any('/status', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'status'])->name('blog_status');
  81 + Route::any('/sort', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'sort'])->name('blog_sort');
88 Route::any('/statusNum', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'getStatusNumber'])->name('blog_statusNum'); 82 Route::any('/statusNum', [\App\Http\Controllers\Bside\Blog\BlogController::class, 'getStatusNumber'])->name('blog_statusNum');
  83 + //分类
  84 + Route::any('/category/', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'lists'])->name('blog_category_lists');
  85 + Route::any('/category/add', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'add'])->name('blog_category_add');
  86 + Route::any('/category/info', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'info'])->name('blog_category_info');
  87 + Route::any('/category/edit', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'edit'])->name('blog_category_edit');
  88 + Route::any('/category/del', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'del'])->name('blog_category_del');
  89 + Route::any('/category/status', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'status'])->name('blog_category_status');
  90 + Route::any('/category/categoryTopList', [\App\Http\Controllers\Bside\Blog\BlogCategoryController::class, 'categoryTopList'])->name('blog_category_categoryTopList');
89 //博客标签 91 //博客标签
90 Route::any('/label/', [\App\Http\Controllers\Bside\Blog\BlogLabelController::class, 'lists'])->name('blog_lists'); 92 Route::any('/label/', [\App\Http\Controllers\Bside\Blog\BlogLabelController::class, 'lists'])->name('blog_lists');
91 Route::any('/label/add', [\App\Http\Controllers\Bside\Blog\BlogLabelController::class, 'add'])->name('blog_add'); 93 Route::any('/label/add', [\App\Http\Controllers\Bside\Blog\BlogLabelController::class, 'add'])->name('blog_add');