From 93c4bddc5d4563edb9314de5ff53efe83ee695b1 Mon Sep 17 00:00:00 2001 From: sa0ChunLuyu Date: Thu, 19 Jun 2025 11:41:12 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E4=BD=93=E6=A3=80?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=20=20=20=20=E5=A5=97=E9=A4=90?= =?UTF-8?q?=E6=9C=89=E6=95=88=E6=9C=9F=20=20=20=20=20showArea?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/API/H5/HomeController.php | 2 +- admin/src/views/SystemMngr/SystemConfig.vue | 13 +++ h5/pages/main/bgcx/bgcx.vue | 2 +- h5/pages/user/fenzhen/fenzhen.vue | 93 ++++++++++++++----- 4 files changed, 84 insertions(+), 26 deletions(-) diff --git a/Laravel/app/Http/Controllers/API/H5/HomeController.php b/Laravel/app/Http/Controllers/API/H5/HomeController.php index ce9ec0c..3a3a375 100644 --- a/Laravel/app/Http/Controllers/API/H5/HomeController.php +++ b/Laravel/app/Http/Controllers/API/H5/HomeController.php @@ -82,7 +82,7 @@ class HomeController extends Controller 'button' => [[[ 'message' => '', 'name' => '报告解读预约', - 'jump' => 'XCX/pages/other/entry/index?path=/pages/outpatient/doctor-appointment/index&scene=1002&hospitalAreaId=6&departmentCode=A0030077&subDepartmentCode=4773794195699464904', + 'jump' => 'XCX/pages/other/entry/index?path=/pages/outpatient/doctor-appointment/index&scene=1002&showArea=0&hospitalAreaId=6&departmentCode=A0030077&subDepartmentCode=4773794195699464904', 'icon' => '/assets/h5/a_jiedubaogao.png' ],[ 'message' => '', diff --git a/admin/src/views/SystemMngr/SystemConfig.vue b/admin/src/views/SystemMngr/SystemConfig.vue index 17f3970..e504bf9 100644 --- a/admin/src/views/SystemMngr/SystemConfig.vue +++ b/admin/src/views/SystemMngr/SystemConfig.vue @@ -45,6 +45,19 @@ @click="saveInfo('客服电话')">保 存 + + + + + 天 + + + + 保 存 + + diff --git a/h5/pages/main/bgcx/bgcx.vue b/h5/pages/main/bgcx/bgcx.vue index 4b5200e..996b073 100644 --- a/h5/pages/main/bgcx/bgcx.vue +++ b/h5/pages/main/bgcx/bgcx.vue @@ -78,7 +78,7 @@ import TabBar from "@/common/TabBar.vue"; const tzroutes = (url) => { if (url == 'bgjd') { wx.miniProgram.navigateTo({ - url: '/pages/other/entry/index?path=/pages/outpatient/doctor-appointment/index&scene=1002&hospitalAreaId=6&departmentCode=A0030077&subDepartmentCode=4773794195699464904' + url: '/pages/other/entry/index?path=/pages/outpatient/doctor-appointment/index&scene=1002&showArea=0&hospitalAreaId=6&departmentCode=A0030077&subDepartmentCode=4773794195699464904' }) } // 跳转路径 diff --git a/h5/pages/user/fenzhen/fenzhen.vue b/h5/pages/user/fenzhen/fenzhen.vue index 7c5975d..9a80f97 100644 --- a/h5/pages/user/fenzhen/fenzhen.vue +++ b/h5/pages/user/fenzhen/fenzhen.vue @@ -31,7 +31,7 @@ default: "0", }, }); - let tips_popup=ref(null) + let tips_popup = ref(null) let erweima_popup = ref(null) const fenzhen_list = ref(false); const check_tip_show = ref(false); @@ -69,22 +69,25 @@ //uni.hideLoading(); $response(response, () => { fenzhen_list.value = response.data; + timelineSet(fenzhen_list.value.list) if (!check_tip_show.value) { checkTipShow(response.data.check_tip, response.data.info.tj_number) - return false; + if (!!check_tip_show.value) { + return + } } if (fenzhen_active.value !== -1) { getFenzhenInfo(fenzhen_active.value) } setTimeout(() => { if (!!window.location.href.includes('/pages/user/fenzhen/fenzhen')) { - if (!window.location.href.includes('192.168.31.84:5173')) { + if (!window.location.href.includes('192.168.1.118:5173')) { if (erweimaText.value == '') { getFenzhenList(false) } } else { if (Number($props.test) === 1) { - if (erweimaText.value == '' ) { + if (erweimaText.value == '') { getFenzhenList(false) } } @@ -93,6 +96,28 @@ }, 1000 * 10) }); }; + const timeline_max = ref(0) + const timeline_now = ref(0) + const timeline_step = ref(0) + const timelineSet = (list) => { + let maxcount = 0 + let nowcount = 0 + for (let i in list) { + if (!!list[i]['time']) { + maxcount++ + if (Number(list[i]['status']) === 4) { + nowcount++ + } + } + } + timeline_max.value = maxcount + timeline_now.value = nowcount + if (!!maxcount && !!nowcount) { + timeline_step.value = (nowcount / maxcount) * 100 + } else { + timeline_step.value = 0 + } + } const mountedAction = () => { getFenzhenList(); @@ -124,14 +149,14 @@ }); }; const tipShowClick = () => { - - getTipContent(); - + + getTipContent(); + }; const toReport = () => { wx.miniProgram.navigateTo({ - url: '/pages/other/entry/index?path=/pages/outpatient/doctor-appointment/index&scene=1002&hospitalAreaId=6&departmentCode=A0030077&subDepartmentCode=4773794195699464904' + url: '/pages/other/entry/index?path=/pages/outpatient/doctor-appointment/index&scene=1002&showArea=0&hospitalAreaId=6&departmentCode=A0030077&subDepartmentCode=4773794195699464904' }) } @@ -184,18 +209,18 @@ erweimaText.value = '' console.log(erweimaText.value) } - const tipsClose=()=>{ + const tipsClose = () => { tips_popup.value.close(); tip_show.value = false; } - const processString=(str, substring)=> { - const index = str.indexOf(substring); - if(index !== -1) { - // 返回指定子串之后的所有内容 - return str.substring(index + substring.length).trim(); - } - return ""; // 如果未找到指定子串，则返回空字符串或其他提示信息 - } + const processString = (str, substring) => { + const index = str.indexOf(substring); + if (index !== -1) { + // 返回指定子串之后的所有内容 + return str.substring(index + substring.length).trim(); + } + return ""; // 如果未找到指定子串，则返回空字符串或其他提示信息 + } onShow(() => { if (!!config_ref.value) { mountedAction(); @@ -227,8 +252,8 @@ - - + + 分钟 + + + @@ -313,7 +344,7 @@ - + {{ i.time }} @@ -323,9 +354,9 @@ - - - + + + {{ k + 1 }}.{{ i.name }} {{ i.desc }} @@ -378,6 +409,20 @@