Skip to content

D
DoorLock
Commit cb65abb8 by wangying
Options

1.0.1 / 2017-09-15 

==================
 * 1.上传项目页面样式
parent 94b63896
Showing with 1269 additions and 332 deletions
History.md
1.0.0 / 2017-09-13
1.0.1 / 2017-09-15
==================
* 1.上传项目页面样式
1.0.0 / 2017-09-13
==================
* 1.上传项目开发环境
\ No newline at end of file
dev/src/lang/zh.json
......@@ -43,9 +43,8 @@
"bindUser": "绑定用户",
"userList": "用户列表"
},
"footer":{
"guide": "指纹改变生活",
"recordList": "记录时间以锁为准"
"guide":{
"footer": "指纹改变生活"
},
"login":{
"telInputTip": "请输入手机号",
......@@ -127,8 +126,8 @@
"wifiAddHelp": {
"helpTitle": "配置Wi-Fi说明：",
"helpCont1": "1.按下指纹锁背面的按钮，进入主菜单，选择Wi-Fi设置→配置Wi-Fi，门锁进入等待配网状态",
"helpCont2": "2.点击页面“开始配置Wi-Fi”按钮，进入Wi-Fi配网画面",
"helpCont3": "3.输入Wi-Fi密码，点击“l连接”按钮，等待锁端相应，直至配网成功",
"helpCont2": "2.点击页面 “开始配置Wi-Fi” 按钮，进入Wi-Fi配网画面",
"helpCont3": "3.输入Wi-Fi密码，点击 “l连接” 按钮，等待锁端相应，直至配网成功",
"helpCont4": "（提示：如果指纹锁已经绑定过用户，重新绑定成功后会清除之前所有绑定信息）"
},
"wifiAdd": {
......
dev/src/view/addDevice/v_wifiAddHelp.js
......@@ -39,7 +39,7 @@ function initComponentsConfig() {
//开始配置Wi-Fi button 参数
wifiAddButton: {
initParam: {
class: 'custom-button',
class: 'custom-help-button',
text: Vue.t('btn.wifiAdd')
}
},
......
dev/src/view/bindUser/r_bindUserHelp.vue
......@@ -21,7 +21,7 @@
<li>{{ $t('bindUserHelp.helpCont4') }}</li>
</ul>
<u-button :init-param="componentsConfig.bindUserButton.initParam" v-on:u-button-tap="onBindUserButtonTap"></u-button>
<v-touch tag="p" v-on:tap="onBoundUserTap">{{ $t('bindUserHelp.boundUser') }}</v-touch>
<p class="linkText"><v-touch tag="span" v-on:tap="onBoundUserTap">{{ $t('bindUserHelp.boundUser') }}</v-touch></p>
</div>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
......@@ -72,7 +72,7 @@
//绑定姓名 button 参数
bindUserButton: {
initParam: {
class: 'custom-button',
class: 'custom-help-button',
text: Vue.t('btn.bindUser')
}
},
......
dev/src/view/device/v_alarmInfo.js
......@@ -11,10 +11,8 @@ import {iot, uPublic, uComponents} from '../../public/public.js';
iot.ready(init);
function init() {
//通用 dialog、loading组件
uPublic.componentsInit(['u-dialog','u-loading']);
//项目 时间轴组件
uPublic.componentsExtend(['timeline']);
//通用 list、dialog、loading组件
uPublic.componentsInit(['u-list','u-dialog','u-loading']);
const app = new Vue({
data:{
//配置组件
......@@ -36,12 +34,12 @@ function initComponentsConfig() {
return {
alarmInfoList:{
initParam: {
class: '',
class: 'custom-list',
list: [
{value: 1, leftText: '2017.06.2315:56:26', leftImage: '../../resources/image/green_alarmInfo0_icon.png', title:'禁试报警'},
{value: 2, leftText: '2017.06.2315:01:01', leftImage: '../../resources/image/green_alarmInfo1_icon.png', title:'防撬报警'},
{value: 3, leftText: '2017.05.2315:56:26', leftImage: '../../resources/image/green_alarmInfo2_icon.png', title:'欠电报警'},
{value: 4, leftText: '2017.03.2315:01:01', leftImage: '../../resources/image/green_alarmInfo3_icon.png', title:'假锁报警'}
{value: 1, leftImage: '../../resources/image/green_alarmInfo0_icon.png', title:'', subtitle:'禁试报警', rightText: '2017.06.2315:56:26'},
{value: 2, leftImage: '../../resources/image/green_alarmInfo1_icon.png', title:'', subtitle:'防撬报警', rightText: '2017.06.2315:01:01'},
{value: 3, leftImage: '../../resources/image/green_alarmInfo2_icon.png', title:'', subtitle:'欠电报警', rightText: '2017.05.2315:56:26'},
{value: 4, leftImage: '../../resources/image/green_alarmInfo3_icon.png', title:'', subtitle:'假锁报警', rightText: '2017.03.2315:01:01'}
],
tip: Vue.t('alarmInfo.noInfoTip')
}
......
dev/src/view/device/v_hijackRecord.js
......@@ -11,10 +11,8 @@ import {iot, uPublic, uComponents} from '../../public/public.js';
iot.ready(init);
function init() {
//通用 dialog、loading组件
uPublic.componentsInit(['u-dialog','u-loading']);
//项目 时间轴组件
uPublic.componentsExtend(['timeline']);
//通用 list、dialog、loading组件
uPublic.componentsInit(['u-list','u-dialog','u-loading']);
const app = new Vue({
data:{
//配置组件
......@@ -36,12 +34,10 @@ function initComponentsConfig() {
return {
hijackRecordList:{
initParam: {
class: '',
class: 'custom-list',
list: [
{value: 1, leftText: '2017.07.1306:29:53', leftImage: '../../resources/image/green_opendoor2_icon.png', title:'劫持指纹开门', subtitle: 'ID:117',rightImage: '../../resources/image/white_head_icon.png'},
{value: 2, leftText: '2017.07.0310:27:56', leftImage: '../../resources/image/green_opendoor2_icon.png', title:'劫持指纹开门', subtitle: 'ID:115',rightImage: '../../resources/image/white_head_icon.png'},
{value: 3, leftText: '2017.06.3022:30:47', leftImage: '../../resources/image/green_opendoor2_icon.png', title:'劫持指纹开门', subtitle: 'ID:114',rightImage: '../../resources/image/white_head_icon.png'},
{value: 4, leftText: '2017.06.2617:10:03', leftImage: '../../resources/image/green_opendoor2_icon.png', title:'劫持指纹开门', subtitle: 'ID:113',rightImage: '../../resources/image/white_head_icon.png'}
{value: 1, leftImage: '../../resources/image/green_opendoor2_icon.png', title:'测试用户02', subtitle: '劫持指纹开门', rightText: '2017.07.1306:10:10'},
{value: 2, leftImage: '../../resources/image/green_opendoor2_icon.png', title:'ID:117', subtitle: '劫持指纹开门', rightText: '2017.07.0322:57:44'}
],
tip: Vue.t('hijackRecord.noRecordTip')
}
......
dev/src/view/device/v_opendoorRecord.js
......@@ -11,10 +11,8 @@ import {iot, uPublic, uComponents} from '../../public/public.js';
iot.ready(init);
function init() {
//通用 dialog、loading组件
uPublic.componentsInit(['u-dialog','u-loading']);
//项目 时间轴组件
uPublic.componentsExtend(['timeline']);
//通用 list、dialog、loading组件
uPublic.componentsInit(['u-list','u-dialog','u-loading']);
const app = new Vue({
data:{
//配置组件
......@@ -36,16 +34,16 @@ function initComponentsConfig() {
return {
opendoorRecordList:{
initParam: {
class: '',
class: 'custom-list',
list: [
{value: 1, leftText: '2017.08.0310:29:53', leftImage: '../../resources/image/green_opendoor0_icon.png', title:'手机远程开门', subtitle: '',rightImage: '../../resources/image/white_head_icon.png'},
{value: 2, leftText: '2017.08.0310:27:56', leftImage: '../../resources/image/green_opendoor0_icon.png', title:'手机远程开门', subtitle: '',rightImage: '../../resources/image/white_head_icon.png'},
{value: 3, leftText: '2017.08.0310:25:47', leftImage: '../../resources/image/green_opendoor1_icon.png', title:'指纹开门', subtitle: 'ID:6',rightImage: '../../resources/image/white_head_icon.png'},
{value: 4, leftText: '2017.07.3117:13:03', leftImage: '../../resources/image/green_opendoor0_icon.png', title:'手机远程开门', subtitle: '',rightImage: '../../resources/image/white_head_icon.png'},
{value: 5, leftText: '2017.07.3117:10:10', leftImage: '../../resources/image/green_opendoor2_icon.png', title:'劫持指纹开门', subtitle: 'ID:117',rightImage: '../../resources/image/white_head_icon.png'},
{value: 6, leftText: '2017.07.3117:09:59', leftImage: '../../resources/image/green_opendoor3_icon.png', title:'密码开门', subtitle: 'ID:0',rightImage: '../../resources/image/white_head_icon.png'},
{value: 7, leftText: '2017.07.3117:05:19', leftImage: '../../resources/image/green_opendoor2_icon.png', title:'劫持指纹开门', subtitle: 'ID:117',rightImage: '../../resources/image/white_head_icon.png'},
{value: 8, leftText: '2017.07.3117:03:50', leftImage: '../../resources/image/green_opendoor3_icon.png', title:'密码开门', subtitle: 'ID:0',rightImage: '../../resources/image/white_head_icon.png'}
{value: 1, leftImage: '../../resources/image/green_opendoor0_icon.png', title:'', subtitle: '手机远程开门', rightText: '2017.08.0310:29:53'},
{value: 2, leftImage: '../../resources/image/green_opendoor0_icon.png', title:'', subtitle: '手机远程开门', rightText: '2017.08.0310:27:56'},
{value: 3, leftImage: '../../resources/image/green_opendoor1_icon.png', title:'ID:6', subtitle: '指纹开门', rightText: '2017.08.0310:25:47'},
{value: 4, leftImage: '../../resources/image/green_opendoor0_icon.png', title:'', subtitle: '手机远程开门', rightText: '2017.07.3117:13:03',},
{value: 5, leftImage: '../../resources/image/green_opendoor2_icon.png', title:'测试用户02', subtitle: '劫持指纹开门', rightText: '2017.07.3117:10:10'},
{value: 6, leftImage: '../../resources/image/green_opendoor3_icon.png', title:'测试用户', subtitle: '密码开门', rightText: '2017.07.3117:09:59'},
{value: 7, leftImage: '../../resources/image/green_opendoor2_icon.png', title:'ID:117', subtitle: '劫持指纹开门', rightText: '2017.07.3117:05:19'},
{value: 8, leftImage: '../../resources/image/green_opendoor3_icon.png', title:'测试用户', subtitle: '密码开门', rightText: '2017.07.3117:03:50',}
],
tip: Vue.t('opendoorRecord.noRecordTip')
}
......
web/debug.log deleted 100644 → 0
[0912/183235.881:ERROR:process_info.cc(631)] range at 0xfffde000, size 0x230 fully unreadable
[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfffdd000, size 0xf84 fully unreadable
[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfffd7000, size 0xf84 fully unreadable
[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff99000, size 0xf84 fully unreadable
[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff93000, size 0xf84 fully unreadable
[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff8f000, size 0xf84 fully unreadable
[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff8c000, size 0xf84 fully unreadable
[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff89000, size 0xf84 fully unreadable
[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff7d000, size 0xf84 fully unreadable
[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff7a000, size 0xf84 fully unreadable
[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff77000, size 0xf84 fully unreadable
[0912/183237.582:ERROR:process_info.cc(631)] range at 0xfff74000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff71000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff6e000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff6b000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff68000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff65000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff62000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff5f000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff59000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff56000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff53000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff38000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff35000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff32000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff2f000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff2c000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff29000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff26000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff23000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff1a000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff0e000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff86000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff3e000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff20000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff1d000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff47000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff14000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff3b000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff4d000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff08000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff9c000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff83000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff9f000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff80000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff5c000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff4a000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff41000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff17000, size 0xf84 fully unreadable
[0912/183237.597:ERROR:process_info.cc(631)] range at 0xfff11000, size 0xf84 fully unreadable
web/lib/less/bindUser/bindUser.less
@import "../public/public.less";
@import "../public/header.less";
.u-text();
//ID-姓名绑定
.bindUserHelp{
.help();
}
.u-button();
.custom-help-button,
.custom-button{
.button();
}
.linkText();
.u-text();
.u-swipe-list();
\ No newline at end of file
web/lib/less/device/device.less
......@@ -3,10 +3,32 @@
.u-switch();
//远程开门
.inputBox{
width: 250px;
margin: 145px auto 50px;
padding-bottom: 40px;
}
.u-text();
.custom-text{
.textInput();
}
.errorTip{
position: absolute;
left: 0;
right: 0;
.errorTip();
}
.u-button();
.custom-button{
.button();
}
.custom-marquee-top{
width: 100%;
height: 25px;
......
web/lib/less/device/recordList.less
@import "../public/public.less";
@import "../public/header.less";
\ No newline at end of file
@import "../public/header.less";
.u-list();
.custom-list{
position: absolute;
top: 44px;
bottom: 0;
left: 0;
height: auto;
}
\ No newline at end of file
web/lib/less/doorlockManage/doorlockManage.less
@import "../public/public.less";
@import "../public/header.less";
//生成绑定二维码
.qrcodeHelp{
margin: 30px 30px 0;
li{
color: @QRCODEHELP-TEXT-COLOR;
font-size: @QRCODEHELP-TEXT-FONTSIZE;
padding-left: 12px;
text-indent: -12px;
line-height: 18px;
margin-bottom: 28px;
&:first-child{
color: inherit;
font-size: @QRCODEHELP-TITLE-FONTSIZE;
margin-bottom: 18px;
}
p{
width: 200px;
height: 200px;
margin: 0 auto;
border: 1px solid;/*no*/
}
}
}
.u-text();
.u-button();
\ No newline at end of file
.u-button();
.custom-button{
.button();
.buttonPosition();
}
\ No newline at end of file
web/lib/less/login/login.less
......@@ -21,19 +21,82 @@
}
}
//login
.inputBox();
//登录、注册、忘记密码
.inputBox(184px,40px,380px,"logo.png",75px,64px 64px);
.u-text();
.custom-text,
.custom-password-text,
.custom-code-text{
.custom-text();
.textInput();
}
.u-button();
//验证码
.code{
margin-top: 17px;
position: relative;
&:after{
content: '';
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;/*no*/
.white_gradient_border();
}
}
.custom-code-text{
width: 170px;
margin-top: 0;
&:after{
display: none;
}
}
//验证码 button
.custom-code-button{
position: absolute;
top: 5px;
right: 0;
.button(93px);
padding: 4px 0;
.transform(scale(0.7));
}
//密码
.passwordInput();
.errorTip{
position: absolute;
left: 0;
right: 0;
.errorTip();
}
.custom-button{
.custom-button();
.button();
}
.link{
width: 275px;
margin: 5px auto;
overflow: hidden;
span{
color: @LINK-TEXT-COLOR;
font-size: @LINK-TEXT-FONTSIZE;
.transform(scale(0.7));
padding: 15px;
&:nth-child(1){
float: left;
margin-left: -25px;
}
&:nth-child(2){
float: right;
margin-right: -25px;
}
}
}
\ No newline at end of file
web/lib/less/public/core.less
......@@ -101,7 +101,7 @@ p{
line-height: @lineHeight;
}
//0.5px的 top/bottom border
//top/bottom border
.defaultBorder(@positionPro:bottom,@startVal:0,@endVal:0,@borderBg:@DEFAULT-BORDER-COLOR){
content: '';
position: absolute;
......@@ -142,7 +142,7 @@ p{
}
//遮罩蒙版
.mask(@zIndex:1050){
.mask(@zIndex:1051){
position: fixed;
top: 0;
left: 0;
......@@ -155,7 +155,7 @@ p{
//自定义按钮组件
.custom-button(@width:275px){
.button(@width:275px){
// .custom-button{
width: @width;
border-radius: 5px;
......@@ -173,89 +173,125 @@ p{
// }
}
.buttonPosition(){
position: absolute;
bottom: 65px;
left: 0;
right: 0;
}
//自定义输入框组件
.custom-text(){
// .custom-text{
// padding-left: 20px;
margin-top: 16px;
.textInput(){
margin-top: 17px;
input{
padding-top: 8px;
padding-bottom: 8px;
padding-right: 38px;
&::-webkit-input-placeholder{
color: @CUSTOM-TEXT-COMPONENT-INPUT-PLACEHOLDER-COLOR;
}
}
.u-text-icon{
font-size: @CUSTOM-TEXT-COMPONENT-ICON-FONTSIZE;
width: 48px;
padding-left: 9px;
vertical-align: text-bottom;
}
.u-text-clear,
.u-text-see{
&:before{
font-family: iconfont;
color: @CUSTOM-TEXT-COMPONENT-DEFAULTICON-COLOR;
font-size: @CUSTOM-TEXT-COMPONENT-DEFAULTICON-FONTSIZE;
}
}
//x icon
.u-text-clear{
right: 7px;
&:before{
content: '\e601';
}
}
&:after{
.white_gradient_border();
}
}
.passwordInput(){
.custom-password-text{
input{
padding-top: 8px;
padding-bottom: 8px;
&::-webkit-input-placeholder{
color: #91929a;
padding-right: 70px;
&[type = text] ~ .u-text-see:before{
content: '\e60e';
}
}
.u-text-icon{
font-size: 24px;
width: 48px;
padding-left: 9px;
vertical-align: text-bottom;
}
//x icon
.u-text-clear{
right: 0;
width: 60px;
right: 37px;
}
//眼睛 icon
.u-text-see{
right: 7px;
&:before{
color: @CUSTOM-TEXT-COMPONENT-DEFAULTICON-COLOR;
font-size: @CUSTOM-TEXT-COMPONENT-DEFAULTICON-FONTSIZE;
}
}
&:after{
.white_gradient_border();
}
// }
content: '\e6b2';
}
}
}
}
//自定义弹出框组件
.custom-dialog(){
.custom-dialog .u-dialog-box{
width: 270px;
height: 150px;
border-radius: 5px;
.u-dialog-content{
width: 100%;
height: 100px;
.display-box();
.box-horizontal-alignment();
.box-vertical-alignment();
font-size: @CUSTOM-DIALOG-COMPONENT-CONTENT-FONTSIZE;
line-height: 22px;
padding: 0 15px;
&:after{
height: 0;
}
}
.u-dialog-button{
border-spacing: 23px 0;
.u-dialog-cancel,
.u-dialog-confirm{
background-color: @CUSTOM-DIALOG-COMPONENT-BUTTON-BG;
padding: 8px 0;
border-radius: 30px;
//按钮 active
.tap_row(@CUSTOM-DIALOG-COMPONENT-BUTTON-ACTIVE-BG);
}
//取消 button
.u-dialog-cancel{
color: @CUSTOM-DIALOG-COMPONENT-CANCELBUTTON-COLOR;
.custom-dialog{
background-color: @CUSTOM-BACKDROP-BG;
.u-dialog-box{
width: 355px;
border-radius: 5px;
background-color: @CUSTOM-DIALOG-COMPONENT-BOX-BG;
border: 1px solid;/*no*/
color: @CUSTOM-DIALOG-COMPONENT-COLOR;
padding-bottom: 35px;
.u-dialog-content{
width: 100%;
height: 140px;
.display-box();
.box-horizontal-alignment();
.box-vertical-alignment();
font-size: @CUSTOM-DIALOG-COMPONENT-CONTENT-FONTSIZE;
line-height: 22px;
padding: 0 15px;
span{
margin-right: 12px;
}
&:after{
width: 0;
display: none;
}
}
.u-dialog-button{
display: block;
text-align: center;
.u-dialog-cancel,
.u-dialog-confirm{
.button(135px);
padding: 10px 0;
display: inline-block;
}
//取消 button
.u-dialog-cancel:after{
display: none;
}
}
// //确认 button
// .u-dialog-confirm{
// color: @CUSTOM-DIALOG-COMPONENT-CONFIRMBUTTON-COLOR;
// }
}
}
}
//错误提示
.errorTip(){
.errorTip(@height:40px){
color: @ERRORTIP-TEXT-COLOR;
font-size: @ERRORTIP-TEXT-FONTSIZE;
.transform(scale(0.7));
text-align: center;
height: 30px;
line-height: 30px;
height: @height;
line-height: @height;
}
//上拉加载
......@@ -280,15 +316,63 @@ p{
background: linear-gradient(to right,@WHITE-GRADIENTBORDER-STARTCOLOR,@WHITE-GRADIENTBORDER-CENTERCOLOR,@WHITE-GRADIENTBORDER-ENDCOLOR);
}
.blue_gradient_border(){
.linear-gradient(left,@BLUE-GRADIENTBORDER-STARTCOLOR,@BLUE-GRADIENTBORDER-CENTERCOLOR,@BLUE-GRADIENTBORDER-ENDCOLOR);
background: linear-gradient(to right,@BLUE-GRADIENTBORDER-STARTCOLOR,@BLUE-GRADIENTBORDER-CENTERCOLOR,@BLUE-GRADIENTBORDER-ENDCOLOR);
}
.noBottomGradient(){
.noBottomGradient{
background-image: none;
}
}
}
.inputBox(){
.inputBox(@paddingTop,@paddingBottom,@height,@bgImg,@bgYPosition,@bgSize){
.inputBox{
width: 250px;
position: relative;
margin: 0 auto;
padding: @paddingTop 0 @paddingBottom;
.bgImgSize(250px,@height,@bgImg,center @bgYPosition,@bgSize);
}
}
.help(){
margin: 30px 38px 58px;
li{
color: @HELP-TEXT-COLOR;
padding-left: 12px;
text-indent: -12px;
line-height: 16px;
min-height: 60px;
&:first-child{
color: inherit;
font-size: @HELP-TITLE-FONTSIZE;
min-height: auto;
margin-bottom: 34px;
}
}
}
.linkText(){
.linkText{
text-align: center;
span{
position: relative;
color: @LINKTEXT-TEXT-COLOR;
font-size: @LINKTEXT-TEXT-FONTSIZE;
display: inline-block;
min-width: 100px;
padding: 16px 26px 2px;
margin-top: 20px;
&:after{
content: '';
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;/*no*/
.blue_gradient_border();
}
}
}
}
\ No newline at end of file
web/lib/less/public/public.less
......@@ -5,7 +5,7 @@
//loading
.u-loading{
.mask();
.mask(1050);
.u-loading-box{
.transform_center();
.u-loading-icon{
......@@ -235,7 +235,7 @@
}
.u-text-icon{
.iconfont(@TEXT-COMPONENT-ICON-FONTSIZE);
width: 44px;
width: 42px;
padding-left: 17px;
display: table-cell;
vertical-align: middle;
......
web/lib/less/public/variables.less
......@@ -16,7 +16,7 @@
@font-face{
font-family: 'iconfont';
//src: url('@{ICONFONT_PATH}/iconfont.ttf') format('truetype');
src: url('//at.alicdn.com/t/font_372681_ifeqlzhn1k9e8kt9.ttf') format('truetype');
src: url('//at.alicdn.com/t/font_372681_hjaizbm8cxwp14i.ttf') format('truetype');
}
@BODY-TEXT-FONTFAMILY: Helvetica,'Helvetica Neue',sans-serif;
......@@ -34,16 +34,21 @@
@C_BLUE_5: #153D4C;
@C_GREEN: #4cd964;
@C_RED: #ff0000;
@C_RED_1: #fc2168;
@C_GRAY: #bbb;
@C_GRAY_1: #ddd;
@C_GRAY_2: #999;
@C_GRAY_3: #91929a;
@C_GRAY_4: #959595;
@OPACITY: transparent;
@BLACK_OPACITY: fade(@C_BLACK,80%);
@BLACK_OPACITY_1: fade(@C_BLACK,40%);
@WHITE_OPACITY: fade(@C_WHITE,0);
@BLUE_OPACITY: fade(@C_BLUE_2,90%);
//font-sizes
@DEFAULT_F_SIZE: 14px;
@F_SIZE_12: @DEFAULT_F_SIZE - 2; //12px
@F_SIZE_13: @DEFAULT_F_SIZE - 1; //13px
@F_SIZE_15: @DEFAULT_F_SIZE + 1; //15px
@F_SIZE_16: @DEFAULT_F_SIZE + 2; //16px
......@@ -68,8 +73,13 @@
@WHITE-GRADIENTBORDER-CENTERCOLOR: @C_WHITE;
@WHITE-GRADIENTBORDER-ENDCOLOR: @C_BLUE_2;
@BLUE-GRADIENTBORDER-STARTCOLOR: @C_BLUE_2;
@BLUE-GRADIENTBORDER-CENTERCOLOR: @C_BLUE_4;
@BLUE-GRADIENTBORDER-ENDCOLOR: @C_BLUE_2;
//遮罩蒙版
@BACKDROP-BG-COLOR: @BLACK_OPACITY;
@CUSTOM-BACKDROP-BG: @BLUE_OPACITY;
//通用组件
@LOADING-COMPONENT-TEXT-COLOR: @C_WHITE; //loading
......@@ -138,16 +148,15 @@
@CUSTOM-BUTTON-COMPONENT-DISABLED-COLOR: @C_GRAY_2;
//自定义输入框组件
@CUSTOM-TEXT-COMPONENT-INPUT-PLACEHOLDER-COLOR: ;
@CUSTOM-TEXT-COMPONENT-DEFAULTICON-COLOR: ;
@CUSTOM-TEXT-COMPONENT-DEFAULTICON-FONTSIZE: @DEFAULT_F_SIZE + 8;
@CUSTOM-TEXT-COMPONENT-INPUT-PLACEHOLDER-COLOR: @C_GRAY_3;
@CUSTOM-TEXT-COMPONENT-ICON-FONTSIZE: @DEFAULT_F_SIZE + 10;
@CUSTOM-TEXT-COMPONENT-DEFAULTICON-COLOR: @C_BLUE_4;
@CUSTOM-TEXT-COMPONENT-DEFAULTICON-FONTSIZE: @F_SIZE_13;
//自定义弹出框组件
@CUSTOM-DIALOG-COMPONENT-BOX-BG: @OPACITY;
@CUSTOM-DIALOG-COMPONENT-COLOR: @C_BLUE_4;
@CUSTOM-DIALOG-COMPONENT-CONTENT-FONTSIZE: @F_SIZE_18;
@CUSTOM-DIALOG-COMPONENT-BUTTON-BG: ;
@CUSTOM-DIALOG-COMPONENT-BUTTON-ACTIVE-BG: ;
@CUSTOM-DIALOG-COMPONENT-CANCELBUTTON-COLOR: ;
@CUSTOM-DIALOG-COMPONENT-CONFIRMBUTTON-COLOR: @C_WHITE;
//header
@HEADER-BG-COLOR: @C_BLUE_3;
......@@ -157,12 +166,44 @@
@HEADER-ICON-FONTSIZE: @F_SIZE_25;
//errorTip
@ERRORTIP-TEXT-COLOR: ;
@ERRORTIP-TEXT-FONTSIZE: @F_SIZE_13;
@ERRORTIP-TEXT-COLOR: @C_RED_1;
@ERRORTIP-TEXT-FONTSIZE: @F_SIZE_16;
@LINKTEXT-TEXT-COLOR: @C_BLUE_4;
@LINKTEXT-TEXT-FONTSIZE: @F_SIZE_12;
//list
@LIST-LOAD-FONTSIZE: @F_SIZE_13; //上拉加载
@LIST-NOCONTTIP-COLOR: ; //list 无内容
//引导
@GUIDE-FOOTER-FONTSIZE: @F_SIZE_16;
\ No newline at end of file
@GUIDE-FOOTER-FONTSIZE: @F_SIZE_16;
//登录
@LINK-TEXT-COLOR: @C_BLUE_4;
@LINK-TEXT-FONTSIZE: @F_SIZE_16;
//添加设备
@ADDDEVICE-TEXT-COLOR: @C_BLUE_4;
@ADDDEVICE-TEXT-FONTSIZE: @F_SIZE_18;
@ADDDEVICE-ROW-ACTIVE-BG: @C_BLUE_5;
//配置Wi-Fi/ID-姓名绑定
@HELP-TEXT-COLOR: @C_GRAY_3;
@HELP-TITLE-FONTSIZE: @F_SIZE_18;
//连接Wi-Fi
@WIFI-ICON-FONTSIZE: @DEFAULT_F_SIZE + 10;
@WIFI-TEXT-COLOR: @C_BLUE_4;
@REMIND-TEXT-COLOR: @C_GRAY_3; //配置Wi-Fi提醒
@REMIND-TEXT-FONTSIZE: @F_SIZE_16;
//
@RECORDLIST-FOOTER-TOPBORDER: @C_WHITE;
@RECORDLIST-FOOTER-COLOR: @C_GRAY_4;
@RECORDLIST-FOOTER-FONTSIZE: @F_SIZE_16;
//生成绑定二维码
@QRCODEHELP-TEXT-COLOR: @C_GRAY_3;
@QRCODEHELP-TEXT-FONTSIZE: @F_SIZE_16;
@QRCODEHELP-TITLE-FONTSIZE: @F_SIZE_18;
\ No newline at end of file
web/resources/lang/zh.json
{"loading":"请耐心等待...","scroll":{"clickToLoadMore":"点击加载更多","loading":"loading..."},"btn":{"confirm":"确定","login":"登录","getCode":"获取验证码","register":"注册","logout":"退出系统","save":"保存","qrcode":"生成二维码","wifiAdd":"开始配置Wi-Fi","connect":"连接","bindUser":"绑定姓名","bind":"我要绑定","reBound":"请重新绑定","saveQRcode":"保存二维码到相册"},"dialog":{"confirm":"确认","cancel":"取消"},"title":{"login":"登录","register":"注册","forgetPassword":"忘记密码","device":"智能指纹锁","opendoorRecord":"开门记录","alarmInfo":"报警信息","remoteOpendoor":"远程开门","hijackRecord":"劫持记录","doorlockManage":"门锁管理","editName":"修改名称","qrcode":"生成绑定二维码","addDevice":"添加设备","scanCodeAdd":"扫描绑定设备","wifiAddHelp":"配置Wi-Fi","wifiAdd":"连接Wi-Fi","bindUserHelp":"ID-姓名绑定","bindUser":"绑定用户","userList":"用户列表"},"footer":{"guide":"指纹改变生活","recordList":"记录时间以锁为准"},"login":{"telInputTip":"请输入手机号","passwordInputTip":"请输入密码","register":"快速注册","forgetPassword":"忘记密码","error":{"telNull":"请输入手机号","passWordNull":"请输入密码"}},"register":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"forgetPassword":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"device":{"opendoorRecord":"开门记录","securityAlarm":"安全报警","remoteOpendoor":"远程开门","hijackAlarm":"劫持报警","followTitle":"关注服务号","followCont1":"关注“i智信”微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知，赶紧按下方提示试试吧","followCont2":"1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注","laterFollow":"稍后关注"},"opendoorRecord":{"noRecordTip":"暂无记录"},"alarmInfo":{"noInfoTip":"暂无信息"},"remoteOpendoor":{"passwordInputTip":"请输入远程开门密码","error":{}},"hijackRecord":{"noRecordTip":"暂无记录"},"doorlockManage":{"noDeviceTip":"暂无设备","deleteDialogTip":"<span>{0}</span>将被删除","logoutDialogTip":"确定要退出系统吗？"},"editName":{"nameInputTip":"请输入门锁名称","error":{}},"qrcode":{"helpTitle":"注意事项：","helpCont1":"1.仅超级管理员（通过Wi-Fi配网绑定的用户为超级管理员）可以生成绑定二维码","helpCont2":"2.二维码有效时间为10分钟且只能使用一次","helpCont3":"3.用户只需要扫描该二维码即可绑定指纹锁","helpCont4":"4.绑定失败则需要重新生成二维码进行绑定"},"addDevice":{"scanCodeAdd":"扫描绑定设备","wifiAdd":"配置Wi-Fi"},"wifiAddHelp":{"helpTitle":"配置Wi-Fi说明：","helpCont1":"1.按下指纹锁背面的按钮，进入主菜单，选择Wi-Fi设置→配置Wi-Fi，门锁进入等待配网状态","helpCont2":"2.点击页面“开始配置Wi-Fi”按钮，进入Wi-Fi配网画面","helpCont3":"3.输入Wi-Fi密码，点击“l连接”按钮，等待锁端相应，直至配网成功","helpCont4":"（提示：如果指纹锁已经绑定过用户，重新绑定成功后会清除之前所有绑定信息）"},"wifiAdd":{"passwordInputTip":"请输入Wi-Fi密码","remindTitle":"配置Wi-Fi提醒：","remindCont1":"1. 请确保Wi-Fi信号良好","remindCont2":"2. 本产品暂不支持5GHz无线网络","error":{}},"bindUserHelp":{"helpTitle":"配对姓名说明：","helpCont1":"1.在指纹锁上录入指纹、密码、卡并获得相应ID","helpCont2":"2.通过姓名绑定将该ID绑定对应用户姓名","helpCont3":"3.绑定成功后，开门记录中将会显示已绑定的用户姓名","helpCont4":"4.用户姓名信息只保存在APP端，不影响锁端设置","boundUser":"查看已绑定ID姓名"},"bindUser":{"editHeadTip":"点击编辑用户头像","nameTitle":"姓名","fingerprintIDTitle":"指纹ID","passwordIDTitle":"密码ID","ICCardIDTitle":"IC卡ID","requiredInputTip":"（必填）","optionalInputTip":"（选填）","error":{}},"userList":{"name":"姓名：{0}","id":"指纹ID:<span>{0}</span>密码ID:<span>{1}</span>IC卡ID:<span>{2}</span>","noUserTip":"暂无用户"},"commstatusLoading":{"connectSuccess":"Wi-Fi连接成功，正在绑定...","bindSuccess":"绑定成功","bindFailed":"绑定失败"}}
\ No newline at end of file
{"loading":"请耐心等待...","scroll":{"clickToLoadMore":"点击加载更多","loading":"loading..."},"btn":{"confirm":"确定","login":"登录","getCode":"获取验证码","register":"注册","logout":"退出系统","save":"保存","qrcode":"生成二维码","wifiAdd":"开始配置Wi-Fi","connect":"连接","bindUser":"绑定姓名","bind":"我要绑定","reBound":"请重新绑定","saveQRcode":"保存二维码到相册"},"dialog":{"confirm":"确认","cancel":"取消"},"title":{"login":"登录","register":"注册","forgetPassword":"忘记密码","device":"智能指纹锁","opendoorRecord":"开门记录","alarmInfo":"报警信息","remoteOpendoor":"远程开门","hijackRecord":"劫持记录","doorlockManage":"门锁管理","editName":"修改名称","qrcode":"生成绑定二维码","addDevice":"添加设备","scanCodeAdd":"扫描绑定设备","wifiAddHelp":"配置Wi-Fi","wifiAdd":"连接Wi-Fi","bindUserHelp":"ID-姓名绑定","bindUser":"绑定用户","userList":"用户列表"},"guide":{"footer":"指纹改变生活"},"login":{"telInputTip":"请输入手机号","passwordInputTip":"请输入密码","register":"快速注册","forgetPassword":"忘记密码","error":{"telNull":"请输入手机号","passWordNull":"请输入密码"}},"register":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"forgetPassword":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"device":{"opendoorRecord":"开门记录","securityAlarm":"安全报警","remoteOpendoor":"远程开门","hijackAlarm":"劫持报警","followTitle":"关注服务号","followCont1":"关注“i智信”微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知，赶紧按下方提示试试吧","followCont2":"1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注","laterFollow":"稍后关注"},"opendoorRecord":{"noRecordTip":"暂无记录"},"alarmInfo":{"noInfoTip":"暂无信息"},"remoteOpendoor":{"passwordInputTip":"请输入远程开门密码","error":{}},"hijackRecord":{"noRecordTip":"暂无记录"},"doorlockManage":{"noDeviceTip":"暂无设备","deleteDialogTip":"<span>{0}</span>将被删除","logoutDialogTip":"确定要退出系统吗？"},"editName":{"nameInputTip":"请输入门锁名称","error":{}},"qrcode":{"helpTitle":"注意事项：","helpCont1":"1.仅超级管理员（通过Wi-Fi配网绑定的用户为超级管理员）可以生成绑定二维码","helpCont2":"2.二维码有效时间为10分钟且只能使用一次","helpCont3":"3.用户只需要扫描该二维码即可绑定指纹锁","helpCont4":"4.绑定失败则需要重新生成二维码进行绑定"},"addDevice":{"scanCodeAdd":"扫描绑定设备","wifiAdd":"配置Wi-Fi"},"wifiAddHelp":{"helpTitle":"配置Wi-Fi说明：","helpCont1":"1.按下指纹锁背面的按钮，进入主菜单，选择Wi-Fi设置→配置Wi-Fi，门锁进入等待配网状态","helpCont2":"2.点击页面 “开始配置Wi-Fi” 按钮，进入Wi-Fi配网画面","helpCont3":"3.输入Wi-Fi密码，点击 “l连接” 按钮，等待锁端相应，直至配网成功","helpCont4":"（提示：如果指纹锁已经绑定过用户，重新绑定成功后会清除之前所有绑定信息）"},"wifiAdd":{"passwordInputTip":"请输入Wi-Fi密码","remindTitle":"配置Wi-Fi提醒：","remindCont1":"1. 请确保Wi-Fi信号良好","remindCont2":"2. 本产品暂不支持5GHz无线网络","error":{}},"bindUserHelp":{"helpTitle":"配对姓名说明：","helpCont1":"1.在指纹锁上录入指纹、密码、卡并获得相应ID","helpCont2":"2.通过姓名绑定将该ID绑定对应用户姓名","helpCont3":"3.绑定成功后，开门记录中将会显示已绑定的用户姓名","helpCont4":"4.用户姓名信息只保存在APP端，不影响锁端设置","boundUser":"查看已绑定ID姓名"},"bindUser":{"editHeadTip":"点击编辑用户头像","nameTitle":"姓名","fingerprintIDTitle":"指纹ID","passwordIDTitle":"密码ID","ICCardIDTitle":"IC卡ID","requiredInputTip":"（必填）","optionalInputTip":"（选填）","error":{}},"userList":{"name":"姓名：{0}","id":"指纹ID:<span>{0}</span>密码ID:<span>{1}</span>IC卡ID:<span>{2}</span>","noUserTip":"暂无用户"},"commstatusLoading":{"connectSuccess":"Wi-Fi连接成功，正在绑定...","bindSuccess":"绑定成功","bindFailed":"绑定失败"}}
\ No newline at end of file
web/view/addDevice/addDevice.css
......@@ -5,7 +5,7 @@
@font-face {
font-family: 'iconfont';
src: url('//at.alicdn.com/t/font_372681_ifeqlzhn1k9e8kt9.ttf') format('truetype');
src: url('//at.alicdn.com/t/font_372681_hjaizbm8cxwp14i.ttf') format('truetype');
}
html,
......@@ -105,7 +105,7 @@ p {
left: 0;
width: 100%;
height: 100%;
z-index: 1050;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
}
......@@ -176,15 +176,22 @@ p {
opacity: 0;
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.9);
}
.custom-dialog .u-dialog-box {
width: 7.2rem;
height: 4rem;
width: 9.467rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
padding-bottom: 0.933rem;
}
.custom-dialog .u-dialog-box .u-dialog-content {
width: 100%;
height: 2.667rem;
height: 3.733rem;
display: -webkit-box;
display: -webkit-flex;
display: flex;
......@@ -199,32 +206,44 @@ p {
padding: 0 0.4rem;
}
.custom-dialog .u-dialog-box .u-dialog-content span {
margin-right: 0.32rem;
}
.custom-dialog .u-dialog-box .u-dialog-content:after {
height: 0;
display: none;
}
.custom-dialog .u-dialog-box .u-dialog-button {
border-spacing: 0.613rem 0;
display: block;
text-align: center;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm {
background-color: ;
padding: 0.213rem 0;
border-radius: 0.8rem;
width: 3.6rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
padding: 0.267rem 0;
display: inline-block;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel:active,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm:active {
background-color: ;
background-color: #153D4C;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel {
color: ;
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel.disabled,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm.disabled {
background-color: transparent;
color: #999;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel:after {
width: 0;
display: none;
}
.header {
......@@ -284,6 +303,146 @@ p {
padding-top: 1.173rem;
}
.noBottomGradient {
background-image: none;
}
.addDevice li {
margin: 0.267rem;
border: 1px solid;
border-radius: 0.133rem;
color: #00ffff;
font-size: 0.48rem;
height: 5.707rem;
line-height: 5.707rem;
padding-left: 1.547rem;
}
.addDevice li:nth-child(1) img {
width: 2.4rem;
height: 2.4rem;
margin-right: 1.067rem;
}
.addDevice li:nth-child(2) img {
width: 3.6rem;
height: 1.707rem;
margin-right: 0.667rem;
}
.addDevice li:active {
background-color: #153D4C;
}
.wifiAddHelp {
margin: 0.8rem 1.013rem 1.547rem;
}
.wifiAddHelp li {
color: #91929a;
padding-left: 0.32rem;
text-indent: -0.32rem;
line-height: 0.427rem;
min-height: 1.6rem;
}
.wifiAddHelp li:first-child {
color: inherit;
font-size: 0.48rem;
min-height: auto;
margin-bottom: 0.907rem;
}
.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;
}
.custom-help-button,
.custom-button {
width: 7.333rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
}
.custom-help-button:active,
.custom-button:active {
background-color: #153D4C;
}
.custom-help-button.disabled,
.custom-button.disabled {
background-color: transparent;
color: #999;
}
.inputBox {
position: relative;
margin: 0 auto;
padding: 4.907rem 0 0.587rem;
width: 6.667rem;
height: auto;
background: url("../../resources/image/connectWifi.png") no-repeat center 1.067rem;
-webkit-background-size: 2.053rem 3.253rem;
background-size: 2.053rem 3.253rem;
}
.wifi {
width: 100%;
display: table;
position: relative;
margin-top: 0.453rem;
}
.wifi span {
font-family: iconfont;
font-size: 0.64rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
width: 1.28rem;
padding-left: 0.24rem;
display: table-cell;
vertical-align: text-bottom;
}
.wifi p {
padding: 0.213rem 0;
display: table-cell;
color: #00ffff;
}
.wifi:after {
content: '';
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;
background: -webkit-linear-gradient(left, #242635, #fff, #242635);
background: linear-gradient(to right, #242635, #fff, #242635);
}
.u-text {
width: 100%;
display: table;
......@@ -309,7 +468,7 @@ p {
font-size: 0.533rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
width: 1.173rem;
width: 1.12rem;
padding-left: 0.453rem;
display: table-cell;
vertical-align: middle;
......@@ -384,27 +543,96 @@ p {
}
}
.u-button {
width: 6.4rem;
color: #fff;
font-size: inherit;
background-color: #007aff;
border-radius: 0.533rem;
.custom-password-text {
margin-top: 0.453rem;
}
.custom-password-text input {
padding-top: 0.213rem;
padding-bottom: 0.213rem;
padding-right: 1.867rem;
}
.custom-password-text input[type=text] ~ .u-text-see:before {
content: '\e60e';
}
.custom-password-text input::-webkit-input-placeholder {
color: #91929a;
}
.custom-password-text .u-text-icon {
font-size: 0.64rem;
width: 1.28rem;
padding-left: 0.24rem;
vertical-align: text-bottom;
}
.custom-password-text .u-text-clear:before,
.custom-password-text .u-text-see:before {
font-family: iconfont;
color: #00ffff;
font-size: 0.347rem;
}
.custom-password-text .u-text-clear {
right: 0.987rem;
}
.custom-password-text .u-text-clear:before {
content: '\e601';
}
.custom-password-text .u-text-see {
right: 0.187rem;
}
.custom-password-text .u-text-see:before {
content: '\e6b2';
}
.custom-password-text:after {
background: -webkit-linear-gradient(left, #242635, #fff, #242635);
background: linear-gradient(to right, #242635, #fff, #242635);
}
.errorTip {
position: absolute;
left: 0;
right: 0;
color: #fc2168;
font-size: 0.427rem;
-webkit-transform: scale(0.7);
transform: scale(0.7);
text-align: center;
line-height: 1;
height: 0.587rem;
line-height: 0.587rem;
}
.remind {
width: 8.32rem;
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;
.remind li {
color: #91929a;
font-size: 0.427rem;
-webkit-transform: scale(0.7);
transform: scale(0.7);
padding-left: 1.227rem;
margin-bottom: 0.267rem;
line-height: 1;
}
.u-button.disabled {
background-color: #bbb;
.remind li:first-child {
padding-left: 0;
}
.custom-button {
position: absolute;
bottom: 1.733rem;
left: 0;
right: 0;
}
.u-commstatus-loading {
......@@ -498,7 +726,7 @@ p {
}
12.5% {
box-shadow: 0em -3em 0em 0em #00ffff, 2em -2em 0 0.2em #00ffff, 3em 0em 0 0em #00ffff, 2em 2em 0 -0.5em #00ffff, 0em 3em 0 -0.5em #00ffff, -2em 2em 0 -0.5em #00ffff, -3em 0em 0 -0.5em #00ffff, -2em -2em 0 -0.5em #00ffff;
ox-shadow: 0em -3em 0em 0em #00ffff, 2em -2em 0 0.2em #00ffff, 3em 0em 0 0em #00ffff, 2em 2em 0 -0.5em #00ffff, 0em 3em 0 -0.5em #00ffff, -2em 2em 0 -0.5em #00ffff, -3em 0em 0 -0.5em #00ffff, -2em -2em 0 -0.5em #00ffff;
}
25% {
......
web/view/addDevice/index.html
......@@ -17,7 +17,7 @@
<script type="text/javascript" src="../../lib/js/p.js"></script>
<script type="text/javascript" src="../../lib/js/UIOT.js"></script>
</head>
<body ontouchstart="">
<body ontouchstart="" class="noBottomGradient">
<div id="app" v-cloak>
<div class="header">
......
web/view/addDevice/wifiAdd.html
......@@ -25,9 +25,6 @@
<p>{{ $t('title.wifiAdd') }}</p>
</div>
<div class="content">
<p class="wifiImg">
<img src="../../resources/image/connectWifi.png">
</p>
<div class="inputBox">
<div class="wifi">
<span>&#xe62c;</span>
......
web/view/bindUser/bindUser.css
......@@ -5,7 +5,7 @@
@font-face {
font-family: 'iconfont';
src: url('//at.alicdn.com/t/font_372681_ifeqlzhn1k9e8kt9.ttf') format('truetype');
src: url('//at.alicdn.com/t/font_372681_hjaizbm8cxwp14i.ttf') format('truetype');
}
html,
......@@ -105,7 +105,7 @@ p {
left: 0;
width: 100%;
height: 100%;
z-index: 1050;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
}
......@@ -176,15 +176,22 @@ p {
opacity: 0;
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.9);
}
.custom-dialog .u-dialog-box {
width: 7.2rem;
height: 4rem;
width: 9.467rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
padding-bottom: 0.933rem;
}
.custom-dialog .u-dialog-box .u-dialog-content {
width: 100%;
height: 2.667rem;
height: 3.733rem;
display: -webkit-box;
display: -webkit-flex;
display: flex;
......@@ -199,32 +206,44 @@ p {
padding: 0 0.4rem;
}
.custom-dialog .u-dialog-box .u-dialog-content span {
margin-right: 0.32rem;
}
.custom-dialog .u-dialog-box .u-dialog-content:after {
height: 0;
display: none;
}
.custom-dialog .u-dialog-box .u-dialog-button {
border-spacing: 0.613rem 0;
display: block;
text-align: center;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm {
background-color: ;
padding: 0.213rem 0;
border-radius: 0.8rem;
width: 3.6rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
padding: 0.267rem 0;
display: inline-block;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel:active,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm:active {
background-color: ;
background-color: #153D4C;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel {
color: ;
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel.disabled,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm.disabled {
background-color: transparent;
color: #999;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel:after {
width: 0;
display: none;
}
.header {
......@@ -284,6 +303,94 @@ p {
padding-top: 1.173rem;
}
.bindUserHelp {
margin: 0.8rem 1.013rem 1.547rem;
}
.bindUserHelp li {
color: #91929a;
padding-left: 0.32rem;
text-indent: -0.32rem;
line-height: 0.427rem;
min-height: 1.6rem;
}
.bindUserHelp li:first-child {
color: inherit;
font-size: 0.48rem;
min-height: auto;
margin-bottom: 0.907rem;
}
.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;
}
.custom-help-button,
.custom-button {
width: 7.333rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
}
.custom-help-button:active,
.custom-button:active {
background-color: #153D4C;
}
.custom-help-button.disabled,
.custom-button.disabled {
background-color: transparent;
color: #999;
}
.linkText {
text-align: center;
}
.linkText span {
position: relative;
color: #00ffff;
font-size: 0.32rem;
display: inline-block;
min-width: 2.667rem;
padding: 0.427rem 0.693rem 0.053rem;
margin-top: 0.533rem;
}
.linkText span:after {
content: '';
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;
background: -webkit-linear-gradient(left, #242635, #00ffff, #242635);
background: linear-gradient(to right, #242635, #00ffff, #242635);
}
.u-text {
width: 100%;
display: table;
......@@ -309,7 +416,7 @@ p {
font-size: 0.533rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
width: 1.173rem;
width: 1.12rem;
padding-left: 0.453rem;
display: table-cell;
vertical-align: middle;
......@@ -384,29 +491,6 @@ p {
}
}
.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;
}
.u-swipe-list {
width: 100%;
height: 100%;
......
web/view/device/alarmInfo.html
......@@ -24,8 +24,7 @@
<v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
<p>{{ $t('title.alarmInfo') }}</p>
</div>
<timeline :init-param="componentsConfig.alarmInfoList.initParam"></timeline>
<div class="footer">{{ $t('footer.recordList') }}</div>
<u-list :init-param="componentsConfig.alarmInfoList.initParam"></u-list>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
</div>
......
web/view/device/device.css
......@@ -5,7 +5,7 @@
@font-face {
font-family: 'iconfont';
src: url('//at.alicdn.com/t/font_372681_ifeqlzhn1k9e8kt9.ttf') format('truetype');
src: url('//at.alicdn.com/t/font_372681_hjaizbm8cxwp14i.ttf') format('truetype');
}
html,
......@@ -105,7 +105,7 @@ p {
left: 0;
width: 100%;
height: 100%;
z-index: 1050;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
}
......@@ -176,15 +176,22 @@ p {
opacity: 0;
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.9);
}
.custom-dialog .u-dialog-box {
width: 7.2rem;
height: 4rem;
width: 9.467rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
padding-bottom: 0.933rem;
}
.custom-dialog .u-dialog-box .u-dialog-content {
width: 100%;
height: 2.667rem;
height: 3.733rem;
display: -webkit-box;
display: -webkit-flex;
display: flex;
......@@ -199,32 +206,44 @@ p {
padding: 0 0.4rem;
}
.custom-dialog .u-dialog-box .u-dialog-content span {
margin-right: 0.32rem;
}
.custom-dialog .u-dialog-box .u-dialog-content:after {
height: 0;
display: none;
}
.custom-dialog .u-dialog-box .u-dialog-button {
border-spacing: 0.613rem 0;
display: block;
text-align: center;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm {
background-color: ;
padding: 0.213rem 0;
border-radius: 0.8rem;
width: 3.6rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
padding: 0.267rem 0;
display: inline-block;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel:active,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm:active {
background-color: ;
background-color: #153D4C;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel {
color: ;
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel.disabled,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm.disabled {
background-color: transparent;
color: #999;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel:after {
width: 0;
display: none;
}
.header {
......@@ -349,6 +368,12 @@ p {
opacity: 0.3;
}
.inputBox {
width: 6.667rem;
margin: 3.867rem auto 1.333rem;
padding-bottom: 1.067rem;
}
.u-text {
width: 100%;
display: table;
......@@ -374,7 +399,7 @@ p {
font-size: 0.533rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
width: 1.173rem;
width: 1.12rem;
padding-left: 0.453rem;
display: table-cell;
vertical-align: middle;
......@@ -449,6 +474,60 @@ p {
}
}
.custom-text {
margin-top: 0.453rem;
}
.custom-text input {
padding-top: 0.213rem;
padding-bottom: 0.213rem;
padding-right: 1.013rem;
}
.custom-text input::-webkit-input-placeholder {
color: #91929a;
}
.custom-text .u-text-icon {
font-size: 0.64rem;
width: 1.28rem;
padding-left: 0.24rem;
vertical-align: text-bottom;
}
.custom-text .u-text-clear:before,
.custom-text .u-text-see:before {
font-family: iconfont;
color: #00ffff;
font-size: 0.347rem;
}
.custom-text .u-text-clear {
right: 0.187rem;
}
.custom-text .u-text-clear:before {
content: '\e601';
}
.custom-text:after {
background: -webkit-linear-gradient(left, #242635, #fff, #242635);
background: linear-gradient(to right, #242635, #fff, #242635);
}
.errorTip {
position: absolute;
left: 0;
right: 0;
color: #fc2168;
font-size: 0.427rem;
-webkit-transform: scale(0.7);
transform: scale(0.7);
text-align: center;
height: 1.067rem;
line-height: 1.067rem;
}
.u-button {
width: 6.4rem;
color: #fff;
......@@ -472,6 +551,24 @@ p {
background-color: #bbb;
}
.custom-button {
width: 7.333rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
}
.custom-button:active {
background-color: #153D4C;
}
.custom-button.disabled {
background-color: transparent;
color: #999;
}
.custom-marquee-top {
width: 100%;
height: 0.667rem;
......
web/view/device/hijackRecord.html
......@@ -24,8 +24,7 @@
<v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
<p>{{ $t('title.hijackRecord') }}</p>
</div>
<timeline :init-param="componentsConfig.hijackRecordList.initParam"></timeline>
<div class="footer">{{ $t('footer.recordList') }}</div>
<u-list :init-param="componentsConfig.hijackRecordList.initParam"></u-list>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
</div>
......
web/view/device/index.html
......@@ -60,7 +60,7 @@
</li>
</ul>
<u-button :init-param="componentsConfig.saveQRcodeButton.initParam" v-on:u-button-tap="onSaveQRcodeButtonTap"></u-button>
<v-touch tag="p" v-on:tap="onLaterFollowTap">{{ $t('device.laterFollow') }}</v-touch>
<p class="linkText"><v-touch tag="span" v-on:tap="onLaterFollowTap">{{ $t('device.laterFollow') }}</v-touch></p>
</div>
</div>
</transition>
......
web/view/device/opendoorRecord.html
......@@ -24,8 +24,7 @@
<v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
<p>{{ $t('title.opendoorRecord') }}</p>
</div>
<timeline :init-param="componentsConfig.opendoorRecordList.initParam"></timeline>
<div class="footer">{{ $t('footer.recordList') }}</div>
<u-list :init-param="componentsConfig.opendoorRecordList.initParam"></u-list>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
</div>
......
web/view/device/recordList.css
......@@ -5,7 +5,7 @@
@font-face {
font-family: 'iconfont';
src: url('//at.alicdn.com/t/font_372681_ifeqlzhn1k9e8kt9.ttf') format('truetype');
src: url('//at.alicdn.com/t/font_372681_hjaizbm8cxwp14i.ttf') format('truetype');
}
html,
......@@ -105,7 +105,7 @@ p {
left: 0;
width: 100%;
height: 100%;
z-index: 1050;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
}
......@@ -176,15 +176,22 @@ p {
opacity: 0;
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.9);
}
.custom-dialog .u-dialog-box {
width: 7.2rem;
height: 4rem;
width: 9.467rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
padding-bottom: 0.933rem;
}
.custom-dialog .u-dialog-box .u-dialog-content {
width: 100%;
height: 2.667rem;
height: 3.733rem;
display: -webkit-box;
display: -webkit-flex;
display: flex;
......@@ -199,32 +206,44 @@ p {
padding: 0 0.4rem;
}
.custom-dialog .u-dialog-box .u-dialog-content span {
margin-right: 0.32rem;
}
.custom-dialog .u-dialog-box .u-dialog-content:after {
height: 0;
display: none;
}
.custom-dialog .u-dialog-box .u-dialog-button {
border-spacing: 0.613rem 0;
display: block;
text-align: center;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm {
background-color: ;
padding: 0.213rem 0;
border-radius: 0.8rem;
width: 3.6rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
padding: 0.267rem 0;
display: inline-block;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel:active,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm:active {
background-color: ;
background-color: #153D4C;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel {
color: ;
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel.disabled,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm.disabled {
background-color: transparent;
color: #999;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel:after {
width: 0;
display: none;
}
.header {
......@@ -282,4 +301,97 @@ p {
.header ~ .content {
padding-top: 1.173rem;
}
.u-list {
width: 100%;
height: 100%;
overflow: auto;
}
.u-list-scroll .u-list-row {
padding: 0.4rem 0.4rem 0.4rem 0.533rem;
position: relative;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
}
.u-list-scroll .u-list-row .u-list-left-image {
width: 1.333rem;
height: 1.333rem;
margin-right: 0.267rem;
}
.u-list-scroll .u-list-row .u-list-left-icon {
margin-right: 0.267rem;
font-family: iconfont;
font-size: 0.533rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
}
.u-list-scroll .u-list-row div {
-webkit-box-flex: 1;
-webkit-flex: 1;
flex: 1;
min-width: 0;
}
.u-list-scroll .u-list-row .u-list-title {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.u-list-scroll .u-list-row .u-list-subtitle {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.u-list-scroll .u-list-row .u-list-right-text {
margin-left: 0.107rem;
}
.u-list-scroll .u-list-row .u-list-right-icon {
font-family: defaultIconfont;
font-size: 0.667rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
}
.u-list-scroll .u-list-row:after {
content: '';
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;
background: #bbb;
}
.u-list-load {
text-align: center;
}
.u-list-tip {
position: absolute;
top: 50%;
left: 0;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
width: 100%;
text-align: center;
}
.custom-list {
position: absolute;
top: 1.173rem;
bottom: 0;
left: 0;
height: auto;
}
\ No newline at end of file
web/view/doorlockManage/doorlockManage.css
......@@ -5,7 +5,7 @@
@font-face {
font-family: 'iconfont';
src: url('//at.alicdn.com/t/font_372681_ifeqlzhn1k9e8kt9.ttf') format('truetype');
src: url('//at.alicdn.com/t/font_372681_hjaizbm8cxwp14i.ttf') format('truetype');
}
html,
......@@ -105,7 +105,7 @@ p {
left: 0;
width: 100%;
height: 100%;
z-index: 1050;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
}
......@@ -176,15 +176,22 @@ p {
opacity: 0;
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.9);
}
.custom-dialog .u-dialog-box {
width: 7.2rem;
height: 4rem;
width: 9.467rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
padding-bottom: 0.933rem;
}
.custom-dialog .u-dialog-box .u-dialog-content {
width: 100%;
height: 2.667rem;
height: 3.733rem;
display: -webkit-box;
display: -webkit-flex;
display: flex;
......@@ -199,32 +206,44 @@ p {
padding: 0 0.4rem;
}
.custom-dialog .u-dialog-box .u-dialog-content span {
margin-right: 0.32rem;
}
.custom-dialog .u-dialog-box .u-dialog-content:after {
height: 0;
display: none;
}
.custom-dialog .u-dialog-box .u-dialog-button {
border-spacing: 0.613rem 0;
display: block;
text-align: center;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm {
background-color: ;
padding: 0.213rem 0;
border-radius: 0.8rem;
width: 3.6rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
padding: 0.267rem 0;
display: inline-block;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel:active,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm:active {
background-color: ;
background-color: #153D4C;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel {
color: ;
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel.disabled,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm.disabled {
background-color: transparent;
color: #999;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel:after {
width: 0;
display: none;
}
.header {
......@@ -284,6 +303,32 @@ p {
padding-top: 1.173rem;
}
.qrcodeHelp {
margin: 0.8rem 0.8rem 0;
}
.qrcodeHelp li {
color: #91929a;
font-size: 0.427rem;
padding-left: 0.32rem;
text-indent: -0.32rem;
line-height: 0.48rem;
margin-bottom: 0.747rem;
}
.qrcodeHelp li:first-child {
color: inherit;
font-size: 0.48rem;
margin-bottom: 0.48rem;
}
.qrcodeHelp li p {
width: 5.333rem;
height: 5.333rem;
margin: 0 auto;
border: 1px solid;
}
.u-text {
width: 100%;
display: table;
......@@ -309,7 +354,7 @@ p {
font-size: 0.533rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
width: 1.173rem;
width: 1.12rem;
padding-left: 0.453rem;
display: table-cell;
vertical-align: middle;
......@@ -405,4 +450,26 @@ p {
.u-button.disabled {
background-color: #bbb;
}
.custom-button {
width: 7.333rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
position: absolute;
bottom: 1.733rem;
left: 0;
right: 0;
}
.custom-button:active {
background-color: #153D4C;
}
.custom-button.disabled {
background-color: transparent;
color: #999;
}
\ No newline at end of file
web/view/login/forgetPassword.html
......@@ -26,7 +26,6 @@
</div>
<div class="content">
<div class="inputBox">
<p class="logo"></p>
<u-text :init-param="componentsConfig.telInput.initParam" :text="numberTel"
v-on:u-text-change="onTelChange(arguments[0])"></u-text>
<div class="code">
......
web/view/login/index.html
......@@ -21,7 +21,7 @@
<div id="app" v-cloak>
<div class="guideBg">
<p>{{ $t('footer.guide') }}</p>
<p>{{ $t('guide.footer') }}</p>
</div>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
......
web/view/login/login.css
......@@ -5,7 +5,7 @@
@font-face {
font-family: 'iconfont';
src: url('//at.alicdn.com/t/font_372681_ifeqlzhn1k9e8kt9.ttf') format('truetype');
src: url('//at.alicdn.com/t/font_372681_hjaizbm8cxwp14i.ttf') format('truetype');
}
html,
......@@ -105,7 +105,7 @@ p {
left: 0;
width: 100%;
height: 100%;
z-index: 1050;
z-index: 1051;
background-color: rgba(0, 0, 0, 0.8);
}
......@@ -176,15 +176,22 @@ p {
opacity: 0;
}
.custom-dialog {
background-color: rgba(36, 38, 53, 0.9);
}
.custom-dialog .u-dialog-box {
width: 7.2rem;
height: 4rem;
width: 9.467rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
padding-bottom: 0.933rem;
}
.custom-dialog .u-dialog-box .u-dialog-content {
width: 100%;
height: 2.667rem;
height: 3.733rem;
display: -webkit-box;
display: -webkit-flex;
display: flex;
......@@ -199,32 +206,44 @@ p {
padding: 0 0.4rem;
}
.custom-dialog .u-dialog-box .u-dialog-content span {
margin-right: 0.32rem;
}
.custom-dialog .u-dialog-box .u-dialog-content:after {
height: 0;
display: none;
}
.custom-dialog .u-dialog-box .u-dialog-button {
border-spacing: 0.613rem 0;
display: block;
text-align: center;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm {
background-color: ;
padding: 0.213rem 0;
border-radius: 0.8rem;
width: 3.6rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
padding: 0.267rem 0;
display: inline-block;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel:active,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm:active {
background-color: ;
background-color: #153D4C;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel {
color: ;
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel.disabled,
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-confirm.disabled {
background-color: transparent;
color: #999;
}
.custom-dialog .u-dialog-box .u-dialog-button .u-dialog-cancel:after {
width: 0;
display: none;
}
.header {
......@@ -311,8 +330,14 @@ p {
}
.inputBox {
width: 6.667rem;
position: relative;
margin: 0 auto;
padding: 4.907rem 0 1.067rem;
width: 6.667rem;
height: 10.133rem;
background: url("../../resources/image/logo.png") no-repeat center 2rem;
-webkit-background-size: 1.707rem 1.707rem;
background-size: 1.707rem 1.707rem;
}
.u-text {
......@@ -340,7 +365,7 @@ p {
font-size: 0.533rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
width: 1.173rem;
width: 1.12rem;
padding-left: 0.453rem;
display: table-cell;
vertical-align: middle;
......@@ -418,7 +443,7 @@ p {
.custom-text,
.custom-password-text,
.custom-code-text {
margin-top: 0.427rem;
margin-top: 0.453rem;
}
.custom-text input,
......@@ -426,6 +451,7 @@ p {
.custom-code-text input {
padding-top: 0.213rem;
padding-bottom: 0.213rem;
padding-right: 1.013rem;
}
.custom-text input::-webkit-input-placeholder,
......@@ -443,18 +469,27 @@ p {
vertical-align: text-bottom;
}
.custom-text .u-text-clear:before,
.custom-password-text .u-text-clear:before,
.custom-code-text .u-text-clear:before,
.custom-text .u-text-see:before,
.custom-password-text .u-text-see:before,
.custom-code-text .u-text-see:before {
font-family: iconfont;
color: #00ffff;
font-size: 0.347rem;
}
.custom-text .u-text-clear,
.custom-password-text .u-text-clear,
.custom-code-text .u-text-clear {
right: 0;
width: 1.6rem;
right: 0.187rem;
}
.custom-text .u-text-clear:before,
.custom-password-text .u-text-clear:before,
.custom-code-text .u-text-clear:before {
color: ;
font-size: 0.587rem;
content: '\e601';
}
.custom-text:after,
......@@ -487,6 +522,88 @@ p {
background-color: #bbb;
}
.code {
margin-top: 0.453rem;
position: relative;
}
.code:after {
content: '';
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;
background: -webkit-linear-gradient(left, #242635, #fff, #242635);
background: linear-gradient(to right, #242635, #fff, #242635);
}
.custom-code-text {
width: 4.533rem;
margin-top: 0;
}
.custom-code-text:after {
display: none;
}
.custom-code-button {
position: absolute;
top: 0.133rem;
right: 0;
width: 2.48rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
padding: 0.107rem 0;
-webkit-transform: scale(0.7);
transform: scale(0.7);
}
.custom-code-button:active {
background-color: #153D4C;
}
.custom-code-button.disabled {
background-color: transparent;
color: #999;
}
.custom-password-text input {
padding-right: 1.867rem;
}
.custom-password-text input[type=text] ~ .u-text-see:before {
content: '\e60e';
}
.custom-password-text .u-text-clear {
right: 0.987rem;
}
.custom-password-text .u-text-see {
right: 0.187rem;
}
.custom-password-text .u-text-see:before {
content: '\e6b2';
}
.errorTip {
position: absolute;
left: 0;
right: 0;
color: #fc2168;
font-size: 0.427rem;
-webkit-transform: scale(0.7);
transform: scale(0.7);
text-align: center;
height: 1.067rem;
line-height: 1.067rem;
}
.custom-button {
width: 7.333rem;
border-radius: 0.133rem;
......@@ -503,4 +620,28 @@ p {
.custom-button.disabled {
background-color: transparent;
color: #999;
}
.link {
width: 7.333rem;
margin: 0.133rem auto;
overflow: hidden;
}
.link span {
color: #00ffff;
font-size: 0.427rem;
-webkit-transform: scale(0.7);
transform: scale(0.7);
padding: 0.4rem;
}
.link span:nth-child(1) {
float: left;
margin-left: -0.667rem;
}
.link span:nth-child(2) {
float: right;
margin-right: -0.667rem;
}
\ No newline at end of file
web/view/login/login.html
......@@ -25,7 +25,6 @@
</div>
<div class="content">
<div class="inputBox">
<p class="logo"></p>
<u-text :init-param="componentsConfig.telInput.initParam" :text="numberTel"
v-on:u-text-change="onTelChange(arguments[0])"></u-text>
<u-text :init-param="componentsConfig.passwordInput.initParam" :text="textPassword"
......
web/view/login/register.html
......@@ -26,7 +26,6 @@
</div>
<div class="content">
<div class="inputBox">
<p class="logo"></p>
<u-text :init-param="componentsConfig.telInput.initParam" :text="numberTel"
v-on:u-text-change="onTelChange(arguments[0])"></u-text>
<div class="code">
......
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