Skip to content

D
DoorLock
Commit 4883c0ef by wjd
Options

Merge branch 'jianxiang' into 'test/96' 

Jianxiang

See merge request iot-project-js/doorlock!33
parents 938c249c 8958fdc9
Showing with 79 additions and 64 deletions
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,8 @@ async function sdsDataPorcessing(self, data){
self.setValueRemoteOpendoor(false);
self.setRemoteOpendoorDisabledFlag(true);
self.setRemoteOpendoorShowFlag(false);
window.clearTimeout(self.remoteTime);
uComponents.hideCommLoading(self);
}
});
}else{
......
web/lib/less/addDevice/addDevice.less
......@@ -228,9 +228,10 @@
line-height: 1;
margin: 0 auto;
padding: 0.267rem 0;
-webkit-transition: all 0.2s linear;
transition: all 0.2s linear;
-webkit-transition: background-color 0.2s linear;
transition: background-color 0.2s linear;
background-clip: padding-box;
.tap_row(@CUSTOM-BUTTON-COMPONENT-ACTIVE-BG);
}
.custom-process-cancelButton{
......
web/lib/less/public/variables.less
......@@ -50,10 +50,10 @@
@C_GRAY_6: #50515d;
@C_GRAY_7: #C2C2C2;
@OPACITY: transparent;
@BLACK_OPACITY: fade(@C_BLACK,80%);
@BLACK_OPACITY: fade(@C_BLACK,90%);
@BLACK_OPACITY_1: fade(@C_BLACK,40%);
@WHITE_OPACITY: fade(@C_WHITE,0);
@BLUE_OPACITY: fade(@C_BLUE_2,94%);
@BLUE_OPACITY: fade(@C_BLACK,90%);
@GRAY_OPACITY: fade(@C_GRAY_2,5%);
//font-sizes
......
web/view/addDevice/addDevice.css
......@@ -44,7 +44,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-loading .u-loading-box {
......@@ -100,7 +100,7 @@ p {
}
.custom-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-loading .u-loading-box {
......@@ -232,7 +232,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-dialog .u-dialog-box {
......@@ -303,7 +303,7 @@ p {
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-dialog .u-dialog-box {
......@@ -918,7 +918,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-process .u-process-content {
......@@ -1168,11 +1168,15 @@ p {
line-height: 1;
margin: 0 auto;
padding: 0.267rem 0;
-webkit-transition: all 0.2s linear;
transition: all 0.2s linear;
-webkit-transition: background-color 0.2s linear;
transition: background-color 0.2s linear;
background-clip: padding-box;
}
.custom-process-button:active {
background-color: #153D4C;
}
.custom-process-cancelButton {
bottom: 0;
width: 2.667rem;
......
web/view/bindUser/bindUser.css
......@@ -44,7 +44,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-loading .u-loading-box {
......@@ -100,7 +100,7 @@ p {
}
.custom-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-loading .u-loading-box {
......@@ -232,7 +232,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-dialog .u-dialog-box {
......@@ -303,7 +303,7 @@ p {
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-dialog .u-dialog-box {
......
web/view/device/device.css
......@@ -44,7 +44,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-loading .u-loading-box {
......@@ -100,7 +100,7 @@ p {
}
.custom-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-loading .u-loading-box {
......@@ -232,7 +232,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-dialog .u-dialog-box {
......@@ -303,7 +303,7 @@ p {
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-dialog .u-dialog-box {
......@@ -647,7 +647,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-comm-loading .u-comm-loading-content {
......@@ -881,7 +881,7 @@ p {
}
.custom-comm-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-comm-loading .u-comm-loading-button {
......@@ -1641,7 +1641,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.u-notification .u-notification-box {
......
web/view/device/notify.css
......@@ -44,7 +44,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-loading .u-loading-box {
......@@ -100,7 +100,7 @@ p {
}
.custom-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-loading .u-loading-box {
......@@ -232,7 +232,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-dialog .u-dialog-box {
......@@ -303,7 +303,7 @@ p {
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-dialog .u-dialog-box {
......
web/view/device/recordList.css
......@@ -44,7 +44,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-loading .u-loading-box {
......@@ -100,7 +100,7 @@ p {
}
.custom-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-loading .u-loading-box {
......@@ -232,7 +232,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-dialog .u-dialog-box {
......@@ -303,7 +303,7 @@ p {
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-dialog .u-dialog-box {
......
web/view/doorlockManage/doorlockManage.css
......@@ -44,7 +44,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-loading .u-loading-box {
......@@ -100,7 +100,7 @@ p {
}
.custom-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-loading .u-loading-box {
......@@ -232,7 +232,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-dialog .u-dialog-box {
......@@ -303,7 +303,7 @@ p {
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-dialog .u-dialog-box {
......@@ -1031,7 +1031,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.unbindState-dialog div {
......
web/view/doorlockUsers/doorlockUser.css
......@@ -44,7 +44,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-loading .u-loading-box {
......@@ -100,7 +100,7 @@ p {
}
.custom-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-loading .u-loading-box {
......@@ -232,7 +232,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-dialog .u-dialog-box {
......@@ -303,7 +303,7 @@ p {
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-dialog .u-dialog-box {
......@@ -835,7 +835,7 @@ p {
width: 100%;
height: 100%;
text-align: center;
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.inviteBind li p span {
......@@ -868,7 +868,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.unbindState-dialog div {
......@@ -911,7 +911,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.guide-dialog .guideStep1 {
......
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>
......
web/view/doorlockUsers/unlockInfo.css
......@@ -44,7 +44,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-loading .u-loading-box {
......@@ -100,7 +100,7 @@ p {
}
.custom-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-loading .u-loading-box {
......@@ -232,7 +232,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-dialog .u-dialog-box {
......@@ -303,7 +303,7 @@ p {
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-dialog .u-dialog-box {
......@@ -1143,7 +1143,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.guide-dialog .guideStep1 {
......
web/view/doorlockUsers/userList.css
......@@ -44,7 +44,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-loading .u-loading-box {
......@@ -100,7 +100,7 @@ p {
}
.custom-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-loading .u-loading-box {
......@@ -232,7 +232,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-dialog .u-dialog-box {
......@@ -303,7 +303,7 @@ p {
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-dialog .u-dialog-box {
......
web/view/login/login.css
......@@ -44,7 +44,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-loading .u-loading-box {
......@@ -100,7 +100,7 @@ p {
}
.custom-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-loading .u-loading-box {
......@@ -232,7 +232,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-dialog .u-dialog-box {
......@@ -303,7 +303,7 @@ p {
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-dialog .u-dialog-box {
......
web/view/myInfo/help.css
......@@ -44,7 +44,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-loading .u-loading-box {
......@@ -100,7 +100,7 @@ p {
}
.custom-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-loading .u-loading-box {
......@@ -232,7 +232,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-dialog .u-dialog-box {
......@@ -303,7 +303,7 @@ p {
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-dialog .u-dialog-box {
......
web/view/myInfo/myInfo.css
......@@ -44,7 +44,7 @@ p {
width: 100%;
height: 100%;
z-index: 1050;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-loading .u-loading-box {
......@@ -100,7 +100,7 @@ p {
}
.custom-loading {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-loading .u-loading-box {
......@@ -232,7 +232,7 @@ p {
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
background-color: rgba(0, 0, 0, 0.9);
}
.u-dialog .u-dialog-box {
......@@ -303,7 +303,7 @@ p {
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.94);
background-color: rgba(0, 0, 0, 0.9);
}
.custom-dialog .u-dialog-box {
......
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