更新 体检进度条 套餐有效期 showArea

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' => '',

admin/src/views/SystemMngr/SystemConfig.vue

@@ -45,6 +45,19 @@
 					 		@click="saveInfo('客服电话')">保 存</el-button>
 				 </el-col>
 			 </el-row>
+			 <el-row  style="padding:auto 20px;margin: auto 10px ;">
+				 <el-col :span="8">
+					 <el-form-item label="订单有效期">
+					 	<el-input-number size="large" v-model="configInfo.订单有效期" placeholder="客服电话"
+					 		style="  margin: auto 20px;" />
+             <span>天</span>
+					 </el-form-item>
+				 </el-col>
+				 <el-col :span="4">
+					 <el-button type="primary" size="large"
+					 		@click="saveInfo('订单有效期')">保 存</el-button>
+				 </el-col>
+			 </el-row>
 			 <el-row  style="padding:auto 20px;margin: auto 10px ;">
 			 				 <el-col :span="8">
 			 					  <el-form-item label="H5价格筛选最大值">

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'
 			})
 		}
 		// 跳转路径

h5/pages/user/fenzhen/fenzhen.vue

@@ -69,16 +69,19 @@
 		//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)
 						}
@@ -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();
@@ -131,7 +156,7 @@
 
 	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'
 		})
 	}
 
@@ -300,6 +325,12 @@
 					}}</view>
 					<view class="tip_time_text_wrapper">分钟</view>
 				</view>
+				<view class="timeline_wrapper">
+					<view class="timeline_in" :style="{
+						width : `${timeline_step}%`,
+						background : `${timeline_step>=100?'#239EA3':'#FF9900'}`,
+					}"></view>
+				</view>
 				<view class="tip_box_wrapper">
 					<view class="tip_icon_wrapper">
 						<image src="@/static/assets/fenzhen/tip@2x.png"></image>
@@ -378,6 +409,20 @@
 	</view>
 </template>
 <style scoped>
+	.timeline_in {
+		height: 20rpx;
+		border-radius: 0 5rpx 5rpx 0;
+	}
+
+	.timeline_wrapper {
+		width: 100%;
+		height: 20rpx;
+		background: #cccccc;
+		margin: 25rpx auto 0;
+		border-radius: 8rpx;
+		overflow: hidden;
+	}
+
 	.item_desc_wrapper {
 		font-size: 22rpx;
 		color: red;