diff --git a/common/config.js b/common/config.js
index d866485..e12e969 100644
--- a/common/config.js
+++ b/common/config.js
@@ -4,8 +4,8 @@
 //测试环境
 const PROT = "http://"
 // const ROOTHOST = "47.75.182.93:8090";
-// const ROOTHOST = "1.92.152.160";
-const ROOTHOST = "192.168.2.222:8187";
+const ROOTHOST = "1.92.152.160";
+// const ROOTHOST = "192.168.2.222:8187";
 // const ROOTHOST = "120.46.52.165";
 // const ROOTHOST = "192.168.0.115:8187";
 // const ROOTHOST = "192.168.1.169:8187";
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d54e30e..253622e 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -421,8 +421,9 @@
 
 			<view style="margin-top: 45rpx;" v-if="goods.length > 0">
 				<view class="text-bold text-lg" style="border-bottom: 5rpx solid #2FB57A;">
-					<text
-						style="border-radius: 10rpx 10rpx 0 0; background: linear-gradient(90deg, #019C88, #28BA92, #35C495);padding: 15rpx 15rpx 5rpx 15rpx;color: white;">今日服务</text>
+					<text style="border-radius: 10rpx 10rpx 0 0; background: linear-gradient(90deg, #019C88, #28BA92, #35C495);padding: 15rpx 15rpx 5rpx 15rpx;color: white;">
+						今日服务
+					</text>
 				</view>
 				
 				<view class="bgwhite radius margin-top-sm padding-bottom-sm"
@@ -439,7 +440,7 @@
 							:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
 							color="#20C675">
 						</uni-countdown> -->
-						<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
+						<u-count-down :timestamp="item.endOfServiceTimer" separator-color="#20C675" color="#20C675"
 							font-size="30" separator-size="30"></u-count-down>
 					</view>
 					
@@ -452,7 +453,9 @@
 						<view class="progress-status" v-if="item.status == 7">已出发</view>
 						<view class="progress-status" v-if="item.status == 8">已到达</view>
 						<view class="progress-status" v-if="item.status == 3">待评价</view>
-						<view class="progress-status" v-if="item.status == 4" style="color: #999999;">已取消</view>
+						<view class="progress-status" v-if="item.status == 4">已取消</view>
+						<view class="progress-status" v-if="item.status == 9">待确认</view>
+						<view class="progress-status" v-if="item.status == 10" >待补单</view>
 						<view v-if="item.overTimeOrders == 1" style="color: red;font-size:26rpx">(订单已超时)</view>
 						<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
 						<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
@@ -1101,8 +1104,9 @@ export default {
 							let afterTimeStamp = new Date(d.endTime).getTime() / 1000;
 							let currentTimeStamp = new Date().getTime() / 1000;
 							let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
-							console.log(currentTimeStamp);
-							this.endOfServiceTimer = formatTimeStamp;
+							console.log(currentTimeStamp,"currentTimeStamp=======？");
+							d.endOfServiceTimer = formatTimeStamp;
+							
 						}
 						this.goods.push(d);
 					});
diff --git a/pages/order/index.vue b/pages/order/index.vue
index 3c67c02..9856b72 100644
--- a/pages/order/index.vue
+++ b/pages/order/index.vue
@@ -69,12 +69,13 @@
 					<!-- <view class="text-green" v-if="item.status == 1">待支付</view> -->
 					<view class="progress-status" v-if="item.status == 2">待服务</view>
 					<view class="progress-status" v-if="item.status == 3">已完成待评价</view>
-					<!-- <view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view> -->
+					<view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view>
 					<view class="progress-status" v-if="item.status == 5">已完成</view>
 					<view class="progress-status" v-if="item.status == 6">服务中</view>
 					<view class="progress-status" v-if="item.status == 7">技师出发</view>
 					<view class="progress-status" v-if="item.status == 8">技师到达</view>
-					<view class="progress-status" v-if="item.status ==9">确认接单</view>
+					<view class="progress-status" v-if="item.status ==9">待确认</view>
+					<view class="progress-status" v-if="item.status ==10">待补单</view>
 					<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
 			
 					<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
@@ -153,7 +154,7 @@
 				<view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
 					<view style="font-size: 28rpx;font-family: PingFang SC;font-weight: bold;color: #fe9130;">服务倒计时
 					</view>
-					<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675"
+					<u-count-down :timestamp="item.endOfServiceTimer" separator-color="#20C675" color="#20C675"
 						font-size="30" separator-size="30"></u-count-down>
 					<!-- 				<uni-countdown ref="countDownEl" :title="'剩余'" :showDay="false" :fontSize="'14'"
 						:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
@@ -706,7 +707,7 @@
 							let afterTimeStamp = new Date(ret.endTime).getTime() / 1000;
 							let currentTimeStamp = new Date().getTime() / 1000;
 							let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
-							this.endOfServiceTimer = formatTimeStamp;
+							ret.endOfServiceTimer = formatTimeStamp;
 						}
 						if (this.$refs.countDownEl) this.$refs.countDownEl.update();
 					})
diff --git a/unpackage/release/apk/__UNI__B37C795__20240703171316.apk b/unpackage/release/apk/__UNI__B37C795__20240703171316.apk
new file mode 100644
index 0000000..a9070ca
Binary files /dev/null and b/unpackage/release/apk/__UNI__B37C795__20240703171316.apk differ
diff --git a/uview-ui/libs/request/index.js b/uview-ui/libs/request/index.js
index 466da1e..41d6ef4 100644
--- a/uview-ui/libs/request/index.js
+++ b/uview-ui/libs/request/index.js
@@ -104,8 +104,8 @@ class Request {
 			// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
 			// baseUrl: 'http://47.75.182.93:8090/', // 请求的根域名
 			// baseUrl: 'http://120.46.52.165/', // 请求的根域名
-			baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
-			// baseUrl: 'http://1.92.152.160/', // 请求的根域名
+			// baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
+			baseUrl: 'http://1.92.152.160/', // 请求的根域名
 			// 默认的请求头
 			header: {},
 			method: 'POST',