From 4d116096834bf5b158870f151f7777e519fca9a4 Mon Sep 17 00:00:00 2001 From: yanzai Date: Mon, 7 Oct 2024 23:25:45 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E5=B1=8F=E8=94=BD=E6=94=B9=E7=BA=A6?= =?UTF-8?q?=E3=80=81=E6=8E=A5=E5=8F=A3=E9=99=90=E5=88=B6=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E9=80=89=E5=90=8C=E4=B8=80=E4=BB=BD=E6=8A=A5=E5=91=8A=EF=BC=8C?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/FenzhenController.php | 1 + Laravel/app/Http/Controllers/API/H5/OrderController.php | 3 +++ Laravel/app/Http/Controllers/API/H5/ReportController.php | 2 ++ h5/pages/main/order/src/order.vue | 4 ++-- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php index d35134a..2ce8ec9 100644 --- a/Laravel/app/Http/Controllers/API/H5/FenzhenController.php +++ b/Laravel/app/Http/Controllers/API/H5/FenzhenController.php @@ -11,6 +11,7 @@ class FenzhenController extends Controller public function abandon() { // 这里放 弃检逻辑 + return \Yz::Return(true, "弃检成功"); } diff --git a/Laravel/app/Http/Controllers/API/H5/OrderController.php b/Laravel/app/Http/Controllers/API/H5/OrderController.php index 9b3e469..c83615d 100644 --- a/Laravel/app/Http/Controllers/API/H5/OrderController.php +++ b/Laravel/app/Http/Controllers/API/H5/OrderController.php @@ -28,6 +28,9 @@ class OrderController extends Controller $datetime = new DateTime($list->created_at); $timestamp = $datetime->getTimestamp(); $list->end_time = $timestamp + (60 * $WaitingPaymentTime); + if(time() > $list->end_time){ + $list->status=3; + } } } diff --git a/Laravel/app/Http/Controllers/API/H5/ReportController.php b/Laravel/app/Http/Controllers/API/H5/ReportController.php index ca43b1b..b238648 100644 --- a/Laravel/app/Http/Controllers/API/H5/ReportController.php +++ b/Laravel/app/Http/Controllers/API/H5/ReportController.php @@ -41,6 +41,7 @@ class ReportController extends Controller foreach ($report_list as $key => $report) { $report_list[$key]['is_read']=0; + $report_list[$key]['登记时间']= explode('T', $report_list[$key]['登记时间'])[0]; if($report['体检状态']=='报告已出' || $report['体检状态']=='总检完成'){ $cha=DB::table('report_l1_records')->where(['体检号' => $report['体检号']])->first(); if(!!$cha and $cha->is_read==1){ @@ -261,6 +262,7 @@ class ReportController extends Controller { $ids = $request->post('tj_numbers'); if(count($ids)<>2) return \Yz::echoError1("请选择两份报告"); + if($ids[0]==$ids[1]) return \Yz::echoError1('不能选择相同的报告'); sort($ids); $report1=DB::table('report_l1_records as a')->leftJoin('report_l2_items as b' ,'a.id','=','b.reprort_l1_id')->where('a.体检号',$ids[0])->whereIn('体检状态',['报告已出','总检完成'])->get(); $report2=DB::table('report_l1_records as a')->leftJoin('report_l2_items as b' ,'a.id','=','b.reprort_l1_id')->where('a.体检号',$ids[1])->whereIn('体检状态',['报告已出','总检完成'])->get(); diff --git a/h5/pages/main/order/src/order.vue b/h5/pages/main/order/src/order.vue index 45a7624..b2f9356 100644 --- a/h5/pages/main/order/src/order.vue +++ b/h5/pages/main/order/src/order.vue @@ -162,8 +162,8 @@ 继续付款 - - 改约 + 退款 Date: Mon, 7 Oct 2024 23:45:59 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9C=AA=E5=87=BA=E6=8A=A5=E5=91=8A=E4=B8=8D=E5=8F=AF=E7=82=B9?= =?UTF-8?q?=E5=87=BB=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=9C=AA=E8=AF=BB?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- h5/pages/main/bgcx/bgcx.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/h5/pages/main/bgcx/bgcx.vue b/h5/pages/main/bgcx/bgcx.vue index 493b7f5..b7736f6 100755 --- a/h5/pages/main/bgcx/bgcx.vue +++ b/h5/pages/main/bgcx/bgcx.vue @@ -44,8 +44,12 @@ tj_status: tabIndex.value, hospital_id: $store.save.hospital }; + uni.showLoading({ + title: "加载中", + }); const response = await $api("GetReportList", obj); $response(response, () => { + uni.hideLoading() console.log(response, "response"); bgcx_list.value = response.data.list; uni.hideLoading(); @@ -60,6 +64,7 @@ } }; const routesDeatils = (val) => { + if(val["体检状态"]=="报告未出") return false; // 跳转查看报告详情 let tjhStr = val["体检号"]; uni.navigateTo({ @@ -129,7 +134,7 @@ - 未读 From 3e6a0cdb86634bf1fb48c21a879727c897b9f43b Mon Sep 17 00:00:00 2001 From: yanzai Date: Mon, 7 Oct 2024 23:56:04 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=B7=B2=E8=AF=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Laravel/app/Http/Controllers/API/H5/ReportController.php | 2 +- h5/pages/main/bgcx/ckbg/ckbg.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/ReportController.php b/Laravel/app/Http/Controllers/API/H5/ReportController.php index b238648..e226c7e 100644 --- a/Laravel/app/Http/Controllers/API/H5/ReportController.php +++ b/Laravel/app/Http/Controllers/API/H5/ReportController.php @@ -153,7 +153,7 @@ class ReportController extends Controller ]; $info['content'] = $report->总检建议; - + DB::table('report_l1_records')->where(['id' => $report->id])->update(['is_read' => 1]); return \Yz::Return(true, "查询完成", ['info' => $info]); } } diff --git a/h5/pages/main/bgcx/ckbg/ckbg.vue b/h5/pages/main/bgcx/ckbg/ckbg.vue index ff52cde..54c4e53 100755 --- a/h5/pages/main/bgcx/ckbg/ckbg.vue +++ b/h5/pages/main/bgcx/ckbg/ckbg.vue @@ -28,7 +28,7 @@ const $props = defineProps({ const bgjl_obj = ref(false); const wzbg_list = ref(null); -let tabIndex = ref(1); // 标签索引 +let tabIndex = ref(0); // 标签索引 let currentIndex = ref(0); // 标签索引完整报告 const getBtn = (e) => { From a904af1fb3e44e510df6814a1f0037453c0adc42 Mon Sep 17 00:00:00 2001 From: yanzai Date: Tue, 8 Oct 2024 00:54:55 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E5=AF=B9=E9=BD=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- h5/pages/main/tj/tjxq.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/h5/pages/main/tj/tjxq.vue b/h5/pages/main/tj/tjxq.vue index 34a3e41..df77874 100644 --- a/h5/pages/main/tj/tjxq.vue +++ b/h5/pages/main/tj/tjxq.vue @@ -528,7 +528,7 @@ onShow(() => { 套餐价格 - ¥ {{ comboInfo.price }} From 8c996cb738910ca998ca37ce259dd9a8221ea657 Mon Sep 17 00:00:00 2001 From: yanzai Date: Tue, 8 Oct 2024 01:27:12 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=AF=B9=E6=AF=94?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E9=80=89=E6=8B=A9=E5=90=8C=E4=B8=80=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- h5/pages/main/bgcx/bgdb/bgdb.vue | 2 +- h5/pages/main/bgcx/bgdb/xzbg/xzbg.vue | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/h5/pages/main/bgcx/bgdb/bgdb.vue b/h5/pages/main/bgcx/bgdb/bgdb.vue index f495a47..830db29 100755 --- a/h5/pages/main/bgcx/bgdb/bgdb.vue +++ b/h5/pages/main/bgcx/bgdb/bgdb.vue @@ -39,7 +39,7 @@ const duibiclick = async () => { if (dbList.value && dbList.value.length == 2) { let obj = { - tj_numbers: [dbList.value[0]["体检号"], dbList.value[0]["体检号"]], + tj_numbers: [dbList.value[0]["体检号"], dbList.value[1]["体检号"]], }; const response = await $api("ReportContrast", obj); $response(response, () => { diff --git a/h5/pages/main/bgcx/bgdb/xzbg/xzbg.vue b/h5/pages/main/bgcx/bgdb/xzbg/xzbg.vue index b1ce8d8..7227884 100755 --- a/h5/pages/main/bgcx/bgdb/xzbg/xzbg.vue +++ b/h5/pages/main/bgcx/bgdb/xzbg/xzbg.vue @@ -34,6 +34,12 @@ const gettjbgInfo = async () => { const selectdbObj = async (item) => { let tjbgList = $store.getTjbgInfo(); if($store.setTjbgInfo?.length < 2){ + console.log(item.体检号); + console.log(tjbgList.length); + if(tjbgList.length==1 && item.体检号==tjbgList[0].体检号){ + uni.$lu.toast("请选择两份不同的报告"); + return false; + } tjbgList.push(item); } $store.setTjbgInfo(tjbgList); From f0ef4c0ac7b661b778f78af6d18c496c714f3b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E4=BD=B3=E5=AE=87?= <17601616548@163.com> Date: Tue, 8 Oct 2024 02:39:21 +0800 Subject: [PATCH 06/13] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=E5=9B=9E=E5=88=B0?= =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8C=89=E9=92=AE=202.=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E7=AC=AC?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=203.=E4=BD=93=E6=A3=80=E5=BC=95=E5=AF=BC?= =?UTF-8?q?=E5=BF=83=E7=94=B5=E5=9B=BE=E8=AF=A6=E6=83=85+=E5=BC=83?= =?UTF-8?q?=E6=A3=80=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- h5/package.json | 1 + h5/pages.json | 15 + h5/pages/buy/choose/choose.vue | 2 + h5/pages/buy/contrast/contrast.vue | 2 + h5/pages/buy/done/done.vue | 2 + h5/pages/components/goHome.vue | 73 ++ h5/pages/main/bgcx/bgcx.vue | 2 + h5/pages/main/bgcx/bgdb/bgdb.vue | 12 +- h5/pages/main/bgcx/bgdb/xzbg/xzbg.vue | 6 +- h5/pages/main/bgcx/bgjd/bgjd.vue | 2 + h5/pages/main/bgcx/ckbg/ckbg.vue | 6 +- h5/pages/main/bgcx/qsfx/qsfx.vue | 2 + h5/pages/main/bgcx/qsfx/qsfxxq.vue | 2 + h5/pages/main/combo/combo.vue | 6 +- h5/pages/main/combo/tcdb.vue | 2 + h5/pages/main/coupon/coupon.vue | 2 + h5/pages/main/dev/dev.vue | 3 + h5/pages/main/login/login.vue | 1 + h5/pages/main/order/order.vue | 2 + h5/pages/main/order/src/order.vue | 2 + .../main/packageDetails/packageDetails.vue | 2 + h5/pages/main/questionnaire/index.vue | 2 + h5/pages/main/selectDoctor/selectDoctor.vue | 2 + h5/pages/main/tj/choose.vue | 2 + h5/pages/main/tj/selectType.vue | 2 + h5/pages/main/tj/tjxq.vue | 4 +- h5/pages/main/tj/tjzx.vue | 2 + h5/pages/main/tjyy/tjyy.vue | 2 + h5/pages/main/yytjsj/yytjsj.vue | 6 +- h5/pages/posts/posts/posts.vue | 2 + h5/pages/user/choose/choose.vue | 2 + h5/pages/user/fenzhen/fenzhen.vue | 1143 +++++++++-------- h5/pages/user/fenzhen/qijian.vue | 187 +++ h5/pages/user/fenzhen/xindiantu.vue | 594 +++++++++ h5/pages/user/pick/pick.vue | 2 + h5/vite.config.js | 5 +- 36 files changed, 1543 insertions(+), 561 deletions(-) create mode 100644 h5/pages/components/goHome.vue create mode 100644 h5/pages/user/fenzhen/qijian.vue create mode 100644 h5/pages/user/fenzhen/xindiantu.vue diff --git a/h5/package.json b/h5/package.json index a13bd53..f8e8219 100644 --- a/h5/package.json +++ b/h5/package.json @@ -1,5 +1,6 @@ { "dependencies": { + "@uni-ui/code-ui": "^1.5.3", "echarts": "^5.4.2", "weixin-js-sdk": "^1.6.5" }, diff --git a/h5/pages.json b/h5/pages.json index 3fd5bc5..1616f2e 100644 --- a/h5/pages.json +++ b/h5/pages.json @@ -189,6 +189,18 @@ "navigationBarTitleText": "体检引导" } }, + { + "path": "pages/user/fenzhen/xindiantu", + "style": { + "navigationBarTitleText": "体检引导" + } + }, + { + "path": "pages/user/fenzhen/qijian", + "style": { + "navigationBarTitleText": "线上弃检" + } + }, { "path": "pages/buy/contrast/contrast", "style": { @@ -202,6 +214,9 @@ } } ], + "easycom": { + "^w-(.*)": "@/uni_modules/wmf-code/components/w-$1/w-$1.vue" + }, "globalStyle": { "navigationBarTextStyle": "white", "navigationBarTitleText": "海南现代妇女儿童医院", diff --git a/h5/pages/buy/choose/choose.vue b/h5/pages/buy/choose/choose.vue index 73f7242..e15e990 100644 --- a/h5/pages/buy/choose/choose.vue +++ b/h5/pages/buy/choose/choose.vue @@ -1,4 +1,5 @@