Skip to content

D
DoorLock
Commit 50ac7284 by 朱建香
Options

Merge branch 'zjx' of http://192.168.2.91/gitlab/iot-project-js/doorlock into zjx 

# Conflicts:
#	dev/src/lang/zh.json
#	dev/src/view/addDevice/v_wifiAddHelp.js
#	dev/src/view/device/v_index.js
#	dev/src/view/device/v_opendoorRecord.js
#	dev/src/view/device/v_remoteOpendoor.js
#	dev/src/view/doorlockManage/v_editName.js
#	dev/src/view/doorlockManage/v_index.js
#	dev/src/view/doorlockUsers/v_index.js
#	dev/src/view/login/v_index.js
#	web/lib/js/p.js
#	web/resources/lang/zh.json
#	web/view/device/index.html
#	web/view/doorlockUsers/index.html
#	web/view/myInfo/index.html
parents 56d95500 c75b8a24
Showing with 94 additions and 102 deletions
web/view/doorlockUsers/doorlockUser.css~HEAD
...@@ -430,90 +430,126 @@ p { ...@@ -430,90 +430,126 @@ p {
padding-top: 1.173rem; padding-top: 1.173rem;
} }
.u-text { .user-list {
width: 100%; width: 100%;
display: table; height: 100%;
overflow: auto;
position: absolute;
top: 1.173rem;
bottom: 0;
left: 0;
height: auto;
}
.user-list-scroll .user-list-row {
position: relative; position: relative;
overflow: hidden;
} }
.u-text input { .user-list-scroll .user-list-row .user-list-handle {
display: table-cell; position: relative;
width: 100%; -webkit-transition: left 0.4s ease;
border: 0; transition: left 0.4s ease;
outline: 0; left: 0;
-webkit-appearance: none; background-color: #242635;
padding: 0.533rem 1.867rem 0.533rem 0.533rem; padding: 0.4rem 0.533rem;
background-color: transparent; display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
z-index: 2;
} }
.u-text input[type=text] ~ .u-text-see { .user-list-scroll .user-list-row .user-list-handle .user-list-image {
color: #007aff; width: 1.333rem;
height: 1.333rem;
margin-right: 0.267rem;
} }
.u-text .u-text-icon { .user-list-scroll .user-list-row .user-list-handle .user-list-icon {
margin-right: 0.267rem;
font-family: iconfont; font-family: iconfont;
font-size: 0.533rem; font-size: 0.533rem;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
line-height: 1; line-height: 1;
width: 1.12rem;
padding-left: 0.453rem;
display: table-cell;
vertical-align: middle;
} }
.u-text .u-text-icon ~ input { .user-list-scroll .user-list-row .user-list-handle div {
padding-left: 0; -webkit-box-flex: 1;
-webkit-flex: 1;
flex: 1;
min-width: 0;
} }
.u-text .u-text-title { .user-list-scroll .user-list-row .user-list-handle .user-list-title {
width: 1.92rem; overflow: hidden;
padding-left: 0.533rem; white-space: nowrap;
display: table-cell; text-overflow: ellipsis;
vertical-align: middle;
} }
.u-text .u-text-title ~ input { .user-list-scroll .user-list-row .user-list-handle .user-sub-image {
padding-left: 0; width: 0.453rem;
height: 0.453rem;
} }
.u-text .u-text-clear, .user-list-scroll .user-list-row .user-list-handle .user-list-subtitle {
.u-text .u-text-see { overflow: hidden;
position: absolute; white-space: nowrap;
top: 0; text-overflow: ellipsis;
width: 0.8rem; display: inline-block;
height: 100%;
} }
.u-text .u-text-clear:before, .user-list-scroll .user-list-row .user-list-handle.user-list-selected {
.u-text .u-text-see:before { left: -3.2rem;
position: absolute;
top: 50%;
left: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
font-family: defaultIconfont;
font-size: 0.667rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
} }
.u-text .u-text-clear { .user-list-scroll .user-list-row .user-list-handle:after {
right: 0.8rem; content: "\e611";
display: block;
font-family: iconfont;
font-size: 0.533rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
-webkit-transform: rotate(180deg);
transform: rotate(180deg);
} }
.u-text .u-text-clear:before { .user-list-scroll .user-list-row .user-list-button {
content: '\e724'; position: absolute;
top: 0;
bottom: 0;
right: 0;
z-index: 1;
} }
.u-text .u-text-see { .user-list-scroll .user-list-row .user-list-button div {
right: 0; width: 1.6rem;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
color: #fff;
float: left;
} }
.u-text .u-text-see:before { .user-list-scroll .user-list-row .user-list-button div:nth-last-of-type(1) {
content: '\e73c'; background-color: transparent;
font-family: iconfont;
font-size: 0.533rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
color: #00FFFF;
} }
.u-text:after { .user-list-scroll .user-list-row:after {
content: ''; content: '';
position: absolute; position: absolute;
bottom: 0; bottom: 0;
...@@ -521,54 +557,7 @@ p { ...@@ -521,54 +557,7 @@ p {
right: 0; right: 0;
height: 1px; height: 1px;
background: #bbb; background: #bbb;
} z-index: 2;
background: -webkit-linear-gradient(left, #242635, #fff, #242635);
@media (max-height: 400px /*no*/) { background: linear-gradient(to right, #242635, #fff, #242635);
#app {
height: 17.253rem;
position: relative;
}
}
.u-button {
width: 6.4rem;
color: #fff;
font-size: inherit;
background-color: #007aff;
border-radius: 0.533rem;
text-align: center;
line-height: 1;
margin: 0 auto;
padding: 0.267rem 0;
-webkit-transition: all 0.2s linear;
transition: all 0.2s linear;
background-clip: padding-box;
}
.u-button:active {
background-color: #0065ff;
}
.u-button.disabled {
background-color: #bbb;
}
.unbindState-dialog {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
}
.guide-dialog {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
} }
\ No newline at end of file
web/view/login/forgetPassword.html
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
</div> </div>
<div class="content"> <div class="content">
<div class="inputBox"> <div class="inputBox">
<p class="logo"></p>
<u-text :init-param="componentsConfig.telInput.initParam" :text="numberTel" <u-text :init-param="componentsConfig.telInput.initParam" :text="numberTel"
v-on:u-text-change="onTelChange(arguments[0])"></u-text> v-on:u-text-change="onTelChange(arguments[0])"></u-text>
<div class="code"> <div class="code">
......
web/view/login/login.html
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
</div> </div>
<div class="content"> <div class="content">
<div class="inputBox"> <div class="inputBox">
<u-text :init-param="componentsConfig.telInput.initParam" :text="numberTel" <u-text :init-param="componentsConfig.telInput.initParam" :text="numberTel"
v-on:u-text-change="onTelChange(arguments[0])"></u-text> v-on:u-text-change="onTelChange(arguments[0])"></u-text>
<u-text :init-param="componentsConfig.passwordInput.initParam" :text="textPassword" <u-text :init-param="componentsConfig.passwordInput.initParam" :text="textPassword"
......
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