[图片][techtron]:图标添加

locale/en.json

@@ -152,7 +152,11 @@
     "请打开应用定位权限，允许应用使用您的位置信息": "Please open the app's location permission and allow the app to use your location information.",
     "剩余时间" : "Time Left",
     "WIFI配网" : "WIFI Config",
-    "正在连接蓝牙": "",
+	"请打开WIFI":"Please turn on the WIFI.",
+	"获取wifi失败，请检查wifi":"Failed to obtain WiFi, please check WiFi",
+	"请输入wifi密码":"Please enter your WiFi password",
+    "正在连接蓝牙": "Connecting Bluetooth",
+	"请选择WIFI":"Please select WIFI",
     "配网成功,请扫码绑定设备" : "Successfully,Please scan to bind device.",
     "正在配置网络信息": "Configuring network information.",
     "解绑设备":"Unbind",

pages/bluetooth/index/wifi.vue

@@ -52,14 +52,15 @@
                 v-model="SSID"
                 disabled
                 disabledColor="#dddddd"
-                placeholder="Choose wifi:"
+                placeholder="Choose wifi"
                 border="none"
                 labelWidth="auto"
             ></u--input>
-            <u-icon
+			<uni-icons slot="right" type="right" size="30"></uni-icons>
+           <!-- <u-icon
                 slot="right"
                 name="arrow-right"
-            ></u-icon>
+            ></u-icon> -->
           </u-form-item>
           <u-form-item
               label="Password:"
@@ -138,7 +139,7 @@
         </u--form>
       </view>
       <view style="margin:10px">
-        <u-button text="Confirm" v-if="isCompanyUser()" @click="doConnectUser(1)" size="small" type="primary"></u-button>
+        <u-button text="Confirm" v-if="isCompanyUser()" @click="doConnectUser(1)" size="normal" type="success"></u-button>
 
         <u-button text="开始配网" v-else @click="doConnect(2)" size="small" type="primary"></u-button>
 
@@ -213,7 +214,7 @@ export default {
       title: i18('WIFI配网')
     })
     this.deviceno  = this.generateTimestamp();
-    ecUI.showLoading("Bluetooth initing")
+    ecUI.showLoading("WIFI initing")
     ctx = this
     clearInterval(this.timer);
     this.timer = setInterval(() => {
@@ -591,7 +592,7 @@ export default {
     },
     listViewTap(id){
       let self = this;
-      ecUI.showLoading("Bluetooth connectting")
+      ecUI.showLoading("WIFI connectting")
       ecBLE.onBLEConnectionStateChange(res => {
         console.log(res);
         if (res.ok) {

pages/mine/index.vue

@@ -9,7 +9,7 @@
 				src="../../static/images/new/starts/login/backImg2.png"></image>
 			<text @click="clickRight()" style="color: #ffffff;font-size: 15px;margin: 0 0 0 31vh;font-weight: bold;">· · ·</text>
 			<view>
-				<uni-drawer @change="changeDrawer" width="300" style="top:20vh;height: 100vh" ref="showRight" mode="right"
+				<uni-drawer @change="changeDrawer"  style="top:20vh;height: 100vh" ref="showRight" mode="right"
 					:mask-click="true">
 					<scroll-view  style="background: linear-gradient(#000000, #5a5a58);font-size: 20px;height: 100%" scroll-y="true">
 						<view class="prop-item" @click="handleLogout()">
@@ -48,7 +48,8 @@
 		</view>
 		<u-divider style="margin-top: 15vh;"></u-divider>
 		<view style="margin-top: 5vh;justify-content: center;align-items: center;justify-content: center;display: grid;align-content: center;justify-items: center;line-height: 30px;">
-			<image v-if="avatar" @click="handleToAvatar" :src="avatar" class="cu-avatar xl round" mode="widthFix">
+			<!-- <image v-if="avatar" @click="handleToAvatar" :src="avatar" class="cu-avatar xl round" mode="widthFix"> -->
+			<image v-if="avatar" :src="avatar" class="cu-avatar xl round" mode="widthFix">
 			</image>
 			<view >
 			 <image style="width: 40rpx;height: 40rpx;" src="../../static/images/new/starts/mine/start_light.png"></image>

pages/weitiandi/device/status.vue

@@ -6,7 +6,7 @@
 			<text @click.stop="clickRight()"
 				style="color: #ffffff;font-size: 15px;margin: 0 0 0 31vh;font-weight: bold;">· · ·</text>
 			<view>
-				<uni-drawer @change="changeDrawer" width=300 style="top:20vh;height: 100vh" ref="showRight" mode="right"
+				<uni-drawer @change="changeDrawer"  style="top:20vh;height: 100vh" ref="showRight" mode="right"
 					:mask-click="true">
 					<scroll-view  style="background: linear-gradient(#000000, #5a5a58);font-size: 20px;height: 100%;" scroll-y="true">
 						<view class="prop-item" @click="handleLogout()">

pages/weitiandi/deviceList.vue

@@ -5,7 +5,7 @@
 	  		src="../../static/images/new/starts/login/backImg2.png"></image>
 	  	<text @click="clickRight()" style="color: #ffffff;font-size: 15px;margin: 0 0 0 31vh;font-weight: bold;">· · ·</text>
 	  	<view>
-	  		<uni-drawer @change="changeDrawer"  width="300" style="top:20vh;height: 100vh" ref="showRight" mode="right"
+	  		<uni-drawer @change="changeDrawer"  style="top:20vh;height: 100vh" ref="showRight" mode="right"
 	  			:mask-click="true">
 	  			<scroll-view  style="background: linear-gradient(#000000, #5a5a58);font-size: 20px;height: 100%" scroll-y="true">
 	  				<view class="prop-item" @click="handleLogout()">