Skip to content

D
DoorLock
Commit 6a5e9b04 by 朱建香
Options

1121

parent fdf8a840
Showing with 74 additions and 30 deletions
dev/src/lang/zh.json
...@@ -301,6 +301,7 @@ ...@@ -301,6 +301,7 @@
"password": "密码", "password": "密码",
"icCard": "IC卡", "icCard": "IC卡",
"key": "钥匙", "key": "钥匙",
"remote":"遥控器",
"hijackFingerprint": "劫持指纹", "hijackFingerprint": "劫持指纹",
"opendoorRecord": "选择要关联的开锁ID", "opendoorRecord": "选择要关联的开锁ID",
"tip": "仅显示未绑定开门记录", "tip": "仅显示未绑定开门记录",
......
dev/src/view/device/v_index.js
...@@ -835,7 +835,14 @@ function notificationListener(self) { ...@@ -835,7 +835,14 @@ function notificationListener(self) {
//tap 个人信息 //tap 个人信息
function myInfoTap(self){ function myInfoTap(self){
// iot.navigator.openWindow({ iot.navigator.openWindow({
url: '../myInfo/index.html',
id: 'myInfo',
extras: {
nickname: self.nickname
}
});
// uPublic.openWindow({
// url: '../myInfo/index.html', // url: '../myInfo/index.html',
// id: 'myInfo', // id: 'myInfo',
// extras: { // extras: {
...@@ -845,16 +852,6 @@ function myInfoTap(self){ ...@@ -845,16 +852,6 @@ function myInfoTap(self){
// 'background': 'transparent' // 'background': 'transparent'
// } // }
// }); // });
uPublic.openWindow({
url: '../myInfo/index.html',
id: 'myInfo',
extras: {
nickname: self.nickname
},
styles: {
'background': 'transparent'
}
});
// let wv = plus.webview.create( '../myInfo/index.html', 'myInfo',{subNViews:[{id:'subnview1',styles:{top:'0px',width: '100px',height:'100px',backgroundColor:'#FF0000'}}],background:'#ff0000',top:'100px',bottom:'0px'}); // let wv = plus.webview.create( '../myInfo/index.html', 'myInfo',{subNViews:[{id:'subnview1',styles:{top:'0px',width: '100px',height:'100px',backgroundColor:'#FF0000'}}],background:'#ff0000',top:'100px',bottom:'0px'});
// wv.show(); // wv.show();
// plus.webview.create('new.html', 'new', {'titleNView':{'backgroundcolor':'#FFFFFF','titletext':'标题栏','titlecolor':'#FF0000'}}); // plus.webview.create('new.html', 'new', {'titleNView':{'backgroundcolor':'#FFFFFF','titletext':'标题栏','titlecolor':'#FF0000'}});
......
dev/src/view/doorlockUsers/v_doorlockUser.js
...@@ -465,6 +465,13 @@ function iSeeButtonTap(self){ ...@@ -465,6 +465,13 @@ function iSeeButtonTap(self){
//删除用户 //删除用户
function deleteUser(self){ function deleteUser(self){
uComponents.showLoading(self); uComponents.showLoading(self);
// iot.business.sds.unbindByManager({
// data: {
// uuid: self.extras.uuid,
// destAuid: self.extras.account
// },
// success: (response) => {
//// alert(JSON.stringify(response));
iot.business.api.sendCustom('lock/delLockUser',{ iot.business.api.sendCustom('lock/delLockUser',{
data: { data: {
rel_id: self.extras.id, rel_id: self.extras.id,
...@@ -484,12 +491,12 @@ function deleteUser(self){ ...@@ -484,12 +491,12 @@ function deleteUser(self){
}, },
error: (error) => { error: (error) => {
console.log(error); console.log(error);
// if(window.iotDebug){ // if(window.iotDebug){
// iotDebug.push('end: 删除用户失败'+JSON.stringify(error)); // iotDebug.push('end: 删除用户失败'+JSON.stringify(error));
// } // }
// if (window.iotDebug) { // if (window.iotDebug) {
// iotDebug.upload(iot,'删除用户失败'); // iotDebug.upload(iot,'删除用户失败');
// } // }
uComponents.openAlert(self, Vue.t('doorlockUser.deleteFailure'), { uComponents.openAlert(self, Vue.t('doorlockUser.deleteFailure'), {
text: Vue.t('btn.confirm'), callback: function () { text: Vue.t('btn.confirm'), callback: function () {
} }
...@@ -499,5 +506,22 @@ function deleteUser(self){ ...@@ -499,5 +506,22 @@ function deleteUser(self){
uComponents.hideLoading(self); uComponents.hideLoading(self);
} }
}); });
// },
// error: (error) => {
// console.log(error);
// alert(error);
//// if(window.iotDebug){
//// iotDebug.push('end: sds解绑普通用户失败'+JSON.stringify(error));
//// }
//// if (window.iotDebug) {
//// iotDebug.upload(iot,'sds解绑普通用户失败');
//// }
// uPublic.openRequestErrorAlert(self);
// self.setImageSrc('../../resources/image/green_unbindFail_icon.png');
// self.setTextBindTip(Vue.t('doorlockUser.unbindFailue'));
// self.setStateShowFlag(true);
// },
// complete: () => {
// }
// });
} }
web/view/device/index.js
...@@ -24763,7 +24763,14 @@ function notificationListener(self) { ...@@ -24763,7 +24763,14 @@ function notificationListener(self) {
//tap 个人信息 //tap 个人信息
function myInfoTap(self) { function myInfoTap(self) {
// iot.navigator.openWindow({ _public.iot.navigator.openWindow({
url: '../myInfo/index.html',
id: 'myInfo',
extras: {
nickname: self.nickname
}
});
// uPublic.openWindow({
// url: '../myInfo/index.html', // url: '../myInfo/index.html',
// id: 'myInfo', // id: 'myInfo',
// extras: { // extras: {
...@@ -24773,16 +24780,6 @@ function myInfoTap(self) { ...@@ -24773,16 +24780,6 @@ function myInfoTap(self) {
// 'background': 'transparent' // 'background': 'transparent'
// } // }
// }); // });
_public.uPublic.openWindow({
url: '../myInfo/index.html',
id: 'myInfo',
extras: {
nickname: self.nickname
},
styles: {
'background': 'transparent'
}
});
// let wv = plus.webview.create( '../myInfo/index.html', 'myInfo',{subNViews:[{id:'subnview1',styles:{top:'0px',width: '100px',height:'100px',backgroundColor:'#FF0000'}}],background:'#ff0000',top:'100px',bottom:'0px'}); // let wv = plus.webview.create( '../myInfo/index.html', 'myInfo',{subNViews:[{id:'subnview1',styles:{top:'0px',width: '100px',height:'100px',backgroundColor:'#FF0000'}}],background:'#ff0000',top:'100px',bottom:'0px'});
// wv.show(); // wv.show();
// plus.webview.create('new.html', 'new', {'titleNView':{'backgroundcolor':'#FFFFFF','titletext':'标题栏','titlecolor':'#FF0000'}}); // plus.webview.create('new.html', 'new', {'titleNView':{'backgroundcolor':'#FFFFFF','titletext':'标题栏','titlecolor':'#FF0000'}});
......
web/view/doorlockUsers/addUnlockInfo.html
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
<li class="active">{{ $t('addUnlockInfo.fingerprint') }}</li> <li class="active">{{ $t('addUnlockInfo.fingerprint') }}</li>
<li>{{ $t('addUnlockInfo.password') }}</li> <li>{{ $t('addUnlockInfo.password') }}</li>
<li>{{ $t('addUnlockInfo.icCard') }}</li> <li>{{ $t('addUnlockInfo.icCard') }}</li>
<li>遥控器</li> <li>{{ $t('addUnlockInfo.remote') }}</li>
</ul> </ul>
</div> </div>
<div class="guideStep1Tip"> <div class="guideStep1Tip">
......
web/view/doorlockUsers/doorlockUser.js
...@@ -1308,6 +1308,13 @@ function iSeeButtonTap(self) { ...@@ -1308,6 +1308,13 @@ function iSeeButtonTap(self) {
//删除用户 //删除用户
function deleteUser(self) { function deleteUser(self) {
_public.uComponents.showLoading(self); _public.uComponents.showLoading(self);
// iot.business.sds.unbindByManager({
// data: {
// uuid: self.extras.uuid,
// destAuid: self.extras.account
// },
// success: (response) => {
//// alert(JSON.stringify(response));
_public.iot.business.api.sendCustom('lock/delLockUser', { _public.iot.business.api.sendCustom('lock/delLockUser', {
data: { data: {
rel_id: self.extras.id, rel_id: self.extras.id,
...@@ -1341,6 +1348,24 @@ function deleteUser(self) { ...@@ -1341,6 +1348,24 @@ function deleteUser(self) {
_public.uComponents.hideLoading(self); _public.uComponents.hideLoading(self);
} }
}); });
// },
// error: (error) => {
// console.log(error);
// alert(error);
//// if(window.iotDebug){
//// iotDebug.push('end: sds解绑普通用户失败'+JSON.stringify(error));
//// }
//// if (window.iotDebug) {
//// iotDebug.upload(iot,'sds解绑普通用户失败');
//// }
// uPublic.openRequestErrorAlert(self);
// self.setImageSrc('../../resources/image/green_unbindFail_icon.png');
// self.setTextBindTip(Vue.t('doorlockUser.unbindFailue'));
// self.setStateShowFlag(true);
// },
// complete: () => {
// }
// });
} }
/* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(2)["default"], __webpack_require__(128))) /* WEBPACK VAR INJECTION */}.call(exports, __webpack_require__(2)["default"], __webpack_require__(128)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment