Commit 0c68b7bd by wjd

Merge branch 'zjx' into 'debug'

Zjx

See merge request iot-project-js/doorlock!20
parents b1749b58 88e2d434
...@@ -1138,6 +1138,8 @@ function remoteOpendoorTap(self){ ...@@ -1138,6 +1138,8 @@ function remoteOpendoorTap(self){
}else{ }else{
uComponents.openAlert(self, Vue.t('remoteOpendoor.offlineTip'), { uComponents.openAlert(self, Vue.t('remoteOpendoor.offlineTip'), {
text: Vue.t('dialog.confirm'), callback: function () { text: Vue.t('dialog.confirm'), callback: function () {
self.setValueRemoteOpendoor(false);
self.setRemoteOpendoorDisabledFlag(true);
} }
}); });
} }
...@@ -1262,12 +1264,16 @@ function confirmButtonTap(self){ ...@@ -1262,12 +1264,16 @@ function confirmButtonTap(self){
}else{ }else{
uComponents.openAlert(self, Vue.t('remoteOpendoor.textlengthTip'), { uComponents.openAlert(self, Vue.t('remoteOpendoor.textlengthTip'), {
text: Vue.t('dialog.confirm'), callback: function () { text: Vue.t('dialog.confirm'), callback: function () {
} }
}); });
} }
}else{ }else{
uComponents.openAlert(self, Vue.t('remoteOpendoor.offlineTip'), { uComponents.openAlert(self, Vue.t('remoteOpendoor.offlineTip'), {
text: Vue.t('dialog.confirm'), callback: function () { text: Vue.t('dialog.confirm'), callback: function () {
self.setRemoteOpendoorShowFlag(false);
self.setValueRemoteOpendoor(false);
self.setRemoteOpendoorDisabledFlag(true);
} }
}); });
} }
......
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