Skip to content

D
DoorLock
Commit 6a5e9b04 by 朱建香
Options

1121

parent fdf8a840
Showing with 104 additions and 60 deletions
dev/src/lang/zh.json
......@@ -301,6 +301,7 @@
"password": "密码",
"icCard": "IC卡",
"key": "钥匙",
"remote":"遥控器",
"hijackFingerprint": "劫持指纹",
"opendoorRecord": "选择要关联的开锁ID",
"tip": "仅显示未绑定开门记录",
......
dev/src/view/device/v_index.js
......@@ -835,8 +835,15 @@ function notificationListener(self) {
//tap 个人信息
function myInfoTap(self){
// iot.navigator.openWindow({
// url: '../myInfo/index.html',
iot.navigator.openWindow({
url: '../myInfo/index.html',
id: 'myInfo',
extras: {
nickname: self.nickname
}
});
// uPublic.openWindow({
// url: '../myInfo/index.html',
// id: 'myInfo',
// extras: {
// nickname: self.nickname
......@@ -845,16 +852,6 @@ function myInfoTap(self){
// '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'});
// wv.show();
// plus.webview.create('new.html', 'new', {'titleNView':{'backgroundcolor':'#FFFFFF','titletext':'标题栏','titlecolor':'#FF0000'}});
......
dev/src/view/doorlockUsers/v_doorlockUser.js
......@@ -465,39 +465,63 @@ function iSeeButtonTap(self){
//删除用户
function deleteUser(self){
uComponents.showLoading(self);
iot.business.api.sendCustom('lock/delLockUser',{
data: {
rel_id: self.extras.id,
user_id: self.getInfo().user_id,
device_sn: self.getInfo().device_id,
device_id: self.extras.lockId
},
success: (response) => {
console.log(response);
if(response.data.success){
uComponents.openAlert(self, Vue.t('doorlockUser.deleteSuccess'), {
text: Vue.t('btn.confirm'), callback: function () {
iot.navigator.aback();
}
});
}
},
error: (error) => {
console.log(error);
// if(window.iotDebug){
// iotDebug.push('end: 删除用户失败'+JSON.stringify(error));
// }
// if (window.iotDebug) {
// iotDebug.upload(iot,'删除用户失败');
// }
uComponents.openAlert(self, Vue.t('doorlockUser.deleteFailure'), {
text: Vue.t('btn.confirm'), callback: function () {
}
});
},
complete: () => {
uComponents.hideLoading(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',{
data: {
rel_id: self.extras.id,
user_id: self.getInfo().user_id,
device_sn: self.getInfo().device_id,
device_id: self.extras.lockId
},
success: (response) => {
console.log(response);
if(response.data.success){
uComponents.openAlert(self, Vue.t('doorlockUser.deleteSuccess'), {
text: Vue.t('btn.confirm'), callback: function () {
iot.navigator.aback();
}
});
}
},
error: (error) => {
console.log(error);
// if(window.iotDebug){
// iotDebug.push('end: 删除用户失败'+JSON.stringify(error));
// }
// if (window.iotDebug) {
// iotDebug.upload(iot,'删除用户失败');
// }
uComponents.openAlert(self, Vue.t('doorlockUser.deleteFailure'), {
text: Vue.t('btn.confirm'), callback: function () {
}
});
},
complete: () => {
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,8 +24763,15 @@ function notificationListener(self) {
//tap 个人信息
function myInfoTap(self) {
// iot.navigator.openWindow({
// url: '../myInfo/index.html',
_public.iot.navigator.openWindow({
url: '../myInfo/index.html',
id: 'myInfo',
extras: {
nickname: self.nickname
}
});
// uPublic.openWindow({
// url: '../myInfo/index.html',
// id: 'myInfo',
// extras: {
// nickname: self.nickname
......@@ -24773,16 +24780,6 @@ function myInfoTap(self) {
// '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'});
// wv.show();
// plus.webview.create('new.html', 'new', {'titleNView':{'backgroundcolor':'#FFFFFF','titletext':'标题栏','titlecolor':'#FF0000'}});
......
web/view/doorlockUsers/addUnlockInfo.html
......@@ -53,7 +53,7 @@
<li class="active">{{ $t('addUnlockInfo.fingerprint') }}</li>
<li>{{ $t('addUnlockInfo.password') }}</li>
<li>{{ $t('addUnlockInfo.icCard') }}</li>
<li>遥控器</li>
<li>{{ $t('addUnlockInfo.remote') }}</li>
</ul>
</div>
<div class="guideStep1Tip">
......
web/view/doorlockUsers/doorlockUser.js
......@@ -1308,6 +1308,13 @@ function iSeeButtonTap(self) {
//删除用户
function deleteUser(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', {
data: {
rel_id: self.extras.id,
......@@ -1341,6 +1348,24 @@ function deleteUser(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)))
......
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