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('客服电话')">保 存</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价格筛选最大值">
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 @@
 					<view class="tip_dialog_text_wrapper" v-html="tip_content"></view>
 				</view>
 			</view>
-		</uni-popup>	
-		
+		</uni-popup>
+
 		<view v-if="!!fenzhen_list">
 			<view class="order_info_wrapper relative">
 				<w-qrcode v-if="fenzhen_list.info.kahao" @click="erweima_click(fenzhen_list.info.kahao)"
@@ -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>
@@ -313,7 +344,7 @@
 				<view class="time_line_box_wrapper">
 					<view v-for="(i, k) in fenzhen_list.list" :key="k">
 						<view class="time_line_item_wrapper" :class="[`time_line_item-${i.status}_wrapper`]">
-							<view class="time_line_item_time_wrapper"  v-if="i.name!='体检结束'">
+							<view class="time_line_item_time_wrapper" v-if="i.name!='体检结束'">
 								<view v-if="!!i.time" class="time_line_item_time_value_wrapper">{{
 						      i.time
 						    }}</view>
@@ -323,9 +354,9 @@
 								<view v-if="!!i.time" class="time_line_item_time_line_wrapper"></view>
 								<view v-if="!i.time" class="time_line_item_time_cover_wrapper"></view>
 							</view>
-							<view class="time_line_item_content_wrapper"  v-if="i.name!='体检结束'" >
-								<view class="time_line_item_triangle_wrapper" ></view>
-								<view class="time_line_item_flex_wrapper"  v-if="i.name!='体检结束'">
+							<view class="time_line_item_content_wrapper" v-if="i.name!='体检结束'">
+								<view class="time_line_item_triangle_wrapper"></view>
+								<view class="time_line_item_flex_wrapper" v-if="i.name!='体检结束'">
 									<view class="time_line_item_title_wrapper">{{ k + 1 }}.{{ i.name }}</view>
 									<view class="time_line_item_box_wrapper">{{ i.desc }}</view>
 								</view>
@@ -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;
@@ -401,7 +446,7 @@
 		justify-content: end;
 	}
 
-	.report_button_wrapper { 
+	.report_button_wrapper {
 		width: 200rpx;
 		height: 60rpx;
 		background: #239ea3;