2025年4月2日19:51:49

app.js

@@ -41,10 +41,5 @@ App({
 
 			wx.hideLoading();
 		});
-
-		plugin.bus.subscribe("devicesModel", (res) => {
-			console.log('app.js  devicesModel', res);
-			this.globalData.ppScale.device.mac = res.deviceMac;
-        });
 	},
 })

pages/searchDevice/searchDevice.js

@@ -110,6 +110,7 @@ Page({
 	// },
 
 	getDeviceSettingList() {
+		// app.globalData.ppScale.plugin.Blue.visibleLog(true);
 		this.setData({
 			initText: "设备搜索中..."
 		});
@@ -168,6 +169,11 @@ Page({
 			});
 			this.selectDevice();
 		});
+		
+		app.globalData.ppScale.plugin.bus.subscribe("devicesModel", (res) => {
+			console.log("searchDevice ===》devicesModel", res);
+			app.globalData.ppScale.device.mac = res.deviceMac;
+		});
 	},
 
 	selectDevice() {

pages/setNetwork/setNetwork.js

@@ -13,30 +13,43 @@ Page({
 			app.globalData.ppScale.wifi.ssid = ssid;
 			app.globalData.ppScale.wifi.password = password;
 
-			let scaleDeviceId = app.globalData.ppScale.device.mac.replace(/:/g, '');
+			let mac = app.globalData.ppScale.device.mac;
-			let params = {
+			if(mac) {
-				equipmentName: app.globalData.ppScale.device.name,
+				let scaleDeviceId = mac.replace(/:/g, '');
-				scaleDeviceId: scaleDeviceId,
+				let params = {
-			};
+					equipmentName: app.globalData.ppScale.device.name,
-			$.ajax("weighingScale/binding/device", params, "POST").then(res => {
+					scaleDeviceId: scaleDeviceId,
-				app.globalData.ppScale.activeProtocol.codeSetBindingState((res) => {
+				};
-					console.log("setNetwork.js codeSetBindingState", res);
+				$.ajax("weighingScale/binding/device", params, "POST").then(res => {
-
+					app.globalData.ppScale.activeProtocol.codeSetBindingState((res) => {
-					wx.navigateTo({
+						console.log("setNetwork.js codeSetBindingState", res);
-						url: "/pages/setNetworkSuccessful/setNetworkSuccessful"
+	
+						wx.navigateTo({
+							url: "/pages/setNetworkSuccessful/setNetworkSuccessful"
+						})
 					})
+				}).catch(err => {
+					wx.showToast({
+						icon: "none",
+						title: err.message
+					})
+					setTimeout(() => {
+						wx.switchTab({
+							url: "/pages/home/home"
+						})
+					}, 1500)
 				})
-			}).catch(err => {
+			} else {
 				wx.showToast({
 					icon: "none",
-				  	title: err.message
+					title: "Mac 地址获取失败，请重新绑定"
 				})
 				setTimeout(() => {
 					wx.switchTab({
 						url: "/pages/home/home"
 					})
 				}, 1500)
-			})
+			}
 		})
 	}
 })