Merge branch 'jianxiang' into 'debug'

1.多语言更改

See merge request iot-project-js/doorlock!31

dev/src/lang/en.json

@@ -394,5 +394,8 @@
 		"tip": "版本更新",
 		"update":"更新",
 		"miss": "暂不更新"
+	},
+	"textTip":{
+		"textType": "请输入中文、字母和数字"
 	}
 }
\ No newline at end of file

dev/src/lang/zh.json

@@ -394,5 +394,8 @@
 		"tip": "版本更新",
 		"update":"更新",
 		"miss": "暂不更新"
+	},
+	"textTip":{
+		"textType": "请输入中文、字母和数字"
 	}
 }
\ No newline at end of file

dev/src/view/device/v_index.js

@@ -872,6 +872,7 @@ async function sdsDataPorcessing(self, data){
 						        	self.setValueRemoteOpendoor(false);
 									self.setRemoteOpendoorDisabledFlag(true);
 									self.setRemoteOpendoorShowFlag(false);
+									window.clearTimeout(self.remoteTime);
 						        }
 						    });
 						}else{

web/view/doorlockUsers/doorlockUser.html

@@ -34,7 +34,7 @@
                 	<u-button :init-param="componentsConfig.bindButton.initParam" class="userInfo-toBind" v-on:u-button-tap="onBindButtonTap" v-show="bindShowFlag && !role"></u-button>
                     <u-button :init-param="componentsConfig.unbindButton.initParam" v-on:u-button-tap="onUnbindButtonTap" v-show="(unbindShowFlag && !role && userInfo.role != 0)"></u-button>
                 </li>
-                <v-touch tag="li" v-on:tap="onBindUnlockInfoTap">{{ $t('doorlockUser.bindUnlockInfo') }}</v-touch>
+                <v-touch tag="li" v-on:tap="onBindUnlockInfoTap" v-show="!role">{{ $t('doorlockUser.bindUnlockInfo') }}</v-touch>
                 <v-touch tag="li" v-bind:class="[{disabled: isFirstAddUser}]" v-on:tap="onEditNameTap" v-show="!role">{{ $t('doorlockUser.editUsername') }}</v-touch>
                 <v-touch tag="li" v-bind:class="[{disabled: isFirstAddUser}]" v-on:tap="onOpendoorRecordTap">{{ $t('doorlockUser.opendoorRecord') }}</v-touch>
             </ul>