aaa

page_fenbao/statulist/myshop/shopdetail/index.vue

@@ -60,7 +60,8 @@
 				listobj: {},
 				deviceId: '',
 				name: '',
-				mac: ''
+				mac: '',
+				macs:''
 			}
 		},
 		onLoad(option) {
@@ -183,6 +184,8 @@
 						let id = getQueryParam(decodedValue, 's')
 						this.$u.get(`/app/device/${id}/bySn`).then((res) => {
 							if (res.code == 200) {
+								console.log(res,'resres');
+								this.macs = res.data.mac
 								this.qrResult = 'CTKG-' + res.data.mac
 								xBlufi.initXBlufi(1);
 								xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
@@ -263,7 +266,7 @@
 								}
 								let data = {
 									storeId: this.storeId,
-									mac: this.mac
+									mac: this.macs
 								}
 								this.$u.put('/app/device/bind', data).then((res) => {
 									if (res.code == 200) {
@@ -280,18 +283,28 @@
 											content: '你已绑定成功,需前去配网吗？',
 											success: function(res) {
 												if (res.confirm) {
-													let systemInfo = uni.getSystemInfoSync();
+													if(vm.mac == ''){
-													if (systemInfo.platform === 'android') {
+														uni.showToast({
-														// 当前设备是 Android  
+															title: '当前设备不在线',
-														uni.navigateTo({
+															icon: 'none',
-															url: '/page_components/wifilist/index?deviceId=' +options.data.deviceId + '&name=' +options.data.name
+															duration: 2000
-														})
+														});
-													} else if (systemInfo.platform === 'ios') {
+													}else{
-														// 当前设备是 iOS  
+														let systemInfo = uni.getSystemInfoSync();
-														uni.navigateTo({
+														if (systemInfo.platform === 'android') {
-															url: '/page_fenbao/device/wifivideo?deviceId=' +options.data.deviceId + '&name=' +options.data.name
+															// 当前设备是 Android  
-														})
+															uni.navigateTo({
+																url: '/page_components/wifilist/index?deviceId=' +options.data.deviceId + '&name=' +options.data.name
+															})
+														} else if (systemInfo.platform === 'ios') {
+															// 当前设备是 iOS  
+															uni.navigateTo({
+																url: '/page_fenbao/device/wifivideo?deviceId=' +options.data.deviceId + '&name=' +options.data.name
+															})
+														}
 													}
+													
+													
 												} else if (res.cancel) {
 													console.log('用户点击了取消');
 												}
@@ -300,7 +313,7 @@
 
 									} else if (res.code == 500) {
 										uni.showToast({
-											title: '该设备已被绑定',
+											title: res.msg,
 											icon: 'none',
 											duration: 2000
 										});

page_fenbao/statulist/taocanlist/addtaocan/index.vue

@@ -144,6 +144,12 @@
 								setTimeout(() => {
 									uni.navigateBack()
 								}, 1000)
+							}else{
+								uni.showToast({
+									title: res.msg,
+									icon: 'none',
+									duration: 1000,
+								})
 							}
 						})
 					}

page_fenbao/statulist/taocanlist/index.vue

@@ -72,6 +72,12 @@
 					if (res.code == 200) {
 					    this.$u.toast(`删除成功`);
 						this.getlist()
+					}else{
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1000,
+						})
 					}
 				});