diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/YuYueOrderController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/YuYueOrderController.php new file mode 100644 index 0000000..77af33e --- /dev/null +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/YuYueOrderController.php @@ -0,0 +1,51 @@ +where('name', 'like', '%' . $searchInfo['name'] . '%'); + } + if(isset($searchInfo['id_number'])){ + $list = $list->where('id_number', $searchInfo['id_number'] ); + } + if(isset($searchInfo['order_number'])){ + $list = $list->where('order_number', $searchInfo['order_number'] ); + } + $count=$list->count(); + $list=$list->orderBy('id','desc') + ->skip(($page-1)*$pageSize) // 跳过前9999条记录 + ->take($pageSize)->get(); + return \Yz::Return(true,"查询完成",['list'=>$list,'count'=>$count]); + } + public function GetDetail() + { + $id = request('id'); + $order=DB::table('orders_yuyue')->where(['id'=>$id])->first(); + return \Yz::Return(true,"查询完成",['info'=>$order]); + } + public function Save() + { + $info = request('info'); + $date=[ + 'note'=>$info['note'] + ]; + $u=DB::table('orders_yuyue')->where(['id'=>$info['id']])->update($date); + if($u){ + return \Yz::Return(true,"操作完成",[]); + }else{ + return \Yz::echoError1("保存失败"); + } + } +} diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index 2e88d12..3295439 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -120,7 +120,9 @@ Route::group(['middleware' => ['checktoken', 'log'], 'prefix' => 'v1'], function Route::post('admin/AnalysisTypeGetList', 'App\Http\Controllers\API\Admin\YeWu\AnalysisTypeController@GetList');//趋势项目 Route::post('admin/AnalysisTypeGetDetail', 'App\Http\Controllers\API\Admin\YeWu\AnalysisTypeController@GetDetail');//趋势项目 Route::post('admin/AnalysisTypeSave', 'App\Http\Controllers\API\Admin\YeWu\AnalysisTypeController@Save');//趋势项目 - + Route::post('admin/YuYueOrderGetList', 'App\Http\Controllers\API\Admin\YeWu\YuYueOrderController@GetList');//客服订单列表 + Route::post('admin/YuYueOrderGetDetail', 'App\Http\Controllers\API\Admin\YeWu\YuYueOrderController@GetDetail');//客服订单详情 + Route::post('admin/YuYueOrderSave', 'App\Http\Controllers\API\Admin\YeWu\YuYueOrderController@Save');//客服订单保存 }); diff --git a/admin/src/api/api.js b/admin/src/api/api.js index 35b7648..7800388 100644 --- a/admin/src/api/api.js +++ b/admin/src/api/api.js @@ -242,6 +242,20 @@ export const OrderGetDetail = (data = {}) => { export const OrderSave = (data = {}) => { return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/OrderSave', data: data }) } + +//获取订单列表 +export const YuYueOrderGetList = (data = {}) => { + return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/YuYueOrderGetList', data: data }) +} +//获取订单详情 +export const YuYueOrderGetDetail = (data = {}) => { + return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/YuYueOrderGetDetail', data: data }) +} +//保存订单信息 +export const YuYueOrderSave = (data = {}) => { + return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/YuYueOrderSave', data: data }) +} + //获取问答列表 export const QuestionGetList = (data = {}) => { return axios({ url: import.meta.env.VITE_APP_API + 'v1/admin/QuestionGetList', data: data }) diff --git a/admin/src/router/index.js b/admin/src/router/index.js index 2cfba8b..8dd95ac 100644 --- a/admin/src/router/index.js +++ b/admin/src/router/index.js @@ -218,6 +218,13 @@ const router = createRouter({ meta: { title: '套餐类型' } + },{ + path: '/orderMngr/yuyueorder', + name: 'OrderMngrYuYueOrder', + component: () => import('../views/OrderMngr/OrderYuYue.vue'), + meta: { + title: '预约订单' + } }] }, diff --git a/admin/src/views/OrderMngr/OrderYuYue.vue b/admin/src/views/OrderMngr/OrderYuYue.vue new file mode 100644 index 0000000..a3ea625 --- /dev/null +++ b/admin/src/views/OrderMngr/OrderYuYue.vue @@ -0,0 +1,208 @@ + + + + + \ No newline at end of file diff --git a/h5/pages/main/index/index.vue b/h5/pages/main/index/index.vue index 952cc28..c910e12 100644 --- a/h5/pages/main/index/index.vue +++ b/h5/pages/main/index/index.vue @@ -281,7 +281,7 @@ - 10241102 + 102250937