From 6de033d8e10538b3ad0c5f7bb13e11e253674171 Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Tue, 11 Jun 2024 18:03:16 +0800
Subject: [PATCH] aaa

---
 .../statulist/myshop/editshop/index.vue       | 123 ++++++++++------
 page_fenbao/statulist/myshop/shopxx/index.vue | 134 ++++++++++-------
 page_fenbao/statulist/nearby/index.vue        |  60 +++-----
 page_user/Feedback.vue                        |  62 +++-----
 page_user/mapditu/index.vue                   |  35 ++++-
 page_user/sbdetail.vue                        | 133 +++++++++--------
 pages/index/index.vue                         |  26 ++--
 pages/login/login.vue                         | 138 +++++++++---------
 pages/shouye/index.vue                        |  43 +++---
 pages/tj.vue                                  |   5 +-
 10 files changed, 404 insertions(+), 355 deletions(-)

diff --git a/page_fenbao/statulist/myshop/editshop/index.vue b/page_fenbao/statulist/myshop/editshop/index.vue
index c28c230..64888c4 100644
--- a/page_fenbao/statulist/myshop/editshop/index.vue
+++ b/page_fenbao/statulist/myshop/editshop/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-		<u-navbar title="修改店铺" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
-			height='50'></u-navbar>
+		<u-navbar title="修改店铺" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff"
+			title-size='36' height='50'></u-navbar>
 		<view class="box">
 			<view class="list">
 				<view class="listval">
@@ -19,8 +19,8 @@
 						style="display: flex;justify-content: space-between;padding: 15rpx 26rpx;box-sizing: border-box;">
 						<!-- <input type="text" placeholder="请输入营业时间" v-model="yetime" /> -->
 						<view class="" style="font-size: 28rpx;color: #666;" @click="btnyinye(1)">{{ksyy}}</view>
-						 -- 
-						 <view class="" style="font-size: 28rpx;color: #666;" @click="btnyinye(2)">{{jsyy}}</view>
+						--
+						<view class="" style="font-size: 28rpx;color: #666;" @click="btnyinye(2)">{{jsyy}}</view>
 					</view>
 				</view>
 				<view class="listvals" @click="btnregion">
@@ -59,9 +59,13 @@
 								门头照片必须清晰、方正、易于辨识
 							</view>
 						</view>
-						<view class="imgbox" @click="btn">
-							<image :src="imglist" mode=""
-								style="width: 142rpx;height: 142rpx;border-radius: 20rpx;"></image>
+						<view class="imgbox">
+							<!-- <image :src="imglist" mode="" style="width: 142rpx;height: 142rpx;border-radius: 20rpx;"></image> -->
+							<button
+								style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;"
+								type="primary reverse" open-type="chooseAvatar" @chooseavatar="getImage">
+								<image :src="imglist" mode=""></image>
+							</button>
 
 						</view>
 					</view>
@@ -129,14 +133,14 @@
 				lxname: '',
 				lxphone: '',
 				xqdz: '',
-				ksyy:'开始营业时间',
-				jsyy:'结束营业时间',
-				yynum:0,
-				province:'',
-				city:'',
-				area:'',
-				listobj:{},
-				storeId:''
+				ksyy: '开始营业时间',
+				jsyy: '结束营业时间',
+				yynum: 0,
+				province: '',
+				city: '',
+				area: '',
+				listobj: {},
+				storeId: ''
 			}
 		},
 		onLoad(option) {
@@ -144,7 +148,7 @@
 			this.listobj = obj
 			console.log(this.listobj);
 			this.shopname = this.listobj.name
-		    this.ksyy = this.listobj.businessTimeStart
+			this.ksyy = this.listobj.businessTimeStart
 			this.jsyy = this.listobj.businessTimeEnd
 			this.regiontext = this.listobj.province + this.listobj.city + this.listobj.county
 			this.lxname = this.listobj.contactName
@@ -158,28 +162,48 @@
 			this.city = this.listobj.city
 			this.area = this.listobj.county
 			this.storeId = this.listobj.storeId
-			if(this.selectorvalue == 1){
+			if (this.selectorvalue == 1) {
 				this.selectortext = '商场'
-			}else if(this.selectorvalue == 2){
+			} else if (this.selectorvalue == 2) {
 				this.selectortext = '学校'
-			}else if(this.selectorvalue == 3){
+			} else if (this.selectorvalue == 3) {
 				this.selectortext = '娱乐场所'
-			}else if(this.selectorvalue == 4){
+			} else if (this.selectorvalue == 4) {
 				this.selectortext = '出租房'
-			}else{
+			} else {
 				this.selectortext = '其他'
 			}
 			this.getQiniuToken()
 		},
 		methods: {
-			btnyinye(num){
+			getImage(e) {
+				let _this = this
+				let math = 'static/' + _this.$u.guid(20)
+				const tempFilePaths = e.detail.avatarUrl
+				wx.uploadFile({
+					url: 'https://up-z2.qiniup.com',
+					name: 'file',
+					filePath: tempFilePaths,
+					formData: {
+						token: _this.token,
+						key: 'smartmeter/img/' + math
+					},
+					success: function(res) {
+						let str = JSON.parse(res.data)
+						console.log(str.key)
+						_this.userImgs = 'https://api.ccttiot.com/' + str.key
+						_this.imglist = _this.userImgs
+					}
+				})
+			},
+			btnyinye(num) {
 				this.show = true
 				this.yynum = num
 			},
-			btnyy(e){
-				if(this.yynum == 1){
+			btnyy(e) {
+				if (this.yynum == 1) {
 					this.ksyy = e.hour + ':' + e.minute
-				}else{
+				} else {
 					this.jsyy = e.hour + ':' + e.minute
 				}
 			},
@@ -239,7 +263,7 @@
 						icon: 'none',
 						duration: 1000
 					});
-				}else if (this.xqdz == '') {
+				} else if (this.xqdz == '') {
 					uni.showToast({
 						title: '请输入详细地址',
 						icon: 'none',
@@ -258,35 +282,35 @@
 						address: this.xqdz,
 						lng: this.longitude,
 						lat: this.latitude,
-                        businessTimeStart:this.ksyy,
-						businessTimeEnd:this.jsyy,
-						province:this.province,
-						city:this.city,
-						county:this.area,
-						specificAddress:this.xqdz,
-						contactName:this.lxname,
-						contactMobile:this.lxphone,
-						type:this.selectorvalue,
-						storeId:this.storeId
+						businessTimeStart: this.ksyy,
+						businessTimeEnd: this.jsyy,
+						province: this.province,
+						city: this.city,
+						county: this.area,
+						specificAddress: this.xqdz,
+						contactName: this.lxname,
+						contactMobile: this.lxphone,
+						type: this.selectorvalue,
+						storeId: this.storeId
 					}
-					this.$u.put("/app/store",data).then(res => {
+					this.$u.put("/app/store", data).then(res => {
 						if (res.code == 500) {
 							uni.showToast({
 								title: res.msg,
 								icon: 'success',
 								duration: 1000
 							})
-						}else{
+						} else {
 							uni.showToast({
 								title: '修改成功',
 								icon: 'success',
 								duration: 1000
 							})
-							setTimeout(()=>{
+							setTimeout(() => {
 								uni.navigateBack({
-									delta: 2 
+									delta: 2
 								})
-							},1000)
+							}, 1000)
 						}
 					})
 				}
@@ -318,8 +342,8 @@
 						console.log('选择位置失败', err);
 					},
 					complete: (res) => {
-						if (res.errMsg === 'chooseLocation:ok') {
-						} else if (res.errMsg.indexOf('chooseLocation:cancel') === 0) {
+						if (res.errMsg === 'chooseLocation:ok') {} else if (res.errMsg.indexOf(
+								'chooseLocation:cancel') === 0) {
 							uni.showToast({
 								title: '您取消了位置选择',
 								icon: 'none'
@@ -369,12 +393,14 @@
 </script>
 
 <style lang="scss">
-	/deep/ .u-title{
+	/deep/ .u-title {
 		padding-bottom: 22rpx;
 	}
-	/deep/ .u-icon__icon{
+
+	/deep/ .u-icon__icon {
 		padding-bottom: 22rpx;
 	}
+
 	page {
 		background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
 	}
@@ -384,7 +410,8 @@
 		position: fixed;
 		top: 0;
 		left: 0;
-        color: #666;
+		color: #666;
+
 		.box {
 			width: 750rpx;
 			height: 1440rpx;
@@ -431,7 +458,7 @@
 						width: 100%;
 						display: flex;
 						justify-content: space-between;
-
+                        padding-right: 45rpx;
 						.lt {
 							padding-top: 40rpx;
 
@@ -449,7 +476,7 @@
 
 						.imgbox {
 							width: 33%;
-
+                         
 							image {
 								width: 142rpx;
 								height: 142rpx;
diff --git a/page_fenbao/statulist/myshop/shopxx/index.vue b/page_fenbao/statulist/myshop/shopxx/index.vue
index 602855e..8b80d33 100644
--- a/page_fenbao/statulist/myshop/shopxx/index.vue
+++ b/page_fenbao/statulist/myshop/shopxx/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
-		<u-navbar title="创建店铺" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
-			height='50'></u-navbar>
+		<u-navbar title="创建店铺" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff"
+			title-size='36' height='50'></u-navbar>
 		<view class="box">
 			<view class="list">
 				<view class="listval">
@@ -59,13 +59,16 @@
 								门头照片必须清晰、方正、易于辨识
 							</view>
 						</view>
-						<view class="imgbox" @click="btn">
-							<image v-if="imgflag"
-								src="https://api.ccttiot.com/smartmeter/img/static/uY8CPw9YE6JxPzcHUaqf" mode="">
-							</image>
-							<image v-else :src="imglist" mode=""
-								style="width: 142rpx;height: 142rpx;border-radius: 20rpx;"></image>
-
+						<view class="imgbox">
+							<button
+								style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;"
+								type="primary reverse" open-type="chooseAvatar" @chooseavatar="getImage">
+								<image v-if="imgflag"
+									src="https://api.ccttiot.com/smartmeter/img/static/uY8CPw9YE6JxPzcHUaqf" mode="">
+								</image>
+								<image v-else :src="imglist" mode=""
+									style="width: 142rpx;height: 142rpx;border-radius: 20rpx;"></image>
+							</button>
 						</view>
 					</view>
 				</view>
@@ -145,6 +148,27 @@
 			this.getQiniuToken()
 		},
 		methods: {
+			getImage(e) {
+				let _this = this
+				let math = 'static/' + _this.$u.guid(20)
+				const tempFilePaths = e.detail.avatarUrl
+				wx.uploadFile({
+					url: 'https://up-z2.qiniup.com',
+					name: 'file',
+					filePath: tempFilePaths,
+					formData: {
+						token: _this.token,
+						key: 'smartmeter/img/' + math
+					},
+					success: function(res) {
+						let str = JSON.parse(res.data)
+						console.log(str.key)
+						_this.userImgs = 'https://api.ccttiot.com/' + str.key
+						_this.imglist = _this.userImgs
+						_this.imgflag = false
+					}
+				})
+			},
 			btnyinye(num) {
 				this.show = true
 				this.yynum = num
@@ -271,24 +295,23 @@
 				this.area = e.area.label
 			},
 			btnjwd() {
-				uni.chooseLocation({  
-					success: (res) => {  
-						this.latitude = res.latitude;  
-						this.longitude = res.longitude;  
-						// console.log(this.latitude, this.longitude);  
-					},  
-					fail: function(err) {  
+				uni.chooseLocation({
+					success: (res) => {
+						this.latitude = res.latitude;
+						this.longitude = res.longitude;
+					},
+					fail: function(err) {
 						// 检查错误消息，看是否是用户取消了位置选择  
-						if (err.errMsg && err.errMsg.indexOf('chooseLocation:cancel') === 0) {  
-							uni.showToast({  
-								title: '您取消了位置选择',  
-								icon: 'none'  
-							});  
-						} else {  
-							console.log('选择位置失败', err);  
+						if (err.errMsg && err.errMsg.indexOf('chooseLocation:cancel') === 0) {
+							uni.showToast({
+								title: '您取消了位置选择',
+								icon: 'none'
+							});
+						} else {
+							console.log('选择位置失败', err);
 							// 处理其他失败情况  
-						}  
-					},  
+						}
+					},
 				});
 			},
 
@@ -300,44 +323,46 @@
 					}
 				});
 			},
-			btn() {
-				let _this = this
-				let math = 'static/' + _this.$u.guid(20)
-				uni.chooseImage({
-					count: 1,
-					type: 'all',
-					success(res) {
-						const tempFilePaths = res.tempFiles
-						wx.uploadFile({
-							url: 'https://up-z2.qiniup.com',
-							name: 'file',
-							filePath: tempFilePaths[0].path,
-							formData: {
-								token: _this.token, //后端返回的token
-								key: 'smartmeter/img/' + math
-							},
-							success: function(res) {
-								let str = JSON.parse(res.data)
-								console.log(str.key)
-								_this.userImgs = 'https://api.ccttiot.com/' + str.key
-								_this.imglist = _this.userImgs
-								_this.imgflag = false
-							}
-						});
-					}
-				})
-			},
+			// btn() {
+			// 	let _this = this
+			// 	let math = 'static/' + _this.$u.guid(20)
+			// 	uni.chooseImage({
+			// 		count: 1,
+			// 		type: 'all',
+			// 		success(res) {
+			// 			const tempFilePaths = res.tempFiles
+			// 			wx.uploadFile({
+			// 				url: 'https://up-z2.qiniup.com',
+			// 				name: 'file',
+			// 				filePath: tempFilePaths[0].path,
+			// 				formData: {
+			// 					token: _this.token, //后端返回的token
+			// 					key: 'smartmeter/img/' + math
+			// 				},
+			// 				success: function(res) {
+			// 					let str = JSON.parse(res.data)
+			// 					console.log(str.key)
+			// 					_this.userImgs = 'https://api.ccttiot.com/' + str.key
+			// 					_this.imglist = _this.userImgs
+			// 					_this.imgflag = false
+			// 				}
+			// 			});
+			// 		}
+			// 	})
+			// },
 		}
 	}
 </script>
 
 <style lang="scss">
-	/deep/ .u-title{
+	/deep/ .u-title {
 		padding-bottom: 22rpx;
 	}
-	/deep/ .u-icon__icon{
+
+	/deep/ .u-icon__icon {
 		padding-bottom: 22rpx;
 	}
+
 	page {
 		background: linear-gradient(180deg, #8883F0 0%, rgba(255, 255, 255, 0) 100%);
 	}
@@ -394,6 +419,7 @@
 						width: 100%;
 						display: flex;
 						justify-content: space-between;
+						padding-right: 45rpx;
 
 						.lt {
 							padding-top: 40rpx;
diff --git a/page_fenbao/statulist/nearby/index.vue b/page_fenbao/statulist/nearby/index.vue
index af7ff81..b2a27d1 100644
--- a/page_fenbao/statulist/nearby/index.vue
+++ b/page_fenbao/statulist/nearby/index.vue
@@ -127,35 +127,24 @@
 				});
 			},
 			calculateAnchorX(name) {
-				let chineseLength = 0;
-				let englishLength = 0;
+				let chineseLength = 0
+				let englishLength = 0
 				for (let i = 0; i < name.length; i++) {
-					const charCode = name.charCodeAt(i);
+					const charCode = name.charCodeAt(i)
 					// 判断是否为中文字符（这里简化了判断，只考虑了基本的中文字符范围）  
 					if (charCode >= 0x4e00 && charCode <= 0x9fa5) {
-						chineseLength++;
+						chineseLength++
 					} else if (/[a-zA-Z]/.test(name[i])) { // 判断是否为英文字符  
-						englishLength = englishLength + 0.3; // 英文长度加1，但视为两个中文字符长度  
-						// console.log(englishLength);
+						englishLength = englishLength + 0.3 // 英文长度加1，但视为两个中文字符长度  
+						// console.log(englishLength)
 					}
 				}
 				const totalLength = chineseLength + englishLength * 2; // 总长度（以中文字符为单位）  
-				return -totalLength * 6.5; // 假设每个中文字符对应的 anchorX 偏移是 -7 
+				return -totalLength * 6.5 // 假设每个中文字符对应的 anchorX 偏移是 -6.5
 			},
-			// onControltap(control) {
-			// 	uni.createMapContext("map", this).moveToLocation({
-			// 		longitude: this.longitude,
-			// 		latitude: this.latitude
-			// 	})
-			// 	this.mapScale = 15
-			// },
+			
 			onControltap(control) {
 				this.setMapScale()
-
-				// uni.createMapContext("map", this).moveToLocation({
-				// 	longitude: this.longitude,
-				// 	latitude: this.latitude,
-				// })
 			},
 			// 地图回正
 			async setMapScale(e, val) {
@@ -204,6 +193,7 @@
 						this.jinweidu = res.longitude + ',' + res.latitude
 						this.latitude = Number(res.latitude.toFixed(5)) - 0.005
 						this.longitude = Number(res.longitude.toFixed(5)) + 0.005
+						this.setMapScale()
 						// 请求附近的店铺    
 						this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then(
 							response => {
@@ -212,8 +202,7 @@
 									this.gxlist = response.data;
 									this.gxlist.forEach(item => {
 										// 计算距离  
-										const distance = this.getDistance(this.latitude, this
-											.longitude, item.lat, item.lng);
+										const distance = this.getDistance(this.latitude, this.longitude, item.lat, item.lng);
 										// 将距离添加到店铺对象中  
 										item.distance = distance;
 										// 创建店铺覆盖物对象  
@@ -252,31 +241,30 @@
 												textShadow: '2px 2px 0px white, -2px -2px 0px white, 2px -2px 0px white, -2px 2px 0px white',
 											}
 										};
-										// console.log(this.gxlist);
-										this.covers.push(shopCover); // 将店铺覆盖物添加到数组中  
+										// console.log(this.gxlist)
+										this.covers.push(shopCover) // 将店铺覆盖物添加到数组中  
 									});
 								}
 							}).catch(error => {
-							console.error('请求店铺列表失败：', error);
-						});
+							console.error('请求店铺列表失败：', error)
+						})
 					},
 					fail: (err) => {
 						console.error('获取位置失败：', err);
 					}
 				});
 			},
-
+            // 计算距离函数
 			getDistance(lat1, lon1, lat2, lon2) {
-				const R = 6371000; // 地球半径，单位：米  
-				const phi1 = lat1 * Math.PI / 180; // φ, 纬度转为弧度  
-				const phi2 = lat2 * Math.PI / 180;
-				const deltaPhi = (lat2 - lat1) * Math.PI / 180;
-				const deltaLambda = (lon2 - lon1) * Math.PI / 180;
-				const a = Math.sin(deltaPhi / 2) * Math.sin(deltaPhi / 2) + Math.cos(phi1) * Math.cos(phi2) * Math.sin(
-					deltaLambda / 2) * Math.sin(deltaLambda / 2);
-				const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-				const distance = R * c;
-				return distance;
+				const R = 6371000 // 地球半径，单位：米  
+				const phi1 = lat1 * Math.PI / 180 // 纬度转为弧度  
+				const phi2 = lat2 * Math.PI / 180
+				const deltaPhi = (lat2 - lat1) * Math.PI / 180
+				const deltaLambda = (lon2 - lon1) * Math.PI / 180
+				const a = Math.sin(deltaPhi / 2) * Math.sin(deltaPhi / 2) + Math.cos(phi1) * Math.cos(phi2) * Math.sin(deltaLambda / 2) * Math.sin(deltaLambda / 2)
+				const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a))
+				const distance = R * c
+				return distance
 			},
 
 			handleMarkerClick(event) {
diff --git a/page_user/Feedback.vue b/page_user/Feedback.vue
index ae9a670..b688766 100644
--- a/page_user/Feedback.vue
+++ b/page_user/Feedback.vue
@@ -9,13 +9,15 @@
 			<view class="lxxz">
 				<view class="" :class="cutidx==1?'active':''" @click="cutidx=1">
 					功能异常
+					<image style="width: 31rpx;height: 19rpx; position: absolute; right: 0;bottom: 0;display: none;" src="https://api.ccttiot.com/smartmeter/img/static/uvHUjXUhUwA0OvSA0O9K" mode=""></image>
 				</view>
 				<view class="" :class="cutidx==2?'active':''" @click="cutidx=2">
 					意见与建议
-
+                    <image style="width: 31rpx;height: 19rpx; position: absolute; right: 0;bottom: 0;display: none;" src="https://api.ccttiot.com/smartmeter/img/static/uvHUjXUhUwA0OvSA0O9K" mode=""></image>
 				</view>
 				<view class="" :class="cutidx==3?'active':''" @click="cutidx=3">
 					其他
+					<image style="width: 31rpx;height: 19rpx; position: absolute; right: 0;bottom: 0;display: none;" src="https://api.ccttiot.com/smartmeter/img/static/uvHUjXUhUwA0OvSA0O9K" mode=""></image>
 				</view>
 			</view>
 		</view>
@@ -41,10 +43,12 @@
 			</view> -->
 			<view class="icon">
 				<view class="imgbox" v-for="(item,index) in imglist " :key="index">
-					<image :src="item" mode=""></image>
+					<image style="border-radius: 10rpx;" :src="item" mode=""></image>
 				</view>
-				<view class="imgbox" @click="btn">
-					<image src="https://api.ccttiot.com/smartmeter/img/static/uY8CPw9YE6JxPzcHUaqf" mode=""></image>
+				<view class="imgbox" style="width: 17%;">
+					<button style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;"  @click="getImage">
+	                      <image src="https://api.ccttiot.com/smartmeter/img/static/uY8CPw9YE6JxPzcHUaqf" mode=""></image>
+					</button>
 				</view>
 			</view>
 			<text>上传问题图片可以让问题快速解决哦!</text>
@@ -108,14 +112,6 @@
 			},
 			updateWordCount() {
 				this.currentCount = this.textValue.trim().replace(/\s+/g, '').length;
-				// if (this.currentCount > 500) {
-				// 	this.textValue = this.textValue.slice(0, this.textValue.lastIndexOf(' ', 500)).trim();
-				// 	uni.showToast({
-				// 		title: '字数已超过500字限制',
-				// 		icon: 'none'
-				// 	});
-				// }
-
 			},
 			sub() {
 				if (this.cutidx == -1) {
@@ -151,25 +147,19 @@
 					});
 				}
 			},
-			btn() {
+			getImage(e) {
 				let _this = this
 				let math = 'static/' + _this.$u.guid(20)
-				uni.chooseMessageFile({
+				uni.chooseImage({
 					count: 9,
 					type: 'all',
 					success(res) {
-						// tempFilePath可以作为img标签的src属性显示图片
-						const tempFilePaths = res.tempFiles
-						// let tempFilePaths = chooseImageRes.tempFilePaths;
-						// console.log(tempFilePaths)
-						// tempFilePaths.forEach(item=>{
-						// 	// 上传图片到七牛云
-
-						// })
+						console.log(res);
+						const tempFilePaths = res.tempFilePaths[0]
 						wx.uploadFile({
 							url: 'https://up-z2.qiniup.com',
 							name: 'file',
-							filePath: tempFilePaths[0].path,
+							filePath: tempFilePaths,
 							formData: {
 								token: _this.token, //后端返回的token
 								key: 'smartmeter/img/' + math
@@ -177,15 +167,12 @@
 							success: function(res) {
 								console.log(res, 'resres');
 								let str = JSON.parse(res.data)
-								console.log(str.key)
 								_this.userImgs = 'https://api.ccttiot.com/' + str.key
-								console.log(_this.userImgs)
 								_this.imglist.push(_this.userImgs)
 							}
-						});
+						})
 					}
 				})
-
 			},
 			// 获取上传七牛云token
 			getQiniuToken() {
@@ -193,14 +180,7 @@
 					if (res.code == 200) {
 						this.token = res.token
 					}
-				});
-				// this.$u.get('https://v2.ielts.langsi.online/file/getToken').then(res => {
-				// 	console.log(res.data);
-				// 	this.token = res.data.token
-				// }).catch(err => {
-				// 	console.log(err)
-				// })
-
+				})
 			},
 		}
 	}
@@ -216,8 +196,11 @@
 		font-size: 36rpx;
 		line-height: 84rpx;
 		text-align: center;
-		margin-top: 164rpx;
 		border-radius: 50rpx;
+		position: fixed;
+		left: 50%;
+		transform: translateX(-50%);
+		bottom: 96rpx;
 	}
 
 	page {
@@ -243,7 +226,7 @@
 			display: flex;
 
 			view {
-				border-radius: 10rpx 10rpx 10rpx 10rpx;
+				border-radius: 15rpx;
 				border: 2rpx solid #C4C4C4;
 				padding: 14rpx 34rpx 14rpx 34rpx;
 				box-sizing: border-box;
@@ -272,7 +255,10 @@
 
 	.active {
 		border: 2rpx solid #8883F0 !important;
-	}
+        image{
+			display: block !important;
+		}
+ 	}
 
 	.problem {
 		margin-top: 40rpx;
diff --git a/page_user/mapditu/index.vue b/page_user/mapditu/index.vue
index d7e43da..811256a 100644
--- a/page_user/mapditu/index.vue
+++ b/page_user/mapditu/index.vue
@@ -227,14 +227,36 @@
 
 			mapFun() {
 				uni.openLocation({
-					latitude: this.listobj.lat,
-					//纬度 - 目的地/坐标点
-					longitude: this.listobj.lng,
-					//经度 - 目的地/坐标点
-					name: this.mapname,
-					address: this.mapaddress
+					latitude: this.listobj.lat,//纬度 - 目的地/坐标点
+					longitude: this.listobj.lng,//经度 - 目的地/坐标点
+					name: this.mapname, //地点名称
+					address: this.mapaddress //详细地点名称
 				});
 			},
+			
+			// 地图回正
+			async setMapScale(e, val) {
+				let mapContext = uni.createMapContext('map', this);
+				let setScale = () => {
+					return new Promise((resolve, reject) => {
+						mapContext.getScale({
+							success: r => {
+								this.mapScale = 15
+								resolve()
+							}
+						})
+					})
+				};
+				await setScale();
+				mapContext.moveToLocation({
+					success: (res) => {
+						const timer = setTimeout(() => {
+							this.mapScale = 15
+							clearTimeout(timer);
+						}, 500);
+					},
+				})
+			},
 
 			getMyLocation() {
 				uni.getLocation({
@@ -243,6 +265,7 @@
 						this.jinweidu = res.longitude + ',' + res.latitude
 						this.latitude = Number(res.latitude.toFixed(5)) - 0.005
 						this.longitude = Number(res.longitude.toFixed(5)) + 0.005
+						this.setMapScale()
 						// 请求附近的店铺  
 						this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then(
 							res => {
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index 4b13574..8fa1de2 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -124,28 +124,28 @@
 					<view class="" style="display: flex;justify-content: space-between;">
 						<view class="cont" style="width: 120rpx;" @click="topage(0)">
 							<view class="top">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/uj4DT6WructS782RY0J7" mode=""
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uKrpw3p37UHW56IypPJU" mode=""
 									style="width: 58rpx;height: 56rpx;"></image>
 							</view>
 							<view class="bot">充值记录</view>
 						</view>
 						<view class="cont" style="width: 60rpx;" @click="topage(1)">
 							<view class="top">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/uGaAuulryhDmaDwWLuwo" mode=""
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uaS4iFmD786AtBt2tKFs" mode=""
 									style="width: 58rpx;height: 58rpx;"></image>
 							</view>
 							<view class="bot">归零</view>
 						</view>
 						<view class="cont" style="width: 60rpx;" @click="topage(2)">
 							<view class="top">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/u8QfFAKCq8wE32dFA9Go" mode=""
+								<image src="https://api.ccttiot.com/smartmeter/img/static/ue0X00T1C3fh7TCgjopm" mode=""
 									style="width: 58rpx;height: 60rpx;"></image>
 							</view>
 							<view class="bot">异常</view>
 						</view>
 						<view class="cont" style="width: 120rpx;" @click="toydfx()">
 							<view class="top">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/u0N4pFke1isIzNrNT6Wh" mode="">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uDVSE5BFHQnjG2JTVE62" mode="">
 								</image>
 							</view>
 							<view class="bot">用电分析</view>
@@ -154,28 +154,28 @@
 					<view class="" style="display: flex;margin-top: 20rpx;">
 						<view class="cont" style="width: 120rpx;" @click="topage(3)">
 							<view class="top">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/uijv1lOhn2ds1ZS4gEMT" mode=""
+								<image src="https://api.ccttiot.com/smartmeter/img/static/umjPUc8nDKf1JwVqRAeb" mode=""
 									style="width: 58rpx;height: 60rpx;"></image>
 							</view>
 							<view class="bot">收费方式</view>
 						</view>
 						<view class="cont" style="width: 60rpx;" @click="topage(4)">
 							<view class="top">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/ubxoYVnbIK1rk0cfoL3j" mode="">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/u2Uco0iXf8aure0H2ihz" mode="">
 								</image>
 							</view>
 							<view class="bot">设置</view>
 						</view>
 						<view class="cont" style="width: 60rpx;margin-right: 100rpx;" @click="topage(5)">
 							<view class="top">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/uWaQjL7vph474LWTyGfs" mode="">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uXdBHA7pzOv2LYL7stJp" mode="">
 								</image>
 							</view>
 							<view class="bot">配网</view>
 						</view>
 						<view class="cont" style="width: 60rpx;" @click="topage(6)">
 							<view class="top">
-								<image src="https://api.ccttiot.com/smartmeter/img/static/udZvVKZIh6brG3cm3YpN" mode="">
+								<image src="https://api.ccttiot.com/smartmeter/img/static/uAnBmmayp3tVGwXntdaM" mode="">
 								</image>
 							</view>
 							<view class="bot">充值</view>
@@ -447,61 +447,72 @@
 						url: '/page_user/cbRecord?id=' + this.id
 					})
 				} else if (num == 1) {
-					//归零
-					this.$u.put(`/app/device/${this.id}/reset`).then((res) => {
-						if (res.code == 200) {
-							console.log(res.data);
-							uni.showToast({
-								title: res.data,
-								icon: 'none',
-								duration: 2000
-							})
-							this.getDevice(this.id)
-						} else if (res.msg == '设备剩余时间不足，无需归零') {
-							uni.showToast({
-								title: '设备剩余时间不足，无需归零',
-								icon: 'none',
-								duration: 2000
-							})
-						}else if(res.code == 500){
-							uni.showToast({
-								title: res.msg,
-								icon: 'none',
-								duration: 2000
-							})
-							// uni.showLoading({
-							// 	title: '充值中...'
-							// })
-							// let vm = this; // 将外部的 this 绑定到 vm 上
-							// uni.getNetworkType({
-							// 	success(res) {
-							// 		if (res.networkType !== 'none') {
-							// 			uni.getConnectedBluetoothDevices({
-							// 				success(res) {
-							// 					console.log('已连接的蓝牙设备信息：', res);
-							// 					xBlufi.notifySendCustomData({
-							// 						customData: "time@" + 0
-							// 					});
-							// 				},
-							// 				fail(err) {
-							// 					console.error('获取已连接蓝牙设备信息失败：', err);
-							// 				}
-							// 			})
-							// 			// vm.$u.get(`/app/bill/recharge/${vm.billNo}/bluetoothSuccess`).then(res => {
-							// 			// 	if(res.code == 200){
-							// 			// 		setTimeout(()=>{
-							// 			// 			uni.hideLoading()
-							// 			// 			uni.navigateBack()
-							// 			// 		},1000)
-							// 			// 	}
-							// 			// })
-							// 		} else {
-							// 			console.log('手机未连接网络');
-							// 		}
-							// 	}
-							// })
+					uni.showModal({
+						title: '提示',
+						content: '您确定要将电表时间归零吗？',
+						success: function(res) {
+							if (res.confirm) {
+							    //归零
+							    this.$u.put(`/app/device/${this.id}/reset`).then((res) => {
+							    	if (res.code == 200) {
+							    		console.log(res.data);
+							    		uni.showToast({
+							    			title: res.data,
+							    			icon: 'none',
+							    			duration: 2000
+							    		})
+							    		this.getDevice(this.id)
+							    	} else if (res.msg == '设备剩余时间不足，无需归零') {
+							    		uni.showToast({
+							    			title: '设备剩余时间不足，无需归零',
+							    			icon: 'none',
+							    			duration: 2000
+							    		})
+							    	}else if(res.code == 500){
+							    		uni.showToast({
+							    			title: res.msg,
+							    			icon: 'none',
+							    			duration: 2000
+							    		})
+							    		// uni.showLoading({
+							    		// 	title: '充值中...'
+							    		// })
+							    		// let vm = this; // 将外部的 this 绑定到 vm 上
+							    		// uni.getNetworkType({
+							    		// 	success(res) {
+							    		// 		if (res.networkType !== 'none') {
+							    		// 			uni.getConnectedBluetoothDevices({
+							    		// 				success(res) {
+							    		// 					console.log('已连接的蓝牙设备信息：', res);
+							    		// 					xBlufi.notifySendCustomData({
+							    		// 						customData: "time@" + 0
+							    		// 					});
+							    		// 				},
+							    		// 				fail(err) {
+							    		// 					console.error('获取已连接蓝牙设备信息失败：', err);
+							    		// 				}
+							    		// 			})
+							    		// 			// vm.$u.get(`/app/bill/recharge/${vm.billNo}/bluetoothSuccess`).then(res => {
+							    		// 			// 	if(res.code == 200){
+							    		// 			// 		setTimeout(()=>{
+							    		// 			// 			uni.hideLoading()
+							    		// 			// 			uni.navigateBack()
+							    		// 			// 		},1000)
+							    		// 			// 	}
+							    		// 			// })
+							    		// 		} else {
+							    		// 			console.log('手机未连接网络');
+							    		// 		}
+							    		// 	}
+							    		// })
+							    	}
+							    })
+							} else if (res.cancel) {
+								console.log('用户点击了取消');
+							}
 						}
 					})
+
 				} else if (num == 2) { //异常
 					uni.navigateTo({
 						url: '/page_fenbao/statulist/fault/yichang/index'
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a55ec23..8989bcb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -212,28 +212,28 @@
 			setTimeout(() => {
 				if (this.userType === '01') { // 注意 '01' 是一个字符串
 					if (uni.getStorageSync('mac')) {
-						this.mac = uni.getStorageSync('mac');
+						this.mac = uni.getStorageSync('mac')
 						uni.getLocation({
 							type: 'wgs84',
 							success: function(lb) {
-								that.gps.lat = lb.latitude;
-								that.gps.lon = lb.longitude;
+								that.gps.lat = lb.latitude
+								that.gps.lon = lb.longitude
 								that.tobind()
 							},
 							fail: function(error) {
-								console.error('获取位置信息失败：', error);
-								that.gps.lat = 0;
-								that.gps.lon = 0;
+								console.error('获取位置信息失败：', error)
+								that.gps.lat = 0
+								that.gps.lon = 0
 								that.tobind()
 							}
-						});
+						})
 					}
 				} else {
 					if (uni.getStorageSync('billNo')) {
 						let billNo = uni.getStorageSync('billNo')
 						this.$u.get(`/app/bill/recharge/${billNo}/bluetoothSuccess`).then((res) => {
 							if (res.code == 200) {
-								uni.removeStorageSync('billNo');
+								uni.removeStorageSync('billNo')
 								this.showtip = false
 								this.order()
 							}
@@ -392,7 +392,7 @@
 
 
 			changeGp(item, index) {
-				console.log(item);
+				// console.log(item);
 				this.showfz = false
 				if (item == 1) {
 					this.getDeviceList()
@@ -988,7 +988,6 @@
 					}
 
 					.bot_right {
-						// margin-top: 50rpx;
 						display: flex;
 						flex-wrap: nowrap;
 
@@ -1085,7 +1084,6 @@
 					margin-top: 32rpx;
 					display: flex;
 					flex-wrap: nowrap;
-					// justify-content: space-around;
 					padding-left: 50rpx;
 					box-sizing: border-box;
 
@@ -1180,10 +1178,6 @@
 
 				.card_cont {
 					width: 750rpx;
-					// display: flex;
-					// flex-wrap: wrap;
-					// align-items: baseline;
-					// justify-content: center;
 					padding-left: 30rpx;
 					height: 100%;
 					overflow-y: auto;
@@ -1244,7 +1238,7 @@
 						// width: 100vh;
 						display: flex;
 						transition: transform 0.3s ease;
-
+                        padding-top: 10rpx;
 						.fd_tit {
 							text-align: center;
 							padding: 0 15rpx;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 2ac65d6..c73be13 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,7 +1,8 @@
 <template>
 	<view class="page">
-		<u-navbar :is-back="false" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#fff' title-size='36' height='36' >
-			
+		<u-navbar :is-back="false" :title="tittxt" :border-bottom="false" :background="bgc" title-color='#fff'
+			title-size='36' height='36'>
+
 		</u-navbar>
 		<view class="imgbox">
 			<image src="https://api.ccttiot.com/smartmeter/img/static/uCqHftk2W2zEPX03DLcb" mode=""></image>
@@ -26,8 +27,9 @@
 				<view class="input_txt" style="width: 536rpx;font-size: 24rpx;line-height: 32rpx;">
 					您暂未授权共享开关小程序获取你的信息，将无法正常使用小程序的功能。如需要正常使用请点击“授权”按钮，打开头像，昵称等信息的授权。
 				</view>
-				
-				<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"  style="margin-top: 330rpx;margin-left: -10rpx;" >
+
+				<button class="button" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
+					style="margin-top: 330rpx;margin-left: -10rpx;">
 					授权登录
 				</button>
 			</view>
@@ -42,83 +44,73 @@
 				bgc: {
 					backgroundColor: "#7D86EF",
 				},
-				tittxt:"授权登录",
-				chooseType:true,
-				usertype:'',
-				login:false
+				tittxt: "授权登录",
+				chooseType: true,
+				usertype: '',
+				login: false
 			}
 		},
 		methods: {
-			userType(num){
-				this.chooseType=false
-				this.login=true
-				if(num==1){
-					this.usertype='01'
-				}else{
-					this.usertype='00'
+			userType(num) {
+				this.chooseType = false
+				this.login = true
+				if (num == 1) {
+					this.usertype = '01'
+				} else {
+					this.usertype = '00'
 				}
 			},
 			getPhoneNumber(e) {
-			    let that = this;
-			    console.log("eeeeeeee", e);
-			    const wxLoginAsync = () => {
-			        return new Promise((resolve, reject) => {
-			            wx.login({
-			                success(res) {
-			                    if (res.code) {
-			                        console.log('登录！', res);
-			                        let data = {
+				let that = this;
+				console.log("eeeeeeee", e);
+				const wxLoginAsync = () => {
+					return new Promise((resolve, reject) => {
+						wx.login({success(res) {
+								if (res.code) {
+									let data = {
 										loginCode: res.code,
-			                            mobileCode: e.detail.code,
-			                        }; 
-			                        resolve(data);
-			                    } else {
-			                        reject(res.errMsg);
-			                    }
-			                },
-			                fail(err) {
-			                    reject(err);
-			                }
-			            });
-			        });
-			    };
-			    wxLoginAsync()    
-			        .then(async (data) => {
-			            this.$u.post("/app/auth/wxLogin",data).then((res) => {
-			            
-			            	
-			            	
-			            		
-			            		// this.$forceUpdate()
-			            	if (res.code == 200) {
-								console.log(res,'resres');
+										mobileCode: e.detail.code,
+									}
+									resolve(data);
+								} else {
+									reject(res.errMsg)
+								}
+							},fail(err) {
+								reject(err)
+							}
+						})
+					})
+				}
+				wxLoginAsync().then(async (data) => {
+						this.$u.post("/app/auth/wxLogin", data).then((res) => {
+							if (res.code == 200) {
 								wx.setStorageSync('token', res.token);
 								that.ceshi()
-			            	}
-			            });
-			           
-			        })
-			        .catch((err) => {
-			            console.error(err);
-			        });
+							}
+						})
+					}).catch((err) => {
+						console.error(err)
+					})
 			},
 			async ceshi() {
 				this.$u.get("/app/user/userInfo").then((res) => {
 					uni.navigateTo({
 						url: '/pages/shouye/index'
 					})
-				});
+				})
 			},
 		}
 	}
 </script>
 
-<style lang="scss" >
-	page{
+<style lang="scss">
+	page {
 		background: #FFFFFF;
 	}
+
 	.page {
-		position: relative; /* 添加相对定位 */
+		position: relative;
+		/* 添加相对定位 */
 	}
 
 	.imgbox {
@@ -144,22 +136,30 @@
 	}
 
 	.inputbox {
-		position: absolute; /* 或者 fixed，根据你的需求 */
-		top: 700rpx; /* 调整这里来控制距离顶部的距离 */
-		
-		width: 750rpx; /* 调整输入框的宽度 */
+		position: absolute;
+		/* 或者 fixed，根据你的需求 */
+		top: 700rpx;
+		/* 调整这里来控制距离顶部的距离 */
+
+		width: 750rpx;
+		/* 调整输入框的宽度 */
 		padding: 100rpx 0;
-		background: #fff; /* 设置背景颜色，这里是红色的半透明 */
-		border-radius: 50rpx; /* 设置圆角 */
-		z-index: 999; /* 设置 z-index，确保在其他内容上方显示 */
+		background: #fff;
+		/* 设置背景颜色，这里是红色的半透明 */
+		border-radius: 50rpx;
+		/* 设置圆角 */
+		z-index: 999;
+		/* 设置 z-index，确保在其他内容上方显示 */
 		padding-left: 104rpx;
-		.input_txt{
+
+		.input_txt {
 			font-weight: 400;
 			font-size: 32rpx;
 			color: #3D3D3D;
 			line-height: 44rpx;
 		}
-		.button{
+
+		.button {
 			margin-top: 64rpx;
 			display: flex;
 			justify-content: center;
@@ -168,10 +168,10 @@
 			height: 96rpx;
 			background: #8883F0;
 			border-radius: 52rpx 52rpx 52rpx 52rpx;
-			
+
 			font-weight: 500;
 			font-size: 36rpx;
 			color: #FFFFFF;
 		}
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index b861dce..270bb1b 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -108,19 +108,19 @@
 			// this.initOtherCovers(); // 初始化其他覆盖物
 		},
 		onShow() {
-			this.logins();
+			this.logins()
 			this.getad()
 			this.gethuidaio()
 		},
 		onReady() {
-			this.mapContext = uni.createMapContext('map', this);
-			this.mapScaleInterval = setInterval(this.updateMarkers, 1000);
+			this.mapContext = uni.createMapContext('map', this)
+			this.mapScaleInterval = setInterval(this.updateMarkers, 1000)
 		},
 		beforeDestroy() {
 			// 在组件卸载前清除定时器  
 			if (this.mapScaleInterval) {
-				clearInterval(this.mapScaleInterval);
-				this.mapScaleInterval = null;
+				clearInterval(this.mapScaleInterval)
+				this.mapScaleInterval = null
 			}
 		},
 		methods: {
@@ -165,7 +165,7 @@
 						height: 30,
 						iconPath: 'https://api.ccttiot.com/smartmeter/img/static/uZXgsJE6hXbRSwbKILB4',
 					};
-					this.covers.push(shopCover);
+					this.covers.push(shopCover)
 				});
 			},
 			addMarkersWithLabels() {
@@ -186,23 +186,22 @@
 							rotate: 20
 						}
 					}
-					this.covers.push(shopCover);
+					this.covers.push(shopCover)
 				});
 			},
 			calculateAnchorX(name) {
-				let chineseLength = 0;
-				let englishLength = 0;
+				let chineseLength = 0
+				let englishLength = 0
 				for (let i = 0; i < name.length; i++) {
-					const charCode = name.charCodeAt(i);
+					const charCode = name.charCodeAt(i)
 					if (charCode >= 0x4e00 && charCode <= 0x9fa5) {
-						chineseLength++;
+						chineseLength++
 					} else if (/[a-zA-Z]/.test(name[i])) {
-						englishLength = englishLength + 0.3; // 英文长度加1，但视为两个中文字符长度  
-						// console.log(englishLength);
+						englishLength = englishLength + 0.3 // 英文长度加1，但视为两个中文字符长度  
 					}
 				}
 				const totalLength = chineseLength + englishLength * 2;
-				return -totalLength * 6.5; // 假设每个中文字符对应的 anchorX 偏移是 -7 
+				return -totalLength * 6.5 // 假设每个中文字符对应的 anchorX 偏移是 -6.5
 			},
 
 			scanQRCode() {
@@ -211,14 +210,14 @@
 					scanType: ['qrCode'],
 					success: res => {
 						function getQueryParam(url, paramName) {
-							let regex = new RegExp(`[?&]${paramName}=([^&]*)`);
+							let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
 							let results = regex.exec(url);
-							return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null;
+							return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
 						}
 						let sceneValue = res.result
-						let decodedValue = decodeURIComponent(sceneValue);
+						let decodedValue = decodeURIComponent(sceneValue)
 						let id = getQueryParam(decodedValue, 's')
-						console.log(res, id);
+						// console.log(res, id)
 						this.$u.get(`/app/device/${id}/withSuitList`).then((res) => {
 							if (res.code == 200) {
 								uni.navigateTo({
@@ -228,7 +227,7 @@
 						})
 					},
 					fail: err => {
-						console.error('扫描失败：', err);
+						console.error('扫描失败：', err)
 						uni.showToast({
 							title: '扫描失败',
 							icon: 'none'
@@ -282,10 +281,6 @@
 
 			onControltap(control) {
 				this.setMapScale()
-				// uni.createMapContext("map", this).moveToLocation({
-				// 	longitude: this.longitude,
-				// 	latitude: this.latitude,
-				// })
 			},
 			// 地图回正
 			async setMapScale(e, val) {
@@ -319,6 +314,7 @@
 						this.jinweidu = res.longitude + ',' + res.latitude
 						this.latitude = Number(res.latitude.toFixed(5)) - 0.005
 						this.longitude = Number(res.longitude.toFixed(5)) + 0.005
+						this.setMapScale()
 						// 请求附近的店铺  
 						this.$u.get("/app/store/listNearBy?center=" + this.jinweidu + '&radius=' + 1000).then(
 							res => {
@@ -380,7 +376,6 @@
 				})
 			},
 
-
 			logins() {
 				if (uni.getStorageSync('userType')) {
 					this.userType = uni.getStorageSync('userType')
diff --git a/pages/tj.vue b/pages/tj.vue
index 36ca920..ac95084 100644
--- a/pages/tj.vue
+++ b/pages/tj.vue
@@ -164,7 +164,6 @@
 			// 进行获取用电量请求
 			gettime() {
 				let data = {
-
 					year: this.yeartime.year,
 					month: this.yeartime.month,
 					groupBy: 'create_date'
@@ -265,7 +264,7 @@
 							fontSize: 11,
 							formatter: function(value) {
 								// 保留两位小数，没有小数时显示00
-								return value + '.00' + '元'
+								return value + '元'
 							},
 						},
 						splitLine: {
@@ -524,7 +523,7 @@
 				width: 632rpx;
 				height: 88rpx;
 				background: #FFFFFF;
-				box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
+				// box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42, 130, 228, 0.1);
 				opacity: 1;
 				border-radius: 30rpx;
 				display: flex;