From 9b09b974a3beef30f92c07168edf08363a68c8a0 Mon Sep 17 00:00:00 2001
From: tx <2622874537@qq.com>
Date: Mon, 30 Sep 2024 18:02:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 page_user/good_list.vue        |  13 +++-
 page_user/xcjs.vue             |   2 +-
 pages/login/login.vue          |  21 ++++--
 pages_admin/admin_worke.vue    |   2 +-
 pages_admin/controlDevice.vue  |  53 +++++++++++---
 pages_admin/worke/bind_mac.vue |  57 ++++++++-------
 pages_admin/worke/bind_sn.vue  | 130 ++++++++++++++++++++++-----------
 7 files changed, 186 insertions(+), 92 deletions(-)

diff --git a/page_user/good_list.vue b/page_user/good_list.vue
index dddb1d6..ba56120 100644
--- a/page_user/good_list.vue
+++ b/page_user/good_list.vue
@@ -123,9 +123,16 @@
 				});
 			},
 			topage(item){
-				uni.navigateTo({
-					url:'/page_user/xcjs?id='+item.orderNo
-				})
+				if(item.status!=3&&item.paid==0){
+					uni.redirectTo({
+						url:'/pages/index/index'
+					})
+				}else{
+					uni.navigateTo({
+						url:'/page_user/xcjs?id='+item.orderNo
+					})
+				}
+			
 				
 			},
 			getlist() {
diff --git a/page_user/xcjs.vue b/page_user/xcjs.vue
index 5271a2b..6c4b115 100644
--- a/page_user/xcjs.vue
+++ b/page_user/xcjs.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="行程结束" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
+		<u-navbar title="订单详情" :border-bottom="false" :background="bgc" title-color='#000' title-size='36'
 			height='45'></u-navbar>
 		<map class="map" id="map" ref="map" :scale="zoomSize" :latitude="latitude" :longitude="longitude"
 			:show-location='true' :markers="markers" :polygons="polygons" :polyline="polyline"> </map>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 3995bff..85ba9af 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -244,12 +244,14 @@
 				codeButtonText2: '获取验证码',
 				countdown2: 60,
 				openCode:null,
-				isindex:false
+				isindex:false,
+				areaId:'16'
 			}
 		},
 		onLoad(e) {
 			this.deptId = uni.getStorageSync('deptId');
-			
+				
+				
 			if(e.isindex=='true'){
 				this.isindex=true
 			}
@@ -263,6 +265,9 @@
 			
 		},
 		onShow() {
+			if( uni.getStorageSync('areaId')){
+				this.areaId = uni.getStorageSync('areaId');
+			}
 			wx.login({
 			    success(res) {
 			        if (res.code) {
@@ -386,11 +391,11 @@
 					});
 					return;
 				}
-				let areaId = uni.getStorageSync('areaId');
+				// let areaId = uni.getStorageSync('areaId');
 				let data = {
 					phone: this.phone1,
 					password: this.password1,
-					areaId: areaId,
+					areaId: this.areaId,
 					
 					
 				}
@@ -545,11 +550,11 @@
 					});
 					return;
 				}
-				let areaId = uni.getStorageSync('areaId');
+				// let areaId = uni.getStorageSync('areaId');
 				let data = {
 					phone: this.phone,
 					password: this.password,
-					areaId: areaId,
+					areaId:  this.areaId,
 					phoneCode: this.phoneCode,
 					uuid: this.uuid,
 					openid:this.openCode
@@ -613,9 +618,9 @@
 				};
 				wxLoginAsync()
 					.then(async (data) => {
-						let areaId = uni.getStorageSync('areaId');
+						// let areaId = uni.getStorageSync('areaId');
 						this.$u.post("/wxlogin?mobileCode=" + data.mobileCode + '&jsCode=' + data.jscode +
-							'&areaId=' + areaId).then((res) => {
+							'&areaId=' +  this.areaId).then((res) => {
 
 
 
diff --git a/pages_admin/admin_worke.vue b/pages_admin/admin_worke.vue
index 4da5095..3765eaa 100644
--- a/pages_admin/admin_worke.vue
+++ b/pages_admin/admin_worke.vue
@@ -12,7 +12,7 @@
 				应用入口
 			</view>
 			<view class="app_box">
-				<view class="cont" @click="topage(0)">
+				<view class="cont" @click="topage(0)" v-if="deptId==100">
 					<image src="https://lxnapi.ccttiot.com/bike/img/static/unnmUkUif2eWNKFq9fdg" mode=""></image>
 					<view class="text">
 						运营数据
diff --git a/pages_admin/controlDevice.vue b/pages_admin/controlDevice.vue
index db7dcfc..a38f233 100644
--- a/pages_admin/controlDevice.vue
+++ b/pages_admin/controlDevice.vue
@@ -1,11 +1,9 @@
 <template>
 	<view class="pages">
 		<u-navbar title="设备控制" :border-bottom="false" :background="bgc" title-color='#262B37' title-size='38'
-			height='50'></u-navbar>
+			height='50'  :custom-back='backPage'></u-navbar>
 		<view class="title">
 			<text>控制台</text>
-
-
 		</view>
 		<view class="iptbox">
 			<view class="qrcode" @click="qrcode()">
@@ -16,19 +14,26 @@
 
 		</view>
 		<view class="txt">
-			MAC:{{carInfo.mac}}
+			MAC：{{carInfo.mac}}
 		</view>
 		<view class="txt" style="margin-top: 100rpx;">
-			信号:{{carInfo.signalStrength}}
+			信号：{{carInfo.signalStrength}}
 		</view>
 		<view class="txt">
-			电压:{{carInfo.voltage}}V
+			电压：{{carInfo.voltage}}V
 		</view>
 		<view class="txt">
-			网络:<span :style="{ color: carInfo.onlineStatus == 1 ? '#8883F0' : '#808080' }">在线</span> / <span :style="{ color: carInfo.onlineStatus == 0? '#8883F0' : '#808080' }">离线</span>
+			网络：
+			<span v-if="carInfo.onlineStatus==0">离线</span>
+			<span style="color: #8883F0;" v-if="carInfo.onlineStatus==1">在线</span>
+			
 		</view>
 		<view class="txt">
-			锁状态: <span :style="{ color: carInfo.lockStatus == 1? '#8883F0' : '#808080' }">开</span>/ <span :style="{ color: carInfo.lockStatus == 0 ? '#8883F0' : '#808080' }">关</span>
+			
+			锁状态：
+			<span v-if="carInfo.lockStatus==0">关</span>
+			<span style="color: #8883F0;" v-if="carInfo.lockStatus==1">开</span>
+			
 		</view>
 		<view class="btnbox">
 			<view class="btn_box">
@@ -43,7 +48,7 @@
 				<view class="btn1" @click="btn(3)">
 					响铃
 				</view>
-				<view class="btn1" @click="deviceInfo()">
+				<view class="btn1" @click="btn(4)">
 					更新
 				</view>
 			</view>
@@ -83,9 +88,14 @@
 			// this.videoContext = uni.createVideoContext('myVideo', this)
 		},
 		methods: {
-			back(){
+			backPage(){
 				uni.redirectTo({
-					url:'worke/bind_sn'
+					url:'/pages_admin/worke/bind_sn'
+				})
+			},
+			back(){
+				uni.reLaunch({
+					url:'/pages_admin/worke/bind_sn'
 				})
 			},
 			search(){
@@ -212,6 +222,27 @@
 						}
 					})
 
+				}else if (num == 4){
+					uni.showLoading({
+						title: '加载中...'
+					})
+					this.$u.post('/appVerify/refreshDevice?sn=' + this.sn).then((res) => {
+						if (res.code == 200) {
+							this.deviceInfo()
+							uni.hideLoading()
+							uni.showToast({
+								title: '操作成功',
+								icon: 'none',
+								duration: 2000
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none',
+								duration: 2000
+							});
+						}
+					})
 				}
 			}
 		}
diff --git a/pages_admin/worke/bind_mac.vue b/pages_admin/worke/bind_mac.vue
index 7cd7ff2..4c481ad 100644
--- a/pages_admin/worke/bind_mac.vue
+++ b/pages_admin/worke/bind_mac.vue
@@ -260,38 +260,41 @@
 				});
 			},
 			bind() {
-				this.$u.post(`/appVerify/band?sn=` + this.sn + '&mac=' + this.mac+'&hardwareVersionId='+this.hardwareVersionId).then((res) => {
-
-					if (res.code == 200) {
-
-						uni.showToast({
-							title: '绑定成功',
-							icon: 'none',
-							duration: 2000
-						});
-						setTimeout(() => {
-							uni.navigateTo({
-								url:'/pages_admin/controlDevice?sn='+this.sn
-							})
-							// uni.navigateBack({
-							// 	delta: 1 // delta值为1时表示返回的页面层数
-							// });
-						}, 2000)
-
-					} else {
-						if(res.msg=='该MAC号已经存在'){
-							this.showbind=true
-						}else{
+				if(this.sn!='' && this.sn.length === 7 && /^\d+$/.test(this.sn)){
+					this.$u.post(`/appVerify/band?sn=` + this.sn + '&mac=' + this.mac+'&hardwareVersionId='+this.hardwareVersionId).then((res) => {
+					
+						if (res.code == 200) {
+					
 							uni.showToast({
-								title: res.msg,
+								title: '绑定成功',
 								icon: 'none',
 								duration: 2000
 							});
-							
-						}
+							setTimeout(() => {
+								uni.navigateTo({
+									url:'/pages_admin/controlDevice?sn='+this.sn
+								})
+								// uni.navigateBack({
+								// 	delta: 1 // delta值为1时表示返回的页面层数
+								// });
+							}, 2000)
 					
-					}
-				})
+						} else {
+							if(res.msg=='该MAC号已经存在'){
+								this.showbind=true
+							}else{
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 2000
+								});
+								
+							}
+						
+						}
+					})
+				}
+				
 			},
 			qrcode() {
 				uni.scanCode({
diff --git a/pages_admin/worke/bind_sn.vue b/pages_admin/worke/bind_sn.vue
index db7eaf0..3a45e71 100644
--- a/pages_admin/worke/bind_sn.vue
+++ b/pages_admin/worke/bind_sn.vue
@@ -1,14 +1,23 @@
 <template>
 	<view class="pages">
 		<u-navbar title="添加设备" :border-bottom="false" :background="bgc" title-color='#262B37' title-size='38'
-			height='50'></u-navbar>
+			height='50' :custom-back='backPage'></u-navbar>
 		<view class="title">
-			<text>设备列表</text>
-
+			<view class="title_li" style="display: flex;align-items: center;">
+				<view class="text">设备列表</view>
+				<view class="btns" @click="toControl()">
+					控制台
+				</view>
+				<view class="btns" @click="replay()">
+					重置页面
+				</view>
+			</view>
+			
+			
 			<image src="https://api.ccttiot.com/smartmeter/img/static/uCfe9273aC89tGOT7n1G" mode="widthFix"></image>
 			<text class="sm">{{texts}}</text>
 		</view>
-
+		
 		<view class="dblist" v-for="(item, index) in devicesList" :key="index" @tap="choose(item)">
 			<!-- <view class="lt">
 				<image src="https://api.ccttiot.com/smartmeter/img/static/uoQO0pUZ1UHcW5uVKkuR" mode=""></image>
@@ -154,46 +163,66 @@
 			// this.videoContext = uni.createVideoContext('myVideo', this)
 		},
 		methods: {
+			replay(){
+				uni.reLaunch({
+					url:'/pages_admin/worke/bind_sn'
+				})
+			},
+			backPage(){
+				uni.redirectTo({
+					url:'/pages_admin/admin_worke'
+				})
+			},
+			toControl(){
+				uni.redirectTo({
+					url:'/pages_admin/controlDevice'
+				})
+			},
 			fetchDevicesBoundStatus() {
-				// 提取所有设备的 MAC 地址，并通过 Set 去重
-				let uniqueDevices = Array.from(new Set(this.devicesList.map(item => item.localName.substring(5))));
-				
-				// 重新构建去重后的 devicesList
-				this.devicesList = uniqueDevices.map(mac => {
-					return this.devicesList.find(item => item.localName.substring(5) === mac);
-				});
-				
-				// 拼接成字符串
-				const macs = uniqueDevices.join(',');
+			    // 提取所有设备的 MAC 地址，并通过 Set 去重
+			    let uniqueDevices = Array.from(new Set(this.devicesList.map(item => item.localName.substring(5))));
 			
-				// 向批量接口请求录入状态
-				this.$u.get(`app/getDeviceInfoByMacList?macList=${macs}`).then((res) => {
-					const resultList = res.data; // 获取接口返回的数据数组
+			    // 重新构建去重后的 devicesList
+			    this.devicesList = uniqueDevices.map(mac => {
+			        return this.devicesList.find(item => item.localName.substring(5) === mac);
+			    });
 			
-					// 遍历 devicesList 并对比 mac 地址
-					this.devicesList.forEach(device => {
-						const mac = device.localName.substring(5);
+			    // 拼接成字符串
+			    const macs = uniqueDevices.join(',');
 			
-						// 查找返回结果中是否有与该设备 MAC 地址相同的项
-						const matchingResult = resultList.find(result => result.mac === mac);
+			    // 向批量接口请求录入状态
+			    this.$u.get(`app/getDeviceInfoByMacList?macList=${macs}`).then((res) => {
+			        const resultList = res.data; // 获取接口返回的数据数组
 			
-						// 如果找到了匹配的 MAC 地址项，则更新设备的 sn 和 isBand
-						if (matchingResult) {
-							device.sn = matchingResult.sn;
-							device.isBand = matchingResult.isBand;
-						}
-					});
+			        // 遍历 devicesList 并对比 mac 地址
+			        this.devicesList.forEach(device => {
+			            const mac = device.localName.substring(5);
 			
-					this.$forceUpdate(); // 强制更新视图
-					console.log(this.devicesList, 'Updated devicesList');
-				}).catch((error) => {
-					console.error('批量获取设备录入状态失败', error);
-				});
+			            // 查找返回结果中是否有与该设备 MAC 地址相同的项
+			            const matchingResult = resultList.find(result => result.mac === mac);
+			
+			            // 如果找到了匹配的 MAC 地址项，则更新设备的 sn 和 isBand
+			            if (matchingResult) {
+			                device.sn = matchingResult.sn;
+			                device.isBand = matchingResult.isBand;
+			            }
+			        });
+			
+			        // 对 devicesList 进行排序，将 isBand 为 false 的设备排在前面
+			        this.devicesList.sort((a, b) => {
+			            return (a.isBand === false ? -1 : 1) - (b.isBand === false ? -1 : 1);
+			        });
+			
+			        this.$forceUpdate(); // 强制更新视图
+			        console.log(this.devicesList, 'Updated devicesList');
+			    }).catch((error) => {
+			        console.error('批量获取设备录入状态失败', error);
+			    });
 			},
 			choose(e) {
 				console.log(e);
 				let Bluetoothmac = e.name.substring(5)
-				uni.navigateTo({
+				uni.redirectTo({
 					url: '/pages_admin/worke/bind_mac?mac=' + Bluetoothmac
 				})
 			},
@@ -777,10 +806,9 @@
 		// margin-top: 48rpx;
 		display: inline-block;
 	}
-
 	.title {
 		margin-bottom: 84rpx;
-
+	
 		image {
 			display: inline-block;
 			width: 48rpx;
@@ -788,19 +816,39 @@
 			vertical-align: bottom;
 			margin-right: 10rpx;
 		}
-
-		text:nth-child(1) {
+	
+		
+	}
+	.title_li{
+		display: flex;
+		flex-wrap: nowrap;
+		align-items: center;
+		.text{
 			font-weight: 400;
-			font-size: 96rpx;
+			font-size: 70rpx;
 			color: #262B37;
-			line-height: 88rpx;
+			
 			text-align: left;
 			font-style: normal;
 			text-transform: none;
 			display: block;
-			margin-bottom: 48rpx;
+			
+		}
+		.btns{
+			margin-left: 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 138rpx;
+			height: 50rpx;
+			background: #F14C4C;
+			border-radius: 31rpx 31rpx 31rpx 31rpx;
+			font-weight: 500;
+			font-size: 24rpx;
+			color: #FFFFFF;
 		}
 	}
+	
 
 	.dblist {
 		display: flex;