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
cdae6692
Commit
cdae6692
authored
Oct 10, 2017
by
朱建香
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
云端绑定
parent
6e40dbb7
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
151 additions
and
87 deletions
+151
-87
dev/src/lang/zh.json
+2
-1
dev/src/view/addDevice/v_wifiAdd.js
+44
-0
dev/src/view/device/v_index.js
+81
-54
dev/src/view/device/v_remoteOpendoor.js
+5
-2
web/lib/less/myInfo/myInfo.less
+11
-11
web/resources/lang/zh.json
+2
-2
web/view/device/index.html
+2
-2
web/view/myInfo/index.html
+2
-4
web/view/myInfo/myInfo.css
+2
-11
No files found.
dev/src/lang/zh.json
View file @
cdae6692
...
...
@@ -91,7 +91,8 @@
"followCont2"
:
"1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注"
,
"laterFollow"
:
"稍后关注"
,
"newMsgDoorlock"
:
"门锁最新消息"
,
"doorLockRinging"
:
"门铃响了"
"doorLockRinging"
:
"门铃响了"
,
"defaultNewMsg"
:
"您尚未绑定门锁"
},
"opendoorRecord"
:{
"noRecordTip"
:
"暂无记录"
,
...
...
dev/src/view/addDevice/v_wifiAdd.js
View file @
cdae6692
...
...
@@ -24,6 +24,7 @@ function init() {
},
mounted
(){
resolve
(
this
);
},
methods
:{
getTextWiFiName
(){
...
...
@@ -180,19 +181,62 @@ function connectButtonTap(self){
console
.
log
(
error
);
}
});
let
deviceId
=
null
;
iot
.
business
.
sds
.
findDevices
({
success
:
(
response
)
=>
{
console
.
log
(
"findDevices"
);
console
.
log
(
response
);
let
parameters
=
{};
// let data = "DeviceInfo:[model = THM_LIVING_ELECTRICALBLANKET_TH_1507,xModel = null,mac = B0:F8:93:10:D5:09,sn = B0F89310D509,uuid = null,connectMode = alibaba_smartconfig_v3,supportRouterProvision = false,productName = null,gatewayUuid = null,deviceType = null,alinkJoinVersion = Bind, ]"
// console.log(data);
if
(
response
.
data
)
{
let
info
=
response
.
data
.
split
(
':['
);
if
(
info
[
1
]){
let
query
=
info
[
1
].
split
(
','
);
console
.
log
(
query
);
for
(
let
i
=
0
;
i
<
query
.
length
;
i
++
){
let
pari
=
query
[
i
].
split
(
' = '
);
console
.
log
(
pari
);
parameters
[
pari
[
0
]]
=
pari
[
1
];
}
console
.
log
(
parameters
.
sn
);
}
}
if
(
parameters
.
sn
){
deviceId
=
parameters
.
sn
;
}
console
.
log
(
typeof
(
deviceId
));
if
(
response
.
data
==
"joined success"
){
//云端绑定
iot
.
business
.
device
.
bind
({
data
:
{
product_id
:
2
,
device_id
:
deviceId
,
// mac: parameters.mac,
nickname
:
''
},
success
:
(
response
)
=>
{
console
.
log
(
response
);
//连接成功
uComponents
.
changeCommLoadingStatusAndText
(
self
,
1
,
'绑定成功'
);
self
.
setStatus
(
1
);
},
error
:
(
error
)
=>
{
console
.
log
(
error
);
},
complete
:
()
=>
{}
});
//连接成功
// uComponents.changeCommLoadingStatusAndText(self, 1, '绑定成功');
// self.setStatus(1);
// //停止查找设备
iot
.
business
.
sds
.
stopFindDevices
({
success
:
(
response
)
=>
{},
error
:
(
error
)
=>
{}
});
}
else
if
(
response
.
data
==
"fail"
){
//连接失败
uComponents
.
changeCommLoadingStatusAndText
(
self
,
2
,
'绑定失败'
);
...
...
dev/src/view/device/v_index.js
View file @
cdae6692
...
...
@@ -45,7 +45,9 @@ function init() {
//设备ID
deviceId
:
null
,
//设备uuid
uuid
:
null
uuid
:
null
,
//最新消息
newMsg
:
null
},
mounted
(){
let
self
=
this
;
...
...
@@ -54,7 +56,9 @@ function init() {
iot
.
business
.
sds
.
getDevicesByUser
({
success
:
(
response
)
=>
{
let
data
=
uPublic
.
checkResponseData
(
response
.
data
);
if
(
data
){
if
(
response
.
data
==
'success'
){
// console.log(self.uuid);
}
else
if
(
data
){
self
.
uuid
=
data
[
0
].
uuid
;
self
.
deviceId
=
data
[
0
].
sn
;
iot
.
business
.
sds
.
getDeviceStatus
({
...
...
@@ -69,30 +73,7 @@ function init() {
uPublic
.
openRequestErrorAlert
(
self
);
}
});
iot
.
business
.
api
.
sendCustom
(
'lock/getLockInfo'
,{
data
:
{
// device_id:"600194283588"
device_id
:
self
.
deviceId
},
success
:
(
response
)
=>
{
console
.
log
(
response
);
let
data
=
uPublic
.
checkResponseData
(
response
.
data
);
if
(
data
){
console
.
log
(
data
.
info
);
let
newMsg
=
moment
(
data
.
info
[
0
].
time
).
format
(
"YY.MM.DD HH:mm"
)
+
data
.
info
[
0
].
nickname
+
Vue
.
t
(
'opendoorRecord.'
+
config
.
openDoorMode
[
data
.
info
[
0
].
mode
]
+
''
)
uComponents
.
changeMarqueeText
(
self
,
newMsg
);
}
else
{
}
},
error
:
(
error
)
=>
{
console
.
log
(
error
);
uPublic
.
openRequestErrorAlert
(
self
);
}
});
}
else
{
getLockInfo
(
self
);
}
},
error
:
(
error
)
=>
{}
...
...
@@ -101,10 +82,46 @@ function init() {
iot
.
business
.
sds
.
registerPushListener
({
success
:
(
response
)
=>
{
console
.
log
(
response
);
if
(
response
.
hasOwnProperty
(
'params'
)){
console
.
log
(
JSON
.
parse
(
response
));
setDevceInfo
(
self
,
response
.
params
);
if
(
typeof
(
response
)
==
'string'
){
console
.
log
(
"in"
);
let
data
=
JSON
.
parse
(
response
);
console
.
log
(
data
);
console
.
log
(
moment
(
data
.
time
,
"YY-MM-DD-hh-mm-ss"
).
format
(
"HH:mm"
));
switch
(
data
.
action
){
case
'lock_log'
:
self
.
setBatteryPercent
(
data
.
battery
);
self
.
setBatteryState
(
config
.
powerIcon
[
Math
.
round
(
data
.
battery
/
20
)]);
//user_type: 0:密码用户 1:指纹用户 2:卡用户 3:遥控器 4:钥匙
//uid: 用户id
//time
if
(
lock_action
==
0
){
//再次获取最新记录
getLockInfo
(
self
);
}
break
;
case
'notify'
:
self
.
setBatteryPercent
(
data
.
battery
);
self
.
setBatteryState
(
config
.
powerIcon
[
Math
.
round
(
data
.
battery
/
20
)]);
if
(
data
.
notify_type
==
3
){
self
.
setDoorbellRingingFlag
(
true
);
setTimeout
(()
=>
{
self
.
setDoorbellRingingFlag
(
false
);
self
.
setRingingTime
(
moment
(
data
.
time
,
"YY-MM-DD-hh-mm-ss"
).
format
(
"HH:mm"
));
},
3000
);
}
else
if
(
data
.
notify_type
==
4
){
self
.
setRemoteOpendoorFlag
(
true
);
}
break
;
case
'status'
:
self
.
setBatteryPercent
(
data
.
battery
);
self
.
setBatteryState
(
config
.
powerIcon
[
Math
.
round
(
data
.
battery
/
20
)]);
break
;
case
'openDoor'
:
break
;
}
}
// setDevceInfo(self, response.params);
},
error
:
(
error
)
=>
{
console
.
log
(
error
);
...
...
@@ -114,13 +131,10 @@ function init() {
let
power
=
5
;
this
.
batteryPercent
=
power
/
5
*
100
;
this
.
batteryState
=
config
.
powerIcon
[
power
];
let
newMsg
=
'2017.08.02 18:45 宝贝指纹开门'
;
//
let newMsg = '2017.08.02 18:45 宝贝指纹开门';
// uComponents.changeMarqueeText(this, newMsg);
let
time
=
new
Date
();
this
.
ringingTime
=
moment
(
time
).
format
(
"HH:mm"
);
// getNewOpenDoorRecord(this);
},
methods
:{
getValueOpendoorRecord
(){
...
...
@@ -247,7 +261,7 @@ function initComponentsConfig() {
marquee
:
{
initParam
:
{
class
:
"custom-marquee"
,
text
:
"2017.08.02 18:45 宝贝指纹开门<br>2017.08.02 18:45 宝贝指纹开门<br>2017.08.02 18:45 宝贝指纹开门"
text
:
Vue
.
t
(
'device.defaultNewMsg'
)
}
},
//开门记录switch 参数
...
...
@@ -316,38 +330,51 @@ function initComponentsConfig() {
}
}
//设置设备信息
function
setDevceInfo
(
self
,
data
)
{
self
.
setBatteryState
(
config
.
powerIcon
[
data
.
power
]);
self
.
setBatteryPercent
(
data
.
power
/
5
*
100
);
self
.
setRingingTime
(
moment
(
data
.
time
).
format
(
"HH:mm"
));
self
.
setDoorbellRingingFlag
(
data
);
self
.
setRemoteOpendoorFlag
(
flag
);
}
//获取最新开门记录
function
getNewOpenDoorRecord
(
self
){
iot
.
business
.
api
.
sendCustom
(
''
,{
function
getLockInfo
(
self
){
iot
.
business
.
api
.
sendCustom
(
'lock/getLockInfo'
,{
data
:
{
uuid
:
'uuid'
,
start_id
:
0
,
page_size
:
0
// device_id:"600194283588"
device_id
:
self
.
deviceId
},
success
:
(
response
)
=>
{
console
.
log
(
response
);
let
data
=
uPublic
.
checkResponseData
(
response
.
data
);
if
(
data
){
uComponents
.
changeMarqueeText
(
self
,
data
.
message
);
self
.
setBatteryPercent
(
data
.
battery
);
self
.
setBatteryState
(
config
.
powerIcon
[
Math
.
round
(
data
.
battery
/
20
)]);
console
.
log
(
data
.
info
);
self
.
newMsg
=
moment
(
data
.
info
[
0
].
time
).
format
(
"YY.MM.DD HH:mm"
)
+
data
.
info
[
0
].
nickname
+
Vue
.
t
(
'opendoorRecord.'
+
config
.
openDoorMode
[
data
.
info
[
0
].
mode
]
+
''
);
uComponents
.
changeMarqueeText
(
self
,
self
.
newMsg
);
}
else
{
}
},
error
:
(
error
)
=>
{
uPublic
.
openRequestErrorAlert
(
self
);
error
:
(
error
)
=>
{
console
.
log
(
error
);
},
complete
:
()
=>
{
}
uPublic
.
openRequestErrorAlert
(
self
);
}
});
}
//设置设备信息
function
setDevceInfo
(
self
,
data
)
{
console
.
log
(
"监听到了"
);
self
.
setBatteryPercent
(
data
.
battery
);
self
.
setBatteryState
(
config
.
powerIcon
[
Math
.
round
(
data
.
battery
/
20
)]);
self
.
setRingingTime
(
moment
(
data
.
time
).
format
(
"HH:mm"
));
if
(
data
.
notify_type
==
3
){
self
.
setDoorbellRingingFlag
(
true
);
setTimeout
(()
=>
{
self
.
setDoorbellRingingFlag
(
false
);
},
3000
);
}
else
if
(
data
.
notify_type
==
4
){
self
.
setRemoteOpendoorFlag
(
false
);
}
}
//tap 个人信息
function
myInfoTap
(
self
){
iot
.
navigator
.
openWindow
({
...
...
dev/src/view/device/v_remoteOpendoor.js
View file @
cdae6692
...
...
@@ -137,8 +137,11 @@ function confirmButtonTap(self){
data
:
{
uuid
:
self
.
getUuid
(),
setParams
:
{
'POW'
:
{
'value'
:
'20'
'action'
:
{
'value'
:
'openDoor'
},
'remote_open_door'
:
{
'value'
:
self
.
getTextPassword
()
}
}
},
...
...
web/lib/less/myInfo/myInfo.less
View file @
cdae6692
...
...
@@ -51,27 +51,27 @@
// line-height: 1;
// .flex();
// }
&:first-child{
float: right;
font-family: iconfont;
font-size: @TEXT-COMPONENT-ICON-FONTSIZE;
-webkit-font-smoothing: antialiased;
.transform(rotate(180deg));
}
&:last-child{
//
&:first-child{
//
float: right;
//
font-family: iconfont;
//
font-size: @TEXT-COMPONENT-ICON-FONTSIZE;
//
-webkit-font-smoothing: antialiased;
//
.transform(rotate(180deg));
//
}
//
&:last-child{
font-size: 12px;
float: right;
}
//
}
}
}
.editPassword{
span{
&:nth-child(2){
//
&:nth-child(2){
font-family: iconfont;
font-size: @TEXT-COMPONENT-ICON-FONTSIZE;
-webkit-font-smoothing: antialiased;
}
//
}
}
}
}
...
...
web/resources/lang/zh.json
View file @
cdae6692
{
"loading"
:
"loading..."
,
"scroll"
:{
"clickToLoadMore"
:
"点击加载更多"
,
"loading"
:
"loading..."
},
"btn"
:{
"confirm"
:
"确定"
,
"guideLogin"
:
"账号/密码登录"
,
"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"
:
"门锁管理"
,
"doorlockUsers"
:
"门锁用户"
,
"editName"
:
"修改名称"
,
"qrcode"
:
"生成绑定二维码"
,
"addDevice"
:
"添加设备"
,
"scanCodeAdd"
:
"扫描绑定设备"
,
"wifiAddHelp"
:
"配置Wi-Fi"
,
"wifiAdd"
:
"连接Wi-Fi"
,
"bindUserHelp"
:
"ID-姓名绑定"
,
"bindUser"
:
"绑定用户"
,
"userList"
:
"用户列表"
},
"guide"
:{
"footer"
:
"指纹改变生活"
},
"login"
:{
"telInputTip"
:
"请输入手机号"
,
"passwordInputTip"
:
"请输入密码"
,
"register"
:
"快速注册"
,
"forgetPassword"
:
"忘记密码"
,
"error"
:{
"telNull"
:
"请输入手机号"
,
"passWordNull"
:
"请输入密码"
},
"failure"
:
"登陆失败"
},
"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"
:
"门铃响了"
},
"opendoorRecord"
:{
"noRecordTip"
:
"暂无记录"
,
"passwordOpenDoor"
:
"密码开门"
,
"fingerprintOpenDoor"
:
"指纹开门"
,
"ICcardOpenDoor"
:
"IC卡开门"
,
"remoteOpenDoor"
:
"遥控器开门"
,
"keyOpenDoor"
:
"钥匙开门"
,
"hijackingAlarm"
:
"劫持报警"
,
"appRemoteOpenDoor"
:
"app远程开门"
},
"alarmInfo"
:{
"noInfoTip"
:
"暂无信息"
,
"tamperAlarm"
:
"防撬报警"
,
"trialAlarm"
:
"试错报警"
,
"powerAlarm"
:
"欠电报警"
,
"fackLockAlram"
:
"假锁报警"
},
"remoteOpendoor"
:{
"passwordInputTip"
:
"请输入远程开门密码"
,
"openDoorSuccess"
:
"远程开门成功"
,
"openDoorFailure"
:
"远程开门失败"
,
"error"
:{
"noPasswordTip"
:
"远程密码不能为空"
}},
"hijackRecord"
:{
"noRecordTip"
:
"暂无记录"
,
"hijackingAlarm"
:
"劫持指纹报警"
},
"doorlockManage"
:{
"noDeviceTip"
:
"暂无设备"
,
"deleteDialogTip"
:
"<span>{0}</span>将被删除"
,
"logoutDialogTip"
:
"确定要退出系统吗?"
,
"deleteSuccess"
:
"删除成功"
,
"deleteFailue"
:
"删除失败"
,
"defaultNickname"
:
"门锁"
},
"editName"
:{
"nameInputTip"
:
"请输入门锁名称"
,
"editNameSuccess"
:
"名字修改成功"
,
"editNameFailue"
:
"名字修改失败"
,
"error"
:{
"nameCanNotBeBlank"
:
"昵称不能为空"
}},
"qrcode"
:{
"helpTitle"
:
"注意事项:"
,
"helpCont1"
:
"1.仅超级管理员(通过Wi-Fi配网绑定的用户为超级管理员)可以生成绑定二维码"
,
"helpCont2"
:
"2.二维码有效时间为10分钟且只能使用一次"
,
"helpCont3"
:
"3.用户只需要扫描该二维码即可绑定指纹锁"
,
"helpCont4"
:
"4.绑定失败则需要重新生成二维码进行绑定"
},
"addDevice"
:{
"scanCodeAdd"
:
"扫描绑定设备"
,
"wifiAdd"
:
"配置Wi-Fi"
,
"bindSuccess"
:
"绑定成功"
,
"bindFailue"
:
"绑定失败"
},
"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"
:
"暂无用户"
},
"myInfo"
:{
"editNickname"
:
"修改昵称"
,
"editPassword"
:
"修改密码"
},
"editNickname"
:{
"nickNameInputTip"
:
"请输入昵称"
},
"editPassword"
:{
"newPasswordInputTip"
:
"请输入新密码"
,
"oldPasswordInputTip"
:
"请输入旧密码"
,
"oldPasswordInputTipAgain"
:
"请再次输入旧密码"
},
"commstatusLoading"
:{
"connectSuccess"
:
"Wi-Fi连接成功,正在绑定..."
,
"bindSuccess"
:
"绑定成功"
,
"bindFailed"
:
"绑定失败"
},
"request"
:{
"error"
:
"请求发送失败"
}}
\ 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"
:
"保存二维码到相册"
},
"dialog"
:{
"confirm"
:
"确认"
,
"cancel"
:
"取消"
},
"title"
:{
"login"
:
"登录"
,
"register"
:
"注册"
,
"forgetPassword"
:
"忘记密码"
,
"device"
:
"智能指纹锁"
,
"opendoorRecord"
:
"开门记录"
,
"alarmInfo"
:
"报警信息"
,
"remoteOpendoor"
:
"远程开门"
,
"hijackRecord"
:
"劫持记录"
,
"doorlockManage"
:
"门锁管理"
,
"doorlockUsers"
:
"门锁用户"
,
"editName"
:
"修改名称"
,
"qrcode"
:
"生成绑定二维码"
,
"addDevice"
:
"添加设备"
,
"scanCodeAdd"
:
"扫描绑定设备"
,
"wifiAddHelp"
:
"配置Wi-Fi"
,
"wifiAdd"
:
"连接Wi-Fi"
,
"bindUserHelp"
:
"ID-姓名绑定"
,
"bindUser"
:
"绑定用户"
,
"userList"
:
"用户列表"
},
"guide"
:{
"footer"
:
"指纹改变生活"
},
"login"
:{
"telInputTip"
:
"请输入手机号"
,
"passwordInputTip"
:
"请输入密码"
,
"register"
:
"快速注册"
,
"forgetPassword"
:
"忘记密码"
,
"error"
:{
"telNull"
:
"请输入手机号"
,
"passWordNull"
:
"请输入密码"
},
"failure"
:
"登陆失败"
},
"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"
:
"您尚未绑定门锁"
},
"opendoorRecord"
:{
"noRecordTip"
:
"暂无记录"
,
"passwordOpenDoor"
:
"密码开门"
,
"fingerprintOpenDoor"
:
"指纹开门"
,
"ICcardOpenDoor"
:
"IC卡开门"
,
"remoteOpenDoor"
:
"遥控器开门"
,
"keyOpenDoor"
:
"钥匙开门"
,
"hijackingAlarm"
:
"劫持报警"
,
"appRemoteOpenDoor"
:
"app远程开门"
},
"alarmInfo"
:{
"noInfoTip"
:
"暂无信息"
,
"tamperAlarm"
:
"防撬报警"
,
"trialAlarm"
:
"试错报警"
,
"powerAlarm"
:
"欠电报警"
,
"fackLockAlram"
:
"假锁报警"
},
"remoteOpendoor"
:{
"passwordInputTip"
:
"请输入远程开门密码"
,
"openDoorSuccess"
:
"远程开门成功"
,
"openDoorFailure"
:
"远程开门失败"
,
"error"
:{
"noPasswordTip"
:
"远程密码不能为空"
}},
"hijackRecord"
:{
"noRecordTip"
:
"暂无记录"
,
"hijackingAlarm"
:
"劫持指纹报警"
},
"doorlockManage"
:{
"noDeviceTip"
:
"暂无设备"
,
"deleteDialogTip"
:
"<span>{0}</span>将被删除"
,
"logoutDialogTip"
:
"确定要退出系统吗?"
,
"deleteSuccess"
:
"删除成功"
,
"deleteFailue"
:
"删除失败"
,
"defaultNickname"
:
"门锁"
},
"editName"
:{
"nameInputTip"
:
"请输入门锁名称"
,
"editNameSuccess"
:
"名字修改成功"
,
"editNameFailue"
:
"名字修改失败"
,
"error"
:{
"nameCanNotBeBlank"
:
"昵称不能为空"
}},
"qrcode"
:{
"helpTitle"
:
"注意事项:"
,
"helpCont1"
:
"1.仅超级管理员(通过Wi-Fi配网绑定的用户为超级管理员)可以生成绑定二维码"
,
"helpCont2"
:
"2.二维码有效时间为10分钟且只能使用一次"
,
"helpCont3"
:
"3.用户只需要扫描该二维码即可绑定指纹锁"
,
"helpCont4"
:
"4.绑定失败则需要重新生成二维码进行绑定"
},
"addDevice"
:{
"scanCodeAdd"
:
"扫描绑定设备"
,
"wifiAdd"
:
"配置Wi-Fi"
,
"bindSuccess"
:
"绑定成功"
,
"bindFailue"
:
"绑定失败"
},
"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"
:
"暂无用户"
},
"myInfo"
:{
"editNickname"
:
"修改昵称"
,
"editPassword"
:
"修改密码"
},
"editNickname"
:{
"nickNameInputTip"
:
"请输入昵称"
},
"editPassword"
:{
"newPasswordInputTip"
:
"请输入新密码"
,
"oldPasswordInputTip"
:
"请输入旧密码"
,
"oldPasswordInputTipAgain"
:
"请再次输入旧密码"
},
"commstatusLoading"
:{
"connectSuccess"
:
"Wi-Fi连接成功,正在绑定..."
,
"bindSuccess"
:
"绑定成功"
,
"bindFailed"
:
"绑定失败"
},
"request"
:{
"error"
:
"请求发送失败"
}}
\ No newline at end of file
web/view/device/index.html
View file @
cdae6692
...
...
@@ -33,10 +33,10 @@
</div>
<div
class=
"doorbellTip"
v-bind:class=
"[{active: doorbellRingingFlag}]"
><span>
{{ ringingTime }}
</span>
{{ $t('device.doorLockRinging') }}
</div>
</div>
<p
class=
"batteryState"
><span
v-html=
"batteryState"
></span>
{{ batteryPercent }}%
</p>
<p
class=
"batteryState"
v-show=
"uuid"
><span
v-html=
"batteryState"
></span>
{{ batteryPercent }}%
</p>
</div>
<div
class=
"deviceHandle"
>
<p
class=
"title"
>
{{ $t('device.newMsgDoorlock') }}
</p>
<p
class=
"title"
v-if=
"uuid"
>
{{ $t('device.newMsgDoorlock') }}
</p>
<u-marquee
ref=
"umarquee"
:init-param=
"componentsConfig.marquee.initParam"
:active=
"activeFlag"
></u-marquee>
<div
class=
"switchGroup"
>
<div
class=
"guoupRow"
>
...
...
web/view/myInfo/index.html
View file @
cdae6692
...
...
@@ -26,13 +26,11 @@
<ul
class=
"editMyInfo"
>
<v-touch
tag=
"li"
class=
"editNickname"
v-on:tap=
"onEditNicknameTap"
>
{{ $t('myInfo.editNickname') }}
<span>

</span><span>
{{ nickname }}
</span>
<span>
{{ nickname }}
</span>
</v-touch>
<v-touch
tag=
"li"
class=
"editPassword"
v-on:tap=
"onEditPasswordTap"
>
{{ $t('myInfo.editPassword') }}
<span>

</span><span>

</span>
<span>

</span>
</v-touch>
</ul>
<u-loading
ref=
"uloading"
:init-param=
"componentsConfig.loading.initParam"
></u-loading>
...
...
web/view/myInfo/myInfo.css
View file @
cdae6692
...
...
@@ -589,21 +589,12 @@ p {
background
:
linear-gradient
(
to
right
,
#242635
,
#fff
,
#242635
);
}
.editMyInfo
li
span
:first-child
{
float
:
right
;
font-family
:
iconfont
;
font-size
:
0.533rem
;
-webkit-font-smoothing
:
antialiased
;
-webkit-transform
:
rotate
(
180deg
);
transform
:
rotate
(
180deg
);
}
.editMyInfo
li
span
:last-child
{
.editMyInfo
li
span
{
font-size
:
0.32rem
;
float
:
right
;
}
.editMyInfo
.editPassword
span
:nth-child
(
2
)
{
.editMyInfo
.editPassword
span
{
font-family
:
iconfont
;
font-size
:
0.533rem
;
-webkit-font-smoothing
:
antialiased
;
...
...
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