1211代码优化

76353011 · 朱建香 · fd29a166 · 76353011 · 76353011 · 76353011
Commit 76353011 authored Dec 11, 2017 by 朱建香
29 changed files
--- a/dev/src/lang/zh.json
+++ b/dev/src/lang/zh.json
@@ -37,7 +37,7 @@
        "login": "登录",
        "register": "注册",
        "forgetPassword": "忘记密码",
-        "device": "智能指纹锁",
+        "device": "U智锁",
        "opendoorRecord": "开门记录",
        "alarmInfo": "报警信息",
        "remoteOpendoor": "远程开门",

--- a/dev/src/public/public.js
+++ b/dev/src/public/public.js
@@ -239,31 +239,7 @@ iot.navigator.getCurrentWebView = function (){
 }

 uPublic.loopUtils = function(func, opts, intervalTime, time){
-	var _this = this;
-	var params = _extends({}, opts);
-    var loop = function loop() {
-        var handle = setTimeout(function () {
-            _this.loopUtils(func, opts, intervalTime, time);
-            window.clearTimeout(handle);
-        }, intervalTime);
-    };
-    params.success = function (ret) {
-        if (opts.success(ret) === false) {
-            return;
-        }
-        loop();
-    };
-    params.error = function (err) {
-        if (opts.error(err) === false) {
-            return;
-        }
-        loop();
-    };
-    func();
-	var timeout = setTimeout(function (){
-		window.clearTimeout(handle);
-		window.clearTimeout(timeout);
-	}, time);
+	
 }

 export {iot, uPublic, uComponents}
\ No newline at end of file
--- a/dev/src/view/device/v_index.js
+++ b/dev/src/view/device/v_index.js
@@ -853,7 +853,6 @@ function sdsDataPorcessing(self, data){
 				case '3':
 					//防撬、试错、欠电报警
 					//轮循获取最新的历史记录
-					console.log('欠电报警');
 					loopGetLockInfo(self, config.intervalTime, config.getHistoryTime);
 					break;
 			}
@@ -861,19 +860,24 @@ function sdsDataPorcessing(self, data){
 		case 'lock_log':
 			switch(data.lock_action.value){
 				case '4':
+					//远程开门成功
 					//切换轮循loading样式
 					setRemoteOpenDoorLoading(self, 1, Vue.t('remoteOpendoor.openDoorSuccess'), Vue.t('btn.confirm'));
 				case '1':
 					//轮循获取最新的历史记录
 					loopGetLockInfo(self, config.intervalTime, config.getHistoryTime);
 				break;
-			}
-		break;
-	}
-	if(data.ErrorCode.value == 1){
+				case '5':
 					//远程开门失败
 					setRemoteOpenDoorLoading(self, 2, Vue.t('remoteOpendoor.openDoorFailure'), Vue.t('remoteOpendoor.remoteOpendoorAgain'));
+				break;
 			}
+		break;
+	}
+//	if(data.ErrorCode.value == 1){
+//		//远程开门失败
+//		setRemoteOpenDoorLoading(self, 2, Vue.t('remoteOpendoor.openDoorFailure'), Vue.t('remoteOpendoor.remoteOpendoorAgain'));
+//	}
 }

 //设置电量百分比、电量icon
@@ -893,8 +897,7 @@ function setBatteryPercentAndIcon(self, value){
 //设置门铃
 function setBellRing(self, time){
 	let now = moment(new Date(), "YYYY-MM-DD hh:mm:ss");
-	time = moment(time, "YY-MM-DD-hh-mm-ss");
-	console.log(now.diff(time,'seconds'));
+	time = moment(time, "YYYY-MM-DD hh:mm:ss");
 	if(now.diff(time,'seconds') < config.ringBell_timeout && now.diff(time,'seconds') >= 0){
 		self.setRingingTime(now.format("HH:mm"));
 		ringBell(self);
@@ -904,7 +907,7 @@ function setBellRing(self, time){
 //设置远程开门
 function setRemoteOpendoor(self, time){
 	let now = moment(new Date(), "YYYY-MM-DD hh:mm:ss");
-	time = moment(time, "YY-MM-DD-hh-mm-ss");
+	time = moment(time, "YYYY-MM-DD hh:mm:ss");
 	console.log(now.diff(time,'seconds'));
 	if(now.diff(time,'seconds') < config.remote_timeout && now.diff(time,'seconds') >= 0){
 		self.setValueRemoteOpendoor(true);
@@ -979,7 +982,6 @@ function simpleRingBell(self,i){

 function pushAction(self, msg) {
    var payload = msg.payload;
-    console.log(payload);
    if (typeof payload == 'string') {
        payload = JSON.parse(msg.payload);
    }
@@ -1023,7 +1025,9 @@ function pushAction(self, msg) {
 //推送消息处理方法
 function notifyDataProcessing(self, payload){
 	switch(payload.type){
-    	case 'open' || 'notify' || 'alarm':
+    	case 'open':
+    	case 'notify':
+    	case 'alarm':
    		//开门推送、安全报警、劫持报警
    		//历史记录信息只拿一遍，不需要轮询
    		getLockInfo(self);
@@ -1040,30 +1044,30 @@ function notifyDataProcessing(self, payload){
 }

 function notificationListener(self) {
-	if (plus.os.name == 'Android') {
-        setInterval(function () {
-            var pushMsgArray = plus.push.getAllMessage();
-//          console.log(pushMsgArray);
-            if (pushMsgArray) {
-                var pushMsgLength = pushMsgArray.length;
-                if (pushMsgLength) {
-                    var pushMsg = pushMsgArray[(pushMsgArray.length - 1)];
-                    pushAction(self, pushMsg);
-                    plus.push.clear();
-                }
-            }
-        }, 2000);
-    }
+//	if (plus.os.name == 'Android') {
+//      setInterval(function () {
+//          var pushMsgArray = plus.push.getAllMessage();
+////          console.log(pushMsgArray);
+//          if (pushMsgArray) {
+//              var pushMsgLength = pushMsgArray.length;
+//              if (pushMsgLength) {
+//                  var pushMsg = pushMsgArray[(pushMsgArray.length - 1)];
+//                  pushAction(self, pushMsg);
+//                  plus.push.clear();
+//              }
+//          }
+//      }, 2000);
+//  }
    // 从系统消息中心点击消息启动应用事件
    plus.push.addEventListener('click', function (msg) {
-    	console.log("收到了click");
-        pushAction(self, msg);
+//  	console.log("收到了click");
+//      pushAction(self, msg);
 //      alert("click"+JSON.stringify(msg));
    }, false);
    // 应用从推送服务器接收到推送消息事件
    plus.push.addEventListener('receive', function (msg) {
 //  	alert("收到了receive");
-        pushAction(self, msg);
+//      pushAction(self, msg);
 //      alert("receive"+JSON.stringify(msg));
    }, false);
 }
@@ -1078,6 +1082,13 @@ function myInfoTap(self){
        	nickname: self.nickname
        }
    });
+// uPublic.openWindow({
+// 	 	url: '../myInfo/index.html',
+//      id: 'myInfo',
+//      extras: {
+//      	nickname: self.nickname
+//      }
+// });
 }

 //tap 绑定门锁

--- a/dev/webpack.config.js
+++ b/dev/webpack.config.js
@@ -55,7 +55,8 @@ module.exports = {
    },
    resolve: {
        alias: {
-            'vue-i18n$': 'vue-i18n/dist/vue-i18n.common.js'
+            'vue-i18n$': 'vue-i18n/dist/vue-i18n.common.js',
+            'mui': '../src/public/mui.js'
        }
    },
    plugins: [

--- a/web/lib/js/UIOT.js
+++ b/web/lib/js/UIOT.js
@@ -5915,8 +5915,17 @@ var App = function (_Base) {
    _createClass(App, [{
        key: 'openWindow',
        value: function openWindow(params) {
-            var wv = plus.webview.create(params.url, params.id, { styles: params.styles || {} }, { IOTData: params.extras });
+            var wv = plus.webview.create(params.url, params.id, { styles:{backgroundColor:'#000000'} }, { IOTData: params.extras });
            wv.show('slide-in-right');
+//			var IOTData = params.extras;
+//			var webview = mui.openWindow({
+//				url: params.url,
+//				id: params.id,
+//				extras: IOTData,
+//				waiting:{
+//   				autoShow:false//自动显示等待框，默认为true
+//   			}
+//			},"slide-in-right");
        }
    }, {
        key: 'getExtras',

--- a/web/resources/lang/zh.json
+++ b/web/resources/lang/zh.json
-{"loading":"loading...","scroll":{"clickToLoadMore":"点击加载更多","loading":"loading..."},"btn":{"confirm":"确定","guideLogin":"账号/密码登录","login":"登录","getCode":"获取验证码","register":"注册","logout":"退出系统","save":"保存","qrcode":"生成二维码","wifiAdd":"开始配置Wi-Fi","connect":"连接","bindUser":"绑定姓名","bind":"我要绑定","reBound":"请重新绑定","saveQRcode":"保存二维码到相册","unbind":"解绑","deleteUser":"删除该用户","qrcodeReset":"重新生成二维码","add":"添加","next":"下一步","iSee":"我知道了","unbindDoorlock":"解绑门锁"},"dialog":{"confirm":"确认","cancel":"取消","unbind":"解绑","delete":"删除"},"title":{"login":"登录","register":"注册","forgetPassword":"忘记密码","device":"智能指纹锁","opendoorRecord":"开门记录","alarmInfo":"报警信息","remoteOpendoor":"远程开门","hijackRecord":"劫持记录","doorlockManage":"门锁管理","editName":"修改名称","qrcode":"生成绑定二维码","addDevice":"添加设备","scanCodeAdd":"扫描绑定设备","wifiAddHelp":"配置Wi-Fi","wifiAdd":"连接Wi-Fi","bindUserHelp":"ID-姓名绑定","bindUser":"绑定用户","userList":"用户列表","doorlockUser":"门锁用户","addUser":"添加用户","inviteBind":"邀请绑定","unlockInfo":"关联开锁信息","myInfo":"个人信息","editNickname":"修改昵称","editPassword":"修改密码","addUnlockInfo":"关联开锁ID","deviceList":"产品型号"},"guide":{"footer":"指纹改变生活"},"login":{"telInputTip":"请输入手机号","passwordInputTip":"请输入密码","register":"快速注册","forgetPassword":"忘记密码","failure":"登陆失败","error":{"telNull":"请输入手机号","passWordNull":"请输入密码"}},"register":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"forgetPassword":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"device":{"opendoorRecord":"开门记录","securityAlarm":"安全报警","doorlockUser":"门锁用户","remoteOpendoor":"远程开门","hijackAlarm":"劫持报警","doorlockManage":"门锁管理","followTitle":"关注服务号","followCont1":"关注 “i智信” 微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知，赶紧按下方提示试试吧","followCont2":"1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注","laterFollow":"稍后关注","newMsgDoorlock":"门锁最新消息","doorLockRinging":"门铃响了","defaultNewMsg":"您尚未绑定门锁","noNewMsg":"门锁休息中","bindDoorlock":"绑定门锁"},"opendoorRecord":{"noRecordTip":"暂无记录","passwordOpenDoor":"密码开门","fingerprintOpenDoor":"指纹开门","ICcardOpenDoor":"IC卡开门","remoteOpenDoor":"遥控器开门","keyOpenDoor":"钥匙开门","hijackingAlarm":"劫持报警","appRemoteOpenDoor":"app远程开门"},"alarmInfo":{"noInfoTip":"暂无信息","tamperAlarm":"防撬报警","trialAlarm":"试错报警","powerAlarm":"欠电报警"},"remoteOpendoor":{"loading":"远程开门中","passwordInputTip":"请输入远程开门密码","openDoorSuccess":"远程开门成功","openDoorFailure":"远程开门失败","remoteOpendoorAgain":"请尝试重试","error":{"noPasswordTip":"远程密码不能为空"}},"hijackRecord":{"noRecordTip":"暂无记录","hijackingAlarm":"劫持指纹报警"},"doorlockManage":{"name":"名称","logoutDialogTip":"确定要退出系统吗？","defaultNickname":"门锁","isClearRecord":"清除所有信息","unbindSuccess":"解绑成功","doorbellMsgPush":"门铃消息推送","alarmMsgPush":"报警消息推送","opendoorMsgPush":"开门消息推送","unbindDialogTip":"确认解除绑定","unbindFailue":"解绑失败"},"editName":{"nameInputTip":"请输入设备名称","nickNameInputTip":"请输入用户名","editNameSuccess":"修改名称成功","editNameFailue":"修改名称失败","error":{"nameCanNotBeBlank":"设备名称不能为空","nicknameCanNotBeBlank":"用户名不能为空"}},"qrcode":{"helpTitle":"注意事项：","helpCont1":"1.仅超级管理员（通过Wi-Fi配网绑定的用户为超级管理员）可以生成绑定二维码","helpCont2":"2.二维码有效时间为10分钟且只能使用一次","helpCont3":"3.用户只需要扫描该二维码即可绑定指纹锁","helpCont4":"4.绑定失败则需要重新生成二维码进行绑定"},"addDevice":{"scanCodeAdd":"扫描绑定设备","wifiAdd":"配置Wi-Fi","loading":"loading","bindSuccess":"绑定成功","bindFailure":"绑定失败","reBindDevice":"请重新绑定"},"wifiAddHelp":{"helpTitle":"配置WIFI说明：","helpCont1":"1.确认设备端进入配网模式（详情操作请见产品说明书）","helpCont2":"2.点击页面下方“开始配置Wi-Fi”按钮，进入WiFi配网页面","helpCont3":"3.输入Wi-Fi密码，点击“连接”，等待锁端响应，至配网成功。","helpCont4":"（提示：如果指纹锁已经绑定过用户，重新绑定成功后会清除之前所有绑定信息）"},"wifiAdd":{"unbindWifiTip":"当前无Wi-Fi","wifiBinding":"配网中","wifiBindSuccess":"配网成功，请激活设备","deviceActivating":"设备激活中","deviceActivateSuccess":"激活成功","deviceActivateFailure":"激活失败","bindTimeout":"连接超时","passwordInputTip":"请输入Wi-Fi密码","remindTitle":"配置Wi-Fi提醒：","remindCont1":"1.  请确保Wi-Fi信号良好","remindCont2":"2.  本产品暂不支持5GHz无线网络","error":{}},"bindUserHelp":{"helpTitle":"配对姓名说明：","helpCont1":"1.在指纹锁上录入指纹、密码、卡并获得相应ID","helpCont2":"2.通过姓名绑定将该ID绑定对应用户姓名","helpCont3":"3.绑定成功后，开门记录中将会显示已绑定的用户姓名","helpCont4":"4.用户姓名信息只保存在APP端，不影响锁端设置","boundUser":"查看已绑定ID姓名"},"bindUser":{"editHeadTip":"点击编辑用户头像","nameTitle":"姓名","fingerprintIDTitle":"指纹ID","passwordIDTitle":"密码ID","ICCardIDTitle":"IC卡ID","requiredInputTip":"（必填）","optionalInputTip":"（选填）","error":{}},"commstatusLoading":{"connectSuccess":"Wi-Fi连接成功，正在绑定...","bindSuccess":"绑定成功","bindFailed":"绑定失败"},"userList":{"name":"昵称：","noUserTip":"暂无用户","defaultName":"管理员","binded":"已绑定","unbind":"未绑定"},"addUser":{"nameInputTip":"请输入您想添加的用户名","addUserSuccess":"添加用户成功","addUserFailure":"添加用户失败","error":{"nameCanNotEmpty":"用户名不能为空"}},"doorlockUser":{"name":"昵称：","inviteBind":"邀请绑定","bindUnlockInfo":"关联开锁信息","opendoorRecord":"历史开门记录","unbindDialogTip":"<span></span>解绑后，该用户不能对门锁下的信息进行查看","deleteUserDialogTip":"删除后，用户对应的开锁id取消关联，同时失去信息查看权限。","unbindSuccess":"解绑成功","unbindFailue":"解绑失败","guideStep1Tip1":"邀请绑定成功","guideStep1Tip2":"（可查看开门记录，报警记录等<br>相关门锁信息）","guideStep3Tip":"绑定后看可了解<br>该用户的开门情况","deleteSuccess":"删除成功","deleteFailure":"删除失败","defaultName":"管理员"},"inviteBind":{"qrcodeExpireTip":"二维码已过期，请重新生成","title":"注意事项：","cont1":"1.被邀请的用户选择添加设备页面中的扫二维码方式进行添加门锁","cont2":"2.长按二维码保存为图片，发送给被邀请用户，用户通过长按识别二维码","cont3":"3.有效时间10分钟，失效后请点击“重新生成二维码"},"unlockInfo":{"bindUnlockInfo":"已关联的开锁信息","noInfoTip":"当前无绑定开锁ID，请添加","passwordOpenDoor":"密码","fingerprintOpenDoor":"指纹","ICcardOpenDoor":"IC卡","remoteOpenDoor":"遥控器","keyOpenDoor":"钥匙","appRemoteOpenDoor":"app远程","hijackingAlarm":"劫持指纹","setHijack":"设为劫持","setHijackTip":"确认设为劫持指纹？","cancelHijack":"取消劫持","cancelHijackTip":"确认取消劫持指纹？","cancelAssociated":"取消关联","cancelAssociatedTip":"取消关联后，开门历史记录中将不再显示关联的用户信息。","cancelAssociatedSuccess":"取消关联成功","cancelAssociatedFailue":"取消关联失败","setHijackSuccess":"设为劫持指纹成功","setHijackFailue":"设为劫持指纹失败","cancelHijackSuccess":"取消劫持指纹成功","cancelHijackFailue":"取消劫持指纹失败"},"addUnlockInfo":{"opendoorMode":"选择要关联的开锁方式","fingerprint":"指纹","password":"密码","icCard":"IC卡","key":"钥匙","remote":"遥控器","hijackFingerprint":"劫持指纹","opendoorRecord":"选择要关联的开锁ID","tip":"仅显示未绑定开门记录","addInfoSuccess":"添加绑定开锁信息成功","addInfoFailue":"添加绑定开锁信息失败","noRecordTip":"暂无记录","setHijackSwitch":"设为劫持指纹","guideStep1Tip":"选择需要添加关联的开门方式","guideStep3Tip":"根据开门记录中的开门时间，选择关联的<br>开门ID<span>（一个ID只能被一个用户绑定）</span>","guideStep5Tip":"使用劫持指纹开门时，会以报警形式<br>通知到该门锁名下的其他绑定用户"},"myInfo":{"editNickname":"修改昵称","editPassword":"修改密码","logoutDialogTip":"确定要退出系统吗？"},"editNickname":{"nickNameInputTip":"请输入昵称"},"editPassword":{"newPasswordInputTip":"请输入新密码","oldPasswordInputTip":"请输入旧密码","oldPasswordInputTipAgain":"请再次输入旧密码"},"request":{"error":"请求发送失败"},"deviceList":{"model":"型号：","noDeviceTip":"暂无产品型号"}}
\ No newline at end of file
+{"loading":"loading...","scroll":{"clickToLoadMore":"点击加载更多","loading":"loading..."},"btn":{"confirm":"确定","guideLogin":"账号/密码登录","login":"登录","getCode":"获取验证码","register":"注册","logout":"退出系统","save":"保存","qrcode":"生成二维码","wifiAdd":"开始配置Wi-Fi","connect":"连接","bindUser":"绑定姓名","bind":"我要绑定","reBound":"请重新绑定","saveQRcode":"保存二维码到相册","unbind":"解绑","deleteUser":"删除该用户","qrcodeReset":"重新生成二维码","add":"添加","next":"下一步","iSee":"我知道了","unbindDoorlock":"解绑门锁"},"dialog":{"confirm":"确认","cancel":"取消","unbind":"解绑","delete":"删除"},"title":{"login":"登录","register":"注册","forgetPassword":"忘记密码","device":"U智锁","opendoorRecord":"开门记录","alarmInfo":"报警信息","remoteOpendoor":"远程开门","hijackRecord":"劫持记录","doorlockManage":"门锁管理","editName":"修改名称","qrcode":"生成绑定二维码","addDevice":"添加设备","scanCodeAdd":"扫描绑定设备","wifiAddHelp":"配置Wi-Fi","wifiAdd":"连接Wi-Fi","bindUserHelp":"ID-姓名绑定","bindUser":"绑定用户","userList":"用户列表","doorlockUser":"门锁用户","addUser":"添加用户","inviteBind":"邀请绑定","unlockInfo":"关联开锁信息","myInfo":"个人信息","editNickname":"修改昵称","editPassword":"修改密码","addUnlockInfo":"关联开锁ID","deviceList":"产品型号"},"guide":{"footer":"指纹改变生活"},"login":{"telInputTip":"请输入手机号","passwordInputTip":"请输入密码","register":"快速注册","forgetPassword":"忘记密码","failure":"登陆失败","error":{"telNull":"请输入手机号","passWordNull":"请输入密码"}},"register":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"forgetPassword":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"device":{"opendoorRecord":"开门记录","securityAlarm":"安全报警","doorlockUser":"门锁用户","remoteOpendoor":"远程开门","hijackAlarm":"劫持报警","doorlockManage":"门锁管理","followTitle":"关注服务号","followCont1":"关注 “i智信” 微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知，赶紧按下方提示试试吧","followCont2":"1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注","laterFollow":"稍后关注","newMsgDoorlock":"门锁最新消息","doorLockRinging":"门铃响了","defaultNewMsg":"您尚未绑定门锁","noNewMsg":"门锁休息中","bindDoorlock":"绑定门锁"},"opendoorRecord":{"noRecordTip":"暂无记录","passwordOpenDoor":"密码开门","fingerprintOpenDoor":"指纹开门","ICcardOpenDoor":"IC卡开门","remoteOpenDoor":"遥控器开门","keyOpenDoor":"钥匙开门","hijackingAlarm":"劫持报警","appRemoteOpenDoor":"app远程开门"},"alarmInfo":{"noInfoTip":"暂无信息","tamperAlarm":"防撬报警","trialAlarm":"试错报警","powerAlarm":"欠电报警"},"remoteOpendoor":{"loading":"远程开门中","passwordInputTip":"请输入远程开门密码","openDoorSuccess":"远程开门成功","openDoorFailure":"远程开门失败","remoteOpendoorAgain":"请尝试重试","error":{"noPasswordTip":"远程密码不能为空"}},"hijackRecord":{"noRecordTip":"暂无记录","hijackingAlarm":"劫持指纹报警"},"doorlockManage":{"name":"名称","logoutDialogTip":"确定要退出系统吗？","defaultNickname":"门锁","isClearRecord":"清除所有信息","unbindSuccess":"解绑成功","doorbellMsgPush":"门铃消息推送","alarmMsgPush":"报警消息推送","opendoorMsgPush":"开门消息推送","unbindDialogTip":"确认解除绑定","unbindFailue":"解绑失败"},"editName":{"nameInputTip":"请输入设备名称","nickNameInputTip":"请输入用户名","editNameSuccess":"修改名称成功","editNameFailue":"修改名称失败","error":{"nameCanNotBeBlank":"设备名称不能为空","nicknameCanNotBeBlank":"用户名不能为空"}},"qrcode":{"helpTitle":"注意事项：","helpCont1":"1.仅超级管理员（通过Wi-Fi配网绑定的用户为超级管理员）可以生成绑定二维码","helpCont2":"2.二维码有效时间为10分钟且只能使用一次","helpCont3":"3.用户只需要扫描该二维码即可绑定指纹锁","helpCont4":"4.绑定失败则需要重新生成二维码进行绑定"},"addDevice":{"scanCodeAdd":"扫描绑定设备","wifiAdd":"配置Wi-Fi","loading":"loading","bindSuccess":"绑定成功","bindFailure":"绑定失败","reBindDevice":"请重新绑定"},"wifiAddHelp":{"helpTitle":"配置WIFI说明：","helpCont1":"1.确认设备端进入配网模式（详情操作请见产品说明书）","helpCont2":"2.点击页面下方“开始配置Wi-Fi”按钮，进入WiFi配网页面","helpCont3":"3.输入Wi-Fi密码，点击“连接”，等待锁端响应，至配网成功。","helpCont4":"（提示：如果指纹锁已经绑定过用户，重新绑定成功后会清除之前所有绑定信息）"},"wifiAdd":{"unbindWifiTip":"当前无Wi-Fi","wifiBinding":"配网中","wifiBindSuccess":"配网成功，请激活设备","deviceActivating":"设备激活中","deviceActivateSuccess":"激活成功","deviceActivateFailure":"激活失败","bindTimeout":"连接超时","passwordInputTip":"请输入Wi-Fi密码","remindTitle":"配置Wi-Fi提醒：","remindCont1":"1.  请确保Wi-Fi信号良好","remindCont2":"2.  本产品暂不支持5GHz无线网络","error":{}},"bindUserHelp":{"helpTitle":"配对姓名说明：","helpCont1":"1.在指纹锁上录入指纹、密码、卡并获得相应ID","helpCont2":"2.通过姓名绑定将该ID绑定对应用户姓名","helpCont3":"3.绑定成功后，开门记录中将会显示已绑定的用户姓名","helpCont4":"4.用户姓名信息只保存在APP端，不影响锁端设置","boundUser":"查看已绑定ID姓名"},"bindUser":{"editHeadTip":"点击编辑用户头像","nameTitle":"姓名","fingerprintIDTitle":"指纹ID","passwordIDTitle":"密码ID","ICCardIDTitle":"IC卡ID","requiredInputTip":"（必填）","optionalInputTip":"（选填）","error":{}},"commstatusLoading":{"connectSuccess":"Wi-Fi连接成功，正在绑定...","bindSuccess":"绑定成功","bindFailed":"绑定失败"},"userList":{"name":"昵称：","noUserTip":"暂无用户","defaultName":"管理员","binded":"已绑定","unbind":"未绑定"},"addUser":{"nameInputTip":"请输入您想添加的用户名","addUserSuccess":"添加用户成功","addUserFailure":"添加用户失败","error":{"nameCanNotEmpty":"用户名不能为空"}},"doorlockUser":{"name":"昵称：","inviteBind":"邀请绑定","bindUnlockInfo":"关联开锁信息","opendoorRecord":"历史开门记录","unbindDialogTip":"<span></span>解绑后，该用户不能对门锁下的信息进行查看","deleteUserDialogTip":"删除后，用户对应的开锁id取消关联，同时失去信息查看权限。","unbindSuccess":"解绑成功","unbindFailue":"解绑失败","guideStep1Tip1":"邀请绑定成功","guideStep1Tip2":"（可查看开门记录，报警记录等<br>相关门锁信息）","guideStep3Tip":"绑定后看可了解<br>该用户的开门情况","deleteSuccess":"删除成功","deleteFailure":"删除失败","defaultName":"管理员"},"inviteBind":{"qrcodeExpireTip":"二维码已过期，请重新生成","title":"注意事项：","cont1":"1.被邀请的用户选择添加设备页面中的扫二维码方式进行添加门锁","cont2":"2.长按二维码保存为图片，发送给被邀请用户，用户通过长按识别二维码","cont3":"3.有效时间10分钟，失效后请点击“重新生成二维码"},"unlockInfo":{"bindUnlockInfo":"已关联的开锁信息","noInfoTip":"当前无绑定开锁ID，请添加","passwordOpenDoor":"密码","fingerprintOpenDoor":"指纹","ICcardOpenDoor":"IC卡","remoteOpenDoor":"遥控器","keyOpenDoor":"钥匙","appRemoteOpenDoor":"app远程","hijackingAlarm":"劫持指纹","setHijack":"设为劫持","setHijackTip":"确认设为劫持指纹？","cancelHijack":"取消劫持","cancelHijackTip":"确认取消劫持指纹？","cancelAssociated":"取消关联","cancelAssociatedTip":"取消关联后，开门历史记录中将不再显示关联的用户信息。","cancelAssociatedSuccess":"取消关联成功","cancelAssociatedFailue":"取消关联失败","setHijackSuccess":"设为劫持指纹成功","setHijackFailue":"设为劫持指纹失败","cancelHijackSuccess":"取消劫持指纹成功","cancelHijackFailue":"取消劫持指纹失败"},"addUnlockInfo":{"opendoorMode":"选择要关联的开锁方式","fingerprint":"指纹","password":"密码","icCard":"IC卡","key":"钥匙","remote":"遥控器","hijackFingerprint":"劫持指纹","opendoorRecord":"选择要关联的开锁ID","tip":"仅显示未绑定开门记录","addInfoSuccess":"添加绑定开锁信息成功","addInfoFailue":"添加绑定开锁信息失败","noRecordTip":"暂无记录","setHijackSwitch":"设为劫持指纹","guideStep1Tip":"选择需要添加关联的开门方式","guideStep3Tip":"根据开门记录中的开门时间，选择关联的<br>开门ID<span>（一个ID只能被一个用户绑定）</span>","guideStep5Tip":"使用劫持指纹开门时，会以报警形式<br>通知到该门锁名下的其他绑定用户"},"myInfo":{"editNickname":"修改昵称","editPassword":"修改密码","logoutDialogTip":"确定要退出系统吗？"},"editNickname":{"nickNameInputTip":"请输入昵称"},"editPassword":{"newPasswordInputTip":"请输入新密码","oldPasswordInputTip":"请输入旧密码","oldPasswordInputTipAgain":"请再次输入旧密码"},"request":{"error":"请求发送失败"},"deviceList":{"model":"型号：","noDeviceTip":"暂无产品型号"}}
\ No newline at end of file
--- a/web/view/addDevice/deviceList.html
+++ b/web/view/addDevice/deviceList.html
@@ -17,6 +17,7 @@
    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/addDevice/index.html
+++ b/web/view/addDevice/index.html
@@ -16,6 +16,7 @@
    </style>
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/addDevice/scanCodeAdd.html
+++ b/web/view/addDevice/scanCodeAdd.html
@@ -17,6 +17,7 @@
    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/addDevice/wifiAdd.html
+++ b/web/view/addDevice/wifiAdd.html
@@ -17,6 +17,7 @@
    <script type="text/javascript" src="../../lib/js/start.js"></script>
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/addDevice/wifiAddHelp.html
+++ b/web/view/addDevice/wifiAddHelp.html
@@ -16,6 +16,7 @@
    </style>
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/bindUser/index.html
+++ b/web/view/bindUser/index.html
@@ -16,6 +16,7 @@
    </style>
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/device/alarmInfo.html
+++ b/web/view/device/alarmInfo.html
@@ -17,6 +17,7 @@
    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/device/hijackRecord.html
+++ b/web/view/device/hijackRecord.html
@@ -17,6 +17,7 @@
    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/device/index.html
+++ b/web/view/device/index.html
@@ -17,6 +17,7 @@
    <script type="text/javascript" src="../../lib/js/start.js"></script>
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/device/opendoorRecord.html
+++ b/web/view/device/opendoorRecord.html
@@ -17,6 +17,7 @@
    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/device/remoteOpendoor.html
+++ b/web/view/device/remoteOpendoor.html
@@ -17,6 +17,7 @@
    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/doorlockManage/editName.html
+++ b/web/view/doorlockManage/editName.html
@@ -17,6 +17,7 @@
    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">
    <div id="app" v-cloak>

--- a/web/view/doorlockManage/index.html
+++ b/web/view/doorlockManage/index.html
@@ -17,6 +17,7 @@
    <script type="text/javascript" src="../../lib/js/start.js"></script>
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/doorlockUsers/addUnlockInfo.html
+++ b/web/view/doorlockUsers/addUnlockInfo.html
@@ -17,6 +17,7 @@
    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/doorlockUsers/addUser.html
+++ b/web/view/doorlockUsers/addUser.html
@@ -17,6 +17,7 @@
    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/doorlockUsers/doorlockUser.html
+++ b/web/view/doorlockUsers/doorlockUser.html
@@ -17,6 +17,7 @@
    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/doorlockUsers/editName.html
+++ b/web/view/doorlockUsers/editName.html
@@ -17,6 +17,7 @@
    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/doorlockUsers/inviteBind.html
+++ b/web/view/doorlockUsers/inviteBind.html
@@ -17,6 +17,7 @@
    <script type="text/javascript" src="../../lib/js/start.js"></script>
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/doorlockUsers/unlockInfo.html
+++ b/web/view/doorlockUsers/unlockInfo.html
@@ -17,6 +17,7 @@
    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/login/index.html
+++ b/web/view/login/index.html
@@ -18,6 +18,7 @@
    <script type="text/javascript" src="../../lib/js/p.js"></script>
    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
    <script type="text/javascript" src="../../lib/js/SDSPlugin.js"></script>
+    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 </head>
 <body ontouchstart="">


--- a/web/view/myInfo/editNickname.html
+++ b/web/view/myInfo/editNickname.html
@@ -17,6 +17,7 @@
 	    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
 	    <script type="text/javascript" src="../../lib/js/p.js"></script>
 	    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+	    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 	</head>
 	<body  ontouchstart="">
 		<div id="app" v-cloak>

--- a/web/view/myInfo/editPassword.html
+++ b/web/view/myInfo/editPassword.html
@@ -17,6 +17,7 @@
 	    <!--<script type="text/javascript" src="../../lib/js/start.js"></script>-->
 	    <script type="text/javascript" src="../../lib/js/p.js"></script>
 	    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+	    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 	</head>
 	<body  ontouchstart="">
 		<div id="app" v-cloak>

--- a/web/view/myInfo/index.html
+++ b/web/view/myInfo/index.html
@@ -17,6 +17,7 @@
 	    <script type="text/javascript" src="../../lib/js/start.js"></script>
 	    <script type="text/javascript" src="../../lib/js/p.js"></script>
 	    <script type="text/javascript" src="../../lib/js/UIOT.js"></script>
+	    <script type="text/javascript" src="../../lib/js/mui.min.js"></script>
 	</head>
 	<body  ontouchstart="">
 		<div id="app" v-cloak>