From e0513c8d731d383c2e63a2db11e41b0823c16d92 Mon Sep 17 00:00:00 2001 From: yanzai Date: Wed, 8 Nov 2023 15:18:29 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AE=A2=E5=8D=95=E8=AF=84?= =?UTF-8?q?=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/API/LabelController.php | 52 ++++ app/Http/Controllers/API/UserController.php | 27 ++ app/Http/Controllers/ReportController.php | 2 +- app/Http/Controllers/UserController.php | 2 + routes/web.php | 4 + 北京仁仁体检小程序/api/api.js | 5 +- 北京仁仁体检小程序/api/index.js | 8 +- 北京仁仁体检小程序/pages/main/h5/h5.vue | 1 + 北京仁仁体检小程序/pages/main/home/home.vue | 44 ++- 北京仁仁体检小程序/pages/main/order/order.vue | 25 ++ 北京仁仁体检小程序/pages/user/edit/edit.vue | 68 +++-- 北京仁仁体检平台H5/api/api.js | 5 +- 北京仁仁体检平台H5/api/index.js | 16 +- 北京仁仁体检平台H5/pages.json | 7 + 北京仁仁体检平台H5/pages/main/login/login.vue | 12 +- 北京仁仁体检平台H5/pages/main/posts/posts.vue | 2 +- .../pages/main/question2/question2.vue | 280 ++++++++++++++++++ .../static/image/face/face1.png | Bin 0 -> 8386 bytes .../static/image/face/face2.png | Bin 0 -> 10881 bytes .../static/image/face/face3.png | Bin 0 -> 9747 bytes .../static/image/face/face4.png | Bin 0 -> 9333 bytes .../static/image/face/face5.png | Bin 0 -> 10533 bytes .../static/image/face/face6.png | Bin 0 -> 10545 bytes 北京仁仁体检平台报告对比/api/api.js | 2 +- 北京仁仁体检平台报告对比/api/index.js | 2 +- .../components/report/type3.vue | 13 +- 26 files changed, 539 insertions(+), 38 deletions(-) create mode 100644 app/Http/Controllers/API/LabelController.php create mode 100644 app/Http/Controllers/API/UserController.php create mode 100644 北京仁仁体检平台H5/pages/main/question2/question2.vue create mode 100644 北京仁仁体检平台H5/static/image/face/face1.png create mode 100644 北京仁仁体检平台H5/static/image/face/face2.png create mode 100644 北京仁仁体检平台H5/static/image/face/face3.png create mode 100644 北京仁仁体检平台H5/static/image/face/face4.png create mode 100644 北京仁仁体检平台H5/static/image/face/face5.png create mode 100644 北京仁仁体检平台H5/static/image/face/face6.png diff --git a/app/Http/Controllers/API/LabelController.php b/app/Http/Controllers/API/LabelController.php new file mode 100644 index 0000000..9bd71d2 --- /dev/null +++ b/app/Http/Controllers/API/LabelController.php @@ -0,0 +1,52 @@ +select('id','type','value','order','img')->whereIn('type',['face','comment'])->where(['status'=>1,'type'=>'face'])->get(); + $query2=DB::table('label')->select('id','type','value','order','img')->whereIn('type',['face','comment'])->where(['status'=>1,'type'=>'comment'])->get(); + return Yo::echo([ + 'status' => true, + 'label1'=>$query1, + 'label2'=>$query2, + ]); + } + public function GetOrderEvaluate(){ //获取订单是评价详情 + $orderid=request('orderid'); + $orderInfo=DB::select("select a.*,b.name as hname from user_orders as a left join hospitals as b on a.hospital=b.id where a.id=?",[$orderid]); + $query=DB::table('order_evaluate')->where(['order_id'=>$orderid])->get(); + if(count($query)>0){ + return Yo::echo([ + 'status' => true, + 'info'=>$query, + 'orderInfo'=>$orderInfo + ]); + }else{ + return Yo::echo([ + 'status' => false, + 'orderInfo'=>$orderInfo + ]); + } + } + public function AddOrderEvaluate(){ //新增订单评价 + $orderid=request('orderid'); + $faceId=request('faceId'); + $pingjiaList=request('pingjiaList'); + $pingjiaList=implode(',',$pingjiaList); + $i=DB::table('order_evaluate')->insert(['order_id'=>$orderid,'face_id'=>$faceId,'comment_ids'=>$pingjiaList]); + if($i){ + $status=true; + }else{ + $status=false; + } + return Yo::echo([ + 'status' => $status, + ]); + } +} diff --git a/app/Http/Controllers/API/UserController.php b/app/Http/Controllers/API/UserController.php new file mode 100644 index 0000000..8f39f7c --- /dev/null +++ b/app/Http/Controllers/API/UserController.php @@ -0,0 +1,27 @@ +where(['user'=>$subinfo,'check_status'=>2])->limit(1)->orderBy('id', 'desc') ->get(); + if(count($query)>0){ + return Yo::echo([ + 'status' => true, + 'info'=>$query + ]); + }else{ + return Yo::echo([ + 'status' => false + ]); + } + } +} diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index 4ddfa1a..8a62714 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -567,7 +567,7 @@ class ReportController extends Controller foreach ($item['基础项目列表'] as $i) { $content_list[] = [ 'title' => $i['基础项目名称'], - 'content' => $i['结果值'] . $i['结果值单位'], + 'content' => $i['结果值'] .' '.' '. $i['结果值单位'], 'icon' => $i['异常标识'], 'desc' => $i['结果值范围'], ]; diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 3244d74..66cd72f 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -131,4 +131,6 @@ class UserController extends Controller 'token' => $this->create_token($user) ]); } + + } diff --git a/routes/web.php b/routes/web.php index 8a2ac21..32c8753 100644 --- a/routes/web.php +++ b/routes/web.php @@ -97,6 +97,10 @@ Route::post("api/$mp_api/Hospital/info", [\App\Http\Controllers\HospitalControll Route::post("api/$mp_api/HospitalActivityPackage/list", [\App\Http\Controllers\HospitalActivityPackageController::class, 'mp_list']); Route::post("api/$mp_api/Carousel/list", [\App\Http\Controllers\CarouselController::class, 'mp_list']); Route::post("api/$mp_api/Config/get", [\App\Http\Controllers\ConfigController::class, 'mp_get']); +Route::post("api/$mp_api/User/IsChecked", [\App\Http\Controllers\API\UserController::class, 'IsChecked']); +Route::post("api/$mp_api/Label/GetLabelList", [\App\Http\Controllers\API\LabelController::class, 'GetLabelList']); +Route::post("api/$mp_api/Label/GetOrderEvaluate", [\App\Http\Controllers\API\LabelController::class, 'GetOrderEvaluate']); +Route::post("api/$mp_api/Label/AddOrderEvaluate", [\App\Http\Controllers\API\LabelController::class, 'AddOrderEvaluate']); Route::post("api/$admin_api/UserPerson/update", [\App\Http\Controllers\UserPersonController::class, 'admin_update']); Route::post("api/$admin_api/UserPerson/list", [\App\Http\Controllers\UserPersonController::class, 'admin_list']); diff --git a/北京仁仁体检小程序/api/api.js b/北京仁仁体检小程序/api/api.js index d34919b..95f97f7 100644 --- a/北京仁仁体检小程序/api/api.js +++ b/北京仁仁体检小程序/api/api.js @@ -1,9 +1,9 @@ let url_ = "https://bjrrtj-api.cjy.net.cn"; let report_url_ = "https://bjrrtj-api.cjy.net.cn"; let h5_url_ = "https://bjrrtj-api.cjy.net.cn"; -const dev = 0; +const dev = 1; if (dev === 1) { - url_ = "http://192.168.31.106:8000"; + url_ = "http://localbeijingrenren"; report_url_ = "http://192.168.31.106:5173"; h5_url_ = "http://192.168.31.106:5173"; } @@ -39,6 +39,7 @@ url_array['User/status'] = `${url_}/api/Mp/User/status`; url_array['Hospital/info'] = `${url_}/api/Mp/Hospital/info`; url_array['Carousel/list'] = `${url_}/api/Mp/Carousel/list`; url_array['Config/get'] = `${url_}/api/Mp/Config/get`; +url_array['User/IsChecked'] = `${url_}/api/Mp/User/IsChecked`; //检查用户是否有支付体检订单，且已经体检 url_array['YO'] = `${url_}/api/yo`; const api = (mark) => { if (mark === '') return url_; diff --git a/北京仁仁体检小程序/api/index.js b/北京仁仁体检小程序/api/index.js index 212c094..108a9bf 100644 --- a/北京仁仁体检小程序/api/index.js +++ b/北京仁仁体检小程序/api/index.js @@ -3,9 +3,9 @@ import { } from '@/lu/axios.js' import $api from './api.js' let url_ = "https://bjrrtj-api.cjy.net.cn"; -const dev = 0 +const dev = 1 if (dev === 1) { - url_ = "http://192.168.31.106:8000" + url_ = "http://localbeijingrenren" } export const ReportUrl = (data) => { return $api('Report') + `?hospital=${data.hospital}&id_number=${data.id_number}` @@ -123,6 +123,10 @@ export const HospitalInfoAction = async (data) => await $post({ url: 'Hospital/info', data }) +export const UserIsCheckedAction = async (data) => await $post({ + url: 'User/IsChecked', + data +}) export const yo = async (data) => await $post({ url: 'YO', data diff --git a/北京仁仁体检小程序/pages/main/h5/h5.vue b/北京仁仁体检小程序/pages/main/h5/h5.vue index a665eb4..61558fd 100644 --- a/北京仁仁体检小程序/pages/main/h5/h5.vue +++ b/北京仁仁体检小程序/pages/main/h5/h5.vue @@ -22,6 +22,7 @@ const url_data = ref('') const readUrl = () => { url_data.value = decodeURIComponent(props.url) + console.log(url_data.value) } diff --git a/北京仁仁体检小程序/pages/main/home/home.vue b/北京仁仁体检小程序/pages/main/home/home.vue index 219ef24..10e6e65 100644 --- a/北京仁仁体检小程序/pages/main/home/home.vue +++ b/北京仁仁体检小程序/pages/main/home/home.vue @@ -13,6 +13,7 @@ CarouselListAction, HospitalCountAction, HospitalExtraInfoAction, + UserIsCheckedAction, $image, $response } from '@/api' @@ -50,6 +51,7 @@ } } }) + } const hospital_info = ref(false) @@ -136,6 +138,13 @@ break; case 4: h5_list.value = response.data.list + uni.setStorage({ + key: 'h5_list', + data: h5_list.value[1], + success: function () { + console.log('success'); + } + }); break; } }) @@ -150,7 +159,35 @@ }) } const actionClick = (info) => { - uni.$lu.jump(info) + console.log(info) + if (info.id == 9) { + //判断用户下是否有订单 + userischecked(info) + + + } else { + uni.$lu.jump(info) + } + + } + + + const userischecked = async (info) => { //判断是否支付且体检完成 + const response = await UserIsCheckedAction({ + userid: user_info.value.id + }) + + $response(response, () => { + + if (response.data.status) { + + info.jump_path = info.jump_path.replace('question','question2') + info.jump_path=info.jump_path+"&orderid="+response.data.info[0].id + console.log(info.jump_path ) + } + uni.$lu.jump(info) + + }) } const loginCallback = () => { @@ -173,7 +210,7 @@ login_type: 1 }) } - + const mapClick = (info) => { uni.openLocation({ type: 'wgs84', @@ -189,7 +226,8 @@ 您还没有登录，点击登录 - 您还没有添加体检人，点击添加 + + 您还没有添加体检人，点击添加 diff --git a/北京仁仁体检小程序/pages/main/order/order.vue b/北京仁仁体检小程序/pages/main/order/order.vue index a813536..69fdb11 100644 --- a/北京仁仁体检小程序/pages/main/order/order.vue +++ b/北京仁仁体检小程序/pages/main/order/order.vue @@ -138,6 +138,21 @@ const refundClose = () => { refund_show.value = false } + const pingjia =(i)=>{ + + var info={} + uni.getStorage({ + key: 'h5_list', + success: function (res) { + info=res.data + info.jump_path = info.jump_path.replace('question','question2') + info.jump_path=info.jump_path+"&orderid="+i.id + uni.$lu.jump(info) + } + }); + + + }