From 00cb6ab41065a90afefa6b24bb6aa5dc39be9d82 Mon Sep 17 00:00:00 2001
From: Sliverber <2622874537@qq.com>
Date: Mon, 3 Jun 2024 18:06:08 +0800
Subject: [PATCH] 111

---
 components/tab-bar/tab-bar.vue        |   2 +-
 page_user/bhks.vue                    |  77 ++-
 page_user/ckmx.vue                    | 139 ++++-
 page_user/cktcd.vue                   |   2 +-
 page_user/demo.vue                    |   2 +-
 page_user/good_list.vue               |   4 +-
 page_user/gzsb.vue                    |   4 +-
 page_user/idcard_test.vue             |   6 +-
 page_user/jfgz.vue                    |   2 +-
 page_user/ks.vue                      |   2 +-
 page_user/qrks.vue                    |   2 +-
 page_user/qsdetail.vue                |   2 +-
 page_user/qsrecord.vue                |   8 +-
 page_user/xcjs.vue                    |   2 +-
 page_user/yczn.vue                    |   2 +-
 page_user/yj.vue                      |   8 +-
 pages/index/index.vue                 | 768 ++++++++++++++++----------
 pages_admin/admin_index.vue           |  25 +-
 pages_admin/order/device_detail.vue   |   2 +-
 pages_admin/worke/woke_deviceMgmt.vue |  71 ++-
 pages_admin/worke/worke_income.vue    |   2 +
 21 files changed, 764 insertions(+), 368 deletions(-)

diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
index 8aa0ec6..d1e2e7f 100644
--- a/components/tab-bar/tab-bar.vue
+++ b/components/tab-bar/tab-bar.vue
@@ -98,7 +98,7 @@
 	.cont {
 		position: fixed;
 		// left: 60rpx;
-		bottom: 10rpx;
+		bottom: 0rpx;
 		width: 750rpx;
 		height: 118rpx;
 		background: #FFFFFF;
diff --git a/page_user/bhks.vue b/page_user/bhks.vue
index bf3f925..f6858bd 100644
--- a/page_user/bhks.vue
+++ b/page_user/bhks.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="编号开锁" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'height='36'></u-navbar>
+		<u-navbar title="编号开锁" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'height='40'></u-navbar>
 			<view class="cont">
 				<view class="tit">
 					输入编号开锁
@@ -10,7 +10,7 @@
 				</view>
 				<view class="ipt">
 					
-					<input type="text" class="ips" v-model="code" placeholder="请输入车辆二维码下方编号" placeholder-style='font-weight: 400;font-size: 36rpx;color: #808080;' />
+					<input type="text" class="ips" v-model="sn" placeholder="请输入车辆二维码下方编号" placeholder-style='font-weight: 400;font-size: 36rpx;color: #808080;' />
 				</view>
 				<view class="btn" @click="sub">
 					确认开锁
@@ -27,21 +27,84 @@
 				bgc: {
 					backgroundColor: "#fff",
 				},
-				code:''
+				sn:''
 			}
 		},
 		methods: {
 			sub(){
-				if(this.code==''){
+				if(this.sn==''){
 					uni.showToast({
 					  title: '请输入设备编号',
 					  icon: 'none',
 					  duration: 2000
 					});
 				}else{
-					uni.navigateTo({
-						url:'/pages/index/index?sn='+this.code
-					})
+					let that = this
+					if(uni.getStorageSync('token')){
+						this.$u.get('/app/device/info?sn=' + this.sn).then((res) => {
+							if (res.code === 200) {
+								uni.navigateTo({
+									url:'/pages/index/index?sn='+this.code
+								})
+							}else{
+								
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								});
+							}
+						})
+					}else{
+						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(res=>{
+										uni.hideLoading();
+						        		if (res.code == 200) {
+						        			uni.setStorageSync('token', res.token);
+											that.$u.get('/app/device/info?sn=' + that.sn).then((res) => {
+												if (res.code === 200) {
+													uni.navigateTo({
+														url:'/pages/index/index?sn='+this.code
+													})
+												}else{
+													
+													uni.showToast({
+														title: res.msg,
+														icon: 'none',
+														duration: 2000
+													});
+												}
+											})
+											
+						        			
+						        		}else if(res.code == 501){
+											uni.showToast({
+												title: res.msg,
+												icon: 'none',
+												duration: 2000
+											});
+										}else {
+						        			// console.log("老用户登录",res.data)
+						        			uni.redirectTo({
+						        				url:'/pages/login/login'
+						        			})
+						        		}
+						        	});
+						        }
+						    },
+						  
+						});
+					}
+					
+					
 				}
 			}
 		}
diff --git a/page_user/ckmx.vue b/page_user/ckmx.vue
index 1453346..a4f6dc3 100644
--- a/page_user/ckmx.vue
+++ b/page_user/ckmx.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="费用明细" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36' height='36'></u-navbar>
+		<u-navbar title="费用明细" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36' height='40'></u-navbar>
 		<view class="tit">
 			<view class="left">电单车</view>
 			<!-- <view class="right">查看计费规则 ></view> -->
@@ -160,3 +160,140 @@
 		}
 	}
 </script>
+<style lang="scss" >
+page{
+	background-color: #F7FAFE;
+}
+.page{
+	// width: 750rpx;
+	width: 750rpx;
+	// height: 530rpx;
+	background: linear-gradient( 180deg, #4C97E7 0.1%, rgba(255,255,255,0) 40%), #FFFFFF;
+	border-radius: 0rpx 0rpx 0rpx 0rpx;
+	.tit{
+		margin-left: 86rpx;
+		margin-right: 86rpx;
+		margin-top: 30rpx;
+		display: flex;
+		flex-wrap: nowrap;
+		justify-content: space-between;
+		align-items: center;
+		.left{
+			font-weight: 700;
+			font-size: 40rpx;
+			color: #3D3D3D;
+		}
+		.right{
+			
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #3D3D3D;
+		}
+	}
+	.data{
+		margin-left: 86rpx;
+		font-weight: 400;
+		font-size: 24rpx;
+		color: #808080;
+	}
+	.card{
+		padding:34rpx 44rpx ;
+		margin: 68rpx auto;
+		width: 672rpx;
+		// height: 458rpx;
+		background: #FFFFFF;
+		box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0,0,0,0.08);
+		border-radius: 32rpx 32rpx 32rpx 32rpx;
+		.card_tit{
+			width: 112rpx;
+			height: 38rpx;
+			font-family: AlibabaPuHuiTi, AlibabaPuHuiTi;
+			font-weight: 400;
+			font-size: 28rpx;
+			color: #3D3D3D;
+			
+			background: linear-gradient( 0deg, #B1C3FF 0.1%, rgba(255,255,255,0) 40%), #FFFFFF;
+		}
+		.cont{
+			padding: 32rpx 28rpx;
+			margin-top: 26rpx;
+			width: 586rpx;
+			// height: 228rpx;
+			background: #F3F3F3;
+			border-radius: 26rpx 26rpx 26rpx 26rpx;
+			.cont_box{
+				display: flex;
+				flex-wrap: nowrap;
+				justify-content: space-between;
+				.cont_left{
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #3D3D3D;
+				}
+				.cont_right{
+					font-weight: 400;
+					font-size: 28rpx;
+					color: #3D3D3D;
+				}
+			}
+			.tip{
+				margin-top: 32rpx;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #808080;
+			}
+			
+			
+		}
+		.price{
+			margin-top: 28rpx;
+			display: flex;
+			flex-wrap: nowrap;
+			.prices{
+				margin-left: auto;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #3D3D3D;
+				span{
+					margin-left: 2rpx;
+					margin-right: 2rpx;
+				}
+			}
+			.showmore{
+					margin-left: auto;
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				font-weight: 400;
+				font-size: 20rpx;
+				color: #3D3D3D;
+				.icon-xiangshang1{
+					font-size: 20rpx;
+					color: #3D3D3D;
+				}
+				.icon-xiangxia1{
+					font-size: 20rpx;
+					color: #3D3D3D;
+				}
+			}
+		}
+		.info_cont{
+			margin-top: 12rpx;
+			display: flex;
+			flex-wrap: nowrap;
+			align-items: center;
+			justify-content: space-between;
+			.cont_left{
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #3D3D3D;
+			}
+			.cont_right{
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #3D3D3D;
+			}
+		}
+	}
+}
+</style>
diff --git a/page_user/cktcd.vue b/page_user/cktcd.vue
index 628b566..578ee13 100644
--- a/page_user/cktcd.vue
+++ b/page_user/cktcd.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="查看停车点" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36'></u-navbar>
+			height='40'></u-navbar>
 			<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
 				:show-location='true' :polygons='polygons' :markers="markers" :polyline="polyline"></map>
 			<view class="bottom_box">
diff --git a/page_user/demo.vue b/page_user/demo.vue
index 06618aa..d8caba5 100644
--- a/page_user/demo.vue
+++ b/page_user/demo.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="编号开锁" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36'></u-navbar>
+			height='40'></u-navbar>
 			<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
 				:show-location='true' :polygons='polygons' :markers="markers" :polyline="polyline">
 	</view>
diff --git a/page_user/good_list.vue b/page_user/good_list.vue
index 0827d0a..0aaf32e 100644
--- a/page_user/good_list.vue
+++ b/page_user/good_list.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="page">
     <u-navbar title="我的订单" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-      height='36'></u-navbar>
+      height='40'></u-navbar>
     <view class="card" v-for="(item, index) in computedList" :key="index">
       <view class="top_li">
         <view class="left">
@@ -12,7 +12,7 @@
         </view>
       </view>
       <view class="info">
-        时间：{{ item.payTime }}
+        时间：{{ item.createTime }}
       </view>
       <view class="info">
         时长：{{ item.duration }}
diff --git a/page_user/gzsb.vue b/page_user/gzsb.vue
index a3bf960..28c5254 100644
--- a/page_user/gzsb.vue
+++ b/page_user/gzsb.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="故障上报" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='36'></u-navbar>
+			height='40'></u-navbar>
 		<view class="cardbox">
 			<view class="tip">
 				<view class="ipnt">*</view>故障车编号
@@ -290,7 +290,7 @@
 			btn() {
 				let _this = this
 				let math = 'static/' + _this.$u.guid(20)
-				uni.chooseMessageFile({
+				uni.chooseImage({
 					count: 9,
 					type: 'all',
 					success(res) {
diff --git a/page_user/idcard_test.vue b/page_user/idcard_test.vue
index 63d98ab..ed5d1ee 100644
--- a/page_user/idcard_test.vue
+++ b/page_user/idcard_test.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="认证" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='36'></u-navbar>
+			height='40'></u-navbar>
 			<view class="ipt_box">
 				<view class="li">
 					<view class="left">
@@ -75,7 +75,9 @@
 				};
 				this.$u.get('/appVerify/user/authentication?', data).then((res) => {
 					if (res.code === 200) {
-						this.getisInOrder()
+						uni.navigateBack({
+						    delta: 1  // delta值为1时表示返回的页面层数
+						});
 					} else {
 						uni.showToast({
 							title: res.msg,
diff --git a/page_user/jfgz.vue b/page_user/jfgz.vue
index 3af3651..ad8c943 100644
--- a/page_user/jfgz.vue
+++ b/page_user/jfgz.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="计费规则" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='36'></u-navbar>
+			height='40'></u-navbar>
 			<view class="cont" style="margin-top: 50rpx;">
 				<view class="tit" style="margin-top: 50rpx;">
 					骑行服务费
diff --git a/page_user/ks.vue b/page_user/ks.vue
index 34c7470..ff6de2c 100644
--- a/page_user/ks.vue
+++ b/page_user/ks.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="开锁" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36'></u-navbar>
+			height='40'></u-navbar>
 			<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
 				:show-location='true' :polygons='polygons' :markers="markers" :polyline="polyline"></map>
 			<view class="bot_btn">
diff --git a/page_user/qrks.vue b/page_user/qrks.vue
index d685b55..59fc7e5 100644
--- a/page_user/qrks.vue
+++ b/page_user/qrks.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="确认开锁" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36'></u-navbar>
+			height='40'></u-navbar>
 			<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
 				:show-location='true' :polygons='polygons' :markers="markers" :polyline="polyline"></map>
 			<view class="bot_btn">
diff --git a/page_user/qsdetail.vue b/page_user/qsdetail.vue
index a3c4610..c5885ce 100644
--- a/page_user/qsdetail.vue
+++ b/page_user/qsdetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="问题上报详情" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='36'></u-navbar>
+			height='40'></u-navbar>
 			<view class="cont">
 				<view class="cont_top">
 					<view class="tit">
diff --git a/page_user/qsrecord.vue b/page_user/qsrecord.vue
index b18b12c..3a2f864 100644
--- a/page_user/qsrecord.vue
+++ b/page_user/qsrecord.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="问题上报记录" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='36'></u-navbar>
+			height='40'></u-navbar>
 			<view class="card" v-for="(item,index) in list" :key="index" @click="topage(item)" v-if="list.length>=0">
 				<view class="top_li">
 					<view class="left">
@@ -11,8 +11,10 @@
 						处理完成 <view class="iconfont icon-xiangyou1"></view>
 					</view>
 				</view>
-				
-				<view class="info">
+				<view class="info" v-if="!item.address">
+					反馈地点：--
+				</view>
+				<view class="info" v-if="item.address">
 					反馈地点：{{item.address}}
 				</view>
 				
diff --git a/page_user/xcjs.vue b/page_user/xcjs.vue
index 10e919d..a2c64f4 100644
--- a/page_user/xcjs.vue
+++ b/page_user/xcjs.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="行程结束" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
-			height='36'></u-navbar>
+			height='40'></u-navbar>
 			<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
 				:show-location='true' :polygons='polygons' :markers="markers" :polyline="polyline"></map>
 			<view class="bot_btn" v-if="false">
diff --git a/page_user/yczn.vue b/page_user/yczn.vue
index 969795f..a432021 100644
--- a/page_user/yczn.vue
+++ b/page_user/yczn.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="用车指南" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='36'></u-navbar>
+			height='40'></u-navbar>
 			<view class="cont">
 				<view class="tit">
 					请在运营区内骑行，否则将断电
diff --git a/page_user/yj.vue b/page_user/yj.vue
index 0f9a83a..bb797f6 100644
--- a/page_user/yj.vue
+++ b/page_user/yj.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<u-navbar title="押金" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
-			height='36'></u-navbar>
+			height='40'></u-navbar>
 		<view class="norecord" v-if="userinfo.balance==0">
 			<view class="card">
 				<view class="tit">充值押金</view>
@@ -124,7 +124,7 @@
 		data() {
 			return {
 				bgc: {
-					backgroundColor: "#7bb2ec",
+					backgroundColor: "#F7FAFE",
 				},
 				show: false,
 				bindDeviceNum: null,
@@ -221,13 +221,15 @@
 				});
 			},
 			sub4() {
+				let id = uni.getStorageSync('areaId');
 				let data = {
 					userId: this.userId,
 
 					// ruleId: this.freeInfo.ruleId,
 					money: this.areaInfo.deposit,
 					mark: "押金充值",
-					type: '4'
+					type: '4',
+					areaId:this.areaId
 
 
 				}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 1a85cf1..4c7ddf1 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,9 +2,15 @@
 	<view class="page">
 		<!-- 	<u-navbar :is-back="false" title="共享电动车" :border-bottom="false" :background="bgc" title-color='#2E4975'
 			title-size='36' height='36'></u-navbar> -->
-		<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
-			:show-location="true" :markers="markers" :polygons="polyline" @markertap="onMarkerTap">
+		<map class="map" id="map" ref="map" :scale="zoomSize" show-location v-if="showmap"
+			:latitude="latitude" :longitude="longitude" :show-location="true" :markers="markers" :polygons="polyline"
+			@markertap="onMarkerTap">
+			
 		</map>
+		<view class="my-location">
+			<view class="img" src="https://course.jchen.art/static/images/icon-location.png"
+				@click="getMyLocation"></view>
+		</view>
 		<view class="botmbox2" v-if="showdevice">
 			<view class="close" @click="close()">
 				<image src="https://lxnapi.ccttiot.com/bike/img/static/uBeBBKwQu2K2ZBdT7iN7" mode=""></image>
@@ -90,7 +96,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="center" >
+				<view class="center">
 					<!-- <view class="card" :class="freeListIndex==0?'act1':''" @click="freeListIndex=0" v-if="orderinfo.ruleId==null">
 						<image src="https://api.ccttiot.com/smartmeter/img/static/uYg1WNJJH1VK7RdldKE1" mode=""
 							v-if="freeListIndex==0"></image>
@@ -127,29 +133,29 @@
 								{{item.name}}
 							</view>
 							<view style="padding: 18rpx;">
-							<view class="nmtxt">
-								<view class="left">
-									起步价
+								<view class="nmtxt">
+									<view class="left">
+										起步价
+									</view>
+									<view class="right">
+										{{item.ridingRuleJson.startingPrice}}元(含{{item.ridingRuleJson.startingTime}}<span
+											v-if="item.rentalUnit=='minutes'">分钟</span><span
+											v-if="item.rentalUnit=='hours'">小时</span><span
+											v-if="item.rentalUnit=='day'">天</span>)
+									</view>
 								</view>
-								<view class="right">
-									{{item.ridingRuleJson.startingPrice}}元(含{{item.ridingRuleJson.startingTime}}<span
-										v-if="item.rentalUnit=='minutes'">分钟</span><span
-										v-if="item.rentalUnit=='hours'">小时</span><span
-										v-if="item.rentalUnit=='day'">天</span>)
+								<view class="nmtxt">
+									<view class="left">
+										超出费
+									</view>
+									<view class="right">
+										{{item.ridingRuleJson.timeoutPrice}}元/{{ item.ridingRuleJson.timeoutTime}}<span
+											v-if="item.rentalUnit=='minutes'">分钟</span><span
+											v-if="item.rentalUnit=='hours'">小时</span><span
+											v-if="item.rentalUnit=='day'">天</span>
+									</view>
 								</view>
 							</view>
-							<view class="nmtxt">
-								<view class="left">
-									超出费
-								</view>
-								<view class="right">
-									{{item.ridingRuleJson.timeoutPrice}}元/{{ item.ridingRuleJson.timeoutTime}}<span
-										v-if="item.rentalUnit=='minutes'">分钟</span><span
-										v-if="item.rentalUnit=='hours'">小时</span><span
-										v-if="item.rentalUnit=='day'">天</span>
-								</view>
-							</view>
-							</view>
 							<!-- <view class="tips" @click.stop='feedetail(item,index+1)'>
 								查看详情 <view class="iconfont icon-chakanxiangqing"></view>
 							</view> -->
@@ -175,9 +181,9 @@
 									</view>
 								</view>
 							</view>
-							
 
-						
+
+
 
 							<!-- <view class="nmtxt">
 								<view class="left">
@@ -192,7 +198,7 @@
 							</view> -->
 						</view>
 						<view class="tips_btn" @click.stop='feedetail(item,index+1)'>
-							查看详情 
+							查看详情
 						</view>
 					</view>
 				</view>
@@ -317,8 +323,7 @@
 		</view>
 		<view class="botmbox" v-if="showindex==0">
 			<view class="top_btn" @click="qecodelock()">
-				<image src="https://api.ccttiot.com/smartmeter/img/static/un6Wi8CefEjy04qzvn67" mode=""
-					></image>
+				<image src="https://api.ccttiot.com/smartmeter/img/static/un6Wi8CefEjy04qzvn67" mode=""></image>
 				扫码开锁
 			</view>
 
@@ -639,7 +644,8 @@
 				areaInfo: {},
 				// feeInfo:{},
 				showfeeDetail: false,
-				seeDetail:false
+				seeDetail: false,
+				showmap:true
 
 				// userId:this.$store.getters.userId,
 			}
@@ -652,91 +658,88 @@
 			}
 		},
 		onLoad(e) {
-			console.log(e,'eeeeeeeeeeeeeeeeeee');
-			if(e.q){
-			   let qParam = e.q;
-			        
-			        // 第2步: URL解码q参数
-			        let decodedUrl = decodeURIComponent(qParam);
-			        
-			        // 第3步: 使用正则表达式解析解码后的URL并提取查询参数
-			        let sn = null;
-			        let queryParams = decodedUrl.split('?')[1];
-			        if (queryParams) {
-			            let params = queryParams.split('&');
-			            params.forEach(param => {
-			                let [key, value] = param.split('=');
-			                if (key === 'sn') {
-			                    sn = value;
-			                }
-			            });
-			        }
-					this.sn = sn
-					if(this.sn!=''){
-						
-							
-							setTimeout(() => {
-								if(!this.orderinfo.status){
-								this.deviceInfo()
-								this.showdevice = true
-								this.deviceIndex = 1
-								this.type = 1
-								}
-							}, 1000)
-						
-						
-					}
-					
+			console.log(e, 'eeeeeeeeeeeeeeeeeee');
+			if (e.q) {
+				let qParam = e.q;
+
+				// 第2步: URL解码q参数
+				let decodedUrl = decodeURIComponent(qParam);
+
+				// 第3步: 使用正则表达式解析解码后的URL并提取查询参数
+				let sn = null;
+				let queryParams = decodedUrl.split('?')[1];
+				if (queryParams) {
+					let params = queryParams.split('&');
+					params.forEach(param => {
+						let [key, value] = param.split('=');
+						if (key === 'sn') {
+							sn = value;
+						}
+					});
+				}
+				this.sn = sn
+				if (this.sn != '') {
+
+
+					setTimeout(() => {
+						if (!this.orderinfo.status) {
+							this.deviceInfo()
+							this.showdevice = true
+							this.deviceIndex = 1
+							this.type = 1
+						}
+					}, 1000)
+
+
+				}
+
 			}
 			if (e.sn) {
 				this.sn = e.sn
-				if(this.sn!=''){
+				if (this.sn != '') {
 					setTimeout(() => {
-						if(!this.orderinfo.status){
-						this.deviceInfo()
-						this.showdevice = true
-						this.deviceIndex = 1
-						this.type = 1
+						if (!this.orderinfo.status) {
+							this.deviceInfo()
+							this.showdevice = true
+							this.deviceIndex = 1
+							this.type = 1
 						}
 					}, 1000)
-					
+
 				}
 
 			}
 		},
 		onShow() {
-			if(this.seeDetail==false){
-				if (uni.getStorageSync('token')) {
-					this.$store.dispatch('userInfo', this.$u).then(() => {
-				
-						// 执行其他操作...
-				
-					});
-				
-				}
+			if (this.seeDetail == false) {
+
 				if (uni.getStorageSync('role')) {
 					let abb = uni.getStorageSync('role')
-				
+
 				}
-				
+
 				console.log(this.userId);
-				
-				
-				
+
+
+
 				let that = this
 				uni.getLocation({
 					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= lb.latitude
-							that.longitude= lb.longitude
+						that.latitude =  Number( lb.latitude.toFixed(5)) - 0.005
+						that.longitude =  Number( lb.longitude.toFixed(5)) + 0.005
+						console.log(that.areaInfo,'that.areaInfo');
+						if(!that.areaInfo.areaId){
+							that.getArea()
+						}
 						// that.getmarks()
-						that.getArea()
-				
+						
+
 						//
 					},
 					fail: function(error) {
@@ -748,10 +751,10 @@
 						// that.getmarks()
 						// 在这里处理获取位置信息失败的情况
 					}
-				
+
 				})
 			}
-			
+
 
 		},
 
@@ -785,44 +788,50 @@
 			},
 		},
 		methods: {
+			getMyLocation() {
+				uni.createMapContext("map", this).moveToLocation({
+					longitude: this.longitude,
+					latitude: this.latitude,
+				});
+			},
 			// 查看费用详情
-			tofeeDetail(){
+			tofeeDetail() {
 				uni.navigateTo({
-					url:'/page_user/ckmx?orderId='+this.orderinfo.orderNo
+					url: '/page_user/ckmx?orderId=' + this.orderinfo.orderNo
 				})
 			},
 			// 扫码开锁
-			qecodelock(){
+			qecodelock() {
 				uni.scanCode({
 					onlyFromCamera: true,
 					scanType: ['qrCode'],
 					success: res => {
-						
+
 						let sn = null;
 						let queryParams = res.result.split('?')[1];
 						if (queryParams) {
-						    let params = queryParams.split('&');
-						    params.forEach(param => {
-						        let [key, value] = param.split('=');
-						        if (key === 'sn') {
-						            sn = value;
-						        }
-						    });
+							let params = queryParams.split('&');
+							params.forEach(param => {
+								let [key, value] = param.split('=');
+								if (key === 'sn') {
+									sn = value;
+								}
+							});
 						}
-						
+
 						this.sn = sn
-						if(this.sn!=''){
+						if (this.sn != '') {
 							setTimeout(() => {
-								if(!this.orderinfo.status){
-								this.deviceInfo()
-								this.showdevice = true
-								this.deviceIndex = 1
-								this.type = 1
+								if (!this.orderinfo.status) {
+									this.deviceInfo()
+									this.showdevice = true
+									this.deviceIndex = 1
+									this.type = 1
 								}
 							}, 1000)
-							
+
 						}
-						
+
 					},
 					fail: err => {
 						console.error('扫描失败：', err);
@@ -835,15 +844,15 @@
 			},
 			feedetail(item, index) {
 				this.freeInfo = item
-				this.seeDetail=true
-				 try {
-				      const itemStr = encodeURIComponent(JSON.stringify(item));
-				      uni.navigateTo({
-				        url: `/page_user/jfgz?item=${itemStr}`
-				      });
-				    } catch (error) {
-				      console.error('Error serializing item:', error);
-				    }
+				this.seeDetail = true
+				try {
+					const itemStr = encodeURIComponent(JSON.stringify(item));
+					uni.navigateTo({
+						url: `/page_user/jfgz?item=${itemStr}`
+					});
+				} catch (error) {
+					console.error('Error serializing item:', error);
+				}
 				// this.showfeeDetail = true
 				this.freeListIndex = index
 			},
@@ -892,34 +901,34 @@
 			},
 			// 套餐直接开锁
 			sub6() {
-				if(this.orderinfo.ruleId){
+				if (this.orderinfo.ruleId) {
 					let data = {
 						userId: this.userId,
 						sn: this.sn,
-					
+
 						// ruleId: this.freeInfo.ruleId,
 						// money: this.freeInfo.fee,
 						mark: "套餐直接开锁",
 						// type: '1',
 						ruleId: this.orderinfo.ruleId,
 						orderNo: this.orderinfo.orderNo
-					
+
 					}
 					this.$u.post('/appVerify/device/snSwitch', data).then((res) => {
 						if (res.code === 200) {
 							this.getisInOrder()
 						} else {
-					
+
 						}
 					})
-				}else{
+				} else {
 					uni.showToast({
 						title: '请选择套餐',
 						icon: 'none',
 						duration: 2000
 					});
 				}
-				
+
 			},
 			// 预约解锁骑行
 			unlockdevice() {
@@ -995,7 +1004,7 @@
 				})
 			},
 			starTime() {
-				this.seeDetail=false
+				this.seeDetail = false
 				clearInterval(this.timer)
 				this.timer = null
 				this.$u.get('/app/device/info?sn=' + this.orderinfo.sn).then((res) => {
@@ -1230,27 +1239,27 @@
 							}
 
 							// 更新money值
-							this.money = totalCharge+this.orderinfo.appointmentFee
+							this.money = totalCharge + this.orderinfo.appointmentFee
 						} else if (this.orderinfo.rule.ridingRule == 2) {
 							const ridingRuleJson = JSON.parse(this.orderinfo.rule.ridingRuleJson);
-							        const rules = ridingRuleJson.rule;
-							        let totalCharge = 0;
-							
-							        for (let rule of rules) {
-							            const start = parseFloat(rule.start);
-							            const end = parseFloat(rule.end);
-							            const eachUnit = parseFloat(rule.eachUnit);
-							            const fee = parseFloat(rule.fee);
-							
-							            if (totalTime > start && (end === 9999 || totalTime <= end)) {
-							                // 所有时间都按照该区间的费率来计算
-							                totalCharge = Math.ceil(totalTime / eachUnit) * fee;
-							                break;
-							            }
-							        }
-							
-							        // 更新money值
-							        this.money = totalCharge+this.orderinfo.appointmentFee
+							const rules = ridingRuleJson.rule;
+							let totalCharge = 0;
+
+							for (let rule of rules) {
+								const start = parseFloat(rule.start);
+								const end = parseFloat(rule.end);
+								const eachUnit = parseFloat(rule.eachUnit);
+								const fee = parseFloat(rule.fee);
+
+								if (totalTime > start && (end === 9999 || totalTime <= end)) {
+									// 所有时间都按照该区间的费率来计算
+									totalCharge = Math.ceil(totalTime / eachUnit) * fee;
+									break;
+								}
+							}
+
+							// 更新money值
+							this.money = totalCharge + this.orderinfo.appointmentFee
 						}
 
 						// 更新时间字符串
@@ -1390,9 +1399,44 @@
 					// 	url:''
 					// })
 				} else if (num == 1) {
-					uni.navigateTo({
-						url: '/page_user/yj'
-					})
+					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(res=>{
+									uni.hideLoading();
+					        		if (res.code == 200) {
+					        			uni.setStorageSync('token', res.token);
+										uni.navigateTo({
+											url: '/page_user/yj'
+										})
+										
+					        			
+					        		}else if(res.code == 501){
+										uni.showToast({
+											title: res.msg,
+											icon: 'none',
+											duration: 2000
+										});
+									}else {
+					        			// console.log("老用户登录",res.data)
+					        			uni.redirectTo({
+					        				url:'/pages/login/login'
+					        			})
+					        		}
+					        	});
+					        }
+					    },
+					  
+					});
+					
+					
 				} else if (num == 2) {
 					uni.navigateTo({
 						url: '/page_user/jfgz'
@@ -1467,8 +1511,9 @@
 				});
 			},
 			sub5() {
-				if( this.orderinfo.ruleId){
-					this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn + '&ruleId=' + this
+				if (this.orderinfo.ruleId) {
+					this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn + '&ruleId=' +
+						this
 						.orderinfo.ruleId + '&type=2' + '&orderNo=' + this.orderinfo.orderNo).then((res) => {
 						if (res.code === 200) {
 							uni.showLoading({
@@ -1479,7 +1524,7 @@
 								uni.hideLoading()
 							}, 1000)
 							// this.freList=res.rows
-					
+
 						} else {
 							uni.showToast({
 								title: res.msg,
@@ -1488,18 +1533,18 @@
 							});
 						}
 					})
-				}else{
+				} else {
 					uni.showToast({
 						title: '请选择套餐',
 						icon: 'none',
 						duration: 2000
 					});
 				}
-				
+
 			},
 			// 确认开锁
 			sub1() {
-				if(this.freeInfo.ruleId){
+				if (this.freeInfo.ruleId) {
 					let data = {
 						userId: this.userId,
 						sn: this.sn,
@@ -1507,14 +1552,14 @@
 						// money: this.freeInfo.fee,
 						mark: "确认开锁",
 						type: '1'
-					
-					
+
+
 					}
 					this.$u.post('/appVerify/device/snSwitch', data).then((res) => {
-						this.seeDetail=false
+						this.seeDetail = false
 						if (res.code === 200) {
 							this.getisInOrder()
-							
+
 						} else {
 							uni.showToast({
 								title: res.msg,
@@ -1523,18 +1568,18 @@
 							});
 						}
 					})
-				}else{
+				} else {
 					uni.showToast({
 						title: '请选择套餐',
 						icon: 'none',
 						duration: 2000
 					});
 				}
-				
+
 			},
 			// 开锁购买套餐
 			sub2() {
-				if(this.freeInfo.ruleId){
+				if (this.freeInfo.ruleId) {
 					let data = {
 						userId: this.userId,
 						sn: this.sn,
@@ -1543,8 +1588,8 @@
 						isAppointment: false,
 						mark: "套餐开锁",
 						type: '3'
-					
-					
+
+
 					}
 					this.$u.post('/appVerify/pre/order', data).then((res) => {
 						if (res.code === 200) {
@@ -1583,18 +1628,18 @@
 							});
 						}
 					})
-				}else{
+				} else {
 					uni.showToast({
 						title: '请选择套餐',
 						icon: 'none',
 						duration: 2000
 					});
 				}
-				
+
 			},
 			// 确认预约
 			sub3() {
-				if(this.freeInfo.ruleId){
+				if (this.freeInfo.ruleId) {
 					let data = {
 						userId: this.userId,
 						sn: this.sn,
@@ -1603,12 +1648,13 @@
 						// money: this.freeInfo.fee,
 						mark: "预约购买套餐",
 						type: '2'
-					
-					
+
+
 					}
-					this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn + '&ruleId=' + this
+					this.$u.post('/appVerify/device/appointment?userId=' + this.userId + '&sn=' + this.sn + '&ruleId=' +
+						this
 						.freeInfo.ruleId).then((res) => {
-							this.seeDetail=false
+						this.seeDetail = false
 						if (res.code === 200) {
 							uni.showLoading({
 								title: '预约中...'
@@ -1618,7 +1664,7 @@
 								uni.hideLoading()
 							}, 1000)
 							// this.freList=res.rows
-					
+
 						} else {
 							uni.showToast({
 								title: res.msg,
@@ -1627,19 +1673,19 @@
 							});
 						}
 					})
-				}else{
+				} else {
 					uni.showToast({
 						title: '请选择套餐',
 						icon: 'none',
 						duration: 2000
 					});
 				}
-					
-				
+
+
 			},
 			// 预约购买套餐
 			sub4() {
-				if(this.freeInfo.ruleId){
+				if (this.freeInfo.ruleId) {
 					let data = {
 						userId: this.userId,
 						sn: this.sn,
@@ -1648,8 +1694,8 @@
 						// money: this.freeInfo.fee,
 						mark: "预约购买套餐",
 						type: '3'
-					
-					
+
+
 					}
 					console.log('点击了');
 					this.$u.post('/appVerify/pre/order', data).then((res) => {
@@ -1664,7 +1710,7 @@
 								paySign: res.data.paySign,
 								success(res) {
 									// 支付成功逻辑
-					
+
 									this.showdevice = false
 									this.deviceIndex = 0
 									this.mac = ''
@@ -1690,34 +1736,34 @@
 							});
 						}
 					})
-				}else{
+				} else {
 					uni.showToast({
 						title: '请选择套餐',
 						icon: 'none',
 						duration: 2000
 					});
 				}
-				
+
 			},
 			getisInOrder() {
-				if(this.userId){
+				if (this.userId) {
 					this.$u.post('/app/user/isInOrder?userId=' + this.userId, ).then((res) => {
 						if (res.code === 200) {
 							// this.freList=res.rows
 							if (res.data != '') {
 								this.orderinfo = res.data[0]
-					
+
 								this.starTime()
 							} else {
 								this.showdevice = false
 								this.deviceIndex = 0
 							}
 						} else {
-					
+
 						}
 					})
 				}
-				
+
 			},
 			changefree(item, index) {
 				this.freeInfo = item
@@ -1824,7 +1870,7 @@
 			findBike() {
 				this.$u.post('/app/device/ring?sn=' + this.sn).then((res) => {
 					if (res.code === 200) {
-						this.deviceInfos = res.data
+						
 					}
 				})
 			},
@@ -1832,31 +1878,97 @@
 				if (e.type === 'markertap') {
 					console.log('点击了标记：', e.markerId);
 					// 这里可以根据需要处理点击标记的逻辑
-					// 阻止事件冒泡
-					this.showindex = 0
-					this.showdevice = true
+					// 阻止事件冒泡\
 					this.sn = e.markerId
 					this.deviceInfo()
+					
+					
 
 				}
 
 			},
 			deviceInfo() {
-				this.$u.get('/app/device/info?sn=' + this.sn).then((res) => {
-					if (res.code === 200) {
-						this.deviceInfos = res.data
-					}
-				})
+				let that = this
+				if(uni.getStorageSync('token')){
+					this.$u.get('/app/device/info?sn=' + this.sn).then((res) => {
+						if (res.code === 200) {
+							this.deviceInfos = res.data
+							this.showindex = 0
+							this.showdevice = true
+						}else{
+							this.showdevice = false
+							this.deviceIndex = 0
+							this.type = 0
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
+				}else{
+					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(res=>{
+									uni.hideLoading();
+					        		if (res.code == 200) {
+					        			uni.setStorageSync('token', res.token);
+										that.$u.get('/app/device/info?sn=' + that.sn).then((res) => {
+											if (res.code === 200) {
+												that.deviceInfos = res.data
+												that.showindex = 0
+												that.showdevice = true
+											}else{
+												that.showdevice = false
+												that.deviceIndex = 0
+												that.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 {
+					        			// console.log("老用户登录",res.data)
+					        			uni.redirectTo({
+					        				url:'/pages/login/login'
+					        			})
+					        		}
+					        	});
+					        }
+					    },
+					  
+					});
+				}
+				
+				
+				
 			},
 			// onMapTap(e) {
 			//     console.log('点击了地图非标记区域：', e);
 			//     // 这里可以根据需要处理点击地图非标记区域的逻辑
 			// },
 			getmarks() {
-					
-			let data = {
-				areaId: this.areaInfo.areaId
-			}
+
+				let data = {
+					areaId: this.areaInfo.areaId
+				}
 				this.$u.get(`/app/allVehicleByArea`, data).then((res) => {
 					if (res.code === 200) {
 						this.listData = res.data;
@@ -1878,7 +1990,7 @@
 								longitude: parseFloat(item.longitude),
 								// title: item.deviceName,
 								width: 40,
-								height: 40,
+								height: 28,
 								iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uF9qLejuAZErNTrRuHq7',
 							})
 						})
@@ -1891,9 +2003,36 @@
 					// 处理接口请求失败的情况
 				});
 			},
+			getinfo() {
+				if (uni.getStorageSync('token')) {
+					this.$u.get("/getAppInfo").then((res) => {
+
+						if (res.code == 200) {
+							this.$store.commit('SET_USERID', res.user.userId);
+							// this.userinfo = res.user
+							// if (this.areaInfo.authentication == 1) {
+							// 	if (res.user.isAuthentication == 0) {
+							// 		uni.navigateTo({
+							// 			url: "/page_user/idcard_test"
+							// 		})
+							// 	}
+							// }
+						} else {
+							// setTimeout(()=>{
+							// 	this.getinfo()
+							// 	this.getlist()
+							// },1000)
+						}
+					});
+
+
+				}
+			},
 			getArea() {
+				this.showmap=false
 				// 发送请求获取数据
 				this.$u.get('/app/area/info?', this.gps).then((res) => {
+					this.showmap=true
 					if (res.code === 200) {
 						// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
 						const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
@@ -1905,14 +2044,15 @@
 						this.polyline.push(polylines)
 						// console.log(this.areaInfo, 'areaInfoareaInfo');
 						uni.setStorageSync('areaId', res.data.areaId);
+						this.getinfo()
 						this.getmarks()
 						this.getlist()
 						this.getParking()
 						if (uni.getStorageSync('token')) {
 							this.getisInOrder()
-						
+
 						}
-						
+
 						// console.log(this.polyline);
 					} else {
 						uni.showToast({
@@ -2052,6 +2192,25 @@
 	.page {
 		width: 750rpx;
 
+		.my-location {
+
+			position: fixed;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			right: 30rpx;
+			bottom: 300rpx;
+			background-color: #fff;
+			border-radius: 50%;
+			width: 60rpx;
+			height: 60rpx;
+			z-index: 10;
+			.img {
+				width: 50rpx;
+				height: 50rpx;
+			}
+		}
+
 		.feeDetail {
 			padding: 36rpx 22rpx;
 			position: fixed;
@@ -2071,7 +2230,7 @@
 			.close {
 				position: absolute;
 				top: 20rpx;
-				right: 20rpx;
+				right: 40rpx;
 				width: 30rpx;
 				height: 30rpx;
 			}
@@ -2153,9 +2312,9 @@
 			.close {
 				position: absolute;
 				top: 20rpx;
-				right: 20rpx;
-				width: 30rpx;
-				height: 30rpx;
+				right: 30rpx;
+				width: 35rpx;
+				height: 35rpx;
 			}
 
 			.page1 {
@@ -2195,8 +2354,8 @@
 
 						.cent_bot {
 							font-weight: 500;
-							font-size: 20rpx;
-							color: #808080;
+							font-size: 24rpx;
+							color: #ccc;
 						}
 					}
 
@@ -2205,6 +2364,7 @@
 						align-items: center;
 						justify-content: center;
 						margin-left: auto;
+						margin-right: 35rpx;
 						width: 160rpx;
 						height: 60rpx;
 						border-radius: 0rpx 0rpx 0rpx 0rpx;
@@ -2282,6 +2442,7 @@
 						display: flex;
 						align-items: center;
 						justify-content: center;
+						padding-bottom: 2rpx;
 						width: 338rpx;
 						height: 90rpx;
 						border-radius: 45rpx 45rpx 45rpx 45rpx;
@@ -2295,6 +2456,7 @@
 						display: flex;
 						align-items: center;
 						justify-content: center;
+						padding-bottom: 2rpx;
 						width: 338rpx;
 						height: 90rpx;
 						background: #4C97E7;
@@ -2410,108 +2572,108 @@
 				}
 
 				.center {
-				    width: 100%;
-				    display: flex;
-				    flex-wrap: nowrap;
-				    overflow-x: auto; // 添加水平滚动条
-				    margin-bottom: 200rpx;
-				    white-space: nowrap; // 确保子元素不换行
-				
-				    .card {
-				        width: 500rpx !important; // 确保宽度被应用
-				        height: 288rpx;
-				        margin-right: 20rpx;
-				        position: relative;
-				        background: #FFFFFF;
-				        box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
-				        border-radius: 16rpx;
-				        border: 2rpx solid #fff;
-				
-				        image {
-				            position: absolute;
-				            top: 0;
-				            right: 0;
-				            width: 82rpx;
-				            height: 50rpx;
-				        }
-				
-				        .tips_btn {
+					width: 100%;
+					display: flex;
+					flex-wrap: nowrap;
+					overflow-x: auto; // 添加水平滚动条
+					margin-bottom: 200rpx;
+					white-space: nowrap; // 确保子元素不换行
+
+					.card {
+						width: 500rpx !important; // 确保宽度被应用
+						height: 288rpx;
+						margin-right: 20rpx;
+						position: relative;
+						background: #FFFFFF;
+						box-shadow: 0rpx 10rpx 64rpx 0rpx rgba(0, 0, 0, 0.08);
+						border-radius: 16rpx;
+						border: 2rpx solid #fff;
+
+						image {
+							position: absolute;
+							top: 0;
+							right: 0;
+							width: 82rpx;
+							height: 50rpx;
+						}
+
+						.tips_btn {
 							display: flex;
 							align-items: center;
 							justify-content: center;
-				            position: absolute;
-				            bottom: 0;
-				            width: 350rpx;
-				            height: 70rpx;
-				            background: #4C97E7;
-				            border-radius: 0rpx 0rpx 16rpx 16rpx;
+							position: absolute;
+							bottom: 0;
+							width: 350rpx;
+							height: 70rpx;
+							background: #4C97E7;
+							border-radius: 0rpx 0rpx 16rpx 16rpx;
 							font-weight: 500;
 							font-size: 28rpx;
 							color: #FFFFFF;
-				        }
-				
-				        .tit {
+						}
+
+						.tit {
 							padding: 18rpx 0 0 18rpx;
-				            width: 350rpx;
-				            display: flex;
-				            align-items: center;
-				           font-weight: 500;
-				           font-size: 36rpx;
-				           color: #3D3D3D;
-				        }
-				
-				        .nmtxt {
-							
-				            width: 100%;
-				            margin-top: 22rpx;
-				            display: flex;
-				            justify-content: space-between;
-				            align-items: center;
-				
-				            .left {
-				              font-weight: 400;
-				              font-size: 28rpx;
-				                color: #3D3D3D;
-				            }
-				
-				            .right {
-				              font-weight: 400;
-				              font-size: 28rpx;
-				                color: #3D3D3D;
-				            }
-				
-				            .red {
-				                font-weight: 400;
-				                font-size: 36rpx;
-				                color: #FF4444;
-				            }
-				        }
-				
-				        .tip {
-				            margin-top: 14rpx;
-				            font-weight: 400;
-				            font-size: 20rpx;
-				            color: #808080;
-				        }
-				
-				        .tips {
-				            display: flex;
-				            align-items: center;
-				            margin-left: auto;
-				            font-size: 30rpx;
-				            color: #3D3D3D;
-				
-				            .icon-chakanxiangqing {
-				                font-size: 30rpx;
-				                color: #3D3D3D;
-				                font-weight: 600;
-				            }
-				        }
-				    }
-				
-				    .act1 {
-				        border: 2rpx solid #4C97E7;
-				    }
+							width: 350rpx;
+							display: flex;
+							align-items: center;
+							font-weight: 500;
+							font-size: 36rpx;
+							color: #3D3D3D;
+						}
+
+						.nmtxt {
+
+							width: 100%;
+							margin-top: 22rpx;
+							display: flex;
+							justify-content: space-between;
+							align-items: center;
+
+							.left {
+								font-weight: 400;
+								font-size: 28rpx;
+								color: #3D3D3D;
+							}
+
+							.right {
+								font-weight: 400;
+								font-size: 28rpx;
+								color: #3D3D3D;
+							}
+
+							.red {
+								font-weight: 400;
+								font-size: 36rpx;
+								color: #FF4444;
+							}
+						}
+
+						.tip {
+							margin-top: 14rpx;
+							font-weight: 400;
+							font-size: 20rpx;
+							color: #808080;
+						}
+
+						.tips {
+							display: flex;
+							align-items: center;
+							margin-left: auto;
+							font-size: 30rpx;
+							color: #3D3D3D;
+
+							.icon-chakanxiangqing {
+								font-size: 30rpx;
+								color: #3D3D3D;
+								font-weight: 600;
+							}
+						}
+					}
+
+					.act1 {
+						border: 2rpx solid #4C97E7;
+					}
 				}
 
 
diff --git a/pages_admin/admin_index.vue b/pages_admin/admin_index.vue
index 92f81cd..f10f5fd 100644
--- a/pages_admin/admin_index.vue
+++ b/pages_admin/admin_index.vue
@@ -1,20 +1,28 @@
 <template>
-	<view class="page">
-
+	<view class="page" >
+		
+		
 		<u-navbar title="地图" :is-back='false' :border-bottom="false" :background="bgc" title-color='#2E4975'
 			title-size='36' height='36'></u-navbar>
+		<view @touchmove.stop.prevent="() => {}">
 		<view class="slider">
 			<view class="tit">
 				电量区间
 			</view>
-			<slider-range :value="rangeValue" :min="rangeMin" :max="rangMax" :step="1" :bar-height="3" :block-size="20"
-				background-color="#EEEEF6" active-color="#4C97E7" :format="format" :decorationVisible="true"
-				@change="handleRangeChange"></slider-range>
+			<view  style="width: 650rpx;">
+				<slider-range :value="rangeValue" :min="rangeMin" :max="rangMax" :step="1" :bar-height="3" :block-size="20"
+					background-color="#EEEEF6" active-color="#4C97E7" :format="format" :decorationVisible="true"
+					@change="handleRangeChange"></slider-range>
+			</view>
+			
+		</view>
 		</view>
 
 		<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
 			:show-location="true" :markers="markers" :polygons="polyline" @markertap="onMarkerTap" >
 		</map>
+		
+		<view @touchmove.stop.prevent="() => {}">
 		<view class="btn_box">
 			<view class="btn1">
 				车辆扫码
@@ -97,6 +105,8 @@
 				</view>
 			</view> -->
 		</view>
+		</view>
+		
 		<tab-bar :indexs='1' style=""></tab-bar>
 	</view>
 </template>
@@ -641,7 +651,7 @@
 
 			.cont {
 				margin-top: 18rpx;
-				margin-right: 10rpx;
+				margin-right: 9rpx;
 				// display: flex;
 				width: 130rpx;
 
@@ -693,6 +703,7 @@
 		}
 
 		.slider {
+			padding: 15rpx 0 0 15rpx;
 			.tit {
 				font-weight: 500;
 				font-size: 28rpx;
@@ -700,7 +711,7 @@
 			}
 
 			width: 752rpx;
-			height: 150rpx;
+			height:160rpx;
 			background: #FFFFFF;
 			box-shadow: 0rpx 4rpx 22rpx 0rpx rgba(0, 0, 0, 0.07);
 			border-radius: 0rpx 0rpx 0rpx 0rpx;
diff --git a/pages_admin/order/device_detail.vue b/pages_admin/order/device_detail.vue
index ed54b54..290888c 100644
--- a/pages_admin/order/device_detail.vue
+++ b/pages_admin/order/device_detail.vue
@@ -230,7 +230,7 @@
 						console.error("Error fetching area data:", error);
 					});
 				}else if(num==4){
-					this.$u.post('/appVerify/device/ring?sn='+this.sn).then((res) => {
+					this.$u.get('/appVerify/device/ring?sn='+this.sn).then((res) => {
 						if (res.code === 200) {
 							// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
 							this.deviceInfo()
diff --git a/pages_admin/worke/woke_deviceMgmt.vue b/pages_admin/worke/woke_deviceMgmt.vue
index a7fd3fa..b189cbb 100644
--- a/pages_admin/worke/woke_deviceMgmt.vue
+++ b/pages_admin/worke/woke_deviceMgmt.vue
@@ -17,7 +17,8 @@
 				<view class="iconfont icon-xiangxia1"></view>
 			</view>
 			<view class="stause_li" style="margin-left: 50rpx;" @click="showdsc=true">
-				{{sctit}} <view class="iconfont icon-xiangxia1"></view>
+				{{sctit}}
+				<view class="iconfont icon-xiangxia1"></view>
 			</view>
 		</view>
 
@@ -183,33 +184,15 @@
 		},
 
 		methods: {
-			ban(){
-				let data={
-					disableType:'disable',
-					sns:this.selectedItems.join(',')
+			ban() {
+				let data = {
+					disableType: 'disable',
+					sns: this.selectedItems.join(',')
 				}
-				this.$u.post(`/appVerify/device/disable?sns=`+data.sns+'&disableType=disable').then((res) => {
-					if (res.code == 200) {
-						this.closestep()			
-						this.getDevice()
-					} else {
-						// 处理接口返回错误的情况
-					}
-				}).catch(error => {
-					// 处理接口请求失败的情况
-				});
-			},
-			pick(){
-				let data={
-					disableType:'enable',
-					sns:this.selectedItems.join(',')
-				}
-				this.$u.post(`/appVerify/device/disable?sns=`+data.sns+'&disableType=enable').then((res) => {
+				this.$u.post(`/appVerify/device/disable?sns=` + data.sns + '&disableType=disable').then((res) => {
 					if (res.code == 200) {
 						this.closestep()
 						this.getDevice()
-				
-				
 					} else {
 						// 处理接口返回错误的情况
 					}
@@ -217,8 +200,26 @@
 					// 处理接口请求失败的情况
 				});
 			},
-			confirms(e){
-				
+			pick() {
+				let data = {
+					disableType: 'enable',
+					sns: this.selectedItems.join(',')
+				}
+				this.$u.post(`/appVerify/device/disable?sns=` + data.sns + '&disableType=enable').then((res) => {
+					if (res.code == 200) {
+						this.closestep()
+						this.getDevice()
+
+
+					} else {
+						// 处理接口返回错误的情况
+					}
+				}).catch(error => {
+					// 处理接口请求失败的情况
+				});
+			},
+			confirms(e) {
+
 				this.scidx = e[0].value
 				this.sctit = e[0].label
 				this.getDevice()
@@ -288,7 +289,7 @@
 				let data = {
 					powerStart: '',
 					powerEnd: '',
-					sort:this.scidx,
+					sort: this.scidx,
 					status: this.typeidx
 				}
 
@@ -399,13 +400,27 @@
 						font-weight: 400;
 						font-size: 28rpx;
 						color: #808080;
-
+						white-space: nowrap;
+						/* 禁止换行 */
+						overflow: hidden;
+						/* 超出部分隐藏 */
+						text-overflow: ellipsis;
 						span {
 							color: #3D3D3D;
+							white-space: nowrap;
+							/* 禁止换行 */
+							overflow: hidden;
+							/* 超出部分隐藏 */
+							text-overflow: ellipsis;
 						}
 
 						.input {
 							width: 30%;
+							white-space: nowrap;
+							/* 禁止换行 */
+							overflow: hidden;
+							/* 超出部分隐藏 */
+							text-overflow: ellipsis;
 						}
 					}
 				}
diff --git a/pages_admin/worke/worke_income.vue b/pages_admin/worke/worke_income.vue
index 460b541..15f34fd 100644
--- a/pages_admin/worke/worke_income.vue
+++ b/pages_admin/worke/worke_income.vue
@@ -246,7 +246,9 @@
 				if (this.typeindex == 1) {
 					this.operatingData()
 				} else {
+					
 					this.infoList = []
+					
 				}
 
 			}