diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 52fb418..0a8a705 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -20,10 +20,10 @@ const install = (Vue, vm) => {
 	// 	},
 	// }); 
 	Vue.prototype.$u.http.setConfig({ 
-			baseUrl: 'http://192.168.2.143:10002',
-			// baseUrl: 'https://kg.chuangtewl.com/prod-api',
-			loadingText: '努力加载中~',
-			loadingTime: 1000,
+			// baseUrl: 'http://192.168.2.143:10002',
+			baseUrl: 'https://kg.chuangtewl.com/prod-api',
+			// loadingText: '努力加载中~',
+			// loadingTime: 1000,
 			// 设置自定义头部content-type
 			header: {
 				'content-type': 'application/json;charset=UTF-8',
diff --git a/page_components/bindsz.vue b/page_components/bindsz.vue
index 7036974..085ba1a 100644
--- a/page_components/bindsz.vue
+++ b/page_components/bindsz.vue
@@ -6,15 +6,16 @@
 			
 			<view class="icon">
 				<view class="imgbox" v-if="userImgs">
-					<button style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;"  @click="getImage">
+					<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 style="border-radius: 10rpx;" :src="userImgs" mode="aspectFit"></image>
 					</button>
 				</view>
 				<view class="imgbox" v-else>
-					<button style="border: 0;outline: none;width: 143rpx;padding-left: 0rpx;height: 143rpx;border-radius: 16rpx;"  @click="getImage">
+					<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="https://api.ccttiot.com/smartmeter/img/static/uY8CPw9YE6JxPzcHUaqf" mode="aspectFit"></image>
 					</button>
 				</view>
+				
 			</view>
 			
 			<view class="li" @click.stop="sremakemc()">
@@ -183,6 +184,42 @@
 
 		<!-- 选择店铺 -->
 		<u-select v-model="showshop" :list="wateringList" @confirm="confirms"></u-select>
+		
+		<!-- 蓝牙连接 -->
+		<view class="bluetoothbox" v-if="bluetoothflag">
+			<view class="stop">
+				正在连接该设备蓝牙
+			</view>
+					<view class="xtop">
+						请将手机与设备尽量靠近
+					</view>
+					<image src="https://api.ccttiot.com/smartmeter/img/static/ucDphMKsozqwwllJTAKL" mode=""></image>
+					<!-- <view class="xqx" @click="bluetoothflag = false">
+						取消连接
+					</view> -->
+		</view>
+		
+		<!-- 蓝牙连接失败 -->
+		<view class="bluetoothbox" v-if="shibaiflag">
+			 <image class="img" src="https://api.ccttiot.com/smartmeter/img/static/uTb3vSlbcHdPMFQMBjyL" mode=""></image>
+					 <view class="one">
+					 	蓝牙连接失败
+					 </view>
+					 <view class="two">
+					 	请确保手机足够靠近设备
+					 </view>
+					 <view class="thr">
+					 	并且设备处于上电状态
+					 </view>
+					 <view class="anfour">
+					 	<view class="qx" @click="btnlyqx">
+		           取消
+					 	</view>
+						<view class="cx" @click="btnwifi">
+						   重新连接
+						</view>
+					 </view>
+		</view>
 
 	</view>
 </template>
@@ -192,6 +229,8 @@
 	export default {
 		data() {
 			return {
+				bluetoothflag:false,
+				shibaiflag:false,
 				bgc: {
 					backgroundColor: "#8883f0",
 				},
@@ -274,6 +313,10 @@
 		    }  
 		  },
 		methods: {
+			btnlyqx(){
+				this.shibaiflag = false
+				this.bluetoothflag = false
+			},
 			// 修改图片
 			getImage(e) {
 				let _this = this
@@ -355,127 +398,132 @@
 			},
 			// 点击wifi进行配网
 			btnwifi(){
-				uni.showLoading({
-					title: '蓝牙连接中...'
-				})
-				if(this.deviceId == ''){
-					xBlufi.initXBlufi(1);
-					xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
-					xBlufi.notifyStartDiscoverBle({
-						'isStart': true
-					})
-					
-					// 停止蓝牙搜索  
-					setTimeout(() => {
-						xBlufi.notifyStartDiscoverBle({
-							'isStart': false
-						});
-					
-						xBlufi.notifyConnectBle({
-							isStart: true,
-							deviceId: this.deviceId,
-							name: this.name
-						})
-						xBlufi.notifyInitBleEsp32({
-							deviceId: this.deviceId
-						})
-						let name = ''
-						let index = this.name.indexOf('-');
-						if (index !== -1) {
-							name = this.name.slice(index + 1);
-						}
-						let data = {
-							storeId: this.storeId,
-							mac: this.mac
-						}
-						this.$u.put('/app/device/bind', data).then((res) => {
-							if (res.code == 200) {
-								// uni.showToast({
-								// 	title: '绑定成功',
-								// 	icon: 'success',
-								// 	duration: 2000
-								// })
-								uni.hideLoading();
-								uni.removeStorageSync('mac');
-								let systemInfo = uni.getSystemInfoSync();
-								if (systemInfo.platform == 'android') {
-									uni.hideLoading()
-									// 当前设备是 Android  
-									uni.navigateTo({
-										url: '/page_components/wifilist/index?deviceId=' +this.deviceId + '&name=' +this.name
-									})
-								} else if (systemInfo.platform == 'ios') {
-									uni.hideLoading()
-									// 当前设备是 iOS  
-									uni.navigateTo({
-										url: '/page_fenbao/device/wifivideo?deviceId=' +this.deviceId + '&name=' +this.name
-									})
-								}
-							}else if(res.msg == '设备编号和mac不能同时为空'){
-								uni.hideLoading()
-								uni.showToast({
-									title: '未连接到设备，请查看蓝牙是否打开以及在设备范围内',
-									icon: 'none',
-									duration: 2000
-								});
-							} else {
-								uni.hideLoading()
-								uni.showToast({
-									title: res.msg,
-									icon: 'none',
-									duration: 2000
-								});
-								// uni.navigateBack()
-							}
-						})
-					}, 1000)
-				}else{
-					let name = ''
-					let index = this.name.indexOf('-');
-					if (index !== -1) {
-						name = this.name.slice(index + 1);
-					}
-					let data = {
-						storeId: this.storeId,
-						mac: this.mac
-					}
-					this.$u.put('/app/device/bind', data).then((res) => {
-						if (res.code == 200) {
-							uni.showToast({
-								title: '绑定成功',
-								icon: 'none',
-								duration: 2000
+				this.shibaiflag = false
+						this.bluetoothflag = true
+						// console.log(this.deviceId,'idididididdidii');
+						if(this.setMode == null){
+							xBlufi.initXBlufi(1)
+							xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
+							xBlufi.notifyStartDiscoverBle({
+								'isStart': true
 							})
-							uni.hideLoading();
-							uni.removeStorageSync('mac');
-							let systemInfo = uni.getSystemInfoSync();
-							if (systemInfo.platform == 'android') {
-								// 当前设备是 Android  
-								uni.navigateTo({
-									url: '/page_components/wifilist/index?deviceId=' +this.deviceId + '&name=' +this.name
+							
+							// 停止蓝牙搜索  
+							setTimeout(() => {
+								xBlufi.notifyStartDiscoverBle({
+									'isStart': false
 								})
-							} else if (systemInfo.platform == 'ios') {
-								// 当前设备是 iOS  
-								uni.navigateTo({
-									url: '/page_fenbao/device/wifivideo?deviceId=' +this.deviceId + '&name=' +this.name
+								xBlufi.notifyConnectBle({
+									isStart: true,
+									deviceId: this.deviceId,
+									name: this.name
 								})
+								xBlufi.notifyInitBleEsp32({
+									deviceId: this.deviceId
+								})
+								let name = ''
+								let index = this.name.indexOf('-');
+								if (index !== -1) {
+									name = this.name.slice(index + 1);
+								}
+								let data = {
+									storeId: this.storeId,
+									mac: this.mac
+								}
+								this.$u.put('/app/device/bind', data).then((res) => {
+									if (res.code == 200) {
+										uni.hideLoading();
+										this.shibaiflag = false
+										this.bluetoothflag = false
+										uni.removeStorageSync('mac');
+										let systemInfo = uni.getSystemInfoSync();
+										if (systemInfo.platform == 'android') {
+											// 当前设备是 Android  
+											uni.navigateTo({
+												url: '/page_components/wifilist/index?deviceId=' +this.deviceId + '&name=' +this.name
+											})
+										} else if (systemInfo.platform == 'ios') {
+											// 当前设备是 iOS  
+											uni.navigateTo({
+												url: '/page_fenbao/device/wifivideo?deviceId=' +this.deviceId + '&name=' +this.name
+											})
+										}
+									}else if(res.msg == '设备编号和mac不能同时为空'){
+										this.shibaiflag = true
+										this.bluetoothflag = false
+										// uni.showToast({
+										// 	title: '连接失败',
+										// 	icon: 'none',
+										// 	duration: 2000
+										// });
+									} else {
+										// uni.showToast({
+										// 	title: res.msg,
+										// 	icon: 'none',
+										// 	duration: 2000
+										// });
+										// uni.navigateBack()
+									}
+								})
+							}, 1000)
+						}else{
+							let name = ''
+							let index = this.name.indexOf('-');
+							if (index !== -1) {
+								name = this.name.slice(index + 1);
 							}
-						}else if(res.msg == '设备编号和mac不能同时为空'){
-								uni.showToast({
-									title: '未连接到设备，请查看蓝牙是否打开以及在设备范围内',
-									icon: 'none',
-									duration: 2000
-								});
-						} else {
-							uni.showToast({
-								title:res.msg,
-								icon: 'none',
-								duration: 2000
-							});
+							let data = {
+								storeId: this.storeId,
+								mac: this.mac
+							}
+							this.$u.put('/app/device/bind', data).then((res) => {
+								if (res.code == 200) {
+									// uni.showToast({
+									// 	title: '绑定成功',
+									// 	icon: 'none',
+									// 	duration: 2000
+									// })
+									this.shibaiflag = false
+									this.bluetoothflag = false
+									uni.hideLoading();
+									uni.removeStorageSync('mac');
+									let systemInfo = uni.getSystemInfoSync();
+									if (systemInfo.platform == 'android') { 
+										// 当前设备是 Android  
+										uni.navigateTo({
+											url: '/page_components/wifilist/index?deviceId=' +this.deviceId + '&name=' +this.name
+										})
+									} else if (systemInfo.platform == 'ios') {
+										// 当前设备是 iOS  
+										uni.navigateTo({
+											url: '/page_fenbao/device/wifivideo?deviceId=' +this.deviceId + '&name=' +this.name
+										})
+									}
+								}else {
+									if(res.msg == '设备编号和mac不能同时为空'){
+										    this.shibaiflag = true
+										    this.bluetoothflag = false
+										    uni.hideLoading()
+											// uni.showToast({
+											// 	title: '连接失败',
+											// 	icon: 'none',
+											// 	duration: 2000
+											// })
+									} else {
+										this.shibaiflag = true
+										this.bluetoothflag = false
+										uni.hideLoading()
+										uni.showToast({
+											title:res.msg,
+											icon: 'none',
+											duration: 2000
+										})
+										// uni.navigateBack()
+									}
+								}
+							})
 						}
-					})
-				}
-			},
+				},
 			
 			sremakes() {
 				if(this.wateringList.length == 0){
@@ -722,31 +770,31 @@
 						// console.log("文件读取中", options.data);
 						break;
 					case xBlufi.XBLUFI_TYPE.TYPE_RECIEVE_CUSTON_DATA:
-			
 						let ver_data =  this.parseCustomData(options.data) 
 						this.setMode = Math.floor(ver_data.setMode / 60)
-						console.log("1收到设备发来的自定义数据结果：", ver_data,this.setMode);
+						console.log("1收到设备发来的自定义数据结果：", ver_data,this.setMode)
 						break;
-			
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS:
 						if (options.result) {
 							let devicesarr = options.data
 							// console.log(devicesarr,'devicesarrdevicesarr');
 							devicesarr.forEach(device => {
-								const mac = device.name.substring(5);
+								const mac = device.name.substring(5)
 								if (device.name == this.qrResult) {
 									this.deviceId = device.deviceId
 									this.name = device.name
 									this.mac = device.name.slice(5, 17)
-									console.log(this.mac, 'macmacmac');
+									// console.log(this.mac, 'macmacmac');
+									// this.devicesList = uniqueDevicesList;
 								}
 							})
 						}
-						break; 
-			
+						break;
+
 					case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
 						// console.log("连接回调：" + JSON.stringify(options));
 						if (options.result) {
+							this.bluetoothflag = false
 							uni.hideLoading();
 							// uni.showToast({
 							// 	title: '连接成功',
@@ -757,18 +805,24 @@
 									"连接回调options.data.name：" + options.data.name);
 							}
 						} else {
-							// uni.hideLoading()
+							this.shibaiflag = true
+							this.bluetoothflag = false
+							uni.hideLoading()
 							// uni.showToast({
 							// 	title: '设备离线或不在范围内',
 							// 	icon: 'none',
 							// 	duration: 2000
 							// })
 						}
-			
+
 						break;
-			
+
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_START:
 						if (!options.result) {
+							setTimeout(()=>{
+								uni.hideLoading()
+								this.bluetoothflag = false
+							},3000)
 							console.log("蓝牙未开启", options);
 							// uni.showToast({
 							// 	title: '蓝牙未开启',
@@ -783,13 +837,13 @@
 							// 	searching: true
 							// });
 						}
-			
+
 						break;
-			
+
 					case xBlufi.XBLUFI_TYPE.TYPE_GET_DEVICE_LISTS_STOP:
 						if (options.result) {
 							let uniqueDevicesList = Array.from(new Set(this.devicesList));
-			
+
 							// 将去重后的数组重新赋值给 this.devicesList
 							this.devicesList = uniqueDevicesList;
 							let list = []
@@ -800,23 +854,27 @@
 									if (res.data == false) {
 										list.push(device)
 									} else {
-			
+
 									}
 								})
-			
+
 							});
 							setTimeout(() => {
 								this.devicesList = list
 							}, 200)
-			
+
 							console.log('蓝牙停止搜索ok');
 						} else {
 							//蓝牙停止搜索失败
 							console.log('蓝牙停止搜索失败');
 						}
-			
+						this.searching = false
+						// _this.setData({
+						// 	searching: false
+						// });
+
 						break;
-			
+
 				}
 			},
 			parseCustomData(data) {
@@ -852,6 +910,86 @@
 	/deep/ .u-icon__icon{
 		padding-bottom: 22rpx;
 	}
+	.bluetoothbox{
+		width: 100%;
+		height: 100vh;
+		background-color: #f4f1f6;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 99;
+		text-align: center;
+		.img{
+			margin-top: 400rpx;
+			width: 320rpx;
+			height: 320rpx;
+		}
+		.one{
+			font-size: 36rpx;
+			color: #000;
+			// margin-top: 80rpx;
+		}
+		.two{
+			margin-top: 30rpx;
+			font-size: 24rpx;
+			color: #ccc;
+		}
+		.thr{
+			margin-top: 30rpx;
+			font-size: 28rpx;
+			color: #ccc;
+		}
+		.anfour{
+			display: flex;
+			margin-top: 30rpx;
+			justify-content: space-between;
+			padding: 0 220rpx;
+			box-sizing: border-box;
+			.qx{
+				width: 100rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				border: 1px solid #3D3D3D;
+				border-radius: 10rpx;
+			}
+			.cx{
+				width: 200rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				background-color: #8883F0;
+				color: #fff;
+				border-radius: 10rpx;
+			}
+		}
+		.stop{
+			font-size: 36rpx;
+			color: #000;
+			margin-top: 380rpx;
+		}
+		.xtop{
+			margin-top: 30rpx;
+			font-size: 24rpx;
+			color: #ccc;
+		}
+		.xqx{
+			width: 530rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			// border: 1px solid #808080;
+			border-radius: 20rpx;
+			text-align: center;
+			background-color: #fff;
+			margin: auto;
+			margin-top: 200rpx;
+		}
+		image{
+			width: 500rpx;
+			height: 500rpx;
+			margin-top: 100rpx;
+		}
+	}
 	page {
 		background-color: #F7FAFE;
 	}
@@ -1064,6 +1202,7 @@
 		// flex-wrap: wrap;
 		// align-items: center;
 		margin-top: 40rpx;
+		margin-bottom: 30rpx;
 		.imgbox {
 			// width: 33%;
 			image {
diff --git a/page_components/wentdetail.vue b/page_components/wentdetail.vue
index 8fa35a5..7b57b85 100644
--- a/page_components/wentdetail.vue
+++ b/page_components/wentdetail.vue
@@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<u-navbar title="常见问题" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
+		<u-navbar :title="tit" :border-bottom="false" :background="bgc" title-color='#fff' back-icon-color="#fff" title-size='36'
 			height='50'></u-navbar>
         <view class="box">
         	<view class="title">
@@ -18,7 +18,8 @@
 		data() {
 			return {
                 type:'',
-				listobj:{}
+				listobj:{},
+				tit:''
 			}
 		},
 		onLoad(option) {
@@ -47,6 +48,7 @@
            	this.$u.get(`/app/article/licence/${this.type}`).then((res) => {
            		if (res.code == 200) {
            		    this.listobj = res.data
+					this.tit = res.data.title
            		}
            	})
            },
diff --git a/page_components/wifilist/index.vue b/page_components/wifilist/index.vue
index a18cec4..93a9181 100644
--- a/page_components/wifilist/index.vue
+++ b/page_components/wifilist/index.vue
@@ -22,22 +22,22 @@
 							<ul>
 								<li
 									v-if="(item.signalStrength < 1 ? (item.signalStrength * 100) : item.signalStrength) > 1 && (item.signalStrength < 1 ? (item.signalStrength * 100) : item.signalStrength) < 30">
-									<image src="https://api.ccttiot.com/smartmeter/img/static/uTvQ7JtgSsBsTY99SKrF"
+									<image src="https://api.ccttiot.com/smartmeter/img/static/ucHCSQoAToQAwajScBCs"
 										mode=""></image>
 								</li>
 								<li
 									v-if="(item.signalStrength < 1 ? (item.signalStrength * 100) : item.signalStrength) > 29 && (item.signalStrength < 1 ? (item.signalStrength * 100) : item.signalStrength) < 51">
-									<image src="https://api.ccttiot.com/smartmeter/img/static/uXM3mk2pJi73XeM9mVqG"
+									<image src="https://api.ccttiot.com/smartmeter/img/static/u99d7sacejXaGlsLedNx"
 										mode=""></image>
 								</li>
 								<li
 									v-if="(item.signalStrength < 1 ? (item.signalStrength * 100) : item.signalStrength) > 50 && (item.signalStrength < 1 ? (item.signalStrength * 100) : item.signalStrength) < 70">
-									<image src="https://api.ccttiot.com/smartmeter/img/static/uTTcLsrjxpw5asCMUZtR"
+									<image src="https://api.ccttiot.com/smartmeter/img/static/ueL5rF2AGWamJzGpLMU9"
 										mode=""></image>
 								</li>
 								<li
 									v-if="(item.signalStrength < 1 ? (item.signalStrength * 100) : item.signalStrength) > 69">
-									<image src="https://api.ccttiot.com/smartmeter/img/static/uOa0lsRfyLqH7CEYrgXx"
+									<image src="https://api.ccttiot.com/smartmeter/img/static/uCN5HZjWwMqVQkbccAxa"
 										mode=""></image>
 								</li>
 							</ul>
@@ -54,11 +54,88 @@
 				</view>
 			</view>
 			<view class="annius" style="display: flex;justify-content: space-between;">
-				<view class="" @click="btnsd">手动输入WiFi</view>
-				<view class="" @click="btnxyb">下一步</view>
+				<view class="" @click="btnsd">手动添加其他网络</view>
+				<!-- <view class="" @click="btnxyb">下一步</view> -->
 			</view>
 
 		</view>
+		
+		<!-- 蒙层 -->
+		<view class="mask" v-if="maskflag"></view>
+		<!-- 点击WiFi连接弹窗 -->
+		<view class="lianjie" v-if="maskflag">
+			<view class="wifitop">
+				连接网络
+			</view>
+			<view class="wifiname">
+				{{ssid}}
+			</view>
+			<view class="" v-if="passmm == true">
+				<input class="uni-input" v-model="password" type="text" placeholder="输入WiFi密码" />
+				<u-icon name="eye-fill" style="position: absolute;top: 184rpx;right: 60rpx;" @click="passmm = false"></u-icon>
+			</view>
+			<view class="" v-if="passmm == false">
+				<input class="uni-input" v-model="password" type="password" placeholder="输入WiFi密码" />
+				<u-icon name="eye-off" style="position: absolute;top: 184rpx;right: 60rpx;" @click="passmm = true"></u-icon>
+			</view>
+			 <view class="butlj">
+			 	<view class="btnljqx" @click="maskflag = false">
+			 		取消
+			 	</view>
+				<view class="btnljqx" @click="content_wf" :class="textwifi == '连接中...' ? actives : ''">
+					{{textwifi}}
+				</view>
+			 </view>
+		</view>
+		
+		<!-- 手动输入WiFi -->
+		<view class="mask" v-if="sdmaskflag"></view>
+		<!-- 点击WiFi连接弹窗 -->
+		<view class="lianjie" v-if="sdmaskflag">
+			<view class="wifitop">
+				手动添加
+			</view>
+			<input class="uni-input" v-model="ssid" type="text" placeholder="输入WiFi名称" />
+			<view class="" v-if="passmm == true">
+				<input class="uni-input" v-model="password" type="text" placeholder="输入WiFi密码" />
+				<u-icon name="eye-fill" style="position: absolute;top: 184rpx;right: 60rpx;" @click="passmm = false"></u-icon>
+			</view>
+			<view class="" v-if="passmm == false">
+				<input class="uni-input" v-model="password" type="password" placeholder="输入WiFi密码" />
+				<u-icon name="eye-off" style="position: absolute;top: 184rpx;right: 60rpx;" @click="passmm = true"></u-icon>
+			</view>
+			 <view class="butlj">
+			 	<view class="btnljqx" @click="sdmaskflag = false">
+			 		取消
+			 	</view>
+				<view   
+				  class="btnljqx"   
+				  @click="content_wf"   
+				  :class="{ 'actives': textwifi === '连接中...' }">  
+				  {{ textwifi }}  
+				</view>
+			 </view>
+		</view>
+		
+		<!-- 没有WiFi -->
+		<view class="bluetoothbox" v-if="list.length == 0">
+			 <image class="img" src="https://api.ccttiot.com/smartmeter/img/static/uZH5T5qPm6VjuJbGbCpj" mode=""></image>
+					 <view class="one">
+					 	发现网络失败
+					 </view>
+					 <view class="two">
+					 	请确保你的设备处于局域网范围内
+					 </view>
+					 <view class="anfour">
+					 	<view class="qx" @click="btnsd">
+		                  手动添加
+					 	</view>
+						<view class="cx" @click="btnwifi">
+						   重新发现
+						</view>
+					 </view>
+		</view>
+		
 
 	</view>
 </template>
@@ -72,6 +149,10 @@
 		// },nin
 		data() {
 			return {
+				passmm:false,
+				password:'',
+				sdmaskflag:false,
+				maskflag:false,
 				options: {},
 				optionsobj: {},
 				version: '2.0',
@@ -86,10 +167,7 @@
 				wifiList: "",
 				item: '',
 				textwb: '重新扫描',
-				list: [{
-					BSSID: '',
-					SSID: ''
-				}],
+				list: [],
 				picflag: false,
 				indexs: -1,
 				wififlag: true, //wifi列表flag
@@ -100,6 +178,7 @@
 				bgc: {
 					backgroundColor: "#8883f0",
 				},
+				textwifi:'连接'
 			};
 		},
 
@@ -190,18 +269,18 @@
 								});
 								// 去重
 								for (var i = 0; i < that.wifiList.length; i++) {
-									for (var j = i + 1; j < that.wifiList
-										.length; j++) {
-										if (that.wifiList[i].SSID == that.wifiList[j]
-											.SSID) {
+									for (var j = i + 1; j < that.wifiList.length; j++) {
+										if (that.wifiList[i].SSID == that.wifiList[j].SSID) {
 											that.wifiList.splice(j, 1);
 											j--
 										}
 									}
 								}
 								that.signalStrengthflag = true
-								that.list = that.wifiList
-								console.log(that.list, '1010'); //在这里提取列表数据
+								that.list = that.wifiList.filter(item => {  
+								    return item.SSID !== '' 
+								})
+								// console.log(that.list, '1010'); //在这里提取列表数据
 							});
 						},
 						fail: function(err) {
@@ -289,8 +368,9 @@
 			
 			// 点击判断索引是否相同显示图片
 			btnqhwifi(index, item) {
-				this.indexs = index
+				// this.indexs = index
 				this.ssid = item.SSID
+				this.maskflag = true
 			},
 			// 点击进行下一步
 			btnxyb() {
@@ -309,16 +389,17 @@
 				}
 			},
 			btnsd() {
+				this.sdmaskflag = true
 				this.ssid = ''
-				uni.navigateTo({
-					url: '/page_user/wifijoint/index?objlist=' + JSON.stringify(this.objlist) + '&ssid=' + JSON.stringify(this.ssid)
-				})
+				// uni.navigateTo({
+				// 	url: '/page_user/wifijoint/index?objlist=' + JSON.stringify(this.objlist) + '&ssid=' + JSON.stringify(this.ssid)
+				// })
 			},
 			
 			
 			// 点击连接操作
 			content_wf() {
-				if (!this.name) {
+				if (!this.ssid) {
 					uni.showToast({
 						title: 'SSID不能为空',
 						icon: 'none'
@@ -332,12 +413,13 @@
 					});
 					return;
 				}
-				uni.showLoading({
-					title: '正在配网',
-					mask: true
-				})
+				// uni.showLoading({
+				// 	title: '正在配网',
+				// 	mask: true
+				// })
+				this.textwifi = '连接中...'
 			    xBlufi.notifySendCustomData({
-			          customData: "ssid@" + this.name + "pass@" + this.password
+			          customData: "ssid@" + this.ssid + "pass@" + this.password
 			     })
 				// xBlufi.notifySendCustomData({
 				// 	customData: "ssid@" + this.name
@@ -355,31 +437,33 @@
 			funListenDeviceMsgEvent: function(options) {
 				let that = this;
 				switch (options.type) {
-					case xBlufi.XBLUFI_TYPE.TYPE_STATUS_CONNECTED: {
-						console.log('状态', options.result)
-						uni.showModal({
-							title: '很抱歉提醒你！',
-							content: '蓝牙异常断开，请重新连接…', 
-							showCancel: false,
-							success: function(res) {
-								uni.navigateTo({
-									url:'/pages/index/index'
-								})
-							}
-						});
-						this.statusflag = false
-						uni.hideLoading();
-					}
-					break;
+					// case xBlufi.XBLUFI_TYPE.TYPE_STATUS_CONNECTED: {
+					// 	console.log('状态', options.result)
+					// 	this.textwifi = '连接'
+					// 	uni.showModal({
+					// 		title: '很抱歉提醒你！',
+					// 		content: '蓝牙异常断开，请重新连接…', 
+					// 		showCancel: false,
+					// 		success: function(res) {
+					// 			uni.switchTab({
+					// 				url:'/pages/index/index'
+					// 			})
+					// 		}
+					// 	});
+					// 	this.statusflag = false
+					// 	uni.hideLoading();
+					// }
+					// break;
 			
 					case xBlufi.XBLUFI_TYPE.TYPE_CONNECT_ROUTER_RESULT:
 						uni.hideLoading();
 						if (!options.result)
+						    this.textwifi = '连接',
 							this.statusflag = false,
 							uni.hideLoading(),
 							uni.showModal({
 								title: '温馨提示',
-								content: '配网失败，请重试',
+								content: '配网失败，请选择2.4GWiFi连接并确保密码正确',
 								showCancel: false //是否显示取消按钮
 							});
 						else {
@@ -387,6 +471,7 @@
 								let ssid = options.data.ssid;
 								this.statusflag = false
 								uni.hideLoading();
+								this.textwifi = '连接'
 								uni.showModal({
 									title: '温馨提示',
 									content: `连接成功`,
@@ -430,13 +515,13 @@
 							console.log('初始化失败');
 							uni.showModal({
 								title: '温馨提示',
-								content: `设备初始化失败`,
+								content: `设备初始化失败,请重新连接`,
 								showCancel: false,
 								//是否显示取消按钮
 								success: function(res) {
-									// uni.redirectTo({
-									// 	url: '../search/search'
-									// });
+									uni.switchTab({
+										url:'/pages/index/index'
+									})
 								}
 							});
 						}
@@ -476,10 +561,101 @@
 </script>
 
 <style lang="less">
+	.bluetoothbox{
+		width: 100%;
+		height: 100vh;
+		background-color: #f4f1f6;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 98;
+		text-align: center;
+		.img{
+			margin-top: 400rpx;
+		}
+		.one{
+			font-size: 36rpx;
+			color: #000;
+			// margin-top: 80rpx;
+		}
+		.two{
+			margin-top: 30rpx;
+			font-size: 24rpx;
+			color: #ccc;
+		}
+		.thr{
+			margin-top: 30rpx;
+			font-size: 28rpx;
+			color: #ccc;
+		}
+		.anfour{
+			display: flex;
+			margin-top: 30rpx;
+			justify-content: space-between;
+			padding: 0 160rpx;
+			box-sizing: border-box;
+			.qx{
+				width: 200rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				border: 1px solid #3D3D3D;
+				border-radius: 10rpx;
+			}
+			.cx{
+				width: 200rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				background-color: #8883F0;
+				color: #fff;
+				border-radius: 10rpx;
+			}
+		}
+		.stop{
+			font-size: 36rpx;
+			color: #000;
+			margin-top: 380rpx;
+		}
+		.xtop{
+			margin-top: 30rpx;
+			font-size: 24rpx;
+			color: #ccc;
+		}
+		.xqx{
+			width: 530rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			// border: 1px solid #808080;
+			border-radius: 20rpx;
+			text-align: center;
+			background-color: #fff;
+			margin: auto;
+			margin-top: 200rpx;
+		}
+		image{
+			width: 320rpx;
+			height: 320rpx;
+			margin-top: 100rpx;
+		}
+	}
+	.actives{
+		opacity: .5 !important;
+	}
 	//wifi信号强度显示 
 	.wifiactive {
 		background-color: limegreen !important;
 	}
+	.mask{
+		width: 100%;
+		height: 100vh;
+		background-color: #000;
+		opacity: .3;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 99;
+	}
 
 	* {
 		margin: 0;
@@ -505,7 +681,7 @@
 			display: inline-block;
 			margin-top: 10rpx;
 			width: 50rpx;
-			height: 42rpx;
+			height: 52rpx;
 		}
 	}
     .annius{
@@ -519,13 +695,13 @@
 		font-size: 38rpx;
 		width: 90%;
 		view{
-			color: #FFFFFF;
 			height: 96rpx;
 			border-radius: 30rpx;
 			line-height: 96rpx;
 			box-sizing: border-box;
-			width: 44%;
-			background-color: #8883F0 !important;
+			width: 100%;
+			// background-color: #8883F0 !important;
+			color: #8883F0;
 			text-align: center;
 		}
 	}
@@ -533,7 +709,47 @@
 
 
 
-
+     .lianjie{
+			width: 520rpx;
+			height: 320rpx;
+			background-color: #fff;
+			border-radius: 30rpx;
+			position: fixed;
+			top: 30%;
+			left: 50%;
+			transform: translateX(-50%);
+			z-index: 99;
+			padding: 30rpx;
+			box-sizing: border-box;
+			.wifitop{
+				font-size: 32rpx;
+			}
+			.wifiname{
+				font-size: 30rpx;
+				color: #ccc;
+				margin-top: 30rpx;
+			}
+			input{
+				width: 79%;
+				margin-top: 30rpx;
+				color: #000;
+				font-size: 30rpx;
+				margin-left: 30rpx;
+			}
+			.butlj{
+                display: flex;
+				justify-content: space-between;
+				text-align: center;
+				box-sizing: border-box;
+				margin-top: 30rpx;
+				.btnljqx{
+					font-size: 32rpx;
+					color: #8883F0;
+					width: 100%;
+					text-align: center;
+				}				
+ 			}
+	 }
 	// 点击关闭弹出弹窗提示
 	.tanctitle {
 		width: 500rpx;
diff --git a/page_user/sbdetail.vue b/page_user/sbdetail.vue
index ee7d912..dab9490 100644
--- a/page_user/sbdetail.vue
+++ b/page_user/sbdetail.vue
@@ -165,6 +165,44 @@
 		 </view>
 		 <view class="mask" v-if="vipflag"></view>
 		 
+		 
+		 <!-- 蓝牙连接 -->
+		 <view class="bluetoothbox" v-if="bluetoothflag">
+		 	<view class="stop">
+		 		正在连接该设备蓝牙
+		 	</view>
+			<view class="xtop">
+				请将手机与设备尽量靠近
+			</view>
+			<image src="https://api.ccttiot.com/smartmeter/img/static/ucDphMKsozqwwllJTAKL" mode=""></image>
+			<!-- <view class="xqx" @click="bluetoothflag = false">
+				取消连接
+			</view> -->
+		 </view>
+		 
+		 <!-- 蓝牙连接失败 -->
+		 <view class="bluetoothbox" v-if="shibaiflag">
+		 	 <image class="img" src="https://api.ccttiot.com/smartmeter/img/static/uTb3vSlbcHdPMFQMBjyL" mode=""></image>
+			 <view class="one">
+			 	蓝牙连接失败
+			 </view>
+			 <view class="two">
+			 	请确保手机足够靠近设备
+			 </view>
+			 <view class="thr">
+			 	并且设备处于上电状态
+			 </view>
+			 <view class="anfour">
+			 	<view class="qx" @click="btnlyqx">
+                    取消
+			 	</view>
+				<view class="cx" @click="topage(5)">
+				   重新连接
+				</view>
+			 </view>
+		 </view>
+		 
+		 
 	</view>
 </template>
 
@@ -179,6 +217,8 @@
 		},
 		data() {
 			return {
+				bluetoothflag:false,
+				shibaiflag:false,
 				bgc: {
 					backgroundColor: "#8883f0",
 				},
@@ -215,7 +255,7 @@
 				vipflag:false,
 				cztime:'',
 				opflag:true,
-				timer: null
+				timer: null,
 			}
 		},
 		onLoad(option) {
@@ -325,6 +365,10 @@
 		// 	})
 		// },
 		methods: {
+			btnlyqx(){
+				this.shibaiflag = false
+				this.bluetoothflag = false
+			},
 			// 开启和关闭
 			btnkq(){
 				if(this.tdtxt == '开启'){
@@ -635,12 +679,14 @@
 						url: '/page_user/setting?id=' + this.id
 					})
 				} else if (num == 5) {
-					uni.showLoading({
-						title: '蓝牙连接中...'
-					})
+					// uni.showLoading({
+					// 	title: '蓝牙连接中...'
+					// })
+					this.shibaiflag = false
+					this.bluetoothflag = true
 					// console.log(this.deviceId,'idididididdidii');
-					if(this.deviceId == ''){
-						xBlufi.initXBlufi(1);
+					if(this.setMode == null){
+						xBlufi.initXBlufi(1)
 						xBlufi.listenDeviceMsgEvent(true, this.funListenDeviceMsgEvent);
 						xBlufi.notifyStartDiscoverBle({
 							'isStart': true
@@ -670,12 +716,9 @@
 							}
 							this.$u.put('/app/device/bind', data).then((res) => {
 								if (res.code == 200) {
-									// uni.showToast({
-									// 	title: '绑定成功',
-									// 	icon: 'success',
-									// 	duration: 2000
-									// })
 									uni.hideLoading();
+									this.shibaiflag = false
+									this.bluetoothflag = false
 									uni.removeStorageSync('mac');
 									let systemInfo = uni.getSystemInfoSync();
 									if (systemInfo.platform == 'android') {
@@ -690,11 +733,13 @@
 										})
 									}
 								}else if(res.msg == '设备编号和mac不能同时为空'){
-									uni.showToast({
-										title: '未找到设备',
-										icon: 'none',
-										duration: 2000
-									});
+									this.shibaiflag = true
+									this.bluetoothflag = false
+									// uni.showToast({
+									// 	title: '连接失败',
+									// 	icon: 'none',
+									// 	duration: 2000
+									// });
 								} else {
 									// uni.showToast({
 									// 	title: res.msg,
@@ -722,6 +767,8 @@
 								// 	icon: 'none',
 								// 	duration: 2000
 								// })
+								this.shibaiflag = false
+								this.bluetoothflag = false
 								uni.hideLoading();
 								uni.removeStorageSync('mac');
 								let systemInfo = uni.getSystemInfoSync();
@@ -738,13 +785,17 @@
 								}
 							}else {
 								if(res.msg == '设备编号和mac不能同时为空'){
+									    this.shibaiflag = true
+									    this.bluetoothflag = false
 									    uni.hideLoading()
-										uni.showToast({
-											title: '未找到设备',
-											icon: 'none',
-											duration: 2000
-										})
+										// uni.showToast({
+										// 	title: '连接失败',
+										// 	icon: 'none',
+										// 	duration: 2000
+										// })
 								} else {
+									this.shibaiflag = true
+									this.bluetoothflag = false
 									uni.hideLoading()
 									uni.showToast({
 										title:res.msg,
@@ -852,6 +903,7 @@
 					case xBlufi.XBLUFI_TYPE.TYPE_CONNECTED:
 						// console.log("连接回调：" + JSON.stringify(options));
 						if (options.result) {
+							this.bluetoothflag = false
 							uni.hideLoading();
 							// uni.showToast({
 							// 	title: '连接成功',
@@ -862,6 +914,8 @@
 									"连接回调options.data.name：" + options.data.name);
 							}
 						} else {
+							this.shibaiflag = true
+							this.bluetoothflag = false
 							uni.hideLoading()
 							// uni.showToast({
 							// 	title: '设备离线或不在范围内',
@@ -876,6 +930,7 @@
 						if (!options.result) {
 							setTimeout(()=>{
 								uni.hideLoading()
+								this.bluetoothflag = false
 							},3000)
 							console.log("蓝牙未开启", options);
 							// uni.showToast({
@@ -959,6 +1014,86 @@
 </script>
 
 <style lang="scss">
+	.bluetoothbox{
+		width: 100%;
+		height: 100vh;
+		background-color: #f4f1f6;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 99;
+		text-align: center;
+		.img{
+			margin-top: 400rpx;
+			width: 320rpx;
+			height: 320rpx;
+		}
+		.one{
+			font-size: 36rpx;
+			color: #000;
+			// margin-top: 80rpx;
+		}
+		.two{
+			margin-top: 30rpx;
+			font-size: 24rpx;
+			color: #ccc;
+		}
+		.thr{
+			margin-top: 30rpx;
+			font-size: 28rpx;
+			color: #ccc;
+		}
+		.anfour{
+			display: flex;
+			margin-top: 30rpx;
+			justify-content: space-between;
+			padding: 0 220rpx;
+			box-sizing: border-box;
+			.qx{
+				width: 100rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				border: 1px solid #3D3D3D;
+				border-radius: 10rpx;
+			}
+			.cx{
+				width: 200rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				background-color: #8883F0;
+				color: #fff;
+				border-radius: 10rpx;
+			}
+		}
+		.stop{
+			font-size: 36rpx;
+			color: #000;
+			margin-top: 380rpx;
+		}
+		.xtop{
+			margin-top: 30rpx;
+			font-size: 24rpx;
+			color: #ccc;
+		}
+		.xqx{
+			width: 530rpx;
+			height: 90rpx;
+			line-height: 90rpx;
+			// border: 1px solid #808080;
+			border-radius: 20rpx;
+			text-align: center;
+			background-color: #fff;
+			margin: auto;
+			margin-top: 200rpx;
+		}
+		image{
+			width: 500rpx;
+			height: 500rpx;
+			margin-top: 100rpx;
+		}
+	}
 	/deep/ .u-title {
 		padding-bottom: 22rpx;
 	}
diff --git a/pages.json b/pages.json
index b49ca90..c88751b 100644
--- a/pages.json
+++ b/pages.json
@@ -17,10 +17,11 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "我的",
-				"enablePullDownRefresh": false,
+				"enablePullDownRefresh": true,
 				"navigationBarBackgroundColor": "#3996FD",
 				"navigationBarTextStyle": "#FFFFFF",
 				"navigationStyle": "custom"
+				
 			}
 		},
 		{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7e74de6..bcd9131 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -52,7 +52,7 @@
 
 					</view>
 					<view class="tit">
-						店铺管理
+						<!-- 店铺管理 -->
 					</view>
 					<view class="txt" @click="tosetpage()">
 						管理
@@ -114,7 +114,7 @@
 										未分配店铺
 									</view>
 									<view v-else :class="item.onlineStatus == 0 ? 'activewzgl' : ''" style="color: #95989D;margin-top: 20rpx;" @click="todetail(item.deviceId)">
-									   归属店铺:	{{item.storeName == null ? '--' : item.storeName}} |  <text v-if="item.onlineStatus == 1" style="margin-left: 10rpx;">在线</text> <text v-else>离线</text>
+									   归属店铺:	{{item.storeName == null ? '--' : item.storeName}}  <text v-if="item.onlineStatus == 0" style="margin-left: 10rpx;">| 离线</text> 
 									</view>
 								</view>
 								<view class="card_right" @click="todetail(item.deviceId)">
@@ -145,6 +145,8 @@
 			</view>
 			<view class="tip">需要添加设备后方可使用</view>
 		</view> -->
+		
+		<image v-if="curtitidx == 0" class="saoyisao" @click="saoyisao" src="https://api.ccttiot.com/smartmeter/img/static/u165t8tHqFQxSg0lrt1P" mode=""></image>
 
 		<tab-bar :indexs='0'></tab-bar>
 
@@ -218,6 +220,16 @@
 		onLoad() {
 
 		},
+		onPullDownRefresh() {  
+			   this.pagenum = 1
+		        // 执行数据加载  
+		        this.getlist() 
+		  
+		        // 设置一个定时器，2秒后停止下拉刷新动画  
+		        setTimeout(() => {  
+		            uni.stopPullDownRefresh();  
+		        }, 500); // 停止下拉刷新  
+		    },
 		onShow() {
 			this.gettanc()
 			this.pagenum = 1
@@ -278,6 +290,82 @@
 		    }  
 		  },
 		methods: {
+			// 扫一扫绑定设备
+			saoyisao(){
+				uni.scanCode({
+					onlyFromCamera: true,
+					scanType: ['qrCode'],
+					success: res => {
+						function getQueryParam(url, paramName) {
+							let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
+							let results = regex.exec(url);
+							return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
+						}
+						let sceneValue = res.result
+						let decodedValue = decodeURIComponent(sceneValue)
+						let id = getQueryParam(decodedValue, 's')
+						// console.log(res, id)
+						let that = this
+						let data = {
+							deviceNo: id
+						}
+						that.$u.get(`/app/device/isBind?deviceNo=${id}`).then(res => {
+							if (res.data == 2) {
+								that.$u.get(`/app/device/${id}/withSuitList`).then((res) => {
+									if (res.code == 200) {
+										uni.navigateTo({
+											url: '/page_components/fuwu/index?id=' + id
+										})
+									} 
+								})
+							} else if (res.data == 1) {
+								uni.showModal({
+									title: '提示',
+									content: '该设备未绑定,你需进行绑定吗？',
+									success: function(res) {
+										if (res.confirm) {
+											that.$u.put("/app/device/bind", data).then(res => {
+												if(res.code == 200){
+													that.$u.get(`/app/device/${id}/bySn`).then((res) => {
+														if (res.code == 200) {
+															uni.navigateTo({
+																url: '/page_components/bindsz?id=' + res.data.deviceId
+															})
+														} 
+													})
+												}
+											})
+										} else if (res.cancel) {
+				
+										}
+									}
+								})
+							} else if (res.data == 0) {
+								uni.showModal({
+									title: '提示',
+									content: '该设备未录入,你需进行录入吗？',
+									success: function(res) {
+										if (res.confirm) {
+											uni.navigateTo({
+												url: '/page_fenbao/zhuce?sn=' + id
+											})
+										} else if (res.cancel) {
+				
+										}
+									}
+								})
+							}
+						})
+					},
+					fail: err => {
+						console.error('扫描失败：', err)
+						uni.showToast({
+							title: '扫描失败',
+							icon: 'none'
+						})
+					}
+				})
+			},
 			
 			// 获取店铺
 			sremakes(item) {
@@ -794,9 +882,9 @@
 				})
 			},
 			swiperchange(e) {
-				uni.showLoading({
-					title: '加载中...'
-				});
+				// uni.showLoading({
+				// 	title: '加载中...'
+				// });
 				// this.wateringList = []
 				this.pagenum = 1
 				this.curtitidx = e.detail.current
@@ -857,6 +945,14 @@
 </script>
 
 <style lang="scss">
+	.saoyisao{
+		width: 90rpx;
+		height: 90rpx;
+		position: fixed;
+		bottom: 240rpx;
+		right: 60rpx;
+		z-index: 99;
+	}
 	.title {
 		padding-left: 32rpx;
 		font-size: 40rpx;
diff --git a/pages/my.vue b/pages/my.vue
index bf598ea..a39316f 100644
--- a/pages/my.vue
+++ b/pages/my.vue
@@ -5,9 +5,9 @@
 			id="navbar">
 		</u-navbar>
 
-		<view class="fdpage" style="padding-bottom: 200rpx;">
+		<view class="fdpage">
 			<view class="top_box">
-				<view class="userinfo">
+				<view class="userinfo"  @click="topage(5)">
 					<view class="info">
 						<view class="username">
 							{{userinfo.nickName == null ? '' : userinfo.nickName}}
@@ -16,6 +16,12 @@
 							共{{userinfo.storeCount == null ? 0 : userinfo.storeCount}}间店铺
 						</view>
 					</view>
+					<view class="">
+						<!-- <view class="botcard" @click="topage(5)">
+							<image src="https://api.ccttiot.com/smartmeter/img/static/uYWpW30vIQ6M4svb7Vnb"></image>
+							<view class="txt">设置</view>
+						</view> -->
+					</view>
 				</view>
 				<!-- <view class="tit">
 					我的钱包
@@ -59,6 +65,10 @@
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uYOquvGtfb1sm5F60NgJ" mode=""></image>
 					<view class="txt">提交申请后可创建店铺</view>
 				</view>
+				<view class="botcard" @click="btnguanli">
+					<image src="https://api.ccttiot.com/smartmeter/img/static/umjPUc8nDKf1JwVqRAeb" mode=""></image>
+					<view class="txt">套餐管理</view>
+				</view>
 				<view class="botcard" @click="topage(1)">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/ujXfMLJmerXRSRGZfGFV" mode=""></image>
 					<view class="txt">订单记录</view>
@@ -79,14 +89,11 @@
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uCtxeWyTyH2DHQZaRv5Q" mode=""></image>
 					<view class="txt">秘钥管理</view>
 				</view> -->
-				<view class="botcard" @click="btnguanli">
-					<image src="https://api.ccttiot.com/smartmeter/img/static/umjPUc8nDKf1JwVqRAeb" mode=""></image>
-					<view class="txt">套餐管理</view>
-				</view>
-				<view class="botcard" @click="topage(5)">
+			
+				<!-- <view class="botcard" @click="topage(5)">
 					<image src="https://api.ccttiot.com/smartmeter/img/static/uYWpW30vIQ6M4svb7Vnb"></image>
 					<view class="txt">设置</view>
-				</view>
+				</view> -->
 				
 				<!-- <view class="botcard" style="padding-left: 220rpx;font-size: 40rpx;font-weight: 600;" @click="btntc">
 					切换用户端
@@ -336,6 +343,29 @@ page{
 		}
 			
 	}
+	.botcard{
+		// margin-bottom: 32rpx;
+		display: flex;
+		align-items: center;
+		padding-left: 12rpx;
+		width: 190rpx;
+		height: 66rpx;
+		background: #FFFFFF;
+		border-radius: 30rpx;
+		box-shadow: 0rpx 16rpx 40rpx 0rpx rgba(42,130,228,0.1);
+		image{
+			width: 52rpx;
+			height: 52rpx;
+			margin-right: 32rpx
+			;
+		}
+		.txt{
+			font-size: 30rpx;
+			font-family: Source Han Sans, Source Han Sans;
+			font-weight: 400;
+			color: #383838;
+		}
+	}
 	.fdpage{
 		.top_box{
 			padding-top: 40rpx;
@@ -344,9 +374,12 @@ page{
 			background-color: #8883F0;
 			.userinfo{
 				margin-left: 56rpx;
+				padding-right: 56rpx;
+				box-sizing: border-box;
 				display: flex;
 				flex-wrap: nowrap;
 				align-content: flex-start;
+				justify-content: space-between;
 				.img{
 					width: 100rpx;
 					height: 100rpx;
diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue
index ae2e2f6..6337269 100644
--- a/pages/shouye/index.vue
+++ b/pages/shouye/index.vue
@@ -125,7 +125,9 @@
 				},
 				deviceobj: {},
 				deviceCount: 0,
-				sylist: []
+				sylist: [],
+				networkInterval:null,
+				wangluo:true
 			};
 		},
 		onLoad(option) {
@@ -199,6 +201,7 @@
 			}
 		},
 		onShow() {
+			
 			this.logins()
 			this.getad()
 			this.gethuidaio()
@@ -214,8 +217,32 @@
 				clearInterval(this.mapScaleInterval)
 				this.mapScaleInterval = null
 			}
+			// 检测网络状态
+			if (this.networkInterval) {
+			  clearInterval(this.networkInterval);  
+			  this.networkInterval = null;  
+			}  
 		},
+
 		methods: {
+          startNetworkCheck() {  
+                this.networkInterval = setInterval(() => {  
+                  uni.getNetworkType({  
+                    success: (res) => {  
+                      // console.log(res);  
+                      if (res.networkType == "none") {  
+                          this.wangluo = false
+                      } else {  
+                          this.wangluo = true
+                      }  
+                    },  
+                    fail: (err) => {  
+                      console.error('获取网络类型失败', err);  
+                    }  
+                  });  
+                }, 3000);  
+              },
+
 			// 请求正在使用的设备列表
 			getshiy() {
 				this.$u.get("/app/device/usingDevice").then((res) => {
@@ -269,80 +296,95 @@
 			},
 
 			scanQRCode() {
-				uni.scanCode({
-					onlyFromCamera: true,
-					scanType: ['qrCode'],
-					success: res => {
-						function getQueryParam(url, paramName) {
-							let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
-							let results = regex.exec(url);
-							return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
-						}
-						let sceneValue = res.result
-						let decodedValue = decodeURIComponent(sceneValue)
-						let id = getQueryParam(decodedValue, 's')
-						// console.log(res, id)
-						let that = this
-						let data = {
-							deviceNo: id
-						}
-						that.$u.get(`/app/device/isBind?deviceNo=${id}`).then(res => {
-							if (res.data == 2) {
-								that.$u.get(`/app/device/${id}/withSuitList`).then((res) => {
-									if (res.code == 200) {
-										uni.navigateTo({
-											url: '/page_components/fuwu/index?id=' + id
-										})
-									} 
-								})
-							} else if (res.data == 1) {
-								uni.showModal({
-									title: '提示',
-									content: '该设备未绑定,你需进行绑定吗？',
-									success: function(res) {
-										if (res.confirm) {
-											that.$u.put("/app/device/bind", data).then(res => {
-												if(res.code == 200){
-													that.$u.get(`/app/device/${id}/bySn`).then((res) => {
-														if (res.code == 200) {
-															uni.navigateTo({
-																url: '/page_components/bindsz?id=' + res.data.deviceId
-															})
-														} 
-													})
-												}
-											})
-										} else if (res.cancel) {
-
-										}
-									}
-								})
-							} else if (res.data == 0) {
-								uni.showModal({
-									title: '提示',
-									content: '该设备未录入,你需进行录入吗？',
-									success: function(res) {
-										if (res.confirm) {
-											uni.navigateTo({
-												url: '/page_fenbao/zhuce?sn=' + id
-											})
-										} else if (res.cancel) {
-
-										}
-									}
-								})
-							}
-						})
-					},
-					fail: err => {
-						console.error('扫描失败：', err)
-						uni.showToast({
-							title: '扫描失败',
-							icon: 'none'
-						})
-					}
-				})
+                  if(this.wangluo == true){
+					  uni.scanCode({
+					  	onlyFromCamera: true,
+					  	scanType: ['qrCode'],
+					  	success: res => {
+					  		function getQueryParam(url, paramName) {
+					  			let regex = new RegExp(`[?&]${paramName}=([^&]*)`)
+					  			let results = regex.exec(url);
+					  			return results ? decodeURIComponent(results[1].replace(/\+/g, ' ')) : null
+					  		}
+					  		let sceneValue = res.result
+					  		let decodedValue = decodeURIComponent(sceneValue)
+					  		let id = getQueryParam(decodedValue, 's')
+					  		// console.log(res, id)
+					  		let that = this
+					  		let data = {
+					  			deviceNo: id
+					  		}
+					  		that.$u.get(`/app/device/isBind?deviceNo=${id}`).then(res => {
+					  			if (res.data == 2) {
+					  				that.$u.get(`/app/device/${id}/withSuitList`).then((res) => {
+					  					if (res.code == 200) {
+					  						uni.navigateTo({
+					  							url: '/page_components/fuwu/index?id=' + id
+					  						})
+					  					} 
+					  				})
+					  			} else if (res.data == 1) {
+					  				uni.showModal({
+					  					title: '提示',
+					  					content: '该设备未绑定,你需进行绑定吗？',
+					  					success: function(res) {
+					  						if (res.confirm) {
+					  							that.$u.put("/app/device/bind", data).then(res => {
+					  								if(res.code == 200){
+					  									that.$u.get(`/app/device/${id}/bySn`).then((res) => {
+					  										if (res.code == 200) {
+					  											uni.navigateTo({
+					  												url: '/page_components/bindsz?id=' + res.data.deviceId
+					  											})
+					  										} 
+					  									})
+					  								}
+					  							})
+					  						} else if (res.cancel) {
+					  
+					  						}
+					  					}
+					  				})
+					  			} else if (res.data == 0) {
+					  				uni.showModal({
+					  					title: '提示',
+					  					content: '该设备未录入,你需进行录入吗？',
+					  					success: function(res) {
+					  						if (res.confirm) {
+					  							uni.navigateTo({
+					  								url: '/page_fenbao/zhuce?sn=' + id
+					  							})
+					  						} else if (res.cancel) {
+					  
+					  						}
+					  					}
+					  				})
+					  			}
+					  		})
+					  	},
+					  	fail: err => {
+					  		console.error('扫描失败：', err)
+					  		uni.showToast({
+					  			title: '扫描失败',
+					  			icon: 'none'
+					  		})
+					  	}
+					  })
+				  }else{
+					  uni.showModal({
+					  	title: '提示',
+					  	content: '请打开网络再进行操作',
+					  	success: function(res) {
+					  		if (res.confirm) {
+					  			
+					  		} else if (res.cancel) { 
+					  
+					  		}
+					  	}
+					  })
+				  }
 			},
+			
 			getad() {
 				this.$u.get("/app/ad").then((res) => {
 					if (res.code == 200) {
@@ -353,34 +395,48 @@
 
 
 			btnindex(num) {
-				if (num == 2) {
-					uni.navigateTo({
-						url: '/page_fenbao/statulist/question/index'
-					})
-				} else if (num == 3) {
-					uni.navigateTo({
-						url: '/page_fenbao/statulist/about/index'
-					})
-				} else if (num == 1) {
-					uni.navigateTo({
-						url: '/page_fenbao/statulist/myorder/index'
-					})
-				} else if (num == 4) {
-					uni.navigateTo({
-						url: '/page_fenbao/statulist/merchant/index'
-					})
-				} else if (num == 5) {
-					uni.navigateTo({
-						url: '/page_fenbao/statulist/nearby/index'
-					})
-				} else if (num == 6) {
-					uni.switchTab({
-						url: '/pages/index/index'
-					})
-				} else if (num == 7) {
-					uni.navigateTo({
-						url: '/page_fenbao/statulist/fault/yichang/index'
+				if(this.wangluo = false){ //判断是否有网络在进行点击
+					uni.showModal({
+						title: '提示',
+						content: '请打开网络再进行操作',
+						success: function(res) {
+							if (res.confirm) {
+								
+							} else if (res.cancel) {
+					
+							}
+						}
 					})
+				}else{
+					if (num == 2) {
+						uni.navigateTo({
+							url: '/page_fenbao/statulist/question/index'
+						})
+					} else if (num == 3) {
+						uni.navigateTo({
+							url: '/page_fenbao/statulist/about/index'
+						})
+					} else if (num == 1) {
+						uni.navigateTo({
+							url: '/page_fenbao/statulist/myorder/index'
+						})
+					} else if (num == 4) {
+						uni.navigateTo({
+							url: '/page_fenbao/statulist/merchant/index'
+						})
+					} else if (num == 5) {
+						uni.navigateTo({
+							url: '/page_fenbao/statulist/nearby/index'
+						})
+					} else if (num == 6) {
+						uni.switchTab({
+							url: '/pages/index/index'
+						})
+					} else if (num == 7) {
+						uni.navigateTo({
+							url: '/page_fenbao/statulist/fault/yichang/index'
+						})
+					}
 				}
 			},
 
@@ -628,6 +684,7 @@
 		},
 		mounted() {
 			this.getMyLocation(); // 获取并设置自身位置的覆盖物  
+			this.startNetworkCheck(); //检测网络
 		}
 	};
 </script>