Skip to content

D
DoorLock
Commit 3d363a7c by wjd
Options

Merge branch 'jianxiang' into 'debug' 

绑定页面样式修改

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