Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
DoorLock
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
朱建香
DoorLock
Commits
b61259fe
Commit
b61259fe
authored
Oct 18, 2017
by
wangying
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.1.1 / 2017-10-18
================== * 1.修改列表为空样式 * 2.修改绑定开锁信息页面
parent
7edec0f6
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
191 additions
and
95 deletions
+191
-95
History.md
+7
-1
dev/src/lang/zh.json
+3
-1
dev/src/view/doorlockUsers/v_addUnlockInfo.js
+2
-1
dev/src/view/doorlockUsers/v_unlockInfo.js
+13
-23
web/lib/less/doorlockUsers/unlockInfo.less
+26
-36
web/lib/less/public/core.less
+5
-4
web/lib/less/public/public.less
+8
-0
web/lib/less/public/variables.less
+1
-1
web/resources/lang/zh.json
+2
-2
web/view/bindUser/bindUser.css
+2
-0
web/view/device/recordList.css
+2
-0
web/view/doorlockManage/doorlockManage.css
+1
-0
web/view/doorlockUsers/unlockInfo.css
+115
-23
web/view/doorlockUsers/unlockInfo.html
+4
-3
No files found.
History.md
View file @
b61259fe
1.1.0 / 2017-10-17
1.1.1 / 2017-10-18
==================
*
1.修改列表为空样式
*
2.修改绑定开锁信息页面
1.
1.0 / 2017-10-17
==================
==================
*
1.修改绑定开锁信息页面样式
*
1.修改绑定开锁信息页面样式
...
...
dev/src/lang/zh.json
View file @
b61259fe
...
@@ -232,6 +232,7 @@
...
@@ -232,6 +232,7 @@
"key"
:
"钥匙"
,
"key"
:
"钥匙"
,
"hijackFingerprint"
:
"劫持指纹"
,
"hijackFingerprint"
:
"劫持指纹"
,
"opendoorRecord"
:
"今日开门记录"
,
"opendoorRecord"
:
"今日开门记录"
,
"tip"
:
"仅显示未绑定开门记录"
"tip"
:
"仅显示未绑定开门记录"
,
"noRecordTip"
:
"暂无记录"
}
}
}
}
\ No newline at end of file
dev/src/view/doorlockUsers/v_addUnlockInfo.js
View file @
b61259fe
...
@@ -49,7 +49,8 @@ function initComponentsConfig() {
...
@@ -49,7 +49,8 @@ function initComponentsConfig() {
{
value
:
2
,
title
:
'15:33'
,
subtitle
:
'ID:002'
},
{
value
:
2
,
title
:
'15:33'
,
subtitle
:
'ID:002'
},
{
value
:
3
,
title
:
'15:06'
,
subtitle
:
'ID:007'
}
{
value
:
3
,
title
:
'15:06'
,
subtitle
:
'ID:007'
}
],
],
pagesize
:
Number
.
MAX_VALUE
pagesize
:
Number
.
MAX_VALUE
,
tip
:
Vue
.
t
(
'addUnlockInfo.noRecordTip'
)
}
}
},
},
//添加 button 参数
//添加 button 参数
...
...
dev/src/view/doorlockUsers/v_unlockInfo.js
View file @
b61259fe
...
@@ -11,17 +11,10 @@ import {iot, uPublic, uComponents} from '../../public/public.js';
...
@@ -11,17 +11,10 @@ import {iot, uPublic, uComponents} from '../../public/public.js';
iot
.
ready
(
init
);
iot
.
ready
(
init
);
function
init
()
{
function
init
()
{
//通用 dialog、loading组件
//通用
list、
dialog、loading组件
uPublic
.
componentsInit
([
'u-dialog'
,
'u-loading'
]);
uPublic
.
componentsInit
([
'u-
list'
,
'u-
dialog'
,
'u-loading'
]);
const
app
=
new
Vue
({
const
app
=
new
Vue
({
data
:{
data
:{
unlockInfoList
:
[{
value
:
1
,
title
:
'指纹1'
,
rightText
:
123456
},
{
value
:
2
,
title
:
'指纹2'
,
rightText
:
123456
}],
loadShowFlag
:
false
,
loadFlag
:
false
,
loadText
:
Vue
.
t
(
'scroll.clickToLoadMore'
),
pagesize
:
10
,
tip
:
Vue
.
t
(
'unlockInfo.noInfoTip'
),
//配置组件
//配置组件
componentsConfig
:
initComponentsConfig
()
componentsConfig
:
initComponentsConfig
()
},
},
...
@@ -35,9 +28,6 @@ function init() {
...
@@ -35,9 +28,6 @@ function init() {
//tap 添加
//tap 添加
onAddTap
(){
onAddTap
(){
addTap
();
addTap
();
},
onTapLoad
(){
tapLoad
();
}
}
}
}
}).
$mount
(
'#app'
);
}).
$mount
(
'#app'
);
...
@@ -46,6 +36,16 @@ function init() {
...
@@ -46,6 +36,16 @@ function init() {
//配置组件参数
//配置组件参数
function
initComponentsConfig
()
{
function
initComponentsConfig
()
{
return
{
return
{
unlockInfoList
:{
initParam
:
{
class
:
'custom-unlockInfo-list'
,
list
:
[
{
title
:
'指纹1'
,
rightText
:
'ID:123456'
},
{
title
:
'指纹2'
,
rightText
:
'ID:123456'
}
],
tip
:
Vue
.
t
(
'unlockInfo.noInfoTip'
)
}
},
dialog
:
{
dialog
:
{
initParam
:
{
initParam
:
{
class
:
'custom-dialog'
class
:
'custom-dialog'
...
@@ -70,13 +70,4 @@ function addTap(){
...
@@ -70,13 +70,4 @@ function addTap(){
url
:
'./addUnlockInfo.html'
,
url
:
'./addUnlockInfo.html'
,
id
:
'addUnlockInfo'
id
:
'addUnlockInfo'
});
});
}
//点击加载更多
function
tapLoad
(){
if
(
!
self
.
loadFlag
)
{
self
.
loadText
=
Vue
.
t
(
'scroll.loading'
);
self
.
loadFlag
=
true
;
//再次发送获取用户列表请求
}
}
}
\ No newline at end of file
web/lib/less/doorlockUsers/unlockInfo.less
View file @
b61259fe
...
@@ -9,63 +9,48 @@
...
@@ -9,63 +9,48 @@
font-size: @UNLOCKINFO-TITLE-FONTSIZE;
font-size: @UNLOCKINFO-TITLE-FONTSIZE;
padding-left: 42px;
padding-left: 42px;
border-bottom: 2px solid @UNLOCKINFO-TITLE-BOTTOMBORDER;/*no*/
border-bottom: 2px solid @UNLOCKINFO-TITLE-BOTTOMBORDER;/*no*/
~ .unlockInfo-list{
~ .
custom-
unlockInfo-list{
top: 92px;
top: 92px;
}
}
}
}
.unlockInfo-list{
.u-list();
.custom-unlockInfo-list{
position: absolute;
position: absolute;
top: 44px;
top: 44px;
bottom: 0;
bottom: 0;
left: 0;
left: 0;
width: 100%;
height: auto;
overflow: auto;
.u-list-scroll .u-list-row{
}
.unlockInfo-list-scroll{
.unlockInfo-list-row{
position: relative;
color: @UNLOCKINFOLIST-TEXT-COLOR;
color: @UNLOCKINFOLIST-TEXT-COLOR;
font-size: @UNLOCKINFOLIST-TEXT-FONTSIZE;
font-size: @UNLOCKINFOLIST-TEXT-FONTSIZE;
overflow: hidden;
padding: 18px 42px 8px;
padding: 18px 42px 8px;
p{
float: right;
}
&:after{
&:after{
content: '';
position: absolute;
bottom: 0;
left: 0;
right: 0;
height: 1px;/*no*/
.white_gradient_border();
.white_gradient_border();
}
}
}
}
}
//上拉加载
.u-list-load{
.unlockInfo-list-load{
.listLoad();
text-align: center;
}
.listLoad();
//list 无内容
}
.u-list-tip{
.bgImg("unlockNoCont.png");
.unlockInfo-list-tip{
background-position: top center;
.transformV_center(left,0);
background-repeat: no-repeat;
width: 100%;
.background-size(70px 70px);
.bgImg("unlockNoCont.png");
padding-top: 88px;
background-position: top center;
color: @LIST-NOCONTTIP-COLOR;
background-repeat: no-repeat;
font-size: @LIST-NOCONTTIP-FONTSIZE;
.background-size(70px 70px);
}
padding-top: 88px;
font-size: @LIST-NOCONTTIP-FONTSIZE;
text-align: center;
}
}
//绑定开锁信
//绑定开锁信
.opendoorMode{
.opendoorMode{
border: solid #50515d;
border: solid #50515d;
border-width: 2px 0;/*no*/
border-width: 2px 0;/*no*/
overflow: hidden;
ul{
ul{
padding: 11px 42px;
padding: 11px 42px;
font-size: 0;
font-size: 0;
...
@@ -131,6 +116,11 @@
...
@@ -131,6 +116,11 @@
.u-select-load{
.u-select-load{
.listLoad();
.listLoad();
}
}
.u-select-tip{
top: 80px;
.transform(none);
.listNoCont(inherit,45px 45px,58px);
}
}
}
.tip{
.tip{
...
...
web/lib/less/public/core.less
View file @
b61259fe
...
@@ -391,13 +391,14 @@ p{
...
@@ -391,13 +391,14 @@ p{
}
}
//list 无内容
//list 无内容
.listNoCont(){
.listNoCont(@fontSize:@LIST-NOCONTTIP-FONTSIZE,@bgSize:61px 61px,@paddingTop:88px){
font-size: @LIST-NOCONTTIP-FONTSIZE;
color: @LIST-NOCONTTIP-COLOR;
font-size: @fontSize;
.bgImg("noCont.png");
.bgImg("noCont.png");
background-position: top center;
background-position: top center;
background-repeat: no-repeat;
background-repeat: no-repeat;
.background-size(
61px 61px
);
.background-size(
@bgSize
);
padding-top:
88px
;
padding-top:
@paddingTop
;
}
}
.white_gradient_border(){
.white_gradient_border(){
...
...
web/lib/less/public/public.less
View file @
b61259fe
...
@@ -154,6 +154,7 @@
...
@@ -154,6 +154,7 @@
width: 100%;
width: 100%;
height: 100%;
height: 100%;
overflow: auto;
overflow: auto;
position: relative;
}
}
.u-select-scroll .u-select-row{
.u-select-scroll .u-select-row{
padding: 15px 45px 15px 20px;
padding: 15px 45px 15px 20px;
...
@@ -196,6 +197,11 @@
...
@@ -196,6 +197,11 @@
.u-select-load{
.u-select-load{
text-align: center;
text-align: center;
}
}
.u-select-tip{
.transformV_center(left,0);
width: 100%;
text-align: center;
}
}
}
//按钮
//按钮
...
@@ -296,6 +302,7 @@
...
@@ -296,6 +302,7 @@
width: 100%;
width: 100%;
height: 100%;
height: 100%;
overflow: auto;
overflow: auto;
position: relative;
}
}
.u-list-scroll .u-list-row{
.u-list-scroll .u-list-row{
padding: 15px 15px 15px 20px;
padding: 15px 15px 15px 20px;
...
@@ -349,6 +356,7 @@
...
@@ -349,6 +356,7 @@
width: 100%;
width: 100%;
height: 100%;
height: 100%;
overflow: auto;
overflow: auto;
position: relative;
}
}
.u-swipe-list-scroll .u-swipe-list-row{
.u-swipe-list-scroll .u-swipe-list-row{
position: relative;
position: relative;
...
...
web/lib/less/public/variables.less
View file @
b61259fe
...
@@ -188,7 +188,7 @@
...
@@ -188,7 +188,7 @@
//list
//list
@LIST-LOAD-COLOR: @C_BLUE_4; //上拉加载
@LIST-LOAD-COLOR: @C_BLUE_4; //上拉加载
@LIST-LOAD-FONTSIZE: @F_SIZE_16;
@LIST-LOAD-FONTSIZE: @F_SIZE_16;
@LIST-NOCONTTIP-COLOR: @C_
BLUE_4
; //list 无内容
@LIST-NOCONTTIP-COLOR: @C_
GRAY_3
; //list 无内容
@LIST-NOCONTTIP-FONTSIZE: @F_SIZE_16;
@LIST-NOCONTTIP-FONTSIZE: @F_SIZE_16;
//引导
//引导
...
...
web/resources/lang/zh.json
View file @
b61259fe
{
"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"
:
"绑定开锁信息"
},
"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"
:
"安全报警"
,
"doorlockUser"
:
"门锁用户"
,
"remoteOpendoor"
:
"远程开门"
,
"hijackAlarm"
:
"劫持报警"
,
"doorlockManage"
:
"门锁管理"
,
"followTitle"
:
"关注服务号"
,
"followCont1"
:
"关注 “i智信” 微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知,赶紧按下方提示试试吧"
,
"followCont2"
:
"1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注"
,
"laterFollow"
:
"稍后关注"
,
"bindDoorlock"
:
"绑定门锁"
},
"opendoorRecord"
:{
"noRecordTip"
:
"暂无记录"
},
"alarmInfo"
:{
"noInfoTip"
:
"暂无信息"
},
"remoteOpendoor"
:{
"passwordInputTip"
:
"请输入远程开门密码"
,
"error"
:{}},
"hijackRecord"
:{
"noRecordTip"
:
"暂无记录"
},
"doorlockManage"
:{
"name"
:
"名称"
,
"unbindDialogTip"
:
"<span></span>解锁门锁后,您将失去对该门锁<br>所有查看、管理等功能操作"
,
"unbindSuccess"
:
"解绑成功"
},
"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"
:
"昵称:"
,
"noUserTip"
:
"暂无用户"
},
"commstatusLoading"
:{
"connectSuccess"
:
"Wi-Fi连接成功,正在绑定..."
,
"bindSuccess"
:
"绑定成功"
,
"bindFailed"
:
"绑定失败"
},
"addUser"
:{
"nameInputTip"
:
"请输入您想添加的用户名"
,
"error"
:{}},
"doorlockUser"
:{
"name"
:
"昵称:"
,
"inviteBind"
:
"邀请绑定"
,
"bindUnlockInfo"
:
"绑定开锁信息"
,
"opendoorRecord"
:
"历史开门记录"
,
"unbindDialogTip"
:
"<span></span>解绑后,您将失去对门锁所有查看功能该用户仍在用户列表中"
,
"deleteUserDialogTip"
:
"删除后,二者不再为绑定关系,用户无法查看该门锁下的任何信息,该用户名下绑定的所有ID号仍可以显示在开门记录中"
,
"unbindSuccess"
:
"解绑成功"
,
"guideStep1Tip1"
:
"邀请绑定成功"
,
"guideStep1Tip2"
:
"(可查看开门记录,报警记录等<br>相关门锁信息)"
,
"guideStep3Tip"
:
"绑定后看可了解<br>该用户的开门情况"
},
"inviteBind"
:{
"title"
:
"注意事项:"
,
"cont1"
:
"1.直接通过微信扫一扫添加门锁"
,
"cont2"
:
"2.将此二维码保存为图片,发送给好友,好友通过长按识别二维码"
},
"unlockInfo"
:{
"bindUnlockInfo"
:
"已绑定的开锁信息"
,
"noInfoTip"
:
"目前无绑定任何信息,请添加"
},
"addUnlockInfo"
:{
"opendoorMode"
:
"开门方式"
,
"fingerprint"
:
"指纹"
,
"password"
:
"密码"
,
"icCard"
:
"IC卡"
,
"key"
:
"钥匙"
,
"hijackFingerprint"
:
"劫持指纹"
,
"opendoorRecord"
:
"今日开门记录"
,
"tip"
:
"仅显示未绑定开门记录"
}}
{
"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"
:
"绑定开锁信息"
},
"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"
:
"安全报警"
,
"doorlockUser"
:
"门锁用户"
,
"remoteOpendoor"
:
"远程开门"
,
"hijackAlarm"
:
"劫持报警"
,
"doorlockManage"
:
"门锁管理"
,
"followTitle"
:
"关注服务号"
,
"followCont1"
:
"关注 “i智信” 微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知,赶紧按下方提示试试吧"
,
"followCont2"
:
"1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注"
,
"laterFollow"
:
"稍后关注"
,
"bindDoorlock"
:
"绑定门锁"
},
"opendoorRecord"
:{
"noRecordTip"
:
"暂无记录"
},
"alarmInfo"
:{
"noInfoTip"
:
"暂无信息"
},
"remoteOpendoor"
:{
"passwordInputTip"
:
"请输入远程开门密码"
,
"error"
:{}},
"hijackRecord"
:{
"noRecordTip"
:
"暂无记录"
},
"doorlockManage"
:{
"name"
:
"名称"
,
"unbindDialogTip"
:
"<span></span>解锁门锁后,您将失去对该门锁<br>所有查看、管理等功能操作"
,
"unbindSuccess"
:
"解绑成功"
},
"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"
:
"昵称:"
,
"noUserTip"
:
"暂无用户"
},
"commstatusLoading"
:{
"connectSuccess"
:
"Wi-Fi连接成功,正在绑定..."
,
"bindSuccess"
:
"绑定成功"
,
"bindFailed"
:
"绑定失败"
},
"addUser"
:{
"nameInputTip"
:
"请输入您想添加的用户名"
,
"error"
:{}},
"doorlockUser"
:{
"name"
:
"昵称:"
,
"inviteBind"
:
"邀请绑定"
,
"bindUnlockInfo"
:
"绑定开锁信息"
,
"opendoorRecord"
:
"历史开门记录"
,
"unbindDialogTip"
:
"<span></span>解绑后,您将失去对门锁所有查看功能该用户仍在用户列表中"
,
"deleteUserDialogTip"
:
"删除后,二者不再为绑定关系,用户无法查看该门锁下的任何信息,该用户名下绑定的所有ID号仍可以显示在开门记录中"
,
"unbindSuccess"
:
"解绑成功"
,
"guideStep1Tip1"
:
"邀请绑定成功"
,
"guideStep1Tip2"
:
"(可查看开门记录,报警记录等<br>相关门锁信息)"
,
"guideStep3Tip"
:
"绑定后看可了解<br>该用户的开门情况"
},
"inviteBind"
:{
"title"
:
"注意事项:"
,
"cont1"
:
"1.直接通过微信扫一扫添加门锁"
,
"cont2"
:
"2.将此二维码保存为图片,发送给好友,好友通过长按识别二维码"
},
"unlockInfo"
:{
"bindUnlockInfo"
:
"已绑定的开锁信息"
,
"noInfoTip"
:
"目前无绑定任何信息,请添加"
},
"addUnlockInfo"
:{
"opendoorMode"
:
"开门方式"
,
"fingerprint"
:
"指纹"
,
"password"
:
"密码"
,
"icCard"
:
"IC卡"
,
"key"
:
"钥匙"
,
"hijackFingerprint"
:
"劫持指纹"
,
"opendoorRecord"
:
"今日开门记录"
,
"tip"
:
"仅显示未绑定开门记录"
,
"noRecordTip"
:
"暂无记录"
}}
\ No newline at end of file
\ No newline at end of file
web/view/bindUser/bindUser.css
View file @
b61259fe
...
@@ -716,6 +716,7 @@ p {
...
@@ -716,6 +716,7 @@ p {
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
overflow
:
auto
;
overflow
:
auto
;
position
:
relative
;
}
}
.u-swipe-list-scroll
.u-swipe-list-row
{
.u-swipe-list-scroll
.u-swipe-list-row
{
...
@@ -903,6 +904,7 @@ p {
...
@@ -903,6 +904,7 @@ p {
}
}
.custom-swipe-list
.u-swipeList-tip
{
.custom-swipe-list
.u-swipeList-tip
{
color
:
#91929a
;
font-size
:
0.427rem
;
font-size
:
0.427rem
;
background-image
:
url("../../resources/image/noCont.png")
;
background-image
:
url("../../resources/image/noCont.png")
;
background-position
:
top
center
;
background-position
:
top
center
;
...
...
web/view/device/recordList.css
View file @
b61259fe
...
@@ -456,6 +456,7 @@ p {
...
@@ -456,6 +456,7 @@ p {
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
overflow
:
auto
;
overflow
:
auto
;
position
:
relative
;
}
}
.u-list-scroll
.u-list-row
{
.u-list-scroll
.u-list-row
{
...
@@ -583,6 +584,7 @@ p {
...
@@ -583,6 +584,7 @@ p {
}
}
.custom-list
.u-list-tip
{
.custom-list
.u-list-tip
{
color
:
#91929a
;
font-size
:
0.427rem
;
font-size
:
0.427rem
;
background-image
:
url("../../resources/image/noCont.png")
;
background-image
:
url("../../resources/image/noCont.png")
;
background-position
:
top
center
;
background-position
:
top
center
;
...
...
web/view/doorlockManage/doorlockManage.css
View file @
b61259fe
...
@@ -656,6 +656,7 @@ p {
...
@@ -656,6 +656,7 @@ p {
transform
:
translateY
(
-50%
);
transform
:
translateY
(
-50%
);
width
:
100%
;
width
:
100%
;
text-align
:
center
;
text-align
:
center
;
color
:
#91929a
;
font-size
:
0.427rem
;
font-size
:
0.427rem
;
background-image
:
url("../../resources/image/noCont.png")
;
background-image
:
url("../../resources/image/noCont.png")
;
background-position
:
top
center
;
background-position
:
top
center
;
...
...
web/view/doorlockUsers/unlockInfo.css
View file @
b61259fe
...
@@ -461,44 +461,116 @@ p {
...
@@ -461,44 +461,116 @@ p {
border-bottom
:
2px
solid
#50515d
;
border-bottom
:
2px
solid
#50515d
;
}
}
.title
~
.unlockInfo-list
{
.title
~
.
custom-
unlockInfo-list
{
top
:
2.453rem
;
top
:
2.453rem
;
}
}
.unlockInfo-list
{
.u-list
{
position
:
absolute
;
top
:
1.173rem
;
bottom
:
0
;
left
:
0
;
width
:
100%
;
width
:
100%
;
height
:
100%
;
overflow
:
auto
;
overflow
:
auto
;
position
:
relative
;
}
}
.unlockInfo-list-scroll
.unlockInfo-list-row
{
.u-list-scroll
.u-list-row
{
padding
:
0.4rem
0.4rem
0.4rem
0.533rem
;
position
:
relative
;
position
:
relative
;
color
:
#91929a
;
display
:
-webkit-box
;
font-size
:
0.427rem
;
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
;
overflow
:
hidden
;
padding
:
0.48rem
1.12rem
0.213rem
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
}
}
.unlockInfo-list-scroll
.unlockInfo-list-row
p
{
.u-list-scroll
.u-list-row
.u-list-subtitle
{
float
:
right
;
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
nlockInfo-list-scroll
.unlockInfo
-list-row
:after
{
.u
-list-scroll
.u
-list-row
:after
{
content
:
''
;
content
:
''
;
position
:
absolute
;
position
:
absolute
;
bottom
:
0
;
bottom
:
0
;
left
:
0
;
left
:
0
;
right
:
0
;
right
:
0
;
height
:
1px
;
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-unlockInfo-list
{
position
:
absolute
;
top
:
1.173rem
;
bottom
:
0
;
left
:
0
;
height
:
auto
;
}
.custom-unlockInfo-list
.u-list-scroll
.u-list-row
{
color
:
#91929a
;
font-size
:
0.427rem
;
padding
:
0.48rem
1.12rem
0.213rem
;
}
.custom-unlockInfo-list
.u-list-scroll
.u-list-row
:after
{
background
:
-webkit-linear-gradient
(
left
,
#242635
,
#fff
,
#242635
);
background
:
-webkit-linear-gradient
(
left
,
#242635
,
#fff
,
#242635
);
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
}
}
.unlockInfo-list-load
{
.custom-unlockInfo-list
.u-list-load
{
text-align
:
center
;
color
:
#00ffff
;
color
:
#00ffff
;
font-size
:
0.427rem
;
font-size
:
0.427rem
;
-webkit-transform
:
scale
(
0.7
);
-webkit-transform
:
scale
(
0.7
);
...
@@ -507,26 +579,21 @@ p {
...
@@ -507,26 +579,21 @@ p {
line-height
:
0.933rem
;
line-height
:
0.933rem
;
}
}
.unlockInfo-list-tip
{
.custom-unlockInfo-list
.u-list-tip
{
position
:
absolute
;
top
:
50%
;
left
:
0
;
-webkit-transform
:
translateY
(
-50%
);
transform
:
translateY
(
-50%
);
width
:
100%
;
background-image
:
url("../../resources/image/unlockNoCont.png")
;
background-image
:
url("../../resources/image/unlockNoCont.png")
;
background-position
:
top
center
;
background-position
:
top
center
;
background-repeat
:
no-repeat
;
background-repeat
:
no-repeat
;
-webkit-background-size
:
1.867rem
1.867rem
;
-webkit-background-size
:
1.867rem
1.867rem
;
background-size
:
1.867rem
1.867rem
;
background-size
:
1.867rem
1.867rem
;
padding-top
:
2.347rem
;
padding-top
:
2.347rem
;
color
:
#91929a
;
font-size
:
0.427rem
;
font-size
:
0.427rem
;
text-align
:
center
;
}
}
.opendoorMode
{
.opendoorMode
{
border
:
solid
#50515d
;
border
:
solid
#50515d
;
border-width
:
2px
0
;
border-width
:
2px
0
;
overflow
:
hidden
;
}
}
.opendoorMode
ul
{
.opendoorMode
ul
{
...
@@ -574,6 +641,7 @@ p {
...
@@ -574,6 +641,7 @@ p {
width
:
100%
;
width
:
100%
;
height
:
100%
;
height
:
100%
;
overflow
:
auto
;
overflow
:
auto
;
position
:
relative
;
}
}
.u-select-scroll
.u-select-row
{
.u-select-scroll
.u-select-row
{
...
@@ -652,6 +720,16 @@ p {
...
@@ -652,6 +720,16 @@ p {
text-align
:
center
;
text-align
:
center
;
}
}
.u-select-tip
{
position
:
absolute
;
top
:
50%
;
left
:
0
;
-webkit-transform
:
translateY
(
-50%
);
transform
:
translateY
(
-50%
);
width
:
100%
;
text-align
:
center
;
}
.custom-select
{
.custom-select
{
height
:
4.267rem
;
height
:
4.267rem
;
}
}
...
@@ -693,6 +771,20 @@ p {
...
@@ -693,6 +771,20 @@ p {
line-height
:
0.933rem
;
line-height
:
0.933rem
;
}
}
.custom-select
.u-select-tip
{
top
:
2.133rem
;
-webkit-transform
:
none
;
transform
:
none
;
color
:
#91929a
;
font-size
:
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
;
padding-top
:
1.547rem
;
}
.tip
{
.tip
{
text-align
:
center
;
text-align
:
center
;
color
:
#A0A0A7
;
color
:
#A0A0A7
;
...
...
web/view/doorlockUsers/unlockInfo.html
View file @
b61259fe
...
@@ -26,8 +26,9 @@
...
@@ -26,8 +26,9 @@
<v-touch
tag=
"span"
class=
"header-right"
v-on:tap=
"onAddTap"
>
{{ $t('btn.add') }}
</v-touch>
<v-touch
tag=
"span"
class=
"header-right"
v-on:tap=
"onAddTap"
>
{{ $t('btn.add') }}
</v-touch>
</div>
</div>
<div
class=
"content"
>
<div
class=
"content"
>
<p
class=
"title"
v-if=
"unlockInfoList.length"
>
{{ $t('unlockInfo.bindUnlockInfo') }}
</p>
<p
class=
"title"
>
{{ $t('unlockInfo.bindUnlockInfo') }}
</p>
<div
class=
"unlockInfo-list"
>
<u-list
:init-param=
"componentsConfig.unlockInfoList.initParam"
></u-list>
<!-- <div class="unlockInfo-list">
<ul class="unlockInfo-list-scroll" v-show="unlockInfoList.length">
<ul class="unlockInfo-list-scroll" v-show="unlockInfoList.length">
<li class="unlockInfo-list-row" v-for="item in unlockInfoList">
<li class="unlockInfo-list-row" v-for="item in unlockInfoList">
{{ item.title }}
{{ item.title }}
...
@@ -36,7 +37,7 @@
...
@@ -36,7 +37,7 @@
<v-touch tag="li" class="unlockInfo-list-load" v-on:tap="onTapLoad" v-show="loadShowFlag">{{ loadText }}</v-touch>
<v-touch tag="li" class="unlockInfo-list-load" v-on:tap="onTapLoad" v-show="loadShowFlag">{{ loadText }}</v-touch>
</ul>
</ul>
<p class="unlockInfo-list-tip" v-show="(unlockInfoList.length == 0)">{{ tip }}</p>
<p class="unlockInfo-list-tip" v-show="(unlockInfoList.length == 0)">{{ tip }}</p>
</div>
</div>
-->
</div>
</div>
<u-dialog
ref=
"udialog"
:init-param=
"componentsConfig.dialog.initParam"
></u-dialog>
<u-dialog
ref=
"udialog"
:init-param=
"componentsConfig.dialog.initParam"
></u-dialog>
<u-loading
ref=
"uloading"
:init-param=
"componentsConfig.loading.initParam"
></u-loading>
<u-loading
ref=
"uloading"
:init-param=
"componentsConfig.loading.initParam"
></u-loading>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment