正在显示
4 个修改的文件
包含
41 行增加
和
29 行删除
| @@ -29,7 +29,7 @@ class NavController extends BaseController | @@ -29,7 +29,7 @@ class NavController extends BaseController | ||
| 29 | */ | 29 | */ |
| 30 | public function index(BNav $nav){ | 30 | public function index(BNav $nav){ |
| 31 | $this->map['project_id'] = $this->user['project_id']; | 31 | $this->map['project_id'] = $this->user['project_id']; |
| 32 | - $lists = $nav->list($this->map); | 32 | + $lists = $nav->list($this->map,$this->order = 'sort'); |
| 33 | $data = array(); | 33 | $data = array(); |
| 34 | foreach ($lists as $v){ | 34 | foreach ($lists as $v){ |
| 35 | $v = (array)$v; | 35 | $v = (array)$v; |
| @@ -64,8 +64,6 @@ class NavController extends BaseController | @@ -64,8 +64,6 @@ class NavController extends BaseController | ||
| 64 | * @time 2023/5/9 9:20 | 64 | * @time 2023/5/9 9:20 |
| 65 | */ | 65 | */ |
| 66 | public function delete(NavRequest $request){ | 66 | public function delete(NavRequest $request){ |
| 67 | - | ||
| 68 | - | ||
| 69 | $id = $request->validated()['id']; | 67 | $id = $request->validated()['id']; |
| 70 | NavLogic::instance()->delete($id); | 68 | NavLogic::instance()->delete($id); |
| 71 | return $this->response('删除成功'); | 69 | return $this->response('删除成功'); |
| @@ -103,7 +101,24 @@ class NavController extends BaseController | @@ -103,7 +101,24 @@ class NavController extends BaseController | ||
| 103 | ]); | 101 | ]); |
| 104 | } | 102 | } |
| 105 | 103 | ||
| 106 | - | 104 | + /** |
| 105 | + * @remark :排序 | ||
| 106 | + * @name :sort | ||
| 107 | + * @author :lyh | ||
| 108 | + * @method :post | ||
| 109 | + * @time :2023/8/22 9:49 | ||
| 110 | + */ | ||
| 111 | + public function sort(NavLogic $navLogic){ | ||
| 112 | + $this->request->validate([ | ||
| 113 | + 'id'=>'required', | ||
| 114 | + 'sort'=>'required' | ||
| 115 | + ],[ | ||
| 116 | + 'id.required' => '产品ID不能为空', | ||
| 117 | + 'sort.required'=>'排序字段不能为空' | ||
| 118 | + ]); | ||
| 119 | + $navLogic->navSort(); | ||
| 120 | + $this->response('success'); | ||
| 121 | + } | ||
| 107 | 122 | ||
| 108 | 123 | ||
| 109 | 124 |
| @@ -64,4 +64,19 @@ class NavLogic extends BaseLogic | @@ -64,4 +64,19 @@ class NavLogic extends BaseLogic | ||
| 64 | 64 | ||
| 65 | } | 65 | } |
| 66 | 66 | ||
| 67 | + | ||
| 68 | + /** | ||
| 69 | + * @remark :排序 | ||
| 70 | + * @name :navSort | ||
| 71 | + * @author :lyh | ||
| 72 | + * @method :post | ||
| 73 | + * @time :2023/8/22 9:54 | ||
| 74 | + */ | ||
| 75 | + public function navSort(){ | ||
| 76 | + $rs = $this->model->edit(['sort'=>$this->param['sort']],['id'=>$this->param['id']]); | ||
| 77 | + if($rs === false){ | ||
| 78 | + $this->fail('error'); | ||
| 79 | + } | ||
| 80 | + return $this->success(); | ||
| 81 | + } | ||
| 67 | } | 82 | } |
| @@ -19,7 +19,7 @@ class BNav extends Base | @@ -19,7 +19,7 @@ class BNav extends Base | ||
| 19 | protected $connection = 'custom_mysql'; | 19 | protected $connection = 'custom_mysql'; |
| 20 | use SoftDeletes; | 20 | use SoftDeletes; |
| 21 | 21 | ||
| 22 | - public $hidden = ['deleted_at','project_id']; | 22 | + public $hidden = ['deleted_at']; |
| 23 | 23 | ||
| 24 | 24 | ||
| 25 | /** | 25 | /** |
| @@ -34,25 +34,6 @@ class BNav extends Base | @@ -34,25 +34,6 @@ class BNav extends Base | ||
| 34 | 34 | ||
| 35 | 35 | ||
| 36 | 36 | ||
| 37 | - /** | ||
| 38 | - * 查询当前项目下的所有栏目信息 | ||
| 39 | - * @param int $project_id | ||
| 40 | - * @return mixed | ||
| 41 | - * @author:dc | ||
| 42 | - * @time 2023/5/8 16:29 | ||
| 43 | - */ | ||
| 44 | - public static function _all(int $project_id, string $location = null) | ||
| 45 | - { | ||
| 46 | - return static::where(function ($query) use ($project_id,$location){ | ||
| 47 | - // 那个公司 | ||
| 48 | - $query->where('project_id',$project_id); | ||
| 49 | - // 显示位置 | ||
| 50 | - $location && $query->where('location',$location); | ||
| 51 | - }) | ||
| 52 | - ->orderBy('sort') | ||
| 53 | - ->get(); | ||
| 54 | - } | ||
| 55 | - | ||
| 56 | 37 | ||
| 57 | 38 | ||
| 58 | 39 |
| @@ -280,11 +280,12 @@ Route::middleware(['bloginauth'])->group(function () { | @@ -280,11 +280,12 @@ Route::middleware(['bloginauth'])->group(function () { | ||
| 280 | }); | 280 | }); |
| 281 | // 导航栏编辑 | 281 | // 导航栏编辑 |
| 282 | Route::prefix('nav')->group(function () { | 282 | Route::prefix('nav')->group(function () { |
| 283 | - Route::get('/', [\App\Http\Controllers\Bside\Nav\NavController::class, 'index'])->name('bside_nav'); | ||
| 284 | - Route::post('/create', [\App\Http\Controllers\Bside\Nav\NavController::class, 'save'])->name('bside_nav_create'); | ||
| 285 | - Route::post('/update', [\App\Http\Controllers\Bside\Nav\NavController::class, 'save'])->name('bside_nav_update'); | ||
| 286 | - Route::delete('/delete', [\App\Http\Controllers\Bside\Nav\NavController::class, 'delete'])->name('bside_nav_delete'); | ||
| 287 | - Route::get('/default-urls', [\App\Http\Controllers\Bside\Nav\NavController::class, 'urls'])->name('bside_nav_default-urls'); | 283 | + Route::get('/', [\App\Http\Controllers\Bside\Nav\NavController::class, 'index'])->name('nav'); |
| 284 | + Route::post('/create', [\App\Http\Controllers\Bside\Nav\NavController::class, 'save'])->name('nav_create'); | ||
| 285 | + Route::post('/update', [\App\Http\Controllers\Bside\Nav\NavController::class, 'save'])->name('nav_update'); | ||
| 286 | + Route::delete('/delete', [\App\Http\Controllers\Bside\Nav\NavController::class, 'delete'])->name('nav_delete'); | ||
| 287 | + Route::get('/default-urls', [\App\Http\Controllers\Bside\Nav\NavController::class, 'urls'])->name('nav_default-urls'); | ||
| 288 | + Route::post('/sort', [\App\Http\Controllers\Bside\Nav\NavController::class, 'sort'])->name('nav_sort'); | ||
| 288 | }); | 289 | }); |
| 289 | 290 | ||
| 290 | //排名数据 | 291 | //排名数据 |
-
请 注册 或 登录 后发表评论