Commit 4fe9c697 by wangying

1.1.4 / 2017-11-07

==================
 * 1.上传css样式
parent c0436304
1.1.3 / 2017-11-06
1.1.4 / 2017-11-07
==================
* 1.上传css样式
1.1.3 / 2017-11-06
==================
* 1.上传css样式
......
......@@ -216,11 +216,6 @@
}
},
"userList":{
"name": "姓名:{0}",
"id": "指纹ID:<span>{0}</span>密码ID:<span>{1}</span>IC卡ID:<span>{2}</span>",
"noUserTip": "暂无用户"
},
"commstatusLoading":{
"connectSuccess": "Wi-Fi连接成功,正在绑定...",
"bindSuccess": "绑定成功",
......@@ -319,6 +314,7 @@
"error": "请求发送失败"
},
"deviceList":{
"model": "型号:"
"model": "型号:",
"noDeviceTip": "暂无产品型号"
}
}
\ No newline at end of file
......@@ -57,6 +57,9 @@
.u-list-load{
.listLoad();
}
.u-list-tip{
.listNoCont("noDevice.png");
}
}
//配置Wi-Fi
......@@ -178,6 +181,8 @@
.buttonPosition();
}
.mediaPosition();
.u-comm-loading();
.custom-comm-loading();
\ No newline at end of file
......@@ -81,6 +81,8 @@
.buttonPosition();
}
.mediaPosition();
//用户列表
.u-swipe-list();
......
......@@ -36,6 +36,8 @@
.buttonPosition();
}
.mediaPosition();
//门锁管理
.grid-list{
position: absolute;
......@@ -188,7 +190,8 @@
.custom-switch{
position: absolute;
top: 0;
right: 13px;
right: 0;
width: 126px;
height: 100%;
.u-switch-handle{
width: 40px;
......
......@@ -187,7 +187,7 @@
.mask(1051,@CUSTOM-BACKDROP-BG);
.guideStep1{
position: absolute;
top: 65px;
top: 44px;
left: 0;
width: 100%;
.guideStep1Cont{
......@@ -275,7 +275,7 @@
.guideStep2,
.guideStep4{
position: absolute;
bottom: 150px;
bottom: 65px;
left: 0;
width: 100%;
}
......@@ -284,7 +284,7 @@
}
.guideStep3{
position: absolute;
top: 139px;
top: 120px;
left: 0;
width: 100%;
.guideStep3Cont{
......@@ -327,3 +327,5 @@
}
}
}
.mediaPosition(true);
\ No newline at end of file
......@@ -109,6 +109,7 @@
padding: 10px 42px;
font-size: 0;
margin: 0 -12px;
position: relative;
li{
color: #00ffff;
font-size: 14px;
......@@ -175,7 +176,7 @@
.u-select-tip{
top: 80px;
.transform(none);
.listNoCont(inherit,45px 45px,58px);
.listNoCont("noCont.png",45px 45px,inherit,57px);
}
}
......@@ -192,7 +193,8 @@
height: auto;
text-align: center;
color: #00ffff;
margin: 37px auto 0;
margin: 27px auto 0;
padding: 10px 0;
.u-switch-handle{
position: relative;
top: auto;
......@@ -244,4 +246,172 @@
.guide-dialog{
.mask(1051,@CUSTOM-BACKDROP-BG);
.guideStep1{
position: absolute;
top: 44px;
left: 0;
width: 100%;
.modeSelect:after{
content: '';
position: absolute;
top: 0;
left: 0;
right: 0;
width: 360px;
height: 100%;
margin: 0 auto;
border: 2px dashed;/*no*/
border-radius: 5px;
}
.guideStep1Tip{
.bgImg("guideArrow1.png");
background-position: 190px top;
background-repeat: no-repeat;
.background-size(24px 57px);
padding-top: 64px;
margin-top: -2px;
font-size: 19px;
font-family: tipFont;
text-align: center;
}
}
.guideStep3{
position: absolute;
top: 147px;
left: 0;
width: 100%;
.guideStep3Tip{
.bgImg("guideArrow3.png");
background-position: 184px bottom;
background-repeat: no-repeat;
.background-size(16px 65px);
padding-bottom: 77px;
margin-bottom: -2px;
font-size: 19px;
font-family: tipFont;
text-align: center;
line-height: 23px;
span{
color: #00ffff;
}
}
.guideStep3Cont{
position: relative;
padding-bottom: 7px;
ul{
li{
font-size: 16px;
padding: 22px 80px 11px 42px;
position: relative;
p{
&:nth-child(1){
float: left;
margin-right: 36px;
.text_oneRow_ellipsis();
}
&:nth-child(2){
overflow: hidden;
.text_oneRow_ellipsis();
}
}
&:before{
content: '\e6a9';
position: absolute;
bottom: 9px;
right: 42px;
.iconfont(25px);
color: #00ffff;
}
&:after{
content: '';
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;/*no*/
.white_gradient_border();
}
&.active:before{
content: '\e6aa';
}
}
}
//虚线框
&:after{
content: '';
position: absolute;
top: 0;
left: 0;
right: 0;
width: 360px;
height: 100%;
margin: 0 auto;
border: 2px dashed;/*no*/
border-radius: 5px;
}
}
}
.guideStep5{
position: absolute;
top: 248px;
left: 0;
width: 100%;
.guideStep5Tip{
.bgImg("guideArrow4.png");
background-position: 164px bottom;
background-repeat: no-repeat;
.background-size(39px 179px);
padding-bottom: 188px;
margin-bottom: -3px;
font-size: 19px;
font-family: tipFont;
text-align: center;
line-height: 23px;
}
.guideStep5Cont{
position: relative;
p{
text-align: center;
position: relative;
color: #00ffff;
padding: 17px 0;
&:before{
content: '\e6a9';
.iconfont(17px);
display: inline-block;
vertical-align: middle;
margin-right: 9px;
}
&.active:before{
content: '\e6aa';
}
}
//虚线框
&:after{
content: '';
position: absolute;
top: 0;
left: 0;
right: 0;
width: 360px;
height: 100%;
margin: 0 auto;
border: 2px dashed;/*no*/
border-radius: 5px;
}
}
}
.guideStep2,
.guideStep4,
.guideStep6{
position: absolute;
bottom: 65px;
left: 0;
width: 100%;
}
.custom-dialog-button{
.button(200px);
}
}
.mediaPosition(true,true,true);
\ No newline at end of file
......@@ -103,6 +103,13 @@
.listLoad();
}
.user-list-tip{
.transformV_center(left,0);
width: 100%;
text-align: center;
.listNoCont("noUser.png");
}
//添加用户
.inputBox(200px,40px,auto,"gray_addUser_icon.png",90px,65px 65px);
......@@ -125,3 +132,5 @@
.button();
.buttonPosition();
}
.mediaPosition();
\ No newline at end of file
......@@ -86,6 +86,8 @@
.button();
}
.mediaPosition(false,fasle,false,true);
.link{
width: 275px;
margin: 5px auto;
......
......@@ -180,6 +180,49 @@ p{
right: 0;
}
.mediaPosition(@guideBtnBool: false,@guideStepBool:false,@switchBool:false,@loginBtnBool:false){
@media (min-width: 360px/*no*/) and(max-height: 570px/*no*/){
.custom-button{
bottom: 45px;
}
//指引蒙层
&when(@guideBtnBool){
.guide-dialog{
& .guideStep2,
& .guideStep4,
& .guideStep6{
bottom: 45px;
}
}
}
&when(@guideStepBool){
.guide-dialog{
.guideStep5{
top: 228px;
.guideStep5Cont p{
padding: 12px 0;
}
}
}
}
&when(@switchBool){
.custom-setHijack-switch{
margin-top: 0;
}
}
&when(@loginBtnBool){
.custom-guide-button{
bottom: 45px;
}
}
}
}
//自定义输入框组件
.textInput(@marginTop: 17px,@paddingTopOrBottom: 8px,@fontSize: inherit){
margin-top: @marginTop;
......
{"loading":"loading...","scroll":{"clickToLoadMore":"点击加载更多","loading":"loading..."},"btn":{"confirm":"确定","guideLogin":"账号/密码登录","login":"登录","getCode":"获取验证码","register":"注册","logout":"退出系统","save":"保存","qrcode":"生成二维码","wifiAdd":"开始配置Wi-Fi","connect":"连接","bindUser":"绑定姓名","bind":"我要绑定","reBound":"请重新绑定","saveQRcode":"保存二维码到相册","unbind":"解绑","deleteUser":"删除该用户","qrcodeReset":"重新生成二维码","add":"添加","next":"下一步","iSee":"我知道了","unbindDoorlock":"解绑门锁"},"dialog":{"confirm":"确认","cancel":"取消","unbind":"解绑","delete":"删除"},"title":{"login":"登录","register":"注册","forgetPassword":"忘记密码","device":"智能指纹锁","opendoorRecord":"开门记录","alarmInfo":"报警信息","remoteOpendoor":"远程开门","hijackRecord":"劫持记录","doorlockManage":"门锁管理","editName":"修改名称","qrcode":"生成绑定二维码","addDevice":"添加设备","scanCodeAdd":"扫描绑定设备","wifiAddHelp":"配置Wi-Fi","wifiAdd":"连接Wi-Fi","bindUserHelp":"ID-姓名绑定","bindUser":"绑定用户","userList":"用户列表","doorlockUser":"门锁用户","addUser":"添加用户","inviteBind":"邀请绑定","unlockInfo":"关联开锁信息","myInfo":"个人信息","editNickname":"修改昵称","editPassword":"修改密码","addUnlockInfo":"绑定开锁信息","deviceList":"产品型号"},"guide":{"footer":"指纹改变生活"},"login":{"telInputTip":"请输入手机号","passwordInputTip":"请输入密码","register":"快速注册","forgetPassword":"忘记密码","failure":"登陆失败","error":{"telNull":"请输入手机号","passWordNull":"请输入密码"}},"register":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"forgetPassword":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"device":{"opendoorRecord":"开门记录","securityAlarm":"安全报警","doorlockUser":"门锁用户","remoteOpendoor":"远程开门","hijackAlarm":"劫持报警","doorlockManage":"门锁管理","followTitle":"关注服务号","followCont1":"关注 “i智信” 微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知,赶紧按下方提示试试吧","followCont2":"1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注","laterFollow":"稍后关注","newMsgDoorlock":"门锁最新消息","doorLockRinging":"门铃响了","defaultNewMsg":"您尚未绑定门锁","noNewMsg":"门锁休息中","bindDoorlock":"绑定门锁"},"opendoorRecord":{"noRecordTip":"暂无记录","passwordOpenDoor":"密码开门","fingerprintOpenDoor":"指纹开门","ICcardOpenDoor":"IC卡开门","remoteOpenDoor":"遥控器开门","keyOpenDoor":"钥匙开门","hijackingAlarm":"劫持报警","appRemoteOpenDoor":"app远程开门"},"alarmInfo":{"noInfoTip":"暂无信息","tamperAlarm":"防撬报警","trialAlarm":"试错报警","powerAlarm":"欠电报警","fackLockAlram":"假锁报警"},"remoteOpendoor":{"loading":"远程开门中","passwordInputTip":"请输入远程开门密码","openDoorSuccess":"远程开门成功","openDoorFailure":"远程开门失败","remoteOpendoorAgain":"请尝试重试","error":{"noPasswordTip":"远程密码不能为空"}},"hijackRecord":{"noRecordTip":"暂无记录","hijackingAlarm":"劫持指纹报警"},"doorlockManage":{"name":"名称","deleteDialogTip":"<span>{0}</span>将被删除","logoutDialogTip":"确定要退出系统吗?","deleteSuccess":"删除成功","deleteFailue":"删除失败","defaultNickname":"门锁","unbindDialogTip":"<span></span>解锁门锁后,您将失去对该门锁<br>所有查看、管理等功能操作","unbindSuccess":"解绑成功","doorbellMsgPush":"门铃消息推送","alarmMsgPush":"报警消息推送","opendoorMsgPush":"开门消息推送"},"editName":{"nameInputTip":"请输入设备名称","nickNameInputTip":"请输入用户名","editNameSuccess":"修改名称成功","editNameFailue":"修改名称失败","error":{"nameCanNotBeBlank":"设备名称不能为空","nicknameCanNotBeBlank":"用户名不能为空"}},"qrcode":{"helpTitle":"注意事项:","helpCont1":"1.仅超级管理员(通过Wi-Fi配网绑定的用户为超级管理员)可以生成绑定二维码","helpCont2":"2.二维码有效时间为10分钟且只能使用一次","helpCont3":"3.用户只需要扫描该二维码即可绑定指纹锁","helpCont4":"4.绑定失败则需要重新生成二维码进行绑定"},"addDevice":{"scanCodeAdd":"扫描绑定设备","wifiAdd":"配置Wi-Fi","loading":"loading","bindSuccess":"绑定成功","bindFailure":"绑定失败","reBindDevice":"请重新绑定"},"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":"昵称:","noUserTip":"暂无用户"},"commstatusLoading":{"connectSuccess":"Wi-Fi连接成功,正在绑定...","bindSuccess":"绑定成功","bindFailed":"绑定失败"},"addUser":{"nameInputTip":"请输入您想添加的用户名","addUserSuccess":"添加用户成功","addUserFailure":"添加用户失败","error":{"nameCanNotEmpty":"用户名不能为空"}},"doorlockUser":{"name":"昵称:","inviteBind":"邀请绑定","bindUnlockInfo":"关联开锁信息","opendoorRecord":"历史开门记录","unbindDialogTip":"<span></span>解绑后,您将失去对门锁所有查看功能该用户仍在用户列表中","deleteUserDialogTip":"删除后,二者不再为绑定关系,用户无法查看该门锁下的任何信息,该用户名下绑定的所有ID号仍可以显示在开门记录中","unbindSuccess":"解绑成功","unbindFailue":"解绑失败","guideStep1Tip1":"邀请绑定成功","guideStep1Tip2":"(可查看开门记录,报警记录等<br>相关门锁信息)","guideStep3Tip":"绑定后看可了解<br>该用户的开门情况","deleteSuccess":"删除成功","deleteFailure":"删除失败"},"inviteBind":{"qrcodeExpireTip":"二维码已过期,请重新生成","title":"注意事项:","cont1":"1.直接通过微信扫一扫添加门锁","cont2":"2.将此二维码保存为图片,发送给好友,好友通过长按识别二维码"},"unlockInfo":{"bindUnlockInfo":"已关联的开锁信息","noInfoTip":"目前无绑定任何信息,请添加","passwordOpenDoor":"密码","fingerprintOpenDoor":"指纹","ICcardOpenDoor":"IC卡","remoteOpenDoor":"遥控器","keyOpenDoor":"钥匙","appRemoteOpenDoor":"app远程","setHijack":"设为劫持","setHijackTip":"确认设为劫持指纹吗?","cancelHijack":"取消劫持","cancelHijackTip":"确认取消劫持指纹吗?","cancelAssociated":"取消关联","cancelAssociatedTip":"取消关联后,开门历史记录中将不再显示关联的用户信息"},"addUnlockInfo":{"opendoorMode":"选择要关联的开锁方式","fingerprint":"指纹","password":"密码","icCard":"IC卡","key":"钥匙","hijackFingerprint":"劫持指纹","opendoorRecord":"选择要关联的开锁ID","tip":"仅显示未绑定开门记录","addInfoSuccess":"添加绑定开锁信息成功","addInfoFailue":"添加绑定开锁信息失败","noRecordTip":"暂无记录","setHijackSwitch":"设为劫持指纹","guideStep1Tip":"选择需要添加关联的开门方式","guideStep3Tip":"根据开门记录中的开门时间,选择关联的<br>开门ID<span>(一个ID只能被一个用户绑定)</span>","guideStep5Tip":"使用劫持指纹开门时,会以报警形式<br>通知到该门锁名下的其他绑定用户"},"myInfo":{"editNickname":"修改昵称","editPassword":"修改密码","logoutDialogTip":"确定要退出系统吗?"},"editNickname":{"nickNameInputTip":"请输入昵称"},"editPassword":{"newPasswordInputTip":"请输入新密码","oldPasswordInputTip":"请输入旧密码","oldPasswordInputTipAgain":"请再次输入旧密码"},"request":{"error":"请求发送失败"},"deviceList":{"model":"型号:"}}
\ No newline at end of file
{"loading":"loading...","scroll":{"clickToLoadMore":"点击加载更多","loading":"loading..."},"btn":{"confirm":"确定","guideLogin":"账号/密码登录","login":"登录","getCode":"获取验证码","register":"注册","logout":"退出系统","save":"保存","qrcode":"生成二维码","wifiAdd":"开始配置Wi-Fi","connect":"连接","bindUser":"绑定姓名","bind":"我要绑定","reBound":"请重新绑定","saveQRcode":"保存二维码到相册","unbind":"解绑","deleteUser":"删除该用户","qrcodeReset":"重新生成二维码","add":"添加","next":"下一步","iSee":"我知道了","unbindDoorlock":"解绑门锁"},"dialog":{"confirm":"确认","cancel":"取消","unbind":"解绑","delete":"删除"},"title":{"login":"登录","register":"注册","forgetPassword":"忘记密码","device":"智能指纹锁","opendoorRecord":"开门记录","alarmInfo":"报警信息","remoteOpendoor":"远程开门","hijackRecord":"劫持记录","doorlockManage":"门锁管理","editName":"修改名称","qrcode":"生成绑定二维码","addDevice":"添加设备","scanCodeAdd":"扫描绑定设备","wifiAddHelp":"配置Wi-Fi","wifiAdd":"连接Wi-Fi","bindUserHelp":"ID-姓名绑定","bindUser":"绑定用户","userList":"用户列表","doorlockUser":"门锁用户","addUser":"添加用户","inviteBind":"邀请绑定","unlockInfo":"关联开锁信息","myInfo":"个人信息","editNickname":"修改昵称","editPassword":"修改密码","addUnlockInfo":"绑定开锁信息","deviceList":"产品型号"},"guide":{"footer":"指纹改变生活"},"login":{"telInputTip":"请输入手机号","passwordInputTip":"请输入密码","register":"快速注册","forgetPassword":"忘记密码","failure":"登陆失败","error":{"telNull":"请输入手机号","passWordNull":"请输入密码"}},"register":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"forgetPassword":{"telInputTip":"请输入手机号","codeInputTip":"请输入验证码","passwordInputTip":"请输入6位登录密码","error":{"telNull":"请输入手机号","codeNull":"请输入验证码","passWordNull":"请输入密码"}},"device":{"opendoorRecord":"开门记录","securityAlarm":"安全报警","doorlockUser":"门锁用户","remoteOpendoor":"远程开门","hijackAlarm":"劫持报警","doorlockManage":"门锁管理","followTitle":"关注服务号","followCont1":"关注 “i智信” 微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知,赶紧按下方提示试试吧","followCont2":"1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注","laterFollow":"稍后关注","newMsgDoorlock":"门锁最新消息","doorLockRinging":"门铃响了","defaultNewMsg":"您尚未绑定门锁","noNewMsg":"门锁休息中","bindDoorlock":"绑定门锁"},"opendoorRecord":{"noRecordTip":"暂无记录","passwordOpenDoor":"密码开门","fingerprintOpenDoor":"指纹开门","ICcardOpenDoor":"IC卡开门","remoteOpenDoor":"遥控器开门","keyOpenDoor":"钥匙开门","hijackingAlarm":"劫持报警","appRemoteOpenDoor":"app远程开门"},"alarmInfo":{"noInfoTip":"暂无信息","tamperAlarm":"防撬报警","trialAlarm":"试错报警","powerAlarm":"欠电报警","fackLockAlram":"假锁报警"},"remoteOpendoor":{"loading":"远程开门中","passwordInputTip":"请输入远程开门密码","openDoorSuccess":"远程开门成功","openDoorFailure":"远程开门失败","remoteOpendoorAgain":"请尝试重试","error":{"noPasswordTip":"远程密码不能为空"}},"hijackRecord":{"noRecordTip":"暂无记录","hijackingAlarm":"劫持指纹报警"},"doorlockManage":{"name":"名称","deleteDialogTip":"<span>{0}</span>将被删除","logoutDialogTip":"确定要退出系统吗?","deleteSuccess":"删除成功","deleteFailue":"删除失败","defaultNickname":"门锁","unbindDialogTip":"<span></span>解锁门锁后,您将失去对该门锁<br>所有查看、管理等功能操作","unbindSuccess":"解绑成功","doorbellMsgPush":"门铃消息推送","alarmMsgPush":"报警消息推送","opendoorMsgPush":"开门消息推送"},"editName":{"nameInputTip":"请输入设备名称","nickNameInputTip":"请输入用户名","editNameSuccess":"修改名称成功","editNameFailue":"修改名称失败","error":{"nameCanNotBeBlank":"设备名称不能为空","nicknameCanNotBeBlank":"用户名不能为空"}},"qrcode":{"helpTitle":"注意事项:","helpCont1":"1.仅超级管理员(通过Wi-Fi配网绑定的用户为超级管理员)可以生成绑定二维码","helpCont2":"2.二维码有效时间为10分钟且只能使用一次","helpCont3":"3.用户只需要扫描该二维码即可绑定指纹锁","helpCont4":"4.绑定失败则需要重新生成二维码进行绑定"},"addDevice":{"scanCodeAdd":"扫描绑定设备","wifiAdd":"配置Wi-Fi","loading":"loading","bindSuccess":"绑定成功","bindFailure":"绑定失败","reBindDevice":"请重新绑定"},"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":{}},"commstatusLoading":{"connectSuccess":"Wi-Fi连接成功,正在绑定...","bindSuccess":"绑定成功","bindFailed":"绑定失败"},"userList":{"name":"昵称:","noUserTip":"暂无用户"},"addUser":{"nameInputTip":"请输入您想添加的用户名","addUserSuccess":"添加用户成功","addUserFailure":"添加用户失败","error":{"nameCanNotEmpty":"用户名不能为空"}},"doorlockUser":{"name":"昵称:","inviteBind":"邀请绑定","bindUnlockInfo":"关联开锁信息","opendoorRecord":"历史开门记录","unbindDialogTip":"<span></span>解绑后,您将失去对门锁所有查看功能该用户仍在用户列表中","deleteUserDialogTip":"删除后,二者不再为绑定关系,用户无法查看该门锁下的任何信息,该用户名下绑定的所有ID号仍可以显示在开门记录中","unbindSuccess":"解绑成功","unbindFailue":"解绑失败","guideStep1Tip1":"邀请绑定成功","guideStep1Tip2":"(可查看开门记录,报警记录等<br>相关门锁信息)","guideStep3Tip":"绑定后看可了解<br>该用户的开门情况","deleteSuccess":"删除成功","deleteFailure":"删除失败"},"inviteBind":{"qrcodeExpireTip":"二维码已过期,请重新生成","title":"注意事项:","cont1":"1.直接通过微信扫一扫添加门锁","cont2":"2.将此二维码保存为图片,发送给好友,好友通过长按识别二维码"},"unlockInfo":{"bindUnlockInfo":"已关联的开锁信息","noInfoTip":"目前无绑定任何信息,请添加","passwordOpenDoor":"密码","fingerprintOpenDoor":"指纹","ICcardOpenDoor":"IC卡","remoteOpenDoor":"遥控器","keyOpenDoor":"钥匙","appRemoteOpenDoor":"app远程","setHijack":"设为劫持","setHijackTip":"确认设为劫持指纹吗?","cancelHijack":"取消劫持","cancelHijackTip":"确认取消劫持指纹吗?","cancelAssociated":"取消关联","cancelAssociatedTip":"取消关联后,开门历史记录中将不再显示关联的用户信息"},"addUnlockInfo":{"opendoorMode":"选择要关联的开锁方式","fingerprint":"指纹","password":"密码","icCard":"IC卡","key":"钥匙","hijackFingerprint":"劫持指纹","opendoorRecord":"选择要关联的开锁ID","tip":"仅显示未绑定开门记录","addInfoSuccess":"添加绑定开锁信息成功","addInfoFailue":"添加绑定开锁信息失败","noRecordTip":"暂无记录","setHijackSwitch":"设为劫持指纹","guideStep1Tip":"选择需要添加关联的开门方式","guideStep3Tip":"根据开门记录中的开门时间,选择关联的<br>开门ID<span>(一个ID只能被一个用户绑定)</span>","guideStep5Tip":"使用劫持指纹开门时,会以报警形式<br>通知到该门锁名下的其他绑定用户"},"myInfo":{"editNickname":"修改昵称","editPassword":"修改密码","logoutDialogTip":"确定要退出系统吗?"},"editNickname":{"nickNameInputTip":"请输入昵称"},"editPassword":{"newPasswordInputTip":"请输入新密码","oldPasswordInputTip":"请输入旧密码","oldPasswordInputTipAgain":"请再次输入旧密码"},"request":{"error":"请求发送失败"},"deviceList":{"model":"型号:","noDeviceTip":"暂无产品型号"}}
\ No newline at end of file
......@@ -601,6 +601,17 @@ p {
line-height: 0.933rem;
}
.custom-device-list .u-list-tip {
background-image: url("../../resources/image/noDevice.png");
background-position: top center;
background-repeat: no-repeat;
-webkit-background-size: 1.627rem 1.627rem;
background-size: 1.627rem 1.627rem;
color: #91929a;
font-size: 0.427rem;
padding-top: 2.347rem;
}
.wifiAddHelp {
margin: 0.8rem 1.013rem 1.547rem;
}
......@@ -894,6 +905,12 @@ p {
right: 0;
}
@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
.custom-button {
bottom: 1.2rem;
}
}
.u-comm-loading {
position: fixed;
top: 0;
......
......@@ -706,6 +706,12 @@ p {
right: 0;
}
@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
.custom-button {
bottom: 1.2rem;
}
}
.u-swipe-list {
width: 100%;
height: 100%;
......
......@@ -522,6 +522,12 @@ p {
color: #999;
}
@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
.custom-button {
bottom: 1.2rem;
}
}
.grid-list {
position: absolute;
top: 1.173rem;
......@@ -914,7 +920,8 @@ p {
.custom-switch {
position: absolute;
top: 0;
right: 0.347rem;
right: 0;
width: 3.36rem;
height: 100%;
}
......
......@@ -900,7 +900,7 @@ p {
.guide-dialog .guideStep1 {
position: absolute;
top: 1.733rem;
top: 1.173rem;
left: 0;
width: 100%;
}
......@@ -1006,7 +1006,7 @@ p {
.guide-dialog .guideStep2,
.guide-dialog .guideStep4 {
position: absolute;
bottom: 4rem;
bottom: 1.733rem;
left: 0;
width: 100%;
}
......@@ -1031,7 +1031,7 @@ p {
.guide-dialog .guideStep3 {
position: absolute;
top: 3.707rem;
top: 3.2rem;
left: 0;
width: 100%;
}
......@@ -1083,3 +1083,15 @@ p {
line-height: 0.64rem;
margin-top: -0.053rem;
}
@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
.custom-button {
bottom: 1.2rem;
}
.guide-dialog .guideStep2,
.guide-dialog .guideStep4,
.guide-dialog .guideStep6 {
bottom: 1.2rem;
}
}
\ No newline at end of file
......@@ -692,6 +692,7 @@ p {
padding: 0.267rem 1.12rem;
font-size: 0;
margin: 0 -0.32rem;
position: relative;
}
.modeSelect li {
......@@ -871,14 +872,14 @@ p {
top: 2.133rem;
-webkit-transform: none;
transform: none;
background-image: url("../../resources/image/inherit");
background-image: url("../../resources/image/noCont.png");
background-position: top center;
background-repeat: no-repeat;
-webkit-background-size: 1.2rem 1.2rem;
background-size: 1.2rem 1.2rem;
color: #91929a;
font-size: 1.547rem;
padding-top: 2.347rem;
font-size: inherit;
padding-top: 1.52rem;
}
.tip {
......@@ -949,7 +950,8 @@ p {
height: auto;
text-align: center;
color: #00ffff;
margin: 0.987rem auto 0;
margin: 0.72rem auto 0;
padding: 0.267rem 0;
}
.custom-setHijack-switch .u-switch-handle {
......@@ -1058,3 +1060,237 @@ p {
z-index: 1051;
background-color: rgba(36, 38, 53, 0.9);
}
.guide-dialog .guideStep1 {
position: absolute;
top: 1.173rem;
left: 0;
width: 100%;
}
.guide-dialog .guideStep1 .modeSelect:after {
content: '';
position: absolute;
top: 0;
left: 0;
right: 0;
width: 9.6rem;
height: 100%;
margin: 0 auto;
border: 2px dashed;
border-radius: 0.133rem;
}
.guide-dialog .guideStep1 .guideStep1Tip {
background-image: url("../../resources/image/guideArrow1.png");
background-position: 5.067rem top;
background-repeat: no-repeat;
-webkit-background-size: 0.64rem 1.52rem;
background-size: 0.64rem 1.52rem;
padding-top: 1.707rem;
margin-top: -0.053rem;
font-size: 0.507rem;
font-family: tipFont;
text-align: center;
}
.guide-dialog .guideStep3 {
position: absolute;
top: 3.92rem;
left: 0;
width: 100%;
}
.guide-dialog .guideStep3 .guideStep3Tip {
background-image: url("../../resources/image/guideArrow3.png");
background-position: 4.907rem bottom;
background-repeat: no-repeat;
-webkit-background-size: 0.427rem 1.733rem;
background-size: 0.427rem 1.733rem;
padding-bottom: 2.053rem;
margin-bottom: -0.053rem;
font-size: 0.507rem;
font-family: tipFont;
text-align: center;
line-height: 0.613rem;
}
.guide-dialog .guideStep3 .guideStep3Tip span {
color: #00ffff;
}
.guide-dialog .guideStep3 .guideStep3Cont {
position: relative;
padding-bottom: 0.187rem;
}
.guide-dialog .guideStep3 .guideStep3Cont ul li {
font-size: 0.427rem;
padding: 0.587rem 2.133rem 0.293rem 1.12rem;
position: relative;
}
.guide-dialog .guideStep3 .guideStep3Cont ul li p:nth-child(1) {
float: left;
margin-right: 0.96rem;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.guide-dialog .guideStep3 .guideStep3Cont ul li p:nth-child(2) {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
.guide-dialog .guideStep3 .guideStep3Cont ul li:before {
content: '\e6a9';
position: absolute;
bottom: 0.24rem;
right: 1.12rem;
font-family: iconfont;
font-size: 0.667rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
color: #00ffff;
}
.guide-dialog .guideStep3 .guideStep3Cont ul li: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);
}
.guide-dialog .guideStep3 .guideStep3Cont ul li.active:before {
content: '\e6aa';
}
.guide-dialog .guideStep3 .guideStep3Cont:after {
content: '';
position: absolute;
top: 0;
left: 0;
right: 0;
width: 9.6rem;
height: 100%;
margin: 0 auto;
border: 2px dashed;
border-radius: 0.133rem;
}
.guide-dialog .guideStep5 {
position: absolute;
top: 6.613rem;
left: 0;
width: 100%;
}
.guide-dialog .guideStep5 .guideStep5Tip {
background-image: url("../../resources/image/guideArrow4.png");
background-position: 4.373rem bottom;
background-repeat: no-repeat;
-webkit-background-size: 1.04rem 4.773rem;
background-size: 1.04rem 4.773rem;
padding-bottom: 5.013rem;
margin-bottom: -0.08rem;
font-size: 0.507rem;
font-family: tipFont;
text-align: center;
line-height: 0.613rem;
}
.guide-dialog .guideStep5 .guideStep5Cont {
position: relative;
}
.guide-dialog .guideStep5 .guideStep5Cont p {
text-align: center;
position: relative;
color: #00ffff;
padding: 0.453rem 0;
}
.guide-dialog .guideStep5 .guideStep5Cont p:before {
content: '\e6a9';
font-family: iconfont;
font-size: 0.453rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
display: inline-block;
vertical-align: middle;
margin-right: 0.24rem;
}
.guide-dialog .guideStep5 .guideStep5Cont p.active:before {
content: '\e6aa';
}
.guide-dialog .guideStep5 .guideStep5Cont:after {
content: '';
position: absolute;
top: 0;
left: 0;
right: 0;
width: 9.6rem;
height: 100%;
margin: 0 auto;
border: 2px dashed;
border-radius: 0.133rem;
}
.guide-dialog .guideStep2,
.guide-dialog .guideStep4,
.guide-dialog .guideStep6 {
position: absolute;
bottom: 1.733rem;
left: 0;
width: 100%;
}
.guide-dialog .custom-dialog-button {
width: 5.333rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
}
.guide-dialog .custom-dialog-button:active {
background-color: #153D4C;
}
.guide-dialog .custom-dialog-button.disabled {
background-color: transparent;
color: #999;
}
@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
.custom-button {
bottom: 1.2rem;
}
.guide-dialog .guideStep2,
.guide-dialog .guideStep4,
.guide-dialog .guideStep6 {
bottom: 1.2rem;
}
.guide-dialog .guideStep5 {
top: 6.08rem;
}
.guide-dialog .guideStep5 .guideStep5Cont p {
padding: 0.32rem 0;
}
.custom-setHijack-switch {
margin-top: 0;
}
}
\ No newline at end of file
......@@ -581,6 +581,24 @@ p {
line-height: 0.933rem;
}
.user-list-tip {
position: absolute;
top: 50%;
left: 0;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
width: 100%;
text-align: center;
background-image: url("../../resources/image/noUser.png");
background-position: top center;
background-repeat: no-repeat;
-webkit-background-size: 1.627rem 1.627rem;
background-size: 1.627rem 1.627rem;
color: #91929a;
font-size: 0.427rem;
padding-top: 2.347rem;
}
.inputBox {
position: relative;
margin: 0 1.12rem;
......@@ -783,3 +801,9 @@ p {
background-color: transparent;
color: #999;
}
@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
.custom-button {
bottom: 1.2rem;
}
}
\ No newline at end of file
......@@ -776,6 +776,16 @@ p {
color: #999;
}
@media (min-width: 360px /*no*/) and (max-height: 570px /*no*/) {
.custom-button {
bottom: 1.2rem;
}
.custom-guide-button {
bottom: 1.2rem;
}
}
.link {
width: 7.333rem;
margin: 0.133rem auto;
......
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