diff --git a/app.js b/app.js
index 50d19d1..b4b540d 100644
--- a/app.js
+++ b/app.js
@@ -16,6 +16,8 @@ App({
 			activeProtocol: null,
 			domain1: "http://device.shuziweidao.com:80/gateway", // 老版本 没有鉴权
 			domain2: "http://device.shuziweidao.com:80/weight", // 新版本 有鉴权
+			// domain1: "http://192.168.1.207:8889", // 老版本 没有鉴权
+			// domain2: "http://192.168.1.207:8889/weight", // 新版本 有鉴权
 			wifi: {
 				ssid: "",
 				password: ""
diff --git a/components/configureDevice_2/configureDevice_2.js b/components/configureDevice_2/configureDevice_2.js
index 1e8c570..8d545a0 100644
--- a/components/configureDevice_2/configureDevice_2.js
+++ b/components/configureDevice_2/configureDevice_2.js
@@ -101,7 +101,7 @@ Component({
         },
 
         addUser() {
-            if (this.data.userList.length >= 10) {
+            if (this.data.userList.length >= 5) {
                 wx.showToast({ 
 					title: "超过最大用户数", 
 					icon: "none"
diff --git a/components/configureDevice_3/configureDevice_3.wxml b/components/configureDevice_3/configureDevice_3.wxml
index 568429c..4d839ff 100644
--- a/components/configureDevice_3/configureDevice_3.wxml
+++ b/components/configureDevice_3/configureDevice_3.wxml
@@ -7,18 +7,28 @@
             </view>
 
             <view class="progress0_content">
-                <scroll-view class="scrollView" scroll-y>
-                    <view class="scrollViewContent">
-                        <block wx:for="{{wifiList}}" wx:key="index">
-                            <view data-item="{{item}}" bind:tap="selectDevice" class="~arrowAfter">
-                                <view>
-                                    <image src="/images/configureDevice/wifi.png" />
+                <block wx:if="{{wifiList && wifiList.length}}">
+                    <scroll-view class="scrollView" scroll-y>
+                        <view class="scrollViewContent">
+                            <block wx:for="{{wifiList}}" wx:key="index">
+                                <view data-item="{{item}}" bind:tap="selectDevice" class="~arrowAfter">
+                                    <view>
+                                        <image src="/images/configureDevice/wifi.png" />
+                                    </view>
+                                    <view>{{item.ssid}}</view>
                                 </view>
-                                <view>{{item.ssid}}</view>
-                            </view>
-                        </block>
+                            </block>
+                        </view>
+                    </scroll-view>
+                </block>
+                <block wx:else>
+                    <view class="nullData" bind:tap="initWifi">
+                        <view>
+                            <image src="/images/configureDevice/null.png" />
+                        </view>
+                        <view>获取WIFI失败</view>
                     </view>
-                </scroll-view>
+                </block>
             </view>
         </view>
     </block>
diff --git a/components/configureDevice_3/configureDevice_3.wxss b/components/configureDevice_3/configureDevice_3.wxss
index 0c91321..2b836cb 100644
--- a/components/configureDevice_3/configureDevice_3.wxss
+++ b/components/configureDevice_3/configureDevice_3.wxss
@@ -35,6 +35,25 @@
     line-height: 30rpx;
 }
 
+.nullData {
+	width: 100%;
+	padding: 200rpx 0 250rpx;
+}
+
+.nullData>view:first-of-type {
+	width: 230rpx;
+	height: 160rpx;
+	margin: 0 auto 15rpx;
+}
+
+.nullData>view:last-of-type {
+	color: #B6B6B6;
+	height: 30rpx;
+	font-size: 30rpx;
+	line-height: 30rpx;
+	text-align: center;
+}
+
 .progress0_content {
     width: 100%;
     height: calc(100% - 166rpx);