From 51d047b3ff5d28156b559425beccd96700fab183 Mon Sep 17 00:00:00 2001
From: tx <2622874537@qq.com>
Date: Wed, 11 Dec 2024 10:18:32 +0800
Subject: [PATCH] 11

---
 pages/index/index.vue | 141 +++++++++++++-----------------------------
 1 file changed, 42 insertions(+), 99 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 10770db..016cb9c 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -61,7 +61,7 @@
 
 		<!-- 	<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" show-location v-if="showmap" :latitude="latitude"
+		<map class="map" id="map" ref="map" :scale="zoomSize" show-location  :key="mapKey" :latitude="latitude"
 			:longitude="longitude" :show-location="true" :markers="markers" :polygons="polyline" :polyline="mappolyline"
 			@markertap="onMarkerTap" @tap="onMapTap" @regionchange="onMapRegionChange">
 
@@ -485,38 +485,7 @@
 			</view>
 		</view>
 
-		<!-- <view class="tipss_box">
-			<view class="tipss" v-if="orderinfo.status" @click="starTime">
-				您有正在进行中的订单 <view class="iconfont icon-xiangyou1" style="margin-left: 20rpx;">
-
-				</view>
-			</view>
-			<view class="" v-if="!orderinfo.status" style="background: none;width: 350rpx;
-				height: 64rpx;">
-
-			</view>
-			<swiper class="swiper" circular :autoplay="autoplay" :interval="interval" :duration="duration">
-
-				<swiper-item>
-					<view class="tipss">
-						点击车辆可以预约用车
-					</view>
-				</swiper-item>
-				<swiper-item>
-					<view class="tipss" @click="changetips">
-						<image src="https://lxnapi.ccttiot.com/bike/img/static/uJnO5qX8ggJvL1Nf7PQt" mode=""></image>
-						文明骑行,须知
-						<view class="iconfont icon-xiangyou1">
-
-						</view>
-					</view>
-				</swiper-item>
-			</swiper>
-
-
-
-
-		</view> -->
+		
 		<view class="bottom_more" v-if="showindex == 1">
 			<view class="close" @click="showindex = 0">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uM76uO46a5cZOkFlffnX" mode=""></image>
@@ -562,26 +531,7 @@
 		<u-mask :show="showtcs" @click="showtc = false" :z-index='100' duration='0' />
 		<u-mask :show="showTips" :z-index='100' duration='0' />
 
-		<!-- <u-mask :show="showYjTip" @click="showYjTip = false" :z-index='100' duration='0' />
 
-		<view class="pops" v-if="showYjTip">
-			<view class="tit" style="font-weight: 600;">
-				您未充值押金
-			</view>
-			<view class="cont_box" style="text-align: center;color: #808080;justify-content: center;font-size: 36rpx;">
-				请在充值押金后使用共享电动车
-			</view>
-
-			<view class="btn_box">
-				<view class="btn1" @click="showYjTip = false">
-					取消
-				</view>
-				<view class="btn2" @click="topage(1)">
-					前往充值
-				</view>
-			</view>
-
-		</view> -->
 		<view class="pops" v-if="showtcs">
 			<view class="tit" style="font-weight: 600;">
 				您有正在进行的订单
@@ -1006,8 +956,8 @@ export default {
 			showIconAndCallout: false, // 控制是否显示iconPath和callout
 			showindex: 0,
 			show: false,
-			latitude: '',
-			longitude: '',
+			latitude: 0,
+			longitude: 0,
 			isMap: false,
 			zoomSize: 16,
 			markers: [],
@@ -1138,7 +1088,9 @@ export default {
 
 			},
 			tozf: false,
-			islogin: true
+			islogin: true,
+			
+			mapKey:0,
 		}
 	},
 	watch: {
@@ -1155,8 +1107,8 @@ export default {
 		showdevice(newValue, oldValue) {
 			console.log('showdevice变化了', newValue, oldValue);
 		},
-		tozf(newValue, oldValue) {
-			console.log('tozf变化了', newValue, oldValue);
+		longitude(newValue, oldValue) {
+			console.log('lllllllllllllllllllllllllllllllll', newValue, oldValue);
 		},
 
 	},
@@ -1216,7 +1168,7 @@ export default {
 						// this.deviceIndex = 1
 						// this.type = 1
 					}
-				}, 500)
+				}, 1000)
 
 
 			}
@@ -1289,8 +1241,8 @@ export default {
 								that.gps.latitude = lb.latitude;
 								that.gps.longitude = lb.longitude;
 
-								that.latitude = lb.latitude;
-								that.longitude = lb.longitude;
+								that.latitude =  parseFloat(lb.latitude)  ;
+								that.longitude =   parseFloat(lb.longitude);
 								that.deviceGps.latitude = lb.latitude;
 								that.deviceGps.longitude = lb.longitude;
 								// console.log(that.areaInfo, 'that.areaInfo');
@@ -1431,29 +1383,16 @@ export default {
 			})
 		},
 		getArea() {
-			// 如果有正在进行的订单，直接返回
-			if (this.orderinfo.status) {
-				uni.showToast({
-					title: '您有正在进行的订单，请先完成当前订单',
-					icon: 'none',
-					duration: 2000
-				});
-				return;
-			}
-// this.showmap = false
+		
+				// this.showmap = false
 				// 发送请求获取数据
 				this.areaInfo = {}
 				// console.log(this.qParam, 'qParamqParamqParamqParam');
 				this.polyline = []
-				// if(this.qParam){
-
-				// }
-				// console.log(this.sn,'this.gps.sn this.gps.sn this.gps.sn ');
-
-				// console.log(this.qParam,'qParamqParamqParamqParam');
+				
 				if (/^\d{7}$/.test(this.qParam)) {
 					this.gps.sn = this.qParam
-					console.log(this.gps.sn, 'this.gps.sn this.gps.sn this.gps.sn ');
+				
 				}
 				if (this.orderinfo.sn != '') {
 					this.gps.sn = this.orderinfo.sn
@@ -1466,30 +1405,31 @@ export default {
 
 					if (this.sn != 0 && this.sn != '' && this.sn != null) {
 						this.gps.sn = this.sn
-						console.log(this.sn, 'qParamqParamqParamqParam');
+						
 
 					}
 				}
 				this.$u.get('/app/area/info?', this.gps).then((res) => {
-					// this.showmap = true
+				
 					if (res.code === 200) {
 
 						// 处理接口返回的数据，将边界数据转换为地图组件需要的折线结构
 						const polylines = this.convertBoundaryToPolyline(res.data.boundaryStr)
-					
+						 this.mapKey += 1
 						// 更新折线数据
+						
 						this.areaInfo = res.data
+						
 						setTimeout(() => {
 							let abb = this.cleanedText()
-							console.log(abb.length, 'cleanedTextcleanedTextcleanedText');
+						
 
 							// 计算滚动时间，基于文本宽度
 							this.duration = abb.length * 0.3; // 50 px/s 的速度
 						}, 200)
 
 						this.polyline.push(polylines)
-						console.log();
-						// console.log(this.areaInfo, 'areaInfoareaInfo');
+					
 						uni.setStorageSync('areaId', res.data.areaId);
 						this.getinfo()
 						this.getmarks()
@@ -1500,18 +1440,17 @@ export default {
 
 						}
 						const hasShownPopup = uni.getStorageSync('hasShownPopup');
-						console.log(hasShownPopup, 'hasShownPopup');
+					
 
 						if (hasShownPopup === '' || hasShownPopup === null) {
-							console.log('1111111111');
-
+							
 							this.showTips = true;
 							this.startCountdown();
 							uni.setStorageSync('hasShownPopup', true);
 						} else {
-							console.log('222');
+							
 							this.showTips = uni.getStorageSync('hasShownPopup');
-							console.log(this.showTips, 'this.showTips');
+							;
 							this.startCountdown();
 
 						}
@@ -1557,7 +1496,7 @@ export default {
 						});
 					}
 				}).catch(error => {
-					console.error("Error fetching area data:", error);
+					
 				});
 			
 		},
@@ -1565,15 +1504,18 @@ export default {
 			if (!this.sn) return;
 
 			// 检查是否有进行中的订单
-			if (this.orderinfo.status) {
-				uni.showToast({
-					title: '您有正在进行的订单，请先完成当前订单',
-					icon: 'none',
-					duration: 2000
-				});
-				return;
+			if(this.orderinfo.sn){
+				if (this.orderinfo.sn!=this.sn) {
+					uni.showToast({
+						title: '您有正在进行的订单，请先完成当前订单',
+						icon: 'none',
+						duration: 2000
+					});
+					return;
+				}
+				
 			}
-
+		
 			this.$u.get('/app/device/info?sn=' + this.sn).then((res) => {
 				if (res.code === 200) {
 					this.isqrcode = true
@@ -1586,9 +1528,10 @@ export default {
 
 					// 检查区域是否需要切换
 					const areaChanged = this.areaInfo.areaId != res.data.areaId;
-
+					console.log( this.areaInfo.areaId,res.data.areaId,'aaaaaaaaaaaaaaaaaaaaaa');
 					if (num == 0) {
 						if (areaChanged) {
+							
 							// 区域不同，需要切换区域
 							uni.setStorageSync('areaId', res.data.areaId);
 							this.gps.sn = this.sn;
@@ -1651,7 +1594,7 @@ export default {
 		},
 
 		mapFun() {
-			console.log('点击了');
+			
 			uni.openLocation({
 				latitude: parseFloat(this.parkinfo.latitude),
 				//纬度 - 目的地/坐标点