From d5aaf868ae466b8ec175139bb70f41ec6f6a0798 Mon Sep 17 00:00:00 2001 From: yanzai Date: Wed, 26 Feb 2025 20:34:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=84=E7=A7=8D=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Http/Controllers/API/ApiMapController.php | 3 + .../Controllers/API/H5/ComboController.php | 36 +++- .../Controllers/API/H5/DoctorController.php | 2 +- .../Controllers/API/H5/ItemController.php | 1 + .../Controllers/API/H5/OrderNewController.php | 33 ++- .../Controllers/API/H5/SanFangController.php | 56 +++++ .../API/H5/TransferCodeController.php | 1 + Laravel/app/Services/OrderService.php | 12 +- Laravel/app/Services/SanFangCodeService.php | 47 ++++ Laravel/config/app.php | 1 + Laravel/routes/web.php | 3 + h5/pages.json | 5 + h5/pages/buy/choose/choose.vue | 5 + h5/pages/buy/choose/sanfang.vue | 200 ++++++++++++++++++ h5/pages/buy/done/done.vue | 2 +- h5/pages/buy/done/yuyue_done.vue | 7 + h5/pages/main/combo/combo.vue | 66 ++++-- h5/pages/main/index/index.vue | 3 +- h5/pages/main/order/src/order.vue | 58 ++++- h5/pages/main/selectDoctor/selectDoctor.vue | 4 +- h5/pages/main/tj/tjxq.vue | 17 +- h5/pages/main/tj/tjzx.vue | 41 ++-- h5/pages/main/tjyy/tjyy.vue | 5 +- h5/pages/main/yytjsj/yytjsj_new.vue | 1 + h5/pages/user/choose/choose.vue | 27 ++- h5/static/assets/shaixuan_active@2x.png | Bin 0 -> 2638 bytes 26 files changed, 558 insertions(+), 78 deletions(-) create mode 100644 Laravel/app/Http/Controllers/API/H5/SanFangController.php create mode 100644 Laravel/app/Services/SanFangCodeService.php create mode 100644 h5/pages/buy/choose/sanfang.vue create mode 100644 h5/static/assets/shaixuan_active@2x.png diff --git a/Laravel/app/Http/Controllers/API/ApiMapController.php b/Laravel/app/Http/Controllers/API/ApiMapController.php index e9ce6a7..1fad228 100644 --- a/Laravel/app/Http/Controllers/API/ApiMapController.php +++ b/Laravel/app/Http/Controllers/API/ApiMapController.php @@ -93,6 +93,9 @@ class ApiMapController extends Controller 'OrderZhuanZeng' => $base_url . '/api/H5/OrderZhuanZeng', // 订单转赠 'OrderReceiveZhuanZeng' => $base_url . '/api/H5/OrderReceiveZhuanZeng', // 接受订单转赠 'GetPersonJianDangInfo' => $base_url . '/api/H5/GetPersonJianDangInfo', // 根据多种条件查询建档信息 + 'GetSanFangList' => $base_url . '/api/H5/GetSanFangList', // 获取三方机构列表 + 'GetSanFangCode' => $base_url . '/api/H5/GetSanFangCode', // 获取三方机构code + 'HeXiaoSanFangCode' => $base_url . '/api/H5/HeXiaoSanFangCode', // 核销三方机构code ]; } diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php index 5dc662f..6949221 100644 --- a/Laravel/app/Http/Controllers/API/H5/ComboController.php +++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php @@ -45,6 +45,7 @@ class ComboController extends Controller $combo_type = $request->post('combo_type'); $combo_crowd = $request->post('combo_crowd'); $combo_price = $request->post('combo_price'); + $combo_sex = $request->post('combo_sex'); $combo_item = $request->post('combo_item'); $checkup_type_id = $request->post('checkup_type_id'); $keshi_name=$request->post('keshi_name'); @@ -61,7 +62,12 @@ class ComboController extends Controller //用户绑定就诊人数量 $personCount = DB::table('web_user_person')->where(['user_id' => $user->id, 'is_del' => 0])->count(); $canshu = []; - $canshu[]=$person->sex; + if(isset($combo_sex)){ + $canshu[]=$combo_sex; + }else{ + $canshu[]=$person->sex; + } + $sql = ''; if (isset($combo_price) and !isset($price_range)) { $price_list = [ @@ -232,13 +238,18 @@ select combo_id as c_id,count(*) as count from combo_items where status in(1) gr ]; //获取套餐价格分布 $step = 500; - $maxPrice = 20000 + $step; + $maxPrice = 9500 + $step; + $db_maxPrice = DB::table('configs')->where(['label'=>'H5价格筛选最大值'])->first(); + if(!!$db_maxPrice){ + $maxPrice = $db_maxPrice->value; + } + $result=DB::select("SELECT FLOOR(price / ?) * ? AS price_range_start, COUNT(*) AS count FROM combos WHERE price >= 0 AND price < ? GROUP BY price_range_start;",[$step,$step,$maxPrice]); $price_ranges = []; - for ($i = 0; $i <= 20000; $i += $step) { + for ($i = 0; $i <= $maxPrice-$step; $i += $step) { $price_ranges[$i] = 0; } foreach ($result as $row) { @@ -312,6 +323,7 @@ FROM combos;"); $group_id = request('group_id'); //团检登记id $wj_flag= request('wj'); //问卷标记 $coupon_id=request('coupon_id'); //代金券id + $sanfang_code=request('sanfang_code'); //第三方code $person_id = request('person_id'); //就诊人id $person=DB::table('web_user_person')->where(['id' => $person_id,'is_del'=>0])->first(); @@ -417,6 +429,12 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) $combo_info['items']= $this->KeShiPaiXu($combo_info['items']); $pay_item_count += $combo->item_count; $true_price += $combo_info['price']; + //如果使用了第三方券 + if(isset($sanfang_code) and isset($sanfang_code['code_num'])){ + if($sanfang_code['combo_id']<>$combo_id) return \Yz::echoError1("转赠码与套餐不匹配"); + $true_price=$true_price-$sanfang_code['price']; + if($true_price<0) $true_price=0; + } $combo_info['tags'][0]['text']=$comboItemCount. '个项目'; //如果有影像科，则存储在nmr_list $comboItem=DB::table('combo_items')->where(['combo_id' => $combo_id, 'status' => 1,'keshi_name'=>'影像科'])->get(); @@ -455,21 +473,21 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4) if (!isset($groupedData[$keshiName])) { $groupedData[$keshiName] = []; } - $groupedData[$keshiName][] = ['desc' => $item->jianjie, 'name' => $item->name,'price'=>$item->price,'original_price'=>$item->original_price,'id'=>$item->item_id]; + $groupedData[$keshiName][] = ['desc' => $item->jianjie, 'name' => $item->name,'price'=>number_format( $item->price * config('app.globals.ZiXuan_ZheKou'), 2, '.', ''),'original_price'=>$item->original_price,'id'=>$item->item_id]; //如果有影像科，则存储在nmr_list字段 if($item->keshi_name=='影像科'){ $nmr_list[]=[ 'item_id' => $item->item_id, 'name' => $item->name, - 'price' => $item->price, + 'price' =>number_format( $item->price * config('app.globals.ZiXuan_ZheKou'), 2, '.', '') , ]; } } - if(isset($wj_flag) and $wj_flag==1){ - $item_price=number_format($item_price*$wj_zhekou, 2, '.', '') ; - } - +// if(isset($wj_flag) and $wj_flag==1){ +// $item_price=number_format($item_price*$wj_zhekou, 2, '.', '') ; +// } + $item_price=number_format($item_price * config('app.globals.ZiXuan_ZheKou'), 2, '.', '') ; $items_info['price'] =$item_price; $items_info['original_price'] = $items_original_price; diff --git a/Laravel/app/Http/Controllers/API/H5/DoctorController.php b/Laravel/app/Http/Controllers/API/H5/DoctorController.php index 3a292ff..af17fc8 100644 --- a/Laravel/app/Http/Controllers/API/H5/DoctorController.php +++ b/Laravel/app/Http/Controllers/API/H5/DoctorController.php @@ -106,7 +106,7 @@ class DoctorController extends Controller 'name' => $value['U_NAME'], 'id' => $value['U_ID'], 'level' => $value['ZC_NAME'], - 'hospital' => '', + 'hospital' => '秀英院区', 'time' => $value['U_GDPB'], 'desc' => $value['U_JIANJIE'], 'keshiname'=>$keshiname, diff --git a/Laravel/app/Http/Controllers/API/H5/ItemController.php b/Laravel/app/Http/Controllers/API/H5/ItemController.php index 43643a9..3529a08 100644 --- a/Laravel/app/Http/Controllers/API/H5/ItemController.php +++ b/Laravel/app/Http/Controllers/API/H5/ItemController.php @@ -24,6 +24,7 @@ class ItemController extends Controller $group_list = []; $items= $this->KeShiPaiXu($items); foreach ($items as $item) { + $item->price=number_format($item->price * config('app.globals.ZiXuan_ZheKou'), 2, '.', '') ; if($item->sex <> $person->sex and $item->sex<>0){ continue; } diff --git a/Laravel/app/Http/Controllers/API/H5/OrderNewController.php b/Laravel/app/Http/Controllers/API/H5/OrderNewController.php index 8699c02..0b3398e 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderNewController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderNewController.php @@ -6,6 +6,7 @@ use App\Http\Controllers\API\AspNetZhuanController; use App\Http\Controllers\API\PEISApiController; use App\Http\Controllers\Controller; use App\Lib\Tools; +use App\Services\SanFangCodeService; use DateTime; use Illuminate\Http\Request; use Illuminate\Support\Facades\DB; @@ -22,6 +23,7 @@ class OrderNewController extends Controller $group_id = request('group_id');//团检id $item_ids = request('item_ids');//自选item的ids $peiou_info = request('peiou_info');//配偶信息 + $sanfang_code=request('sanfang_code'); //第三方code if (count($item_ids) != 0 and $item_ids[0] == "") { $item_ids = []; @@ -90,6 +92,9 @@ class OrderNewController extends Controller $combo_info = DB::table('combos')->where(['combo_id' => $combo_id, 'status' => 1])->first(); if (!$combo_info) return \Yz::echoError1("套餐不存在"); if (!isset($combo_info->checkup_type_id)) return \Yz::echoError1("套餐未关联体检类型"); + if($combo_info->sex<>0 and $combo_info->sex<>$person->sex) { + return \Yz::echoError1("套餐性别与体检人性别不匹配"); + } $checkup_type_id = $combo_info->checkup_type_id; //构建多选一数据 @@ -120,6 +125,20 @@ class OrderNewController extends Controller $TJ_Leixing_id = $checkup_type_id; $price += $combo_info->price; + //如果使用了第三方券 + $cha_sanfang_code=false; + if(isset($sanfang_code) and isset($sanfang_code['code_num'])){ + if($sanfang_code['combo_id']<>$combo_id) return \Yz::echoError1("转赠码与套餐不匹配"); + //校验有效性，临时抵消套餐价格 + if($sanfang_code['qudao_type']==1){ + $cha_sanfang_code = DB::table('transfer_code')->where(['code' => $sanfang_code['code_num'], 'status' => 1, 'is_del' => 0])->first(); + if (!$cha_sanfang_code) return \Yz::echoError1("此转赠码不可用"); + $price=$price-$cha_sanfang_code->price; + if($price<0){ + $price=0; + } + } + } $title = $combo_info->name; $buy_info['combo'] = [ 'id' => $combo_info->combo_id, @@ -160,10 +179,10 @@ class OrderNewController extends Controller ]; } } - if (isset($wj_flag) and $wj_flag == 1) { - $item_price = $item_price * $wj_zhekou; - } - +// if (isset($wj_flag) and $wj_flag == 1) { +// $item_price = $item_price * $wj_zhekou; +// } + $item_price = $item_price *0.8; //所有自选项目打8折 $price += $item_price; $missingIds = array_diff($item_ids, $existingIds); @@ -361,6 +380,12 @@ class OrderNewController extends Controller ]; $youhuiquan_dikou_status = $AspNet::YouHuiQuan($data); } + //核销三方券码（转赠码等） + if(!!$cha_sanfang_code){ + $s= new SanFangCodeService(); + $hexiao=$s->HeXiaoSanFangCode($sanfang_code['qudao_type'],$cha_sanfang_code->code,$insert); + if($hexiao['status']===false) return \Yz::echoError1($hexiao['msg']); + } } diff --git a/Laravel/app/Http/Controllers/API/H5/SanFangController.php b/Laravel/app/Http/Controllers/API/H5/SanFangController.php new file mode 100644 index 0000000..9319a12 --- /dev/null +++ b/Laravel/app/Http/Controllers/API/H5/SanFangController.php @@ -0,0 +1,56 @@ +where(['status' => 1])->get(); + return \Yz::Return(true, "查询完成", ['list' => $list]); + } + + //查询三方码 + public function GetSanFangCode(Request $request) + { + $code = request('code'); + $qudao_type = request('qudao_type');//1H5转赠码2有赞 + if ($qudao_type == 1) { + + $code = DB::table('transfer_code')->where(['code' => $code, 'status' => 1, 'is_del' => 0])->first(); + if (!$code) return \Yz::echoError1("此转赠码不可用"); + $data = [ + 'code_num' => $code->code, + 'status' => $code->status, + 'price' => $code->price, + 'combo_id' => $code->combo_id, + 'qudao_type' => $qudao_type, + ]; + return \Yz::Return(true, "查询成功", $data); + } + } + + //操作三方码 + public function HeXiaoSanFangCode(Request $request) + { + $qudao_type = request('qudao_type');//1H5转赠码2有赞 + $code = request('code'); + if ($qudao_type == 1) { + $u = false; + $data = [ + 'status' => 2, + 'tj_num' => isset($tj_num) ? $tj_num : null, + ]; + $u = DB::table('transfer_code')->where(['code' => $code, 'status' => 1, 'is_del' => 0])->update($data); + if ($u) { + return \Yz::Return(true, "操作成功", ['code_num' => $code]); + } else { + return \Yz::echoError1("操作失败"); + } + } + } +} diff --git a/Laravel/app/Http/Controllers/API/H5/TransferCodeController.php b/Laravel/app/Http/Controllers/API/H5/TransferCodeController.php index afb1713..5f82b26 100644 --- a/Laravel/app/Http/Controllers/API/H5/TransferCodeController.php +++ b/Laravel/app/Http/Controllers/API/H5/TransferCodeController.php @@ -38,4 +38,5 @@ class TransferCodeController extends Controller } + } diff --git a/Laravel/app/Services/OrderService.php b/Laravel/app/Services/OrderService.php index 3345129..1a16810 100644 --- a/Laravel/app/Services/OrderService.php +++ b/Laravel/app/Services/OrderService.php @@ -177,6 +177,12 @@ class OrderService $AspNet::YouHuiQuan($data); } } + $sanfangcode=json_decode($orderInfo->sanfang_code,true); + if($sanfangcode and !empty($sanfangcode)){ + $s=new SanFangCodeService(); + $cancel_hexiao=$s->CancelSanFangCode($sanfangcode['qudao_type'],$sanfangcode['code'],$orderInfo->id ); + } + DB::table('orders')->where(['id' => $orderInfo->id,'status'=>1])->update([ 'status' => 3 @@ -286,7 +292,11 @@ class OrderService $AspNet::YouHuiQuan($data); } } - + $sanfangcode=json_decode($orderInfo->sanfang_code,true); + if($sanfangcode and !empty($sanfangcode)){ + $s=new SanFangCodeService(); + $cancel_hexiao=$s->CancelSanFangCode($sanfangcode['qudao_type'],$sanfangcode['code'],$orderInfo->id ); + } DB::table('orders')->where(['id' => $id])->update([ 'status' => 5, 'refund_time'=>$now_datetime diff --git a/Laravel/app/Services/SanFangCodeService.php b/Laravel/app/Services/SanFangCodeService.php new file mode 100644 index 0000000..f3d3d64 --- /dev/null +++ b/Laravel/app/Services/SanFangCodeService.php @@ -0,0 +1,47 @@ + 2, + 'pay_order_id' => $orderid, + ]; + $u = DB::table('transfer_code')->where(['code' => $code, 'status' => 1, 'is_del' => 0])->update($data); + $data2=[ + 'qudao_type' => $qudao_type, + 'code' => $code, + ]; + DB::table('orders')->where(['id'=>$orderid])->update(['sanfang_code'=>json_encode($data2,JSON_UNESCAPED_UNICODE)]); + if ($u) { + return ['status'=>true,'msg'=>'操作成功']; + } else { + return ['status'=>false,'msg'=>'核销失败']; + } + } + } + //撤销核销 + public function CancelSanFangCode($qudao_type, $code,$orderid){ + if ($qudao_type == 1) { + $u = false; + $data = [ + 'status' => 1, + 'pay_order_id' => null, + ]; + $u = DB::table('transfer_code')->where(['code' => $code, 'status' => 2, 'is_del' => 0])->update($data); + if ($u) { + return ['status'=>true,'msg'=>'操作成功']; + } else { + return ['status'=>false,'msg'=>'撤销失败']; + } + } + } +} diff --git a/Laravel/config/app.php b/Laravel/config/app.php index d12b336..557364d 100644 --- a/Laravel/config/app.php +++ b/Laravel/config/app.php @@ -11,6 +11,7 @@ return [ // 'Env'=>'pro', 'Env'=>'dev', 'Wj_ZheKou'=>1,//问卷带出项目，折扣率 + 'ZiXuan_ZheKou'=>0.8,//自选项目折扣 'erxian_kuadu'=>3,//二线时间跨度，单位天 'KeShiPaiXu'=>["预检咨询","体格检查","人体成分","呼气试验","采血室（化验）","内科","妇科","妇科（化验）","妇科（病理）","婚前医学检查","外科","眼科","耳鼻喉科","肺功能室","口腔科","骨密度室","CT室","影像科","住院体检","胃肠镜室"] ], diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php index 9914884..d896f97 100644 --- a/Laravel/routes/web.php +++ b/Laravel/routes/web.php @@ -85,6 +85,9 @@ Route::group(['middleware' => ['log'],'prefix' => 'api/H5'], function () { Route::post('/OrderZhuanZeng', 'App\Http\Controllers\API\H5\OrderNewController@ZhuanZeng');//订单转赠 Route::post('/OrderReceiveZhuanZeng', 'App\Http\Controllers\API\H5\OrderNewController@ReceiveZhuanZeng');//接受订单转赠 Route::post('/CreateTransferCode', 'App\Http\Controllers\API\H5\TransferCodeController@CreateTransferCode');//创建转赠码 + Route::post('/GetSanFangList', 'App\Http\Controllers\API\H5\SanFangController@GetSanFangList');//获取三方机构列表 + Route::post('/GetSanFangCode', 'App\Http\Controllers\API\H5\SanFangController@GetSanFangCode');//获取三方code + Route::post('/HeXiaoSanFangCode', 'App\Http\Controllers\API\H5\SanFangController@HeXiaoSanFangCode');//核销三方code diff --git a/h5/pages.json b/h5/pages.json index abf7956..57513f8 100644 --- a/h5/pages.json +++ b/h5/pages.json @@ -55,6 +55,11 @@ "style": { "navigationBarTitleText": "个检预约" } + },{ + "path": "pages/buy/choose/sanfang", + "style": { + "navigationBarTitleText": "核销" + } }, { "path": "pages/posts/posts/posts", diff --git a/h5/pages/buy/choose/choose.vue b/h5/pages/buy/choose/choose.vue index 8c9a3d2..daa77bf 100644 --- a/h5/pages/buy/choose/choose.vue +++ b/h5/pages/buy/choose/choose.vue @@ -96,6 +96,11 @@ }; onShow(() => { + let buyinfo=$store.getBuyInfo() + buyinfo.combo_id='' + buyinfo.combo_sex='' + buyinfo.sanfang_code={} + $store.setBuyInfo(buyinfo) if (!!config_ref.value) { mountedAction(); } diff --git a/h5/pages/buy/choose/sanfang.vue b/h5/pages/buy/choose/sanfang.vue new file mode 100644 index 0000000..8d27642 --- /dev/null +++ b/h5/pages/buy/choose/sanfang.vue @@ -0,0 +1,200 @@ + + + \ No newline at end of file diff --git a/h5/pages/buy/done/done.vue b/h5/pages/buy/done/done.vue index 015ec57..2397e90 100644 --- a/h5/pages/buy/done/done.vue +++ b/h5/pages/buy/done/done.vue @@ -130,7 +130,7 @@ - 请提前10分钟凭身份证原件到现代妇儿秀英院区健康管理中心(2楼女宾区)签到。建议体检前3天清淡饮食、禁烟酒，体检当天需空腹，禁水禁食。咨询电话66595555、65781993。 + 请提前10分钟凭身份证原件到现代妇儿秀英院区健康管理中心(一楼男宾区二楼女宾区)签到。建议体检前3天清淡饮食、禁烟酒，体检当天需空腹，禁水禁食。咨询电话66595555、65781993。 diff --git a/h5/pages/buy/done/yuyue_done.vue b/h5/pages/buy/done/yuyue_done.vue index c04a159..d7ec637 100644 --- a/h5/pages/buy/done/yuyue_done.vue +++ b/h5/pages/buy/done/yuyue_done.vue @@ -131,6 +131,13 @@ 预约号源： {{ order_info.appointment_date }} {{ order_info.appointment_time }} + + 核磁项目: + + {{item.name}} + 预约时间：{{order_info.erxian_appointment_info[0].date}} {{order_info.erxian_appointment_info[0].time}} + + @@ -643,6 +667,16 @@ + + 性别 + + + + 套餐类型 @@ -843,9 +877,9 @@ } .combo_true_price_wrapper { - font-weight: 500; + font-weight:600; font-size: 18rpx; - color: #ec3d15; + color: #E95513; line-height: 1; } @@ -897,13 +931,13 @@ font-size: 18rpx; color: #47abd8; margin: 10rpx 8rpx 10rpx 0rpx; - border: 1rpx solid #009da5; + border: 2rpx solid #009da5; } .combo_name_wrapper { - font-weight: 400; + font-weight: 900; font-size: 32rpx; - color: #0e0e0e; + color: #3E3A39; line-height: 32rpx; } @@ -1126,6 +1160,8 @@ background-color: #fff; border-radius: 0rpx 0rpx 20rpx 20rpx; padding: 40rpx 20rpx 20rpx 20rpx; + max-height: calc(100vh - 500rpx); + overflow-y: auto; } .top_button_row { diff --git a/h5/pages/main/index/index.vue b/h5/pages/main/index/index.vue index 8be110b..06a9b66 100644 --- a/h5/pages/main/index/index.vue +++ b/h5/pages/main/index/index.vue @@ -237,6 +237,7 @@ let buyinfo=$store.getBuyInfo() buyinfo.combo_id='' buyinfo.combo_sex='' + buyinfo.sanfang_code={} $store.setBuyInfo(buyinfo) $store.setCheckupTypeId({}); @@ -294,7 +295,7 @@ - 01031940 + 02261310 diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue index 0d39f41..affa3cf 100644 --- a/h5/pages/main/order/src/order.vue +++ b/h5/pages/main/order/src/order.vue @@ -16,7 +16,7 @@ import { onShow } from "@dcloudio/uni-app"; - import wx from "weixin-js-sdk"; + import wx from "weixin-js-sdk"; const $props = defineProps({ info: { type: Object, @@ -100,7 +100,25 @@ }; const emit = defineEmits(); - const Refound = async (id) => { + const Refound = async (order) => { + let content='确定要为 '+order.title+' 退款吗？' + if(order.appointment_date?.length>0){ + content='您已经预约'+order.appointment_date+'的体检，'+content; + } + uni.showModal({ + title: '提示', + content: content, + success: function (res) { + if (res.confirm) { + tuikuan(order.id) + } else if (res.cancel) { + console.log('用户点击取消'); + } + } + }); + + }; + const tuikuan=async(id)=>{ uni.showLoading(); const response = await $api("Refund", { openid: localStorage.getItem("OPENID"), @@ -115,7 +133,7 @@ emit("updateValue", "orderUpdate"); } }); - }; + } //去预约 const toPlan=(id)=>{ uni.navigateTo({ @@ -268,7 +286,20 @@ } }) } + + const fuzhi=()=>{ + uni.setClipboardData({ + data:OrderInfoDetail.value.transfer_code, + success: function () { + uni.showToast({ + title: '复制成功' + }); + } + }); + + } onMounted(() => { + deepInfo(); }); @@ -286,7 +317,19 @@ 转赠码 - {{OrderInfoDetail.transfer_code?OrderInfoDetail.transfer_code:''}} + + + {{OrderInfoDetail.transfer_code?OrderInfoDetail.transfer_code:''}} + + + + + + 已转赠至 @@ -364,7 +407,10 @@ 转赠码: - {{OrderInfoDetail.transfer_code?OrderInfoDetail.transfer_code:''}} + + {{OrderInfoDetail.transfer_code?OrderInfoDetail.transfer_code:''}} + + 报告解读 --> - 退款 diff --git a/h5/pages/main/selectDoctor/selectDoctor.vue b/h5/pages/main/selectDoctor/selectDoctor.vue index 624c653..15ffb6e 100644 --- a/h5/pages/main/selectDoctor/selectDoctor.vue +++ b/h5/pages/main/selectDoctor/selectDoctor.vue @@ -279,8 +279,8 @@ }} - {{ item.hospital }}: - {{ item.time }} + {{ item.hospital }}: + {{ item.time }} {{ item.desc }} diff --git a/h5/pages/main/tj/tjxq.vue b/h5/pages/main/tj/tjxq.vue index 13438cb..0d9e6ea 100644 --- a/h5/pages/main/tj/tjxq.vue +++ b/h5/pages/main/tj/tjxq.vue @@ -43,6 +43,7 @@ let active_keshi=ref([]); let popupXuZhi=ref(null); let active_miaoshu=ref([]);//已经显示的项目描述 + let buy_info=ref({}); const GetReadmeDetails = async () => { const response = await $api("GetReadme"); @@ -86,7 +87,8 @@ wj: { type: String, default: "", - }, + } + }); const WenHaoClick=(i)=>{ console.log(active_miaoshu.value) @@ -165,6 +167,7 @@ hospital: $store.save_info.hospital, duo_xuan_yi: $store.getDuoXuanYi(), wj: wj.value, + sanfang_code:buy_info.value.sanfang_code?.code_num?buy_info.value.sanfang_code:null }); if (!!$store.yytjInfo.doctor_name) { $store.setYytjInfo({ @@ -176,6 +179,7 @@ $store.setYytjInfo({}); } uni.setStorageSync("yytjInfoS", {}); + popupXuZhi.value.close() uni.navigateTo({ url: "/pages/main/tjyy/tjyy", }); @@ -192,10 +196,12 @@ group_id: groupId.value, duo_xuan_yi: $store.getDuoXuanYi(), wj: wj.value, + sanfang_code:buy_info.value.sanfang_code?.code_num?buy_info.value.sanfang_code:null }; const response = await $api("BuyInfo", obj); $response(response, () => { uni.hideLoading(); + contentInfo.value=[] if (groupId.value && response.data.group_info.length) { // 团检 groupInfo.value = response.data.group_info[0]; @@ -264,6 +270,7 @@ popupTip.value.close() } onShow(() => { + buy_info.value=$store.getBuyInfo() if (!!config_ref.value) { mountedAction(); } @@ -394,7 +401,9 @@ - + + + 体检须知 @@ -452,8 +461,8 @@ }} - -