diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 6617cfe..e07de3a 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -19,12 +19,13 @@ const install = (Vue, vm) => {
 			
 	// 	},
 	// }); 
+	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
@@ -34,7 +35,7 @@ const install = (Vue, vm) => {
 			},
 			// ......
 		});
-
+		
 // 请求拦截部分，如配置，每次请求前都会执行
 	Vue.prototype.$u.http.interceptor.request = (config) => {
 		// 引用token
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 24a755c..d1f80f7 100644
--- a/page_user/agreement.vue
+++ b/page_user/agreement.vue
@@ -1,17 +1,24 @@
 <template>
-	<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="bottom">
-			<view class="btn" @click="quit()">
-				不同意
-			</view>
-			<view class="btn1" @click="ok()">
-				同意
-			</view>
-		</view>
-	</view>
+  <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">
+        <image src="https://lxnapi.ccttiot.com/bike/img/static/u7F851ikY9rkASzNSNkO" v-if="showxy" mode=""></image>
+      </view>
+      <view class="txt" v-if="isread">
+        我已同意并阅读 <span @click.stop="toxy()">《{{ info.title }}》</span>
+      </view>
+    </view>
+    <view class="bottom" v-if="showbot">
+      <view class="btn" @click="quit()">
+        不同意
+      </view>
+      <view class="btn1" :class="{ 'act1': isread && showxy }" @click="ok()">
+        同意
+      </view>
+    </view>
+  </view>
 </template>
 
 <script>
@@ -23,25 +30,52 @@
 				},
 				info: {},
 				userinfo: {},
-				areaInfo: {}
+				areaInfo: {},
+				qParam:'',
+				isread:false,
+				showxy:false,
+				showbot:false
 			}
 		},
 		onLoad(e) {
 			console.log(e, 'eee');
 			if (e.needback) {
 				this.showbot = true
+				this.qParam=e.qParam
 			}
+		
 		},
+		 onReachBottom() {
+		    // 页面滚动到底部时触发的逻辑
+		    console.log('到达了页面底部');
+			this.isread=true
+		 
+		  },
 		onShow() {
 			this.getagree()
 		},
 		methods: {
 			ok() {
+				if(this.isread==false){
+					uni.showToast({
+						title: '请先阅读完协议',
+						icon: 'none',
+						duration: 700
+					});
+				} else if(this.showxy==false){
+					uni.showToast({
+						title: '请勾选同意',
+						icon: 'none',
+						duration: 1000
+					});
+				} else if(this.isread&&this.showxy){
 					this.$store.commit('SET_SHOWAGRE',false);
 					console.log( this.$store.getters.showagre);
 					uni.redirectTo({
-						url:'/pages/index/index'
+						url:'/pages/index/index?qParam='+this.qParam
 					})
+				}
+				
 			},
 			quit() {
 				uni.exitMiniProgram({
@@ -55,8 +89,15 @@
 			},
 
 			getagree() {
-				let id = 15
-				this.$u.get(`/app/article/list?areaId=${id}&tag=agreement`).then((res) => {
+				let ids = 0
+				let id= uni.getStorageSync('deptId');
+				if(id==100){
+					ids=15
+				}else if(id==101){
+					ids=14
+				}
+				
+				this.$u.get(`/app/article/list?areaId=${ids}&tag=agreement`).then((res) => {
 					if (res.code === 200) {
 						this.info = res.rows[0];
 						this.insertPhoneNumberAndDate();
@@ -69,28 +110,7 @@
 					}
 				});
 			},
-			// insertPhoneNumberAndDate() {
-			//   const currentDate = new Date();
-			//   const formattedDate = `${currentDate.getFullYear()}年${currentDate.getMonth() + 1}月${currentDate.getDate()}日${currentDate.getHours()}时`;
-			//   const simpleDate = `${currentDate.getFullYear()}年${currentDate.getMonth() + 1}月${currentDate.getDate()}日`;
-
-			//   // 插入电话号码
-			//   if (this.userinfo.phonenumber) {
-			//     const phonePattern = /(<p>联系电话：)(<\/p>)/;
-			//     this.info.content = this.info.content.replace(phonePattern, `$1${this.userinfo.phonenumber}$2`);
-			//   }
-
-			//   // 替换起租时间
-			//   const rentTimePattern = /起租<u>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<\/u>年<u>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<\/u>月<u>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<\/u>日<u>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<\/u>时/;
-			//   this.info.content = this.info.content.replace(rentTimePattern, `起租<u>\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0${formattedDate}</u>`);
-
-			//   // 替换底部时间
-			//   const bottomDatePattern = /<p>&nbsp;年月日年月日<\/p>/g;
-			//   this.info.content = this.info.content.replace(bottomDatePattern, `<p>${simpleDate}\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0\u00A0${simpleDate}</p>`);
-
-			//   // 替换所有的&nbsp;为 \u00A0
-			//   this.info.content = this.info.content.replace(/&nbsp;/g, '\u00A0');
-			// },
+			
 			insertPhoneNumberAndDate() {
 
 				// 替换所有的&nbsp;为 \u00A0
@@ -108,7 +128,45 @@
 
 	.page {
 		width: 750rpx;
-
+		padding-bottom: 250rpx;
+		.xy {
+			margin-top: 50rpx;
+			width: 100%;
+			display: flex;
+			flex-wrap: nowrap;
+			align-items: center;
+			justify-content: center;
+		
+			.yuans {
+				margin-top: 2rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 27rpx;
+				height: 27rpx;
+				border-radius: 50%;
+				border: #808080 solid 2rpx;
+		
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 50%;
+				}
+			}
+		
+			.txt {
+				
+				margin-left: 10rpx;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #979797;
+		
+				span {
+					color: #3D3D3D;
+				}
+			}
+		
+		}
 		.bottom {
 			position: fixed;
 			background: #fff;
@@ -120,6 +178,9 @@
 			align-items: center;
 			justify-content: space-around;
 			// box-shadow: 12rpx 16rpx 40rpx 0rpx rgba(42,130,228,0.1);
+			.act1{
+				background: #4C97E7 !important;
+			}
 			.btn {
 				width: 250rpx;
 				height: 80rpx;
@@ -143,11 +204,12 @@
 				justify-content: center;
 				// border: 2rpx solid #000;
 				border-radius: 40rpx;
-				background: #4C97E7;
+				background: #ccc;
 				color: #fff;
 				font-size: 28rpx;
 				font-weight: 600;
 			}
+			
 		}
 
 		.cont {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index ed566be..76c740c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,12 +3,12 @@
 		<view class="tab_top">
 			<image src="https://lxnapi.ccttiot.com/bike/img/static/uVcMTydm81zCMhHomXl1" mode="" @click="topage(6)">
 			</image>
-			<view class="txts">
+			<view class="txts" v-if="gps.deptId==100">
 				创享出行
 			</view>
-			<!-- 	<view class="txts">
+				<view class="txts" v-if="gps.deptId==101">
 				嵛你出行
-			</view> -->
+			</view>
 		</view>
 		<!-- 	<u-navbar :is-back="false" title="共享电动车" :border-bottom="false" :background="bgc" title-color='#2E4975'
 			title-size='36' height='36'></u-navbar> -->
@@ -212,17 +212,6 @@
 
 
 
-							<!-- <view class="nmtxt">
-								<view class="left">
-
-								</view>
-								<view class="right">
-									原价 <span style=" text-decoration: line-through;">{{item.originalFee}}元</span>
-								</view>
-							</view>
-							<view class="tip">
-								超出起步价包含时长后收取
-							</view> -->
 						</view>
 						<view class="tips_btn" @click.stop='feedetail(item,index+1)'>
 							查看详情
@@ -243,18 +232,7 @@
 					<view class="btn" @click="sub1()" v-if="type==1">
 						确认开锁
 					</view>
-					<!-- <view class="btn" @click="sub6()" v-if="type==1&&orderinfo.ruleId!=null">
-						确认开锁
-					</view>
-					<view class="btn" @click="sub2()" v-if="type==1&&freeListIndex!=0">
-						确认套餐
-					</view> -->
-					<!-- <view class="btn" @click="sub3()" v-if="type==2&&freeListIndex==0&&orderinfo.ruleId==null">
-						确认预约
-					</view> -->
-					<!-- <view class="btn" @click="sub5()" v-if="type==2&&orderinfo.ruleId!=null">
-						确认预约
-					</view> -->
+					
 					<view class="btn" @click="sub3()" v-if="type==2">
 						确认预约
 					</view>
@@ -327,15 +305,7 @@
 							还车
 						</view>
 					</view>
-					<!-- <view class="bot" style="margin-top: 20rpx;">
-						
-						<view class="btn1" >
-							临时锁车
-						</view>
-						<view class="btn" >
-							还车
-						</view>
-					</view> -->
+				
 				</view>
 			</view>
 			<view class="page4" v-if="deviceIndex==3">
@@ -724,16 +694,22 @@
 		},
 
 		onLoad(e) {
-			if(this.showagre){
-				uni.redirectTo({
-					url:'/page_user/agreement?needback=true'
-				})
-			}
+			this.gps.deptId= uni.getStorageSync('deptId');
 			console.log(e, 'eeeeeeeeeeeeeeeeeee');
 			if (e.q) {
-				this.qParam = e
+				this.qParam = e.q
 
 
+			}
+			if (e.qParam) {
+				this.qParam = e.qParam
+			
+			
+			}
+			if(this.showagre){
+				uni.redirectTo({
+					url:'/page_user/agreement?needback=true&qParam='+this.qParam
+				})
 			}
 			if (e.sn) {
 				this.sn = e.sn
@@ -745,7 +721,7 @@
 							// this.deviceIndex = 1
 							// this.type = 1
 						}
-					}, 500)
+					}, 700)
 
 				}
 
@@ -769,17 +745,22 @@
 					type: 'wgs84',
 					success: function(lb) {
 
-						that.gps.latitude = lb.latitude;
-						that.gps.longitude = lb.longitude;
-						// that.gps.latitude = '26.940805',
-						// 	that.gps.longitude = '120.356157';
-						that.latitude = Number(lb.latitude.toFixed(5)) - 0.005
-						that.longitude = Number(lb.longitude.toFixed(5)) + 0.005
+						// that.gps.latitude = lb.latitude;
+						// that.gps.longitude = lb.longitude;
+						that.gps.latitude =23.440359
+						that.gps.longitude = 117.074552;
+						// that.latitude = '26.940805',
+						// 	that.longitude = '120.356157';
+						// that.latitude = Number(lb.latitude.toFixed(5)) - 0.005
+						// that.longitude = Number(lb.longitude.toFixed(5)) + 0.005
+						
+						that.latitude = 23.440359
+						that.longitude =117.074552
 						console.log(that.areaInfo, 'that.areaInfo');
 						that.getArea()
-						if (that.qParam) {
-							let qParam = that.qParam.q;
-
+						if (that.qParam!='null'&&that.showagre==false) {
+							let qParam = that.qParam
+							console.log(qParam,'qParamqParamqParam');
 							// 第2步: URL解码q参数
 							let decodedUrl = decodeURIComponent(qParam);
 
@@ -810,7 +791,7 @@
 									} else {
 										// this.showtcs=true
 									}
-								}, 500)
+								}, 700)
 
 
 							}
@@ -1989,7 +1970,7 @@
 										this.deviceInfo(1)
 
 									}
-								}, 200)
+								}, 500)
 
 							}
 
@@ -2020,35 +2001,9 @@
 				this.freeListIndex = index
 			},
 			// 无套餐取消预约
-			cancel() {
-				this.$u.post('/appVerify/device/cancelAppointment?userId=' + this.userId + '&orderNo=' + this.orderinfo
-					.orderNo).then((res) => {
-					if (res.code === 200) {
-						this.getisInOrder()
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				})
-			},
+			
 			// 套餐取消预约
-			cancel1() {
-				this.$u.post('/appVerify/device/cancelAppointment?userId=' + this.userId + '&orderNo=' + this.orderinfo
-					.orderNo + '&ruleId=' + this.orderinfo.ruleId).then((res) => {
-					if (res.code === 200) {
-						this.getisInOrder()
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none',
-							duration: 2000
-						});
-					}
-				})
-			},
+			
 			backDevice() {
 				if (this.OrderdeviceInfos.onlineStatus == 1) {
 					uni.showLoading({
@@ -2271,204 +2226,7 @@
 					}
 				})
 			},
-			topage(num) {
-				if (num == 0) {
-					// uni.navigateTo({
-					// 	url:''
-					// })
-				} else if (num == 1) {
-
-					uni.showLoading({
-
-					})
-					if (uni.getStorageSync('token')) {
-						if (this.areaInfo.authentication == 1) {
-							this.$u.get("/getAppInfo").then(res => {
-
-								if (res.code == 200) {
-									this.userinfo = res.user;
-									this.$store.commit('SET_USERID', res.user.userId);
-									if (res.user.isAuthentication == 0) {
-										uni.hideLoading()
-										this.seeDetail = true;
-										uni.navigateTo({
-											url: "/page_user/idcard_test"
-										});
-									} else {
-										this.seeDetail = true;
-										uni.hideLoading()
-										console.log('跳转1');
-										uni.navigateTo({
-											url: '/page_user/yj?isback=' + this.showYjTip
-										});
-										this.showYjTip = false
-									}
-								} else {
-									uni.hideLoading()
-									uni.showToast({
-										title: '未登录，请登录后尝试',
-										icon: 'none',
-										duration: 2000
-									});
-								}
-							});
-						} else {
-							this.seeDetail = true;
-							uni.hideLoading()
-							console.log('跳转2');
-							uni.navigateTo({
-								url: '/page_user/yj?isback=' + this.showYjTip
-							});
-							this.showYjTip = false
-						}
-
-
-					} else {
-
-						let that = this;
-						wx.login({
-							success(res) {
-								if (res.code) {
-									console.log('登录成功！', res);
-									let areaId = uni.getStorageSync('areaId');
-									uni.showLoading({
-										title: '登录中...'
-									});
-									that.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId)
-										.then(res => {
-											uni.hideLoading();
-											if (res.code == 200) {
-												uni.setStorageSync('token', res.token);
-												if (that.areaInfo.authentication == 1) {
-													that.$u.get("/getAppInfo").then(res => {
-														if (res.code == 200) {
-															that.userinfo = res.user;
-															that.$store.commit('SET_USERID', res
-																.user.userId);
-															if (res.user.isAuthentication == 0) {
-																uni.hideLoading()
-																that.seeDetail = true;
-
-																uni.navigateTo({
-																	url: "/page_user/idcard_test"
-																});
-															} else {
-																that.seeDetail = true;
-																uni.hideLoading()
-																console.log('跳转3');
-																uni.navigateTo({
-																	url: '/page_user/yj?isback=' +
-																		that.showYjTip
-																});
-																that.showYjTip = false
-															}
-														} else {
-															uni.hideLoading()
-															uni.showToast({
-																title: '未登录，请登录后尝试',
-																icon: 'none',
-																duration: 2000
-															});
-														}
-													});
-												} else {
-													that.seeDetail = true;
-													uni.hideLoading()
-													console.log('跳转4');
-													uni.navigateTo({
-														url: '/page_user/yj?isback=' + that.showYjTip
-													});
-													that.showYjTip = false
-												}
-											} else if (res.code == 501) {
-												uni.hideLoading()
-												uni.showToast({
-													title: res.msg,
-													icon: 'none',
-													duration: 2000
-												});
-											} else {
-												uni.hideLoading()
-												uni.redirectTo({
-													url: '/pages/login/login'
-												});
-											}
-										}).catch(err => {
-											uni.hideLoading();
-											uni.showToast({
-												title: '请求失败，请稍后重试',
-												icon: 'none',
-												duration: 2000
-											});
-											console.error('请求失败：', err);
-										});
-								} else {
-									uni.hideLoading()
-									uni.showToast({
-										title: '登录失败，请重试',
-										icon: 'none',
-										duration: 2000
-									});
-									console.error('微信登录失败：', res);
-								}
-							},
-							fail(err) {
-								uni.hideLoading()
-								uni.showToast({
-									title: '微信登录接口调用失败',
-									icon: 'none',
-									duration: 2000
-								});
-								console.error('微信登录接口调用失败：', err);
-							}
-						});
-
-
-						this.showYjTip = false
-
-					}
-
-				} else if (num == 2) {
-					uni.navigateTo({
-						url: '/page_user/jfgz'
-					})
-				} else if (num == 3) {
-					uni.navigateTo({
-						url: '/page_user/yczn'
-					})
-				} else if (num == 4) {
-					if (this.orderinfo.status) {
-						this.showtcs = true
-					} else {
-						uni.navigateTo({
-							url: '/page_user/bhks'
-						})
-					}
-
-				} else if (num == 5) {
-
-					uni.navigateTo({
-						url: '/page_user/gzsb'
-					})
-				} else if (num == 6) {
-					uni.navigateTo({
-						url: '/pages/my'
-					})
-
-				} else if (num == 7) {
-					uni.navigateTo({
-						url: '/page_user/gzsb?sn=' + this.sn
-					})
-				} else if (num == 8) {
-					uni.navigateTo({
-						url: '/page_user/gzsb?sn=' + this.sn
-					})
-				} else if (num == 9) {
-					uni.navigateTo({
-						url: '/page_user/khfw/khfw'
-					})
-				}
-			},
+		
 
 			sub5() {
 				if (this.orderinfo.ruleId) {
@@ -3002,13 +2760,13 @@
 					console.log('点击了标记：', e.markerId);
 					// 这里可以根据需要处理点击标记的逻辑
 					// 阻止事件冒泡\
-					this.sn = e.markerId;
-					this.deviceInfo(0);
+				
 					const markerExists = this.listData.some(item => item.sn == e.markerId);
 
 					if (markerExists) {
 						// 处理点击标记的逻辑
-
+						this.sn = e.markerId;
+						this.deviceInfo(0);
 					} else {
 						console.log('标记ID不存在于列表数据中');
 					}
@@ -3019,203 +2777,8 @@
 				}
 
 			},
-			deviceInfo(num) {
-				if (uni.getStorageSync('token')) {
-
-					this.$u.get('/app/device/info?sn=' + this.sn).then((res) => {
-						if (res.code === 200) {
-							this.deviceInfos = res.data;
-
-							if (num == 0) {
-								this.showdevice = true;
-								this.type = 0;
-							} else {
-								if (this.deviceInfos.onlineStatus == 0) {
-									uni.showToast({
-										title: '车辆离线中,请使用其他车辆',
-										icon: 'none',
-										duration: 4000
-									});
-								} else if (this.deviceInfos.status == 0) {
-									uni.showToast({
-										title: '车辆未上架,请使用其他车辆',
-										icon: 'none',
-										duration: 4000
-									});
-								} else if (this.deviceInfos.status == 2) {
-									uni.showToast({
-										title: '车辆预约中,请使用其他车辆',
-										icon: 'none',
-										duration: 4000
-									});
-								} else if (this.deviceInfos.status == 3) {
-									uni.showToast({
-										title: '车辆骑行中,请使用其他车辆',
-										icon: 'none',
-										duration: 4000
-									});
-								} else if (this.deviceInfos.status == 4) {
-									uni.showToast({
-										title: '车辆临时锁车中,请使用其他车辆',
-										icon: 'none',
-										duration: 4000
-									});
-								} else if (this.deviceInfos.status == 8) {
-									uni.showToast({
-										title: '车辆下线中,请使用其他车辆',
-										icon: 'none',
-										duration: 4000
-									});
-								} else if (this.deviceInfos.status == 9) {
-									uni.showToast({
-										title: '车辆已废弃,请使用其他车辆',
-										icon: 'none',
-										duration: 4000
-									});
-								} else if (this.deviceInfos.status == 7) {
-									uni.showToast({
-										title: '车辆未上线,请使用其他车辆',
-										icon: 'none',
-										duration: 4000
-									});
-								} else if (this.deviceInfos.status == 1) {
-									this.showdevice = true;
-									this.type = 1;
-									this.deviceIndex = 1;
-								}
-							}
-						} else {
-							this.showdevice = false;
-							this.deviceIndex = 0;
-							this.type = 0;
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 2000
-							});
-						}
-					});
-				} else {
-					console.log('判断2');
-					wx.login({
-						success: (res) => {
-							if (res.code) {
-								console.log('登录！', res);
-								let data = {
-									wxOpenId: res.code,
-								};
-								let areaId = uni.getStorageSync('areaId');
-								if (areaId) {
-									this.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId)
-										.then((
-											res) => {
-											uni.hideLoading();
-											if (res.code == 200) {
-												uni.setStorageSync('token', res.token);
-
-												this.$u.get('/app/device/info?sn=' + this.sn).then((
-													res) => {
-													if (res.code === 200) {
-														this.deviceInfos = res.data;
-
-														if (num == 0) {
-															this.showdevice = true;
-															this.type = 0;
-														} else {
-															if (this.deviceInfos.onlineStatus ==
-																0) {
-																uni.showToast({
-																	title: '车辆离线中,请使用其他车辆',
-																	icon: 'none',
-																	duration: 4000
-																});
-															} else if (this.deviceInfos.status ==
-																0) {
-																uni.showToast({
-																	title: '车辆未上架,请使用其他车辆',
-																	icon: 'none',
-																	duration: 4000
-																});
-															} else if (this.deviceInfos.status ==
-																2) {
-																uni.showToast({
-																	title: '车辆预约中,请使用其他车辆',
-																	icon: 'none',
-																	duration: 4000
-																});
-															} else if (this.deviceInfos.status ==
-																3) {
-																uni.showToast({
-																	title: '车辆骑行中,请使用其他车辆',
-																	icon: 'none',
-																	duration: 4000
-																});
-															} else if (this.deviceInfos.status ==
-																4) {
-																uni.showToast({
-																	title: '车辆临时锁车中,请使用其他车辆',
-																	icon: 'none',
-																	duration: 4000
-																});
-															} else if (this.deviceInfos.status ==
-																8) {
-																uni.showToast({
-																	title: '车辆下线中,请使用其他车辆',
-																	icon: 'none',
-																	duration: 4000
-																});
-															} else if (this.deviceInfos.status ==
-																9) {
-																uni.showToast({
-																	title: '车辆已废弃,请使用其他车辆',
-																	icon: 'none',
-																	duration: 4000
-																});
-															} else if (this.deviceInfos.status ==
-																7) {
-																uni.showToast({
-																	title: '车辆未上线,请使用其他车辆',
-																	icon: 'none',
-																	duration: 4000
-																});
-															} else if (this.deviceInfos.status ==
-																1) {
-																this.showdevice = true;
-																this.type = 1;
-																this.deviceIndex = 1;
-															}
-														}
-													} else {
-														this.showdevice = false;
-														this.deviceIndex = 0;
-														this.type = 0;
-														uni.showToast({
-															title: res.msg,
-															icon: 'none',
-															duration: 2000
-														});
-													}
-												});
-											} else if (res.code == 501) {
-												uni.showToast({
-													title: res.msg,
-													icon: 'none',
-													duration: 2000
-												});
-											} else {
-												uni.redirectTo({
-													url: '/pages/login/login'
-												});
-											}
-										});
-
-								}
-
-							}
-						},
-					});
-				}
-			},
+			
+			
 			toggleIconAndCallout() {
 				this.showIconAndCallout = !this.showIconAndCallout;
 				if (this.showIconAndCallout) {
@@ -3226,8 +2789,8 @@
 							latitude: parseFloat(item.latitude),
 							longitude: parseFloat(item.longitude),
 							width: 20,
-							height: 40,
-							iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
+							height: 28.95,
+							iconPath: item.type == 1 ?'https://lxnapi.ccttiot.com/bike/img/static/up2xXqAgwCX5iER600k3':item.type == 2 ?'https://lxnapi.ccttiot.com/bike/img/static/u53BAQcFIX3vxsCzEZ7t' :' https://lxnapi.ccttiot.com/bike/img/static/uDNY5Q4zOiZTCBTA2Jdq',
 							callout: {
 								content: item.parkingName,
 								color: '#ffffff',
@@ -3579,6 +3142,402 @@
 				}
 
 			},
+			topage(num) {
+				if (num == 0) {
+					// uni.navigateTo({
+					// 	url:''
+					// })
+				} else if (num == 1) {
+			
+					uni.showLoading({
+			
+					})
+					if (uni.getStorageSync('token')) {
+						if (this.areaInfo.authentication == 1) {
+							this.$u.get("/getAppInfo").then(res => {
+			
+								if (res.code == 200) {
+									this.userinfo = res.user;
+									this.$store.commit('SET_USERID', res.user.userId);
+									if (res.user.isAuthentication == 0) {
+										uni.hideLoading()
+										this.seeDetail = true;
+										uni.navigateTo({
+											url: "/page_user/idcard_test"
+										});
+									} else {
+										this.seeDetail = true;
+										uni.hideLoading()
+										console.log('跳转1');
+										uni.navigateTo({
+											url: '/page_user/yj?isback=' + this.showYjTip
+										});
+										this.showYjTip = false
+									}
+								} else {
+									uni.hideLoading()
+									uni.showToast({
+										title: '未登录，请登录后尝试',
+										icon: 'none',
+										duration: 2000
+									});
+								}
+							});
+						} else {
+							this.seeDetail = true;
+							uni.hideLoading()
+							console.log('跳转2');
+							uni.navigateTo({
+								url: '/page_user/yj?isback=' + this.showYjTip
+							});
+							this.showYjTip = false
+						}
+			
+			
+					} else {
+			
+						let that = this;
+						wx.login({
+							success(res) {
+								if (res.code) {
+									console.log('登录成功！', res);
+									let areaId = uni.getStorageSync('areaId');
+									uni.showLoading({
+										title: '登录中...'
+									});
+									that.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId)
+										.then(res => {
+											uni.hideLoading();
+											if (res.code == 200) {
+												uni.setStorageSync('token', res.token);
+												if (that.areaInfo.authentication == 1) {
+													that.$u.get("/getAppInfo").then(res => {
+														if (res.code == 200) {
+															that.userinfo = res.user;
+															that.$store.commit('SET_USERID', res
+																.user.userId);
+															if (res.user.isAuthentication == 0) {
+																uni.hideLoading()
+																that.seeDetail = true;
+			
+																uni.navigateTo({
+																	url: "/page_user/idcard_test"
+																});
+															} else {
+																that.seeDetail = true;
+																uni.hideLoading()
+																console.log('跳转3');
+																uni.navigateTo({
+																	url: '/page_user/yj?isback=' +
+																		that.showYjTip
+																});
+																that.showYjTip = false
+															}
+														} else {
+															uni.hideLoading()
+															uni.showToast({
+																title: '未登录，请登录后尝试',
+																icon: 'none',
+																duration: 2000
+															});
+														}
+													});
+												} else {
+													that.seeDetail = true;
+													uni.hideLoading()
+													console.log('跳转4');
+													uni.navigateTo({
+														url: '/page_user/yj?isback=' + that.showYjTip
+													});
+													that.showYjTip = false
+												}
+											} else if (res.code == 501) {
+												uni.hideLoading()
+												uni.showToast({
+													title: res.msg,
+													icon: 'none',
+													duration: 2000
+												});
+											} else {
+												uni.hideLoading()
+												uni.redirectTo({
+													url: '/pages/login/login'
+												});
+											}
+										}).catch(err => {
+											uni.hideLoading();
+											uni.showToast({
+												title: '请求失败，请稍后重试',
+												icon: 'none',
+												duration: 2000
+											});
+											console.error('请求失败：', err);
+										});
+								} else {
+									uni.hideLoading()
+									uni.showToast({
+										title: '登录失败，请重试',
+										icon: 'none',
+										duration: 2000
+									});
+									console.error('微信登录失败：', res);
+								}
+							},
+							fail(err) {
+								uni.hideLoading()
+								uni.showToast({
+									title: '微信登录接口调用失败',
+									icon: 'none',
+									duration: 2000
+								});
+								console.error('微信登录接口调用失败：', err);
+							}
+						});
+			
+			
+						this.showYjTip = false
+			
+					}
+			
+				} else if (num == 2) {
+					uni.navigateTo({
+						url: '/page_user/jfgz'
+					})
+				} else if (num == 3) {
+					uni.navigateTo({
+						url: '/page_user/yczn'
+					})
+				} else if (num == 4) {
+					if (this.orderinfo.status) {
+						this.showtcs = true
+					} else {
+						uni.navigateTo({
+							url: '/page_user/bhks'
+						})
+					}
+			
+				} else if (num == 5) {
+			
+					uni.navigateTo({
+						url: '/page_user/gzsb'
+					})
+				} else if (num == 6) {
+					uni.navigateTo({
+						url: '/pages/my'
+					})
+			
+				} else if (num == 7) {
+					uni.navigateTo({
+						url: '/page_user/gzsb?sn=' + this.sn
+					})
+				} else if (num == 8) {
+					uni.navigateTo({
+						url: '/page_user/gzsb?sn=' + this.sn
+					})
+				} else if (num == 9) {
+					uni.navigateTo({
+						url: '/page_user/khfw/khfw'
+					})
+				}
+			},
+			deviceInfo(num) {
+				if (uni.getStorageSync('token')) {
+			
+					this.$u.get('/app/device/info?sn=' + this.sn).then((res) => {
+						if (res.code === 200) {
+							this.deviceInfos = res.data;
+			
+							if (num == 0) {
+								this.showdevice = true;
+								this.type = 0;
+							} else {
+								if (this.deviceInfos.onlineStatus == 0) {
+									wx.showToast({
+										title: '车辆离线中,请使用其他车辆',
+										icon: 'none',
+										duration: 4000
+									});
+								} else if (this.deviceInfos.status == 0) {
+									uni.showToast({
+										title: '车辆未上架,请使用其他车辆',
+										icon: 'none',
+										duration: 4000
+									});
+								} else if (this.deviceInfos.status == 2) {
+									uni.showToast({
+										title: '车辆预约中,请使用其他车辆',
+										icon: 'none',
+										duration: 4000
+									});
+								} else if (this.deviceInfos.status == 3) {
+									uni.showToast({
+										title: '车辆骑行中,请使用其他车辆',
+										icon: 'none',
+										duration: 4000
+									});
+								} else if (this.deviceInfos.status == 4) {
+									uni.showToast({
+										title: '车辆临时锁车中,请使用其他车辆',
+										icon: 'none',
+										duration: 4000
+									});
+								} else if (this.deviceInfos.status == 8) {
+									uni.showToast({
+										title: '车辆下线中,请使用其他车辆',
+										icon: 'none',
+										duration: 4000
+									});
+								} else if (this.deviceInfos.status == 9) {
+									uni.showToast({
+										title: '车辆已废弃,请使用其他车辆',
+										icon: 'none',
+										duration: 4000
+									});
+								} else if (this.deviceInfos.status == 7) {
+									uni.showToast({
+										title: '车辆未上线,请使用其他车辆',
+										icon: 'none',
+										duration: 4000
+									});
+								} else if (this.deviceInfos.status == 1) {
+									this.showdevice = true;
+									this.type = 1;
+									this.deviceIndex = 1;
+								}
+							}
+						} else {
+							this.showdevice = false;
+							this.deviceIndex = 0;
+							this.type = 0;
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					});
+				} else {
+					console.log('判断2');
+					wx.login({
+						success: (res) => {
+							if (res.code) {
+								console.log('登录！', res);
+								let data = {
+									wxOpenId: res.code,
+								};
+								let areaId = uni.getStorageSync('areaId');
+								if (areaId) {
+									this.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId)
+										.then((
+											res) => {
+											// uni.hideLoading();
+											if (res.code == 200) {
+												uni.setStorageSync('token', res.token);
+			
+												this.$u.get('/app/device/info?sn=' + this.sn).then((
+													res) => {
+													if (res.code === 200) {
+														this.deviceInfos = res.data;
+			
+														if (num == 0) {
+															this.showdevice = true;
+															this.type = 0;
+														} else {
+															if (this.deviceInfos.onlineStatus ==
+																0) {
+																uni.showToast({
+																	title: '车辆离线中,请使用其他车辆',
+																	icon: 'none',
+																	duration: 4000
+																});
+															} else if (this.deviceInfos.status ==
+																0) {
+																uni.showToast({
+																	title: '车辆未上架,请使用其他车辆',
+																	icon: 'none',
+																	duration: 4000
+																});
+															} else if (this.deviceInfos.status ==
+																2) {
+																uni.showToast({
+																	title: '车辆预约中,请使用其他车辆',
+																	icon: 'none',
+																	duration: 4000
+																});
+															} else if (this.deviceInfos.status ==
+																3) {
+																uni.showToast({
+																	title: '车辆骑行中,请使用其他车辆',
+																	icon: 'none',
+																	duration: 4000
+																});
+															} else if (this.deviceInfos.status ==
+																4) {
+																uni.showToast({
+																	title: '车辆临时锁车中,请使用其他车辆',
+																	icon: 'none',
+																	duration: 4000
+																});
+															} else if (this.deviceInfos.status ==
+																8) {
+																uni.showToast({
+																	title: '车辆下线中,请使用其他车辆',
+																	icon: 'none',
+																	duration: 4000
+																});
+															} else if (this.deviceInfos.status ==
+																9) {
+																uni.showToast({
+																	title: '车辆已废弃,请使用其他车辆',
+																	icon: 'none',
+																	duration: 4000
+																});
+															} else if (this.deviceInfos.status ==
+																7) {
+																uni.showToast({
+																	title: '车辆未上线,请使用其他车辆',
+																	icon: 'none',
+																	duration: 4000
+																});
+															} else if (this.deviceInfos.status ==
+																1) {
+																this.showdevice = true;
+																this.type = 1;
+																this.deviceIndex = 1;
+															}
+														}
+													} else {
+														this.showdevice = false;
+														this.deviceIndex = 0;
+														this.type = 0;
+														uni.showToast({
+															title: res.msg,
+															icon: 'none',
+															duration: 2000
+														});
+													}
+												});
+											} else if (res.code == 501) {
+												uni.showToast({
+													title: res.msg,
+													icon: 'none',
+													duration: 2000
+												});
+											} else {
+												uni.redirectTo({
+													url: '/pages/login/login'
+												});
+											}
+										});
+			
+								}
+			
+							}
+						},
+					});
+				}
+			},
+			
 		},
 
 	}
diff --git a/pages/my.vue b/pages/my.vue
index c5fa561..7061c58 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -1,20 +1,22 @@
 <template>
 	<view class="page">
-		<u-navbar title="个人中心" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36' height='45'></u-navbar>
+		<u-navbar title="个人中心" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36'
+			height='45'></u-navbar>
 		<view class="topbg">
 			<view class="topbox">
-				<view class="info" >
+				<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"  mode=""></image>
+					<image v-if="info.avatar==''" src="https://lxnapi.ccttiot.com/bike/img/static/uSRzzLXhnbnWLB8jMKmr"
+						mode=""></image>
 					<view class="cont">
 						<view class="name" v-if="info.realName!=null">
-						 {{maskedName}}
+							{{maskedName}}
 						</view>
-						<view class="name" v-if="info.realName==null" >
-						 未实名
+						<view class="name" v-if="info.realName==null">
+							未实名
 						</view>
 						<view class="phone">
-							 {{ maskedPhoneNumber }}
+							{{ maskedPhoneNumber }}
 						</view>
 					</view>
 				</view>
@@ -24,7 +26,8 @@
 					<view class="btncard">
 						<view class="card_li" @click="topage(1)">
 							<view class="card_left">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/u3ILM6aE0MdFo3ZKiYPH" mode=""></image>
+								<image src="https://api.ccttiot.com/smartmeter/img/static/u3ILM6aE0MdFo3ZKiYPH" mode="">
+								</image>
 								<view class="text">
 									押金
 								</view>
@@ -32,44 +35,47 @@
 									未充值
 								</view>
 							</view>
-							<view class="iconfont icon-xiangyou1" >
-								
+							<view class="iconfont icon-xiangyou1">
+
 							</view>
 						</view>
 						<view class="card_li" @click="topage(2)">
 							<view class="card_left">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/u4Y4UAai9GLSaCBMMIsv" mode=""></image>
+								<image src="https://api.ccttiot.com/smartmeter/img/static/u4Y4UAai9GLSaCBMMIsv" mode="">
+								</image>
 								<view class="text">
 									我的订单
 								</view>
-								
+
 							</view>
-							<view class="iconfont icon-xiangyou1" >
-								
+							<view class="iconfont icon-xiangyou1">
+
 							</view>
 						</view>
 						<view class="card_li" @click="topage(3)">
 							<view class="card_left">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/u245BAqGOvTbYYGXJcrC" mode=""></image>
+								<image src="https://api.ccttiot.com/smartmeter/img/static/u245BAqGOvTbYYGXJcrC" mode="">
+								</image>
 								<view class="text">
 									问题上报记录
 								</view>
-								
+
 							</view>
-							<view class="iconfont icon-xiangyou1" >
-								
+							<view class="iconfont icon-xiangyou1">
+
 							</view>
 						</view>
 						<view class="card_li" @click="topage(4)">
 							<view class="card_left">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/ufD1uFe0pknx00weXJaU" mode=""></image>
+								<image src="https://api.ccttiot.com/smartmeter/img/static/ufD1uFe0pknx00weXJaU" mode="">
+								</image>
 								<view class="text">
 									用车指南
 								</view>
-								
+
 							</view>
-							<view class="iconfont icon-xiangyou1" >
-								
+							<view class="iconfont icon-xiangyou1">
+
 							</view>
 						</view>
 						<!-- <view class="card_li" style="border-bottom:2rpx solid #fff ;" @click="topage(5)">
@@ -84,98 +90,110 @@
 								
 							</view>
 						</view> -->
-						<view class="card_li"  @click="topage(10)" >
+						<view class="card_li" @click="topage(10)">
 							<view class="card_left">
-								<image src="https://lxnapi.ccttiot.com/bike/img/static/uk7i80QWz02cAfbbC518" mode=""></image>
+								<image src="https://lxnapi.ccttiot.com/bike/img/static/uk7i80QWz02cAfbbC518" mode="">
+								</image>
 								<view class="text">
-								客户服务
+									客户服务
 								</view>
-								
+
 							</view>
-							<view class="iconfont icon-xiangyou1" >
-								
+							<view class="iconfont icon-xiangyou1">
+
 							</view>
 						</view>
-						<view class="card_li"  @click="topage(8)" v-if="info.role==3||info.role==2">
+						<view class="card_li" @click="topage(8)" v-if="info.role==3||info.role==2">
 							<view class="card_left">
-								<image src="https://lxnapi.ccttiot.com/bike/img/static/unIGXFEhvTgtXVcfPH33" mode=""></image>
+								<image src="https://lxnapi.ccttiot.com/bike/img/static/unIGXFEhvTgtXVcfPH33" mode="">
+								</image>
 								<view class="text">
-								 维护入口
+									维护入口
 								</view>
-								
+
 							</view>
-							<view class="iconfont icon-xiangyou1" >
-								
+							<view class="iconfont icon-xiangyou1">
+
 							</view>
 						</view>
-						<view class="card_li"  @click="topage(9)" v-if="info.role==3">
+						<view class="card_li" @click="topage(9)" v-if="info.role==3">
 							<view class="card_left">
-								<image src="https://lxnapi.ccttiot.com/bike/img/static/unIGXFEhvTgtXVcfPH33" mode=""></image>
+								<image src="https://lxnapi.ccttiot.com/bike/img/static/unIGXFEhvTgtXVcfPH33" mode="">
+								</image>
 								<view class="text">
-								管理入口
+									管理入口
 								</view>
-								
+
 							</view>
-							<view class="iconfont icon-xiangyou1" >
-								
+							<view class="iconfont icon-xiangyou1">
+
 							</view>
 						</view>
 					</view>
-					<view class="btncard" style="margin-top: 36rpx;"  v-if="false">
+					<view class="btncard" style="margin-top: 36rpx;" v-if="false">
 						<view class="card_li" @click="topage(5)">
 							<view class="card_left">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/utp8xohLmuvcTiYZdGCL" mode=""></image>
+								<image src="https://api.ccttiot.com/smartmeter/img/static/utp8xohLmuvcTiYZdGCL" mode="">
+								</image>
 								<view class="text">
-								用户协议
+									用户协议
 								</view>
-							
+
 							</view>
-							<view class="iconfont icon-xiangyou1" >
-								
+							<view class="iconfont icon-xiangyou1">
+
 							</view>
 						</view>
 						<view class="card_li" @click="topage(6)">
 							<view class="card_left">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/um7bn51NCkfnuQbP0toj" mode=""></image>
+								<image src="https://api.ccttiot.com/smartmeter/img/static/um7bn51NCkfnuQbP0toj" mode="">
+								</image>
 								<view class="text">
 									隐私政策
 								</view>
-								
+
 							</view>
-							<view class="iconfont icon-xiangyou1" >
-								
+							<view class="iconfont icon-xiangyou1">
+
 							</view>
 						</view>
-					
-						<view class="card_li" style="border-bottom:2rpx solid #fff ;" @click="topage(7)" >
+
+						<view class="card_li" style="border-bottom:2rpx solid #fff ;" @click="topage(7)">
 							<view class="card_left">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/uJ1TRgb6xURsKZo5GUj8" mode=""></image>
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uJ1TRgb6xURsKZo5GUj8" mode="">
+								</image>
 								<view class="text">
-								关于我们
+									关于我们
 								</view>
-								
+
 							</view>
-							<view class="iconfont icon-xiangyou1" >
-								
+							<view class="iconfont icon-xiangyou1">
+
 							</view>
 						</view>
-						
+
 					</view>
 				</view>
 			</view>
 		</view>
-
+		<u-select v-model="show" :list="list" title='选择运营区' @confirm="confirm"></u-select>
 	</view>
 </template>
 
 <script>
+	import {
+		info
+	} from 'autoprefixer';
 	export default {
 		data() {
 			return {
 				bgc: {
 					backgroundColor: "#4C97E7",
 				},
-				info:{}
+				info: {},
+				totype: 0,
+				list: [],
+				show: false
 
 
 			}
@@ -183,96 +201,131 @@
 		onShow() {
 			this.getuserInfo()
 		},
-		  computed: {
-		    maskedPhoneNumber() {
-		      if (!this.info.phonenumber) return '';
-		      return this.info.phonenumber.slice(0, 3) + '****' + this.info.phonenumber.slice(7);
-		    },
-		    maskedName() {
-		      if (!this.info.realName) return '';
-		      return this.info.realName.charAt(0) + '*'.repeat(this.info.realName.length - 1);
-		    }
-		  },
+		computed: {
+			maskedPhoneNumber() {
+				if (!this.info.phonenumber) return '';
+				return this.info.phonenumber.slice(0, 3) + '****' + this.info.phonenumber.slice(7);
+			},
+			maskedName() {
+				if (!this.info.realName) return '';
+				return this.info.realName.charAt(0) + '*'.repeat(this.info.realName.length - 1);
+			}
+		},
 		methods: {
-			topage(num){
-				if(num==0){
+			topage(num) {
+				if (num == 0) {
 					// uni.navigateTo({
 					// 	url:''
 					// })
-				}else if(num==1){
+				} else if (num == 1) {
 					uni.navigateTo({
-						url:'/page_user/yj'
+						url: '/page_user/yj'
 					})
-				}else if(num==2){
+				} else if (num == 2) {
 					uni.navigateTo({
-						url:'/page_user/good_list'
+						url: '/page_user/good_list'
 					})
-				}else if(num==3){
+				} else if (num == 3) {
 					uni.navigateTo({
-						url:'/page_user/qsrecord'
+						url: '/page_user/qsrecord'
 					})
-				}else if(num==4){
+				} else if (num == 4) {
 					uni.navigateTo({
-						url:'/page_user/yczn'
+						url: '/page_user/yczn'
 					})
-				}
-				else if(num==5){
+				} else if (num == 5) {
 					uni.navigateTo({
-						url:'/page_user/jfgz'
+						url: '/page_user/jfgz'
 					})
-				}else if(num==8){
-					uni.navigateTo({
-						url:'/page_fix/fix_index'
-					})
-				}else if(num==9){
-					uni.navigateTo({
-						url:'/pages_admin/admin_index'
-					})
-				}else if(num==10){
-					uni.navigateTo({
-						url:'/page_user/khfw/khfw'
-					})
-				}
+				} else if (num == 8) {
+					this.totype = 1
 				
+					if(this.list.length<2){
+						uni.setStorageSync('adminAreaid', this.list[0].value);
+						
+						uni.navigateTo({
+							url:'/page_fix/fix_index'
+						})
+						
+					}else{
+							this.show = true
+					}
+				} else if (num == 9) {
+
+					this.totype = 2
+				
+					if(this.list.length<2){
+						uni.setStorageSync('adminAreaid', this.list[0].value);
+						uni.navigateTo({
+							url:'/pages_admin/admin_index'
+						})
+					}else{
+							this.show = true
+					}
+					
+				} else if (num == 10) {
+
+					uni.navigateTo({
+						url: '/page_user/khfw/khfw'
+					})
+				}
+
 			},
-			getuserInfo(){
+			getareaList(){
+
+			
+				this.$u.get('/appVerify/getAreaList').then((res) => {
+					if(res.code==200){
+					  this.list = res.data.map(item => ({
+					            value: item.areaId,
+					            label: item.areaName
+					        }));
+					}
+				}).catch(error => {
+					console.error("Error fetching area data:", error);
+				});
+			},
+			getuserInfo() {
 				uni.showLoading({
-					title:'加载中'
+					title: '加载中'
 				})
 				this.$u.get("/getAppInfo").then((res) => {
-				
+
 					if (res.code == 200) {
 						uni.hideLoading()
 						this.$store.commit('SET_USERID', res.user.userId);
-						this.info=res.user
-						
+						this.info = res.user
+						if (info.role != 1) {
+							this.getareaList()
+						}
 						// if( res.user.role==2){
 						// 	uni.navigateTo({
 						// 		url:'/page_fix/fix_index'
 						// 	})
 						// }
 					} else {
-						
-						let areaId=uni.getStorageSync('areaId'); 
-						if(areaId){
-							let that =this
+
+						let areaId = uni.getStorageSync('areaId');
+						if (areaId) {
+							let that = this
 							wx.login({
 								success(res) {
 									if (res.code) {
 										console.log('登录！', res);
 										let data = {
 											wxOpenId: res.code,
-							
+
 										};
 										let areaId = uni.getStorageSync('areaId');
-										that.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' + areaId).then(
+										that.$u.post('/loginByopenid?jsCode=' + res.code + '&areaId=' +
+											areaId).then(
 											res => {
 												uni.hideLoading();
 												if (res.code == 200) {
 													uni.setStorageSync('token', res.token);
 													that.getuserInfo()
-							
-							
+
+
 												} else if (res.code == 501) {
 													uni.showToast({
 														title: res.msg,
@@ -288,16 +341,16 @@
 											});
 									}
 								},
-							
+
 							});
-						}else{
+						} else {
 							uni.showToast({
 								title: '请授权位置信息后再尝试',
 								icon: 'none',
 								duration: 4000
 							});
 						}
-						
+
 					}
 				});
 			}
@@ -317,32 +370,38 @@
 			width: 750rpx;
 			background: #fff;
 			height: 184rpx;
-			.topbox{
+
+			.topbox {
 				width: 750rpx;
 				background: #4C97E7;
 				height: 184rpx;
 				border-radius: 0 0 100rpx 0;
-				.info{
+
+				.info {
 					padding-top: 40rpx;
 					margin-left: 100rpx;
 					display: flex;
 					flex-wrap: nowrap;
 					align-items: center;
-					image{
+
+					image {
 						width: 90rpx;
 						height: 90rpx;
 						border-radius: 50%;
 					}
-					.cont{
+
+					.cont {
 						margin-left: 40rpx;
 						width: 70%;
-						.name{
+
+						.name {
 							font-weight: 400;
 							font-size: 32rpx;
 							color: #FFFFFF;
 							width: 100%;
 						}
-						.phone{
+
+						.phone {
 							margin-top: 4rpx;
 							width: 100%;
 							font-weight: 400;
@@ -353,26 +412,29 @@
 				}
 			}
 		}
-		.btnbg{
+
+		.btnbg {
 			width: 750rpx;
 			background: #4C97E7;
-			.btnbox{
+
+			.btnbox {
 				padding-top: 36rpx;
 				width: 750rpx;
 				background: #fff;
-				
+
 				border-radius: 100rpx 0 0 0;
-				
-				.btncard{
+
+				.btncard {
 					padding: 0 54rpx;
 					margin: 0 auto;
 					width: 680rpx;
 					// height: 438rpx;
 					padding: 0 56rpx;
 					background: #FFFFFF;
-					box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
+					box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
 					border-radius: 34rpx 34rpx 34rpx 34rpx;
-					.card_li{
+
+					.card_li {
 						padding-top: 18rpx;
 						width: 100%;
 						display: flex;
@@ -381,24 +443,27 @@
 						justify-content: space-between;
 						border-bottom: 2rpx solid #D8D8D8;
 						padding-bottom: 26rpx;
-						.card_left{
+
+						.card_left {
 							// width: 100%;
 							display: flex;
 							flex-wrap: nowrap;
 							// align-items: center;
-							
-							image{
+
+							image {
 								margin-right: 28rpx;
 								width: 40rpx;
 								height: 40rpx;
 							}
-							.text{
+
+							.text {
 								margin-right: 24rpx;
 								font-weight: 400;
 								font-size: 28rpx;
 								color: #3D3D3D;
 							}
-							.tip{
+
+							.tip {
 								display: flex;
 								align-items: center;
 								justify-content: center;
@@ -411,11 +476,12 @@
 								color: #FA5F5F;
 							}
 						}
-						.icon-xiangyou1{
+
+						.icon-xiangyou1 {
 							font-size: 42rpx;
 							color: #3D3D3D;
 						}
-						
+
 					}
 				}
 			}
diff --git a/pages_admin/admin_index.vue b/pages_admin/admin_index.vue
index fbd2590..2db8d80 100644
--- a/pages_admin/admin_index.vue
+++ b/pages_admin/admin_index.vue
@@ -164,23 +164,33 @@
 			});
 
 
-			this.getareaid()
+			// this.getareaid()
+			if(uni.getStorageSync('adminAreaid')){
+				this.areaId = uni.getStorageSync('adminAreaid')
+				this.getArea()
+				
+				this.allVehicleNum()
+			}
 
 
+		
+			// this.getmarks();
+		},
+		onLoad() {
 
 			let that = this
 			uni.getLocation({
 				type: 'wgs84',
 				success: function(lb) {
-
-
+			
+			
 					that.latitude = Number(lb.latitude.toFixed(5)) - 0.005
 					that.longitude = Number(lb.longitude.toFixed(5)) + 0.005
 					console.log(that.areaInfo, 'that.areaInfo');
 					that.setMapScale()
 					// that.getmarks()
-
-
+			
+			
 					//
 				},
 				fail: function(error) {
@@ -192,13 +202,8 @@
 					// that.getmarks()
 					// 在这里处理获取位置信息失败的情况
 				}
-
+			
 			})
-			// this.getmarks();
-		},
-		onLoad() {
-
-
 		},
 		computed: {
 			userId() {
@@ -216,8 +221,8 @@
 							latitude: parseFloat(item.latitude),
 							longitude: parseFloat(item.longitude),
 							width: 20,
-							height: 40,
-							iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
+							height: 28.95,
+							iconPath: item.type == 1 ?'https://lxnapi.ccttiot.com/bike/img/static/up2xXqAgwCX5iER600k3':item.type == 2 ?'https://lxnapi.ccttiot.com/bike/img/static/u53BAQcFIX3vxsCzEZ7t' :' https://lxnapi.ccttiot.com/bike/img/static/uDNY5Q4zOiZTCBTA2Jdq',
 							callout: {
 								content: item.parkingName,
 								color: '#ffffff',
@@ -243,10 +248,7 @@
 					if (res.code == 200) {
 						// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
 						// this.areaId=res.data
-						this.areaId = 14
-						this.getArea()
-
-						this.allVehicleNum()
+						
 						// console.log(this.polyline);
 					} else {
 						this.areaId = 14
@@ -500,7 +502,7 @@
 					powerStart: this.rangeValue[0],
 					powerEnd: this.rangeValue[1],
 					sort: 'desc',
-
+					areaId: this.areaId
 				}
 				if (this.statusidx != 7 && this.statusidx != 9) {
 					data.status = this.statusidx
@@ -662,24 +664,22 @@
 
 
 			getArea() {
-				// 发送请求获取数据
-				let data = {
-					areaId: this.areaId
-				}
-				this.$u.get('/app/area/list?', data).then((res) => {
-					if (res.code === 200) {
-						// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
-						const polylines = res.rows
-							.filter(area => area.boundaryStr) // 过滤掉boundary为空的数据
-							.map(area => this.convertBoundaryToPolyline(area.boundaryStr));
-						// 更新折线数据
-						this.polyline = polylines;
-
+				
+				let id = this.areaId
+				this.$u.get("/app/area/" + id).then((res) => {
+				
+					if (res.code == 200) {
+						// this.areaInfo = res.data
+						const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
+						this.polyline.push(polylines)
 						this.getmarks()
-						// console.log(this.polyline);
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 2000
+						});
 					}
-				}).catch(error => {
-					console.error("Error fetching area data:", error);
 				});
 			},
 			convertBoundaryToPolylines(boundaries, num) {
@@ -770,7 +770,11 @@
 			},
 			getParking() {
 				// 发送请求获取数据
-				this.$u.get('/app/parking/list').then((res) => {
+				let data = {
+					
+					areaId: this.areaId
+				}
+				this.$u.get('/app/parking/list?',data).then((res) => {
 					if (res.code === 200) {
 						// 处理接口返回的数据
 						const type1Data = [];
@@ -812,12 +816,12 @@
 			},
 			convertBoundaryToPolyline(boundary) {
 				if (!boundary) return null;
-
+			
 				const points = JSON.parse(boundary).map(coord => ({
 					latitude: coord[1],
 					longitude: coord[0]
 				}));
-
+			
 				const polyline = {
 					points: points,
 					fillColor: "#55888840", //填充颜色
@@ -825,7 +829,7 @@
 					strokeWidth: 2, //描边宽度
 					zIndex: 1, //层级
 				};
-
+			
 				return polyline;
 			},
 		}
diff --git a/pages_admin/admin_order.vue b/pages_admin/admin_order.vue
index 1f2446b..535c017 100644
--- a/pages_admin/admin_order.vue
+++ b/pages_admin/admin_order.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar :is-back="false" title="设备管理" :border-bottom="false" :background="bgc" title-color='#2E4975'
+		<u-navbar :is-back="false" title="订单管理" :border-bottom="false" :background="bgc" title-color='#2E4975'
 			title-size='36' height='45'></u-navbar>
 		<view class="top_box">
 			<view class="left_text">
@@ -80,12 +80,10 @@
 									<view class="half_info_li">
 										车辆编号：{{item.sn}}
 									</view>
-									<view class="half_info_li" v-if="item.returnTime">
+									<view class="half_info_li" >
 										租赁时长：{{computedList(item)}}
 									</view>
-									<view class="half_info_li" v-else>
-										租赁时长：--
-									</view>
+									
 								</view>
 								<view class="info_li">
 									订单费用：{{item.totalFee}}元
@@ -150,12 +148,10 @@
 									<view class="half_info_li">
 										车辆编号：{{item.sn}}
 									</view>
-									<view class="half_info_li" v-if="item.returnTime">
+									<view class="half_info_li" >
 										租赁时长：{{computedList(item)}}
 									</view>
-									<view class="half_info_li" v-else>
-										租赁时长：--
-									</view>
+									
 								</view>
 								<view class="info_li">
 									订单费用：{{item.totalFee}}元
@@ -218,12 +214,9 @@
 									<view class="half_info_li">
 										车辆编号：{{item.sn}}
 									</view>
-									<view class="half_info_li" v-if="item.returnTime">
+									<view class="half_info_li" >
 										租赁时长：{{computedList(item)}}
 									</view>
-									<view class="half_info_li" v-else>
-										租赁时长：--
-									</view>
 								</view>
 								<view class="info_li">
 									订单费用：{{item.totalFee}}元
@@ -287,12 +280,9 @@
 									<view class="half_info_li">
 										车辆编号：{{item.sn}}
 									</view>
-									<view class="half_info_li" v-if="item.returnTime">
+									<view class="half_info_li" >
 										租赁时长：{{computedList(item)}}
 									</view>
-									<view class="half_info_li" v-else>
-										租赁时长：--
-									</view>
 								</view>
 								<view class="info_li">
 									订单费用：{{item.totalFee}}元
@@ -503,7 +493,8 @@
 				loading: false,
 				initialValues: {
 
-				}
+				},
+				areaId:false
 
 			}
 		},
@@ -512,10 +503,12 @@
 
 				// 执行其他操作...
 			});
-			this.orderList()
-			// this.orderList1()
-			// this.orderList2()
-			// this.orderList3()
+			
+			if(uni.getStorageSync('adminAreaid')){
+				this.areaId = uni.getStorageSync('adminAreaid')
+				this.orderList()
+			}
+		
 		},
 		watch: {
 			curtitidx(newValue, oldValue) {
@@ -542,15 +535,46 @@
 		},
 		methods: {
 			computedList(item) {
-				const createTime = new Date(item.createTime);
-				const payTime = new Date(item.returnTime);
-				const timeDifference = Math.abs(createTime - payTime);
-
-				const hours = Math.floor(timeDifference / (1000 * 60 * 60));
-				const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
-				const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
-
-				return `${minutes}分钟${seconds}秒`
+				 if(item.status==0||item.status==2){
+				 const createTime = new Date(item.createTime);
+				  const payTime =  Date.now();
+				  const timeDifference = Math.abs(createTime - payTime);
+				 			
+				  const hours = Math.floor(timeDifference / (1000 * 60 * 60));
+				  const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
+				  const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
+				 			
+				  let result = '';
+				  if (hours > 0) {
+				      result += `${hours}小时`;
+				  }
+				  if (minutes > 0 || hours > 0) { // 显示分钟条件：有小时或者有分钟
+				      result += `${minutes}分`;
+				  }
+				  // result += `${seconds}秒`; // 始终显示秒
+				 			
+				  return result;
+				 }else{
+				 	const createTime = new Date(item.createTime);
+				 	 const payTime = new Date(item.returnTime);
+				 	 const timeDifference = Math.abs(createTime - payTime);
+				 				
+				 	 const hours = Math.floor(timeDifference / (1000 * 60 * 60));
+				 	 const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
+				 	 const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
+				 				
+				 	 let result = '';
+				 	 if (hours > 0) {
+				 	     result += `${hours}小时`;
+				 	 }
+				 	 if (minutes > 0 || hours > 0) { // 显示分钟条件：有小时或者有分钟
+				 	     result += `${minutes}分`;
+				 	 }
+				 	 // result += `${seconds}秒`; // 始终显示秒
+				 				
+				 	 return result;
+				 	
+				 }
 			},
 			toOrderDetail(id) {
 				uni.navigateTo({
@@ -703,7 +727,7 @@
 					status: '',
 					startTime: this.firsTime,
 					endTime: this.lasTime,
-
+					areaId:this.areaId
 
 				}
 
@@ -728,7 +752,7 @@
 					statusList: '0,2',
 					startTime: this.firsTime,
 					endTime: this.lasTime,
-
+						areaId:this.areaId
 				}
 				this.loading = false
 				this.$u.get('/appVerify/order/list?', data).then((res) => {
@@ -750,7 +774,7 @@
 					statusList: '1,3',
 					startTime: this.firsTime,
 					endTime: this.lasTime,
-
+						areaId:this.areaId
 
 				}
 				this.loading = false
@@ -773,7 +797,7 @@
 					status: '4',
 					startTime: this.firsTime,
 					endTime: this.lasTime,
-
+						areaId:this.areaId
 
 
 
diff --git a/pages_admin/order/device_detail.vue b/pages_admin/order/device_detail.vue
index 1aedfb9..0d0da07 100644
--- a/pages_admin/order/device_detail.vue
+++ b/pages_admin/order/device_detail.vue
@@ -2,8 +2,17 @@
 	<view class="page">
 		<u-navbar title="设备详情" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
 			height='45'></u-navbar>
+		<!-- 	<view class="map">
+				
+			</view> -->
 		<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
-			:show-location="true" :markers="markers" :polygons="polyline" ></map>
+			:show-location="true" :markers="markers" :polygons="polyline" >
+			<cover-view  class="park" @click="toggleIconAndCallout">
+				<cover-image class="img" src="https://lxnapi.ccttiot.com/bike/img/static/uRiYQZQEb3l2LsltEsyW" mode=""></cover-image>
+			</cover-view>
+			</map>
+			
+			
 		<view class="info_card">
 			<view class="info_tit">
 				设备信息
@@ -643,25 +652,7 @@
 			btnhd() {
 				this.tishiflag = false
 			},
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
-			
+
 			btn(num){
 				if(num==0){
 					this.$u.post('/appVerify/admin/unlocking?sn='+this.sn).then((res) => {
@@ -976,6 +967,38 @@
 					}).filter(polyline => polyline !== null); // 过滤掉无效的折线数据
 				}
 				
+			},
+			toggleIconAndCallout() {
+				this.showIconAndCallout = !this.showIconAndCallout;
+				if (this.showIconAndCallout) {
+					const newMarkers = [];
+					this.parkingList.forEach(item => {
+						newMarkers.push({
+							id: parseFloat(item.parkingId),
+							latitude: parseFloat(item.latitude),
+							longitude: parseFloat(item.longitude),
+							width: 20,
+							height: 28.95,
+							iconPath: item.type == 1 ?'https://lxnapi.ccttiot.com/bike/img/static/up2xXqAgwCX5iER600k3':item.type == 2 ?'https://lxnapi.ccttiot.com/bike/img/static/u53BAQcFIX3vxsCzEZ7t' :' https://lxnapi.ccttiot.com/bike/img/static/uDNY5Q4zOiZTCBTA2Jdq',
+							callout: {
+								content: item.parkingName,
+								color: '#ffffff',
+								fontSize: 14,
+								borderRadius: 10,
+								bgColor: item.type == 1 ? '#3A7EDB' : item.type == 2 ? '#FFC107' :
+									'#FF473E',
+								padding: 6,
+								display: 'ALWAYS'
+							},
+							isCalloutVisible: true // 添加标记
+						});
+					});
+					this.$set(this, 'markers', [...this.markers, ...newMarkers]);
+				} else {
+					// 过滤掉所有气泡显示的标记
+					this.$set(this, 'markers', this.markers.filter(marker => !marker.isCalloutVisible));
+				}
+			
 			},
 			getParking() {
 				// 发送请求获取数据
@@ -1011,65 +1034,9 @@
 							this.polyline = this.polyline.concat(polylines2);
 						this.polyline = this.polyline.concat(polylines1);
 						this.polyline = this.polyline.concat(polylines);
-			
+						this.parkingList = res.rows
 						// console.log(this.polyline);
-						res.rows.forEach(item => {
-							if(item.type==1){
-								this.markers.push({
-									id: parseFloat(item.parkingId),
-									latitude: parseFloat(item.latitude),
-									longitude: parseFloat(item.longitude),
-									width: 20,
-									height: 40,
-									iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
-									callout: {
-										content: item.parkingName, // 修改为你想要显示的文字内容
-										color: '#ffffff', // 修改为文字颜色
-										fontSize: 14, // 修改为文字大小
-										borderRadius: 10, // 修改为气泡圆角大小
-										bgColor: '#3A7EDB', // 修改为气泡背景颜色
-										padding: 6, // 修改为气泡内边距
-										display: 'ALWAYS' // 修改为气泡的显示策略
-									}
-								});
-							}else if(item.type==2){
-								this.markers.push({
-									id: parseFloat(item.parkingId),
-									latitude: parseFloat(item.latitude),
-									longitude: parseFloat(item.longitude),
-									width: 20,
-									height: 40,
-									iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
-									callout: {
-										content: item.parkingName, // 修改为你想要显示的文字内容
-										color: '#ffffff', // 修改为文字颜色
-										fontSize: 14, // 修改为文字大小
-										borderRadius: 10, // 修改为气泡圆角大小
-										bgColor: '#FFC107', // 修改为气泡背景颜色
-										padding: 6, // 修改为气泡内边距
-										display: 'ALWAYS' // 修改为气泡的显示策略
-									}
-								});
-							}else if(item.type==3){
-								this.markers.push({
-									id: parseFloat(item.parkingId),
-									latitude: parseFloat(item.latitude),
-									longitude: parseFloat(item.longitude),
-									width: 20,
-									height: 40,
-									iconPath: 'https://lxnapi.ccttiot.com/bike/img/static/u9yz0bKCWKyev0JYpTne',
-									callout: {
-										content: item.parkingName, // 修改为你想要显示的文字内容
-										color: '#ffffff', // 修改为文字颜色
-										fontSize: 14, // 修改为文字大小
-										borderRadius: 10, // 修改为气泡圆角大小
-										bgColor: '#FF473E', // 修改为气泡背景颜色
-										padding: 6, // 修改为气泡内边距
-										display: 'ALWAYS' // 修改为气泡的显示策略
-									}
-								});
-							}
-						})
+						
 					}
 				}).catch(error => {
 					console.error("Error fetching parking data:", error);
@@ -1107,9 +1074,29 @@
 		width: 750rpx;
 
 		.map {
+			position: relative;
 			width: 750rpx;
 			height: 752rpx;
+			.park {
+				position: absolute;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				right: 30rpx;
+				bottom: 40rpx;
+				// background-color: #fff;
+				border-radius: 50%;
+				width: 82rpx;
+				height: 82rpx;
+				z-index: 10;
+			
+				.img {
+					width: 82rpx;
+					height: 82rpx;
+				}
+			}
 		}
+		
 		.tip_box {
 			position: fixed;
 			left: 72rpx;
diff --git a/pages_admin/order/order_detail.vue b/pages_admin/order/order_detail.vue
index 8454387..cb3451a 100644
--- a/pages_admin/order/order_detail.vue
+++ b/pages_admin/order/order_detail.vue
@@ -13,8 +13,20 @@
 				<view class="info_li">
 					订单编号：<span>{{orderInfo.orderNo}}</span>
 				</view>
+				<!-- <view class="info_li">
+					
+				</view> -->
 				<view class="info_li">
-					租赁用户：<span style="color:#4C97E7 ;">{{orderInfo.phonenumber}}</span>
+					<view class="half_infoli " @click="callPhone">
+						租赁用户：<span style="color:#4C97E7 ;">{{orderInfo.phonenumber}}</span>
+					</view>
+					<view class="half_infoli">
+						用户姓名：<span v-if="orderInfo.realName">{{orderInfo.realName}}</span>
+						<span v-else>--</span>
+					</view>
+				</view>
+				<view class="info_li">
+					订单状态：<span>{{status()}}</span>
 				</view>
 				<view class="info_li">
 					<view class="half_infoli">
@@ -224,16 +236,53 @@
 
 		},
 		methods: {
+			callPhone(){
+				uni.makePhoneCall({
+					phoneNumber:this.orderInfo.phonenumber
+				})
+			},
 			computedList(item) {
+				if(item.status==0||item.status==2){
 				const createTime = new Date(item.createTime);
-				const payTime = new Date(item.returnTime);
-				const timeDifference = Math.abs(createTime - payTime);
-			
-				const hours = Math.floor(timeDifference / (1000 * 60 * 60));
-				const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
-				const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
-			
-				return `${minutes}分钟${seconds}秒`
+				 const payTime =  Date.now();
+				 const timeDifference = Math.abs(createTime - payTime);
+							
+				 const hours = Math.floor(timeDifference / (1000 * 60 * 60));
+				 const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
+				 const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
+							
+				 let result = '';
+				 if (hours > 0) {
+				     result += `${hours}小时`;
+				 }
+				 if (minutes > 0 || hours > 0) { // 显示分钟条件：有小时或者有分钟
+				     result += `${minutes}分`;
+				 }
+				 // result += `${seconds}秒`; // 始终显示秒
+							
+				 return result;
+				}else{
+					const createTime = new Date(item.createTime);
+					 const payTime = new Date(item.returnTime);
+					 const timeDifference = Math.abs(createTime - payTime);
+								
+					 const hours = Math.floor(timeDifference / (1000 * 60 * 60));
+					 const minutes = Math.floor((timeDifference % (1000 * 60 * 60)) / (1000 * 60));
+					 const seconds = Math.floor((timeDifference % (1000 * 60)) / 1000);
+								
+					 let result = '';
+					 if (hours > 0) {
+					     result += `${hours}小时`;
+					 }
+					 if (minutes > 0 || hours > 0) { // 显示分钟条件：有小时或者有分钟
+					     result += `${minutes}分`;
+					 }
+					 // result += `${seconds}秒`; // 始终显示秒
+								
+					 return result;
+					
+				}
+			 
 			},
 			convertBoundaryToPolyline(boundary) {
 				if (!boundary) return null;
@@ -463,7 +512,7 @@
 					} else if (this.orderInfo.status == 1) {
 						return '取消预约'
 					} else if (this.orderInfo.status == 2) {
-						return '开始骑行'
+						return '骑行中'
 					} else if (this.orderInfo.status == 3) {
 						return '骑行结束'
 					} else if (this.orderInfo.status == 4) {
@@ -711,13 +760,17 @@
 				}
 
 				.info_lis {
-
+					width: 90%;
 					display: inline-block;
 					// flex-wrap: nowrap;
 					font-weight: 400;
 					font-size: 28rpx;
 					color: #808080;
-
+					white-space: nowrap;
+					/* 禁止换行 */
+					overflow: hidden;
+					/* 超出部分隐藏 */
+					text-overflow: ellipsis;
 					.text {
 						display: inline;
 						// width: 70%;
diff --git a/pages_admin/order/search_device.vue b/pages_admin/order/search_device.vue
index 174ee7a..e4399d6 100644
--- a/pages_admin/order/search_device.vue
+++ b/pages_admin/order/search_device.vue
@@ -79,7 +79,14 @@
 				typeindex:0,
 				show:false,
 				searchKeyword:'',
-				searchList:[]
+				searchList:[],
+				areaId:null
+			}
+		},
+		onShow() {
+			if(uni.getStorageSync('adminAreaid')){
+				this.areaId = uni.getStorageSync('adminAreaid')
+				
 			}
 		},
 		methods: {
@@ -91,9 +98,10 @@
 			getSearch(){
 				let data={
 					type:this.typeidx,
-					key:this.searchKeyword
+					key:this.searchKeyword,
+					areaId:this.areaId
 				}
-				this.$u.get(`/appVerify/device/search?`, data).then((res) => {
+				this.$u.get(`/app/device/search?`, data).then((res) => {
 					if (res.code == 200) {
 						this.searchList=res.data
 						
diff --git a/pages_admin/worke/woke_deviceMgmt.vue b/pages_admin/worke/woke_deviceMgmt.vue
index 34ec65d..c5983a2 100644
--- a/pages_admin/worke/woke_deviceMgmt.vue
+++ b/pages_admin/worke/woke_deviceMgmt.vue
@@ -333,7 +333,8 @@
 					powerStart: '',
 					powerEnd: '',
 					sort: this.scidx,
-					status: this.typeidx
+					status: this.typeidx,
+					
 				}
 
 				this.selectedItems = [];