diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 9be2e86..9a9d3b7 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -10,7 +10,7 @@ const install = (Vue, vm) => {
 	// 	dataType: 'json',  
 	// 	showLoading: true, // 是否显示请求中的loading
 	// 	loadingText: '...', // 请求loading中的文字提示
-		// loadingTime: 800, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms
+		loadingTime: 1000, // 在此时间内，请求还没回来的话，就显示加载中动画，单位ms
 	// 	originalData: false, // 是否在拦截器中返回服务端的原始数据
 	// 	loadingMask: true, // 展示loading的时候，是否给一个透明的蒙层，防止触摸穿透
 	// 	// 配置请求头信息 
@@ -19,13 +19,13 @@ const install = (Vue, vm) => {
 			
 	// 	},
 	// }); 
-	uni.setStorageSync('deptId', 100);
+	uni.setStorageSync('deptId', 101);
 	Vue.prototype.$u.http.setConfig({
 			// baseUrl: 'http://61.174.243.28:15861',
 			// baseUrl: 'http://192.168.2.14:8080',
 			// baseUrl: 'http://124.221.246.124:2289',
-			// baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
-			baseUrl: 'https://dche.ccttiot.com/prod-api',
+			baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
+			// baseUrl: 'https://dche.ccttiot.com/prod-api',
 			loadingText: '努力加载中~',
 			// loadingTime: 2000,
 			// 设置自定义头部content-type
diff --git a/manifest.json b/manifest.json
index cad1f86..8d15cb5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -51,7 +51,7 @@
     /* 小程序特有相关 */
     "mp-weixin" : {
         "libVersion" : "latest",
-        "appid" : "wx3428c498d5061192",
+        "appid" : "wx4d178f8c80348214",
         "setting" : {
             "urlCheck" : false
         },
diff --git a/page_user/agreement.vue b/page_user/agreement.vue
index d1f80f7..85a2050 100644
--- a/page_user/agreement.vue
+++ b/page_user/agreement.vue
@@ -2,8 +2,8 @@
   <view class="page">
     <u-navbar :is-back="false" title=" " :border-bottom="false" :background="bgc" title-color="#000" title-size="36" height="45"></u-navbar>
     <view class="cont" v-html="info.content"></view>
-    <view class="xy" @click="showxy = !showxy">
-      <view class="yuans">
+    <view class="xy" @click="showxy = !showxy" v-if="showbot">
+      <view class="yuans" >
         <image src="https://lxnapi.ccttiot.com/bike/img/static/u7F851ikY9rkASzNSNkO" v-if="showxy" mode=""></image>
       </view>
       <view class="txt" v-if="isread">
@@ -18,6 +18,12 @@
         同意
       </view>
     </view>
+	<view class="bottom" v-if="!showbot">
+	  <view class="btn" @click="back()" style="width: 80%;">
+	    返回
+	  </view>
+	 
+	</view>
   </view>
 </template>
 
@@ -55,6 +61,12 @@
 			this.getagree()
 		},
 		methods: {
+			back(){
+				
+				uni.navigateBack({
+					delta: 1 // delta值为1时表示返回的页面层数
+				});
+			},
 			ok() {
 				if(this.isread==false){
 					uni.showToast({
diff --git a/page_user/ckmx.vue b/page_user/ckmx.vue
index 4befb71..56a91f5 100644
--- a/page_user/ckmx.vue
+++ b/page_user/ckmx.vue
@@ -31,7 +31,7 @@
 				</view>
 				<view class="cont_box" style="margin-top: 20rpx;">
 					<view class="cont_left">
-						管理费
+						停车点外调度费
 					</view>
 					<view class="cont_right">
 						{{info.manageFee}}元
@@ -39,7 +39,7 @@
 				</view>
 				<view class="cont_box" style="margin-top: 20rpx;">
 					<view class="cont_left">
-						调度费
+						运营区外调度费
 					</view>
 					<view class="cont_right">
 						{{info.dispatchFee}}元
diff --git a/page_user/jfgz.vue b/page_user/jfgz.vue
index 4186abe..00da0dd 100644
--- a/page_user/jfgz.vue
+++ b/page_user/jfgz.vue
@@ -148,7 +148,7 @@
 				<view class="card">
 					<view class="li">
 						<view class="left">
-							调度费（非停车点）
+							运营区外调度费
 						</view>
 						<view class="right">
 							{{areaInfo. dispatchFee}}元
@@ -159,7 +159,7 @@
 					</view>
 					<view class="li" style="margin-top: 38rpx;">
 						<view class="left">
-							管理费费
+							停车点外调度费
 						</view>
 						<view class="right">
 							{{areaInfo.vehicleManagementFee}}元
@@ -174,7 +174,7 @@
 						
 					</view>
 					<view class="txt">
-						调度费（非还车点）、调度费（运营区域外）不重复叠加 收取
+						运营区外调度费、停车点外调度费不重复叠加 收取
 					</view>
 					
 				</view>
diff --git a/page_user/yj.vue b/page_user/yj.vue
index 5b38d41..02aeef1 100644
--- a/page_user/yj.vue
+++ b/page_user/yj.vue
@@ -143,6 +143,19 @@
 			</view>
 			
 		</view>
+		<u-mask :show="loadingmask" :z-index='100' duration='0' />
+		<view class="pops" v-if="loadingmask" style="width: 500rpx;left:124rpx">
+			<view class="tit" style="font-weight: 600;">
+				加载中...
+			</view>
+			<!-- <u-loading size="50" mode="flower"></u-loading> -->
+			<view class="loading_box">
+				<image src="https://lxnapi.ccttiot.com/bike/img/static/uOQxwzp0Sj9l2WZ534zp" mode=""></image>
+				<!-- <view class="loader">
+					
+				</view> -->
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -160,7 +173,8 @@
 				total: 0,
 				areaInfo: "",
 				isback:false,
-				showBack:false
+				showBack:false,
+				loadingmask:false
 
 			}
 
@@ -267,13 +281,13 @@
 				});
 			},
 			getinfo() {
-				uni.showLoading({
-					title:'加载中'
-				})
+				// uni.showLoading({
+				// 	title:'加载中'
+				// })
 				this.$u.get("/getAppInfo").then((res) => {
 				
 					if (res.code == 200) {
-						uni.hideLoading()
+						// uni.hideLoading()
 						this.$store.commit('SET_USERID', res.user.userId);
 						this.userinfo = res.user
 						console.log(res.user.balance,'es.user.balance',this.isback);
@@ -291,7 +305,34 @@
 						setTimeout(()=>{
 							this.getinfo()
 							this.getlist()
-						},2000)
+						},500)
+					}
+				});
+			},
+			check(){
+				
+				this.$u.get("/getAppInfo").then((res) => {
+				
+					if (res.code == 200) {
+						
+						this.$store.commit('SET_USERID', res.user.userId);
+						this.userinfo = res.user
+						console.log(res.user.balance,'es.user.balance',this.isback);
+						this.loadingmask=false
+							this.getlist()
+						if(res.user.balance==parseFloat(this.areaInfo.deposit)){
+							console.log('进入判断了',this.isback);
+							if(this.isback==true){
+								
+								console.log('进入判断了1');
+								this.showBack=true
+							}
+							
+							
+						}
+					
+					} else {
+						
 					}
 				});
 			},
@@ -321,14 +362,15 @@
 							paySign: res.data.paySign,
 							success(res) {
 								// 支付成功逻辑
-								uni.showLoading({
-									title: '加载中'
-								})
+								// uni.showLoading({
+								// 	title: '加载中'
+								// })
+								that.loadingmask=true
 								setTimeout(() => {
-									uni.hideLoading()
-									that.getinfo()
-									that.getlist()
-								}, 2000)
+									
+									that.check()
+									
+								}, 4000)
 
 							},
 							fail(err) {
@@ -341,7 +383,11 @@
 							}
 						});
 					} else {
-
+						uni.showToast({
+							title: res.data,
+							icon: 'none',
+							duration: 2000
+						});
 					}
 				})
 			},
@@ -377,12 +423,43 @@
 					height: 80rpx;
 				}
 			}
-			.btn_box{
+			.loading_box{
+				width: 100%;
+				// height: 200rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				image{
+					width: 336rpx;
+					height: 154rpx;
+				}
+				// .loader {
+				//   width: 120rpx;
+				//   aspect-ratio: 1;
+				//   border-radius: 50%;
+				//   clip-path: inset(-360rpx); /* 4倍的比例调整 */
+				//   box-shadow: -240rpx 60rpx, -240rpx 60rpx, -240rpx 60rpx; /* 4倍的比例调整 */
+				//   transform: translateY(-60rpx); /* 4倍的比例调整 */
+				//   animation: l19 1s infinite linear;
+				// }
+				
+				// @keyframes l19 {
+				//   16.67% {box-shadow:-240rpx 60rpx,-240rpx 60rpx,  76rpx 60rpx} /* 4倍的比例调整 */
+				//   33.33% {box-shadow:-240rpx 60rpx,    0px 60rpx,  76rpx 60rpx} /* 4倍的比例调整 */
+				//   40%,60%{box-shadow: -76rpx 60rpx,    0px 60rpx,  76rpx 60rpx} /* 4倍的比例调整 */
+				//   66.67% {box-shadow: -76rpx 60rpx,    0px 60rpx, 240rpx 60rpx} /* 4倍的比例调整 */
+				//   83.33% {box-shadow: -76rpx 60rpx, 240rpx 60rpx,240rpx 60rpx} /* 4倍的比例调整 */
+				//   100%   {box-shadow: 240rpx 60rpx, 240rpx 60rpx,240rpx 60rpx} /* 4倍的比例调整 */
+				// }
+		
+			}
+			.btn_box {
 				margin-top: 80rpx;
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
-				.btn1{
+		
+				.btn1 {
 					display: flex;
 					align-items: center;
 					justify-content: center;
@@ -390,12 +467,13 @@
 					height: 90rpx;
 					background: #989898;
 					border-radius: 54rpx 54rpx 54rpx 54rpx;
-					
+		
 					font-weight: 500;
 					font-size: 40rpx;
 					color: #FFFFFF;
 				}
-				.btn2{
+		
+				.btn2 {
 					display: flex;
 					align-items: center;
 					justify-content: center;
@@ -403,12 +481,13 @@
 					height: 90rpx;
 					background: #4C97E7;
 					border-radius: 54rpx 54rpx 54rpx 54rpx;
-					
+		
 					font-weight: 500;
 					font-size: 40rpx;
 					color: #FFFFFF;
 				}
 			}
+		
 			.time {
 				margin-top: 20rpx;
 				text-align: center;
@@ -418,7 +497,7 @@
 			}
 		
 			.cont {
-				height: 300rpx;
+				height: 500rpx;
 				overflow-x: hidden;
 				overflow-y: auto;
 			}
@@ -523,9 +602,14 @@
 				font-size: 40rpx;
 				color: #FFFFFF;
 			}
+		
+			.act1 {
+				background-color: #ccc;
+			}
 		}
 		
 		
+		
 		.card {
 			display: flex;
 			justify-content: center;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 22f3d09..9e3be78 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -240,11 +240,11 @@
 			</view>
 
 			<view class="page3" v-if="deviceIndex==2">
-				<view class="bot_btn">
+				<view class="bot_btns">
 
 					<view class="info">
 						<view class="left">
-							预估金额：{{money}}<span>元</span>
+							预估金额：{{ parseFloat(money).toFixed(2) }}<span>元</span>
 						</view>
 						<!-- <view style="width: 10rpx;" v-if="orderinfo.ruleId!=null">
 
@@ -550,10 +550,10 @@
 		<u-mask :show="isnoline" :z-index='100' duration='0' />
 		<view class="pops" v-if="isnoline">
 			<view class="tit" style="font-weight: 600;">
-				设备离线 请使用蓝牙连接辅助操作
+				设备异常离线 
 			</view>
 			<view class="cont_box" style="text-align: center;color: #808080;justify-content: center;font-size: 36rpx;">
-				请确保手机蓝牙权限已授权
+				请使用蓝牙连接辅助操作,请确保手机蓝牙权限已授权
 			</view>
 
 			<view class="btn_box">
@@ -587,15 +587,15 @@
 
 		</view>
 		<!-- 是否确认还车 -->
-		<u-mask :show="isbackcar"   :z-index='100' duration='0' />
-		<view class="pops"  @click="isbackcar = false"  v-if="isbackcar">
+		<u-mask :show="isbackcar" :z-index='100' duration='0' />
+		<view class="pops" @click="isbackcar = false" v-if="isbackcar">
 			<view class="tit" style="font-weight: 600;">
 				温馨提示
 			</view>
 			<view class="cont_box" style="text-align: center;color: #808080;justify-content: center;font-size: 36rpx;">
-			 为了避免误触，请问是否确定还车
+				为了避免误触，请问是否确定还车
 			</view>
-		
+
 			<view class="btn_box">
 				<view class="btn1" @click="isbackcar = false">
 					取消
@@ -604,9 +604,21 @@
 					确定
 				</view>
 			</view>
-		
+
+		</view>
+		<u-mask :show="loadingmask" :z-index='100' duration='0' />
+		<view class="pops" v-if="loadingmask" style="width: 500rpx;left:124rpx">
+			<view class="tit" style="font-weight: 600;">
+				{{loadingtxt}}
+			</view>
+			<!-- <u-loading size="50" mode="flower"></u-loading> -->
+			<view class="loading_box">
+				<image src="https://lxnapi.ccttiot.com/bike/img/static/uOQxwzp0Sj9l2WZ534zp" mode=""></image>
+				<!-- <view class="loader">
+					
+				</view> -->
+			</view>
 		</view>
-		
 	</view>
 </template>
 
@@ -705,8 +717,9 @@
 				carstause: false,
 
 				isbackdevice: false,
-				isbackcar:false
-
+				isbackcar: false,
+				loadingmask:false,
+				loadingtxt:'设备连接中...'
 			}
 		},
 		watch: {
@@ -759,11 +772,38 @@
 			}, 500)
 		},
 		onShow() {
-			// this.timers = setInterval(() => {
-			// 	// console.log('定时器运行中...');
-			// 	this.getmarks()
-			// 	// 在这里执行你的逻辑
-			// }, 3000); // 每秒执行一次
+			this.timers = setInterval(() => {
+				// console.log('定时器运行中...');
+				this.getmarks()
+				// 在这里执行你的逻辑
+				if(this.orderinfo.sn){
+
+					this.$u.get('/app/device/info?sn=' + this.orderinfo.sn).then((res) => {
+						if (res.code === 200) {
+							if(this.OrderdeviceInfos.onlineStatus!=res.data.onlineStatus){
+								this.OrderdeviceInfos = res.data
+								// this.OrderdeviceInfos.onlineStatus ='0'
+
+								if (this.OrderdeviceInfos.onlineStatus == 0 && this.orderinfo.status != 3) {
+									this.mac = this.OrderdeviceInfos.mac
+									if (this.carstause == false) {
+
+										this.isnoline = true
+									}
+
+								}
+							}
+
+
+						} else {
+							// 处理接口返回错误的情况
+						}
+					}).catch(error => {
+						// 处理接口请求失败的情况
+					});
+				}
+
+			}, 3000); // 每秒执行一次
 
 			if (this.seeDetail == false) {
 
@@ -913,17 +953,17 @@
 			},
 		},
 		methods: {
-			backDevicecar(){
-				this.isbackcar=true
+			backDevicecar() {
+				this.isbackcar = true
 			},
 			gotowzysd() {
 				uni.navigateToMiniProgram({
 					appId: 'wxd7c0bb79b9d616c3', //目标小程序appid
-					path: '/pages/index/index', //需要打开的目标路径
-					extraData: {
-						'data1': 'test'
-					},
-					envVersion: 'trial', //小程序版本：develop（开发版），trial（体验版），release（正式版）
+					path: 'pages/tabbar/index/index', //需要打开的目标路径
+					// extraData: {
+					// 	'data1': 'test'
+					// },
+					// envVersion: 'release', //小程序版本：develop（开发版），trial（体验版），release（正式版）
 					success(res) {
 						// 打开成功
 					}
@@ -977,7 +1017,7 @@
 
 
 
-						// this.setMapScale()
+						this.setMapScale()
 						// if(!hasShownPopup){
 						// 	console.log(typeof(hasShownPopup),'hasShownPopuphasShownPopup');
 						// 	this.showTips=uni.getStorageSync('hasShownPopup')
@@ -1013,13 +1053,14 @@
 							areaId: that.areaInfo.areaId
 						}
 						if (that.carstause) {
-							that.reboot()
+							
 							that.$u.post('/appVerify/device/return?returnType=1&orderNo=' + that.orderinfo
 								.orderNo + '&isBluetooth=true' + '&lon=' + lb.longitude + '&lat=' + lb
 								.latitude).then((
 								res) => {
 								uni.hideLoading()
 								if (res.code === 200) {
+									that.reboot()
 									that.isbackdevice = false
 									that.close()
 									that.getisInOrder()
@@ -1033,24 +1074,18 @@
 								}
 							})
 						} else {
-							uni.showToast({
-								title: '蓝牙状态异常，请重新链接',
-								icon: 'none',
-								duration: 1000
-							});
-							setTimeout(() => {
-								that.isbackdevice = false
-								that.isnoline = true
-							}, 1300)
+							
+						that.isbackdevice = false
+						that.isnoline = true
 						}
 
 					},
 					fail: function(error) {
-						uni.showToast({
-							title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
-							icon: 'none',
-							duration: 2000
-						});
+						// uni.showToast({
+						// 	title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
+						// 	icon: 'none',
+						// 	duration: 2000
+						// });
 						// that.getmarks()
 						// 在这里处理获取位置信息失败的情况
 					}
@@ -1173,11 +1208,11 @@
 
 					},
 					fail: function(error) {
-						uni.showToast({
-							title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
-							icon: 'none',
-							duration: 2000
-						});
+						// uni.showToast({
+						// 	title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
+						// 	icon: 'none',
+						// 	duration: 2000
+						// });
 						// that.getmarks()
 						// 在这里处理获取位置信息失败的情况
 					}
@@ -1188,9 +1223,11 @@
 			// 蓝牙
 			Binddevice() {
 				this.isnoline = false
-				uni.showLoading({
-					title: '连接中..'
-				})
+				this.loadingmask=true
+				this.loadingtxt='设备连接中...'
+				// uni.showLoading({
+				// 	title: '蓝牙扫描中..'
+				// })
 				xBlufi.initXBlufi(1);
 				console.log("xBlufi", xBlufi.XMQTT_SYSTEM);
 				xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
@@ -1205,11 +1242,12 @@
 						'isStart': false
 					});
 					setTimeout(() => {
-
+						// uni.hideLoading()
 						if (this.devicesList.length == 0) {
 							uni.showToast({
 								title: '暂无发现对应设备,请靠近设备',
-								icon: 'none'
+								icon: 'none',
+								duration: 1500
 							});
 						} else {
 							let uniqueDevicesList = Array.from(new Set(this.devicesList));
@@ -1217,6 +1255,7 @@
 							// 将去重后的数组重新赋值给 this.devicesList
 							this.devicesList = uniqueDevicesList;
 							console.log(this.devicesList, 'this.devicesListthis.devicesList');
+							let istrue = false
 							this.devicesList.forEach(device => {
 								// 从设备名称中提取 MAC 地址（假设 MAC 地址是设备名称的后6个字符）
 								let macFromName = device.name.substring(device.name.length - 12);
@@ -1227,6 +1266,7 @@
 									console.log(device);
 									this.deviceInfoss = device
 									// this.ishave = true;
+									istrue = true
 									this.createBLEConnection(device)
 
 									console.log('对比正确1111111111');
@@ -1235,6 +1275,17 @@
 
 								}
 							});
+							setTimeout(() => {
+								if (!istrue) {
+									this.loadingtxt='设备连接失败...'
+									
+										
+									setTimeout(()=>{
+										this.loadingmask=false
+									},500)
+								}
+
+							}, 500)
 						}
 
 
@@ -1242,7 +1293,7 @@
 					// 判断是否存在浇花器设备
 
 					// this.status = true
-				}, 2000)
+				}, 5000)
 
 			},
 			reboot() {
@@ -1352,71 +1403,64 @@
 					})
 				} else {
 					if (this.carstause) {
-						this.opencar()
+						
 
-						setTimeout(() => {
-							let that = this
-							uni.getLocation({
-								type: 'gcj02',
-								success: function(lb) {
-
-
-									let data = {
-										latitude: lb.latitude,
-										longitude: lb.longitude,
-										areaId: that.areaInfo.areaId
-									}
-									that.$u.post('/appVerify/device/unlock?sn=' + that.OrderdeviceInfos
-										.sn + '&orderNo=' +
-										that
-										.orderinfo
-										.orderNo + '&isBluetooth=true' + '&lon=' + lb.longitude +
-										'&lat=' + lb.latitude).then((res) => {
-
-										if (res.code === 200) {
-											that.getisInOrder()
-										} else {
-											if (res.msg == '10500-----') {
-												uni.showToast({
-													title: '系统异常，请重新尝试',
-													icon: 'none',
-													duration: 2000
-												});
-											} else {
-												uni.showToast({
-													title: res.msg,
-													icon: 'none',
-													duration: 2000
-												});
-											}
-
-										}
-									})
-
-								},
-								fail: function(error) {
-									uni.showToast({
-										title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
-										icon: 'none',
-										duration: 2000
-									});
-									// that.getmarks()
-									// 在这里处理获取位置信息失败的情况
+						let that = this
+						uni.getLocation({
+							type: 'gcj02',
+							success: function(lb) {
+						
+						
+								let data = {
+									latitude: lb.latitude,
+									longitude: lb.longitude,
+									areaId: that.areaInfo.areaId
 								}
-
-							})
-
-
-						}, 300)
+								that.$u.post('/appVerify/device/unlock?sn=' + that.OrderdeviceInfos
+									.sn + '&orderNo=' +
+									that
+									.orderinfo
+									.orderNo + '&isBluetooth=true' + '&lon=' + lb.longitude +
+									'&lat=' + lb.latitude).then((res) => {
+						
+									if (res.code === 200) {
+										that.opencar()
+										console.log('发送了离线开锁请求');
+										that.getisInOrder()
+									} else {
+										if (res.msg == '10500-----') {
+											uni.showToast({
+												title: '系统异常，请重新尝试',
+												icon: 'none',
+												duration: 2000
+											});
+										} else {
+											uni.showToast({	
+												title: res.msg,
+												icon: 'none',
+												duration: 2000
+											});
+										}
+						
+									}
+								})
+						
+							},
+							fail: function(error) {
+								// uni.showToast({
+								// 	title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
+								// 	icon: 'none',
+								// 	duration: 2000
+								// });
+								// that.getmarks()
+								// 在这里处理获取位置信息失败的情况
+							}
+						
+						})
+						
 					} else {
-						uni.showToast({
-							title: '蓝牙状态异常，请重新链接',
-							icon: 'none',
-							duration: 1000
-						});
-						setTimeout(() => {
-							this.isnoline = true
-						}, 1300)
+						console.log('蓝牙没了');
+						this.isnoline = true
 					}
 
 				}
@@ -1452,70 +1496,63 @@
 					})
 				} else {
 					if (this.carstause) {
-						this.closecar()
+						
 
-						setTimeout(() => {
-							let that = this
-							uni.getLocation({
-								type: 'gcj02',
-								success: function(lb) {
-
-
-									let data = {
-										latitude: lb.latitude,
-										longitude: lb.longitude,
-										areaId: that.areaInfo.areaId
-									}
-									that.$u.post('/appVerify/device/lock?sn=' + that.OrderdeviceInfos
-										.sn + '&orderNo=' +
-										that
-										.orderinfo
-										.orderNo + '&isBluetooth=true' + '&lon=' + lb.longitude +
-										'&lat=' + lb.latitude).then((res) => {
-
-										if (res.code === 200) {
-											that.getisInOrder()
-										} else {
-											if (res.msg == '10500-----') {
-												uni.showToast({
-													title: '系统异常，请重新尝试',
-													icon: 'none',
-													duration: 2000
-												});
-											} else {
-												uni.showToast({
-													title: res.msg,
-													icon: 'none',
-													duration: 2000
-												});
-											}
-
-										}
-									})
-
-								},
-								fail: function(error) {
-									uni.showToast({
-										title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
-										icon: 'none',
-										duration: 2000
-									});
-									// that.getmarks()
-									// 在这里处理获取位置信息失败的情况
+						let that = this
+						uni.getLocation({
+							type: 'gcj02',
+							success: function(lb) {
+						
+						
+								let data = {
+									latitude: lb.latitude,
+									longitude: lb.longitude,
+									areaId: that.areaInfo.areaId
 								}
-
-							})
-
-						}, 300)
+								that.$u.post('/appVerify/device/lock?sn=' + that.OrderdeviceInfos
+									.sn + '&orderNo=' +
+									that
+									.orderinfo
+									.orderNo + '&isBluetooth=true' + '&lon=' + lb.longitude +
+									'&lat=' + lb.latitude).then((res) => {
+						
+									if (res.code === 200) {
+										that.closecar()
+										console.log('发送了离线锁车请求');
+										that.getisInOrder()
+									} else {
+										if (res.msg == '10500-----') {
+											uni.showToast({
+												title: '系统异常，请重新尝试',
+												icon: 'none',
+												duration: 2000
+											});
+										} else {
+											uni.showToast({
+												title: res.msg,
+												icon: 'none',
+												duration: 2000
+											});
+										}
+						
+									}
+								})
+						
+							},
+							fail: function(error) {
+								// uni.showToast({
+								// 	title: '未获取到定位信息，请点击设置勾选允许位置信息，即可使用全部功能',
+								// 	icon: 'none',
+								// 	duration: 2000
+								// });
+								// that.getmarks()
+								// 在这里处理获取位置信息失败的情况
+							}
+						
+						})
 					} else {
-						uni.showToast({
-							title: '蓝牙状态异常，请重新链接',
-							icon: 'none',
-							duration: 1000
-						});
-						setTimeout(() => {
-							this.isnoline = true
-						}, 1300)
+						console.log('点击了');
+						this.isnoline = true
 					}
 
 				}
@@ -1558,46 +1595,105 @@
 						if (options.result) {
 							// uni.hideLoading();
 
-							uni.showToast({
-								title: '连接成功',
-								icon: 'none'
-							}); {
-
-								xBlufi.notifyInitBleEsp32({
-									deviceId: options.data.deviceId
-								});
-
-								xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvents);
-
-								this.deviceIds = options.data.deviceId
-								this.name = options.data.name
-								// 连接成功绑定设备
-								// let params = {
-								// 	mac: this.Bluetoothmac,
-								// 	userId: this.$store.state.user.userId
-								// }
-								let systemInfo = uni.getSystemInfoSync();
-								if (systemInfo.platform === 'android') {
-									// 当前设备是 Android  
-
-								} else if (systemInfo.platform === 'ios') {
-									// 当前设备是 iOS  
-									// uni.navigateTo({
-									// 	url: '/pages/wifilist/index?deviceId=' + options
-									// 		.data.deviceId + '&name=' + options.data.name
-									// })
-								}
+							
+							xBlufi.notifyInitBleEsp32({
+								deviceId: options.data.deviceId
+							});
+							
+							// xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvents);
+							
+							// this.deviceIds = options.data.deviceId
+							// this.name = options.data.name
+							// 连接成功绑定设备
+							// let params = {
+							// 	mac: this.Bluetoothmac,
+							// 	userId: this.$store.state.user.userId
+							// }
+							let systemInfo = uni.getSystemInfoSync();
+							if (systemInfo.platform === 'android') {
+								// 当前设备是 Android  
+							
+							} else if (systemInfo.platform === 'ios') {
+								// 当前设备是 iOS  
+								// uni.navigateTo({
+								// 	url: '/pages/wifilist/index?deviceId=' + options
+								// 		.data.deviceId + '&name=' + options.data.name
+								// })
 							}
 						}
-
+						if (options.result == false) {
+							// this.loadingmask=false
+							this.carstause = false
+							
+							this.loadingtxt='设备连接失败...'
+							
+								
+							setTimeout(()=>{
+								this.loadingmask=false
+							},500)
+							// uni.showModal({
+							// 	title: '很抱歉提醒你！',
+							// 	content: '小程序与设备异常断开',
+							// 	showCancel: false,
+							// 	success: function(res) {
+							// 		// uni.navigateBack({
+							// 		// 	url: '../search/search'
+							// 		// });
+							// 	}
+							// });
+							// this.statusflag = false
+							// uni.hideLoading();
+						}
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
 
 						// this.ver_data = this.parseCustomData(options.data)
 						if (options.data) {
 							this.carstause = true
+							
+							this.loadingtxt='设备连接成功！'
+							if(this.loadingmask){
+								setTimeout(()=>{
+									this.loadingmask=false
+								},700)
+							}
+							
+								
+							
+							
+						}else{
+							this.carstause = false
+							this.loadingtxt='设备链接失败'
+							if(this.loadingmask){
+								setTimeout(()=>{
+									this.loadingmask=false
+								},700)
+							}
+						}
+						// console.log("1收到设备发来的自定义数据结果：",options.data);
+						break;
+						case xBlufi.XBLUFI_TYPE.TYPE_STATUS_CONNECTED: {
+							console.log('状态', options.result)
+							if (options.result == false) {
+								this.carstause = false
+								// uni.showToast({
+								// 	title: '设备断开链接，请重新点击蓝牙链接',
+								// 	icon: 'none'
+								// });
+								// uni.showModal({
+								// 	title: '很抱歉提醒你！',
+								// 	content: '小程序与设备异常断开',
+								// 	showCancel: false,
+								// 	success: function(res) {
+								// 		// uni.navigateBack({
+								// 		// 	url: '../search/search'
+								// 		// });
+								// 	}
+								// });
+								// this.statusflag = false
+								// uni.hideLoading();
+							}
 						}
-						// console.log("1收到设备发来的自定义数据结果：", this.ver_data);
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
 						if (options.result) {
@@ -1627,17 +1723,19 @@
 
 			//4、建立连接
 			createBLEConnection(e) {
-				uni.showLoading({
-					title: '绑定中..'
-				})
-				console.log('调用了');
+				this.loadingmask=true
+				
+				// uni.showLoading({
+				// 	title: '绑定中..'
+				// })
+				// console.log('调用了');
 				xBlufi.notifyStartDiscoverBle({
 					'isStart': false
 				});
 				// console.log(e, '蓝牙信息')
 				const deviceId = e.deviceId
 				this.Bluetoothmac = e.localName.substring(5) //从第七位开始截取 只取后面的mac号
-				console.log(this.Bluetoothmac, '11111');
+				// console.log(this.Bluetoothmac, '11111');
 				let name = e.name;
 				// console.log('点击了，蓝牙准备连接的deviceId:' + e.deviceId);
 				xBlufi.notifyConnectBle({
@@ -1645,9 +1743,9 @@
 					deviceId: e.deviceId,
 					name
 				});
-				setTimeout(() => {
-					uni.hideLoading()
-				}, 3000)
+				// setTimeout(() => {
+				// 	uni.hideLoading()
+				// }, 3000)
 				// for (var i = 0; i < this.devicesList.length; i++) {
 				// 	if (e.deviceId === this.devicesList[i].deviceId) {
 
@@ -1724,30 +1822,6 @@
 					}
 					break;
 
-					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_MY_DATA:
-						this.loadPercent = options.data;
-						this.loadText = '文件读取中'
-						console.log("文件读取中", options.data);
-						break;
-					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
-						// this.isband = true
-						// this.ver_data = this.parseCustomData(options.data)
-						console.log("1收到设备发来的自定义数据结果：", options.data);
-						if (options.data) {
-							this.carstause = true
-						}
-						break;
-
-					case xBlufi.XBLUFI_TYPE.TYPE_INIT_ESP32_RESULT:
-						// uni.hideLoading();
-						if (options.result) {
-							console.log('初始化成功');
-						} else {
-							console.log('初始化失败');
-
-
-						}
-						break;
 				}
 			},
 			// 点击隐藏没有设备提示
@@ -1767,7 +1841,7 @@
 				this.$u.get('/app/device/info?sn=' + this.orderinfo.sn).then((res) => {
 					if (res.code === 200) {
 						this.OrderdeviceInfos = res.data
-						// this.OrderdeviceInfos.onlineStatus ='0'
+						// this.OrderdeviceInfos.onlineStatus = '0'
 
 						if (this.OrderdeviceInfos.onlineStatus == 0 && this.orderinfo.status != 3) {
 							this.mac = this.OrderdeviceInfos.mac
@@ -1993,24 +2067,24 @@
 				// this.close()
 				// 在这里添加你的回调逻辑
 			},
-			lockDevice() {
-				if (this.orderinfo.status) {
-					this.showtcs = true
-				} else {
-					if (this.deviceInfos.status != 1) {
-						uni.showToast({
-							title: '车辆正在使用中,请使用其他车辆',
-							icon: 'none',
-							duration: 2000
-						});
-					} else {
-						this.showdevice = true;
-						this.type = 1;
-						this.deviceIndex = 1;
-					}
-				}
+			// lockDevice() {
+			// 	if (this.orderinfo.status) {
+			// 		this.showtcs = true
+			// 	} else {
+			// 		if (this.deviceInfos.status != 1) {
+			// 			uni.showToast({
+			// 				title: '车辆正在使用中,请使用其他车辆',
+			// 				icon: 'none',
+			// 				duration: 2000
+			// 			});
+			// 		} else {
+			// 			this.showdevice = true;
+			// 			this.type = 1;
+			// 			this.deviceIndex = 1;
+			// 		}
+			// 	}
 
-			},
+			// },
 			changetips() {
 				if (this.countdown <= 0) {
 					if (this.showTips) {
@@ -2237,7 +2311,24 @@
 				}
 
 			},
-
+				lockDevice() {
+							if (this.orderinfo.status) {
+								this.showtcs = true
+							} else {
+								if (this.deviceInfos.status != 1) {
+									uni.showToast({
+										title: '车辆正在使用中,请使用其他车辆',
+										icon: 'none',
+										duration: 2000
+									});
+								} else {
+									this.showdevice = true;
+									this.type = 1;
+									this.deviceIndex = 1;
+								}
+							}
+			
+						},
 
 			// 取消预约支付
 			topay() {
@@ -2885,6 +2976,18 @@
 						// 处理点击标记的逻辑
 						this.sn = e.markerId;
 						this.deviceInfo(0);
+						// this.markers = this.markers.map(item => {
+						// 	if (item.sn === e.markerId) { // 假设markers数组中的mark对象也有sn属性
+						// 		// 你可以根据需要设置更大的尺寸
+						// 		return {
+						// 			...item,
+						// 			width: item.width * 2, // 假设初始宽度是25，这里放大到50
+						// 			height: item.height * 2 // 假设初始高度是25，这里放大到50
+						// 		};
+						// 	}
+						// 	return item;
+						// });
+						console.log(this.markers, 'this.markersthis.markers');
 					} else {
 						console.log('标记ID不存在于列表数据中');
 					}
@@ -2941,7 +3044,7 @@
 				if (this.areaInfo.areaId) {
 					this.$u.get(`/app/allVehicleByArea`, data).then((res) => {
 						if (res.code === 200 && res.data != '') {
-							this.listData = res.data;
+							this.listData = res.data.filter(item => item.onlineStatus != 0);
 							const newMarkers = this.listData.map(item => ({
 								id: parseFloat(item.sn),
 								latitude: parseFloat(item.latitude),
@@ -3092,7 +3195,7 @@
 
 						}
 
-						// this.setMapScale()
+						this.setMapScale()
 						// if(!hasShownPopup){
 						// 	console.log(typeof(hasShownPopup),'hasShownPopuphasShownPopup');
 						// 	this.showTips=uni.getStorageSync('hasShownPopup')
@@ -3718,20 +3821,24 @@
 			height: 250rpx;
 			z-index: 1;
 			background: linear-gradient(to bottom, rgba(255, 255, 255, 0.8), transparent);
+			display: flex;
+			padding-top: 104rpx;
+			// align-items: center;
+			// justify-content: center;
 
 			image {
 				position: absolute;
+				top: 100rpx;
 				left: 30rpx;
-				bottom: 90rpx;
-
 				width: 60rpx;
 				height: 60rpx;
 			}
 
 			.txts {
-				position: absolute;
-				left: 300rpx;
-				bottom: 90rpx;
+				width: 100%;
+				// position: absolute;
+
+				text-align: center;
 				font-weight: 500;
 				font-size: 36rpx;
 				color: #3D3D3D;
@@ -4193,7 +4300,7 @@
 					.card {
 
 						// max-width:  600rpx !important; // 确保宽度被应用
-						width:  450rpx !important;
+						width: 450rpx !important;
 						height: 288rpx;
 						margin-right: 20rpx;
 						position: relative;
@@ -4373,27 +4480,31 @@
 			}
 
 			.page3 {
-				.bot_btn {
-
+				.bot_btns {
+					// display: flex;
+					// justify-content: center;
 					width: 750rpx;
 					height: 618rpx;
 					// background: #fff;
 					// box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
 					border-radius: 50rpx 50rpx 0 0;
-
+					padding-left: 10rpx;	
 					.info {
+						
 						// margin-top: 20rpx;
-						padding: 0 60rpx;
 
+						padding: 0 60rpx;
+						// margin-right: 20rpx;
 						display: flex;
 						flex-wrap: nowrap;
 						align-items: center;
 						justify-content: space-between;
-						width: 708rpx;
+						width: 695rpx;
 						height: 100rpx;
 						background: #FFFFFF;
 						border-radius: 20rpx 20rpx 20rpx 20rpx;
 						box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
+												// margin: 0 auto;
 					}
 
 
@@ -4666,7 +4777,36 @@
 					height: 80rpx;
 				}
 			}
+			.loading_box{
+				width: 100%;
+				// height: 200rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				image{
+					width: 336rpx;
+					height: 154rpx;
+				}
+				// .loader {
+				//   width: 120rpx;
+				//   aspect-ratio: 1;
+				//   border-radius: 50%;
+				//   clip-path: inset(-360rpx); /* 4倍的比例调整 */
+				//   box-shadow: -240rpx 60rpx, -240rpx 60rpx, -240rpx 60rpx; /* 4倍的比例调整 */
+				//   transform: translateY(-60rpx); /* 4倍的比例调整 */
+				//   animation: l19 1s infinite linear;
+				// }
+				
+				// @keyframes l19 {
+				//   16.67% {box-shadow:-240rpx 60rpx,-240rpx 60rpx,  76rpx 60rpx} /* 4倍的比例调整 */
+				//   33.33% {box-shadow:-240rpx 60rpx,    0px 60rpx,  76rpx 60rpx} /* 4倍的比例调整 */
+				//   40%,60%{box-shadow: -76rpx 60rpx,    0px 60rpx,  76rpx 60rpx} /* 4倍的比例调整 */
+				//   66.67% {box-shadow: -76rpx 60rpx,    0px 60rpx, 240rpx 60rpx} /* 4倍的比例调整 */
+				//   83.33% {box-shadow: -76rpx 60rpx, 240rpx 60rpx,240rpx 60rpx} /* 4倍的比例调整 */
+				//   100%   {box-shadow: 240rpx 60rpx, 240rpx 60rpx,240rpx 60rpx} /* 4倍的比例调整 */
+				// }
 
+			}
 			.btn_box {
 				margin-top: 80rpx;
 				display: flex;
@@ -4822,6 +4962,7 @@
 			}
 		}
 
+		
 		.bottom_more {
 			position: fixed;
 
diff --git a/pages/my.vue b/pages/my.vue
index c65c984..e496ed6 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -6,8 +6,11 @@
 			<view class="topbox">
 				<view class="info">
 					<image v-if="info.avatar!=''" :src='info.avatar' mode=""></image>
-					<image v-if="info.avatar==''" src="https://lxnapi.ccttiot.com/bike/img/static/uSRzzLXhnbnWLB8jMKmr"
+					<image v-if="info.avatar==''&&deptId==100" src="https://lxnapi.ccttiot.com/bike/img/static/uSRzzLXhnbnWLB8jMKmr"
 						mode=""></image>
+					<image v-if="info.avatar==''&&deptId==101" src="	https://lxnapi.ccttiot.com/bike/img/static/uP9vN4Vht0B2bd10Sy60"
+						mode=""></image>
+					
 					<view class="cont">
 						<view class="name" v-if="info.realName!=null">
 							{{maskedName}}
@@ -193,12 +196,15 @@
 				info: {},
 				totype: 0,
 				list: [],
-				show: false
+				show: false,
+				deptId:0
+				
 
 
 			}
 		},
 		onShow() {
+			this.deptId= uni.getStorageSync('deptId');
 			this.getuserInfo()
 		},
 		computed: {
diff --git a/pages_admin/admin_order.vue b/pages_admin/admin_order.vue
index 62de7bb..c7021bd 100644
--- a/pages_admin/admin_order.vue
+++ b/pages_admin/admin_order.vue
@@ -348,7 +348,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="tip_box" v-if="showgj">
+		<view class="tip_box" v-if="showgj"> 
 			<view class="top">
 				<view class="tip">
 					改价
@@ -356,7 +356,7 @@
 
 				<view class="ipt_box">
 					<view class="text">
-						调度费
+						运营区外调度费
 					</view>
 					<view class="ipt">
 						<input type="text" v-model="orderInfo.dispatchFee" placeholder="0.00" class="input"
@@ -366,7 +366,7 @@
 				</view>
 				<view class="ipt_box">
 					<view class="text">
-						管理费
+					停车点外调度费
 					</view>
 					<view class="ipt">
 						<input type="text" v-model="orderInfo.manageFee" placeholder="0.00" class="input"
@@ -412,7 +412,7 @@
 
 				<view class="ipt_box">
 					<view class="text">
-						调度费
+						运营区外调度费
 					</view>
 					<view class="ipt">
 						<input type="text" v-model="orderInfo.dispatchFee" placeholder="0.00" class="input"
@@ -422,7 +422,7 @@
 				</view>
 				<view class="ipt_box">
 					<view class="text">
-						管理费
+						停车点外调度费
 					</view>
 					<view class="ipt">
 						<input type="text" v-model="orderInfo.manageFee" placeholder="0.00" class="input"
@@ -925,7 +925,7 @@
 					align-items: center;
 
 					.text {
-						width: 96rpx;
+						width: 350rpx;
 						font-weight: 400;
 						font-size: 32rpx;
 						color: #3D3D3D;
diff --git a/pages_admin/order/order_detail.vue b/pages_admin/order/order_detail.vue
index e34c827..4fe126c 100644
--- a/pages_admin/order/order_detail.vue
+++ b/pages_admin/order/order_detail.vue
@@ -68,7 +68,7 @@
 						车辆编号：<span>{{orderInfo.device.areaName}}</span>
 					</view> -->
 					<view class="half_infoli">
-						运营区域
+						运营区域:
 						<span v-if="orderInfo.area">{{orderInfo.area}}</span>
 						<span v-else>--</span>
 					</view>
@@ -134,12 +134,13 @@
 						预约费用：<span>{{orderInfo.appointmentFee}}</span>
 					</view>
 					<view class="half_infoli">
-						调度费用：<span>{{orderInfo.dispatchFee}}</span>
+						运营区外调度费：<span>{{orderInfo.dispatchFee}}</span>
 					</view>
 				</view>
 				<view class="info_li">
 					<view class="half_infoli">
-						管理费用：<span>{{orderInfo.manageFee}}</span>
+						
+					停车点外调度费：<span>{{orderInfo.manageFee}}</span>
 					</view>
 					<view class="half_infoli">
 						骑行费用：<span>{{orderInfo.ridingFee}}</span>
@@ -151,7 +152,7 @@
 				<view class="info_li">
 					支付方式：<span>微信支付</span>
 				</view>
-				<view class="info_li" v-if="orderInfo.rule">
+				<view class="info_li" v-if="orderInfo.rule" style="display: inline-block;">
 					计费模板：<span>{{orderInfo.rule.name}}</span>
 				</view>
 				<view class="info_li" v-if="orderInfo.payTime">
@@ -181,7 +182,8 @@
 
 				</view>
 				<view class="info_li">
-					退款原因：<span>{{orderInfo.etRefund.reason}}</span>
+					退款原因：<span v-if="orderInfo.etRefund.reason">{{orderInfo.etRefund.reason}}</span>
+					<span v-else>--</span>
 				</view>
 				<view class="info_li">
 					退款时间：<span>{{orderInfo.etRefund.createTime}}</span>
@@ -190,10 +192,76 @@
 			</view>
 		</view>
 		<view class="bot" v-if='orderInfo.paid==1'>
-			<view class="btn">
+			<view class="btn" @click="backfee">
 				退款
 			</view>
 		</view>
+		<u-mask :show="show" @click="show = false" :z-index='100' />
+		<view class="tip_box" v-if="showtk">
+			<view class="top" v-if="showtk">
+				<view class="tip">
+					退款
+				</view>
+		
+				<view class="ipt_box">
+					<view class="text">
+						运营区外调度费
+					</view>
+					<view class="ipt">
+						<input type="text" v-model="orderInfo.dispatchFee" placeholder="0.00" class="input"
+							placeholder-style="color:#C7CDD3" @input="checkAndUpdate('dispatchFee')">
+						元
+					</view>
+				</view>
+				<view class="ipt_box">
+					<view class="text">
+						停车点外调度费
+					</view>
+					<view class="ipt">
+						<input type="text" v-model="orderInfo.manageFee" placeholder="0.00" class="input"
+							placeholder-style="color:#C7CDD3" @input="checkAndUpdate('manageFee')">
+						元
+					</view>
+				</view>
+				<view class="ipt_box">
+					<view class="text">
+						骑行费
+					</view>
+					<view class="ipt">
+						<input type="text" v-model="orderInfo.ridingFee" placeholder="0.00" class="input"
+							placeholder-style="color:#C7CDD3" @input="checkAndUpdate('ridingFee')">
+						元
+					</view>
+				</view>
+				<view class="ipt_box">
+					<view class="text">
+						预约费
+					</view>
+					<view class="ipt">
+						<input type="text" v-model="orderInfo.appointmentFee" placeholder="0.00" class="input"
+							placeholder-style="color:#C7CDD3" @input="checkAndUpdate('appointmentFee')">
+						元
+					</view>
+				</view>
+				<view class="ipt_box">
+					<view class="text">
+						原因
+					</view>
+					<view class="ipt">
+						<input type="text" v-model="orderInfo.reason" placeholder="选填" class="input"
+							placeholder-style="color:#C7CDD3" @input="checkAndUpdate('reason')">
+					</view>
+				</view>
+			</view>
+			<view class="bots">
+				<view class="bot_left" @click="closetk()">
+					取消
+				</view>
+				<view class="bot_right" @click="backMoney()">
+					确定
+				</view>
+			</view>
+		</view>
 	</view>
 </template>
 
@@ -225,6 +293,7 @@
 				orderInfo: {},
 				loading: false,
 				showtk: false,
+				show:false
 
 
 			}
@@ -239,6 +308,15 @@
 
 		},
 		methods: {
+			backfee(){
+				this.show = true
+				this.showtk = true
+			},
+			closetk() {
+				this.show = false
+				this.showtk = false
+				// this.orderInfo = {}
+			},
 			toggleIconAndCallout() {
 				this.showIconAndCallout = !this.showIconAndCallout;
 				if (this.showIconAndCallout) {
@@ -509,6 +587,34 @@
 				}
 
 			},
+			backMoney() {
+				let data = {
+					orderNo: this.orderInfo.orderNo,
+					dispatchFee: this.orderInfo.dispatchFee,
+					manageFee: this.orderInfo.manageFee,
+					ridingFee: this.orderInfo.ridingFee,
+					appointmentFee: this.orderInfo.appointmentFee,
+					reason: this.orderInfo.reason
+				}
+			
+				this.$u.put('/appVerify/order/refund', data).then((res) => {
+					if (res.code === 200) {
+						// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
+						this.show = false
+						
+						this.showtk = false
+						this.getOrderDetail()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				}).catch(error => {
+					console.error("Error fetching area data:", error);
+				});
+			},
 			getOrderDetail() {
 				this.$u.get('/appVerify/order/' + this.orderId).then((res) => {
 					if (res.code === 200) {
@@ -574,7 +680,7 @@
 	.page {
 		padding-bottom: 200rpx;
 		width: 750rpx;
-
+		
 		.tip_box {
 			position: fixed;
 			left: 72rpx;
@@ -585,23 +691,23 @@
 			border-radius: 30rpx 30rpx 30rpx 30rpx;
 			z-index: 110;
 			padding-bottom: 100rpx;
-
+		
 			.top {
 				padding: 52rpx 38rpx 42rpx 36rpx;
-
+		
 				.ipt_box {
 					margin-top: 22rpx;
 					display: flex;
 					flex-wrap: nowrap;
 					align-items: center;
-
+		
 					.text {
-						width: 96rpx;
+						width: 350rpx;
 						font-weight: 400;
 						font-size: 32rpx;
 						color: #3D3D3D;
 					}
-
+		
 					.ipt {
 						padding: 10rpx 18rpx;
 						display: flex;
@@ -612,13 +718,13 @@
 						height: 64rpx;
 						border-radius: 0rpx 0rpx 0rpx 0rpx;
 						border: 2rpx solid #979797;
-
+		
 						.input {
 							width: 80%;
 						}
 					}
 				}
-
+		
 				.tip {
 					width: 100%;
 					text-align: center;
@@ -626,7 +732,7 @@
 					font-size: 32rpx;
 					color: #3D3D3D;
 				}
-
+		
 				.txt {
 					margin-top: 32rpx;
 					width: 100%;
@@ -636,17 +742,17 @@
 					color: #3D3D3D;
 				}
 			}
-
-			.bot {
+		
+			.bots {
 				position: absolute;
-
+		
 				width: 610rpx;
 				// border-top: 2rpx solid #D8D8D8;
 				display: flex;
 				flex-wrap: nowrap;
 				// height: 100%;
 				bottom: -20rpx;
-
+		
 				.bot_left {
 					border-radius: 0rpx 0rpx 0rpx 30rpx;
 					width: 50%;
@@ -659,7 +765,7 @@
 					color: #3D3D3D;
 					background: #EEEEEE;
 				}
-
+		
 				.bot_right {
 					border-radius: 0rpx 0rpx 30rpx 0rpx;
 					width: 50%;
@@ -673,12 +779,13 @@
 					font-weight: 500;
 					font-size: 32rpx;
 					// color: #4C97E7;
-
+		
 				}
-
+		
 			}
 		}
-
+		
+		
 
 		.map {
 			position: relative;