Skip to content

D
DoorLock
Commit 45cda6b5 by 朱建香
Options

#30 

关联和未关联页面修改
parent 8e3435ae
Showing with 30 additions and 20 deletions
dev/src/lang/en.json
......@@ -163,7 +163,7 @@
"opendoorMsgPush": "开门消息推送",
"unbindDialogTip": "确认解除绑定",
"unbindSuccess": "<img src='../../resources/image/green_unbindSuccess_icon.png'>解绑成功",
"unbindFailue": "<img src='../../resources/image/green_unbindFail_icon.png'>解绑失败"
"unbindFailue": "<img src='../../resources/image/green_unbindSuccess_icon.png'>解绑失败"
},
"editName":{
"nameInputTip": "请输入门锁名称",
......@@ -262,7 +262,7 @@
"unbindDialogTip": "<img src='../../resources/image/green_unbind_icon.png'>解绑后，该用户不能对门锁下的信息进行查看",
"deleteUserDialogTip": "删除后，用户对应的开锁id取消关联，同时失去信息查看权限。",
"unbindSuccess": "<img src='../../resources/image/green_unbindSuccess_icon.png'>解绑成功",
"unbindFailue": "<img src='../../resources/image/green_unbindFail_icon.png'>解绑失败",
"unbindFailue": "<img src='../../resources/image/green_unbindSuccess_icon.png'>解绑失败",
"guideStep1Tip1": "邀请绑定成功",
"guideStep1Tip2": "（受邀用户可查看开门记录，报警记录等<br>相关门锁信息）",
"guideStep3Tip": "关联后可了解<br>该用户的开门情况",
......@@ -291,6 +291,7 @@
"unlockInfo":{
"bindUnlockInfo": "已关联的开锁信息",
"noInfoTip": "尚未关联开锁信息",
"bindSoon": "快速关联",
"passwordOpenDoor": "密码",
"fingerprintOpenDoor": "指纹",
"ICcardOpenDoor": "IC卡",
......@@ -299,9 +300,9 @@
"appRemoteOpenDoor": "app远程",
"hijackingAlarm": "劫持指纹",
"setHijack": "设为劫持",
"setHijackTip": "确认设为劫持指纹？",
"setHijackTip": "确认设为劫持指纹？设定后使用该指纹开锁时，门锁用户将会收到劫持报警",
"cancelHijack": "取消劫持",
"cancelHijackTip": "确认取消劫持指纹？",
"cancelHijackTip": "确认取消劫持指纹？取消后，门锁用户不再收到劫持报警",
"cancelAssociated": "取消关联",
"cancelAssociatedTip": "取消关联后，开门历史记录中将不再显示关联的用户信息。",
"cancelAssociatedSuccess": "取消关联成功",
......@@ -309,7 +310,9 @@
"setHijackSuccess": "设为劫持指纹成功",
"setHijackFailue": "设为劫持指纹失败",
"cancelHijackSuccess": "取消劫持指纹成功",
"cancelHijackFailue": "取消劫持指纹失败"
"cancelHijackFailue": "取消劫持指纹失败",
"unlockInfoListTip": "暂无关联信息",
"noHistoryTip": "今日尚无未关联的开门记录"
},
"addUnlockInfo":{
"opendoorMode": "选择要关联的开锁方式",
......@@ -327,7 +330,9 @@
"setHijackSwitch": "设为劫持指纹",
"guideStep1Tip": "选择需要添加关联的开门方式",
"guideStep3Tip": "根据开门记录中的开门时间，选择关联的<br>开门ID<span>（一个ID只能被一个用户绑定）</span>",
"guideStep5Tip": "使用劫持指纹开门时，会以报警形式<br>通知到该门锁名下的其他绑定用户"
"guideStep5Tip": "使用劫持指纹开门时，会以报警形式<br>通知到该门锁名下的其他绑定用户",
"bindedUnlockInfo": "查看已关联信息",
"stay": "留在此页"
},
"myInfo":{
"editNickname": "修改昵称",
......@@ -335,7 +340,8 @@
"logoutDialogTip": "确定要退出系统吗？"
},
"editNickname": {
"nickNameInputTip": "请输入昵称"
"nickNameInputTip": "请输入昵称",
"nickNameTypeTip": "请输入中文、字母和数字"
},
"editPassword": {
"newPasswordInputTip": "请输入新密码",
......@@ -388,8 +394,5 @@
"tip": "版本更新",
"update":"更新",
"miss": "暂不更新"
},
"textTip":{
"textType": "请输入中文、字母和数字"
}
}
\ No newline at end of file
dev/src/lang/zh.json
......@@ -300,9 +300,9 @@
"appRemoteOpenDoor": "app远程",
"hijackingAlarm": "劫持指纹",
"setHijack": "设为劫持",
"setHijackTip": "确认设为劫持指纹？",
"setHijackTip": "确认设为劫持指纹？设定后使用该指纹开锁时，门锁用户将会收到劫持报警",
"cancelHijack": "取消劫持",
"cancelHijackTip": "确认取消劫持指纹？",
"cancelHijackTip": "确认取消劫持指纹？取消后，门锁用户不再收到劫持报警",
"cancelAssociated": "取消关联",
"cancelAssociatedTip": "取消关联后，开门历史记录中将不再显示关联的用户信息。",
"cancelAssociatedSuccess": "取消关联成功",
......@@ -310,7 +310,9 @@
"setHijackSuccess": "设为劫持指纹成功",
"setHijackFailue": "设为劫持指纹失败",
"cancelHijackSuccess": "取消劫持指纹成功",
"cancelHijackFailue": "取消劫持指纹失败"
"cancelHijackFailue": "取消劫持指纹失败",
"unlockInfoListTip": "暂无关联信息",
"noHistoryTip": "今日尚无未关联的开门记录"
},
"addUnlockInfo":{
"opendoorMode": "选择要关联的开锁方式",
......@@ -328,7 +330,9 @@
"setHijackSwitch": "设为劫持指纹",
"guideStep1Tip": "选择需要添加关联的开门方式",
"guideStep3Tip": "根据开门记录中的开门时间，选择关联的<br>开门ID<span>（一个ID只能被一个用户绑定）</span>",
"guideStep5Tip": "使用劫持指纹开门时，会以报警形式<br>通知到该门锁名下的其他绑定用户"
"guideStep5Tip": "使用劫持指纹开门时，会以报警形式<br>通知到该门锁名下的其他绑定用户",
"bindedUnlockInfo": "查看已关联信息",
"stay": "留在此页"
},
"myInfo":{
"editNickname": "修改昵称",
......
dev/src/view/doorlockUsers/v_doorlockUser.js
......@@ -241,10 +241,10 @@ async function showGuide(self){
console.log(self.userInfo.role);
if(self.userInfo.role == 0){
try{
time = await sleep(1000);
time = await sleep(500);
self.setGuideStep3ShowFlag(true),
time = await sleep(1000);
time = await sleep(500);
self.setGuideStep4ShowFlag(true);
}
catch (err){
......
web/view/doorlockUsers/unlockInfo.html
......@@ -23,7 +23,7 @@
<div class="header">
<v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
<p>{{ $t('title.unlockInfo') }}</p>
<v-touch tag="span" class="header-right" v-on:tap="onAddTap" v-show="!role">{{ $t('btn.add') }}</v-touch>
<!--<v-touch tag="span" class="header-right" v-on:tap="onAddTap" v-show="!role">{{ $t('btn.add') }}</v-touch>-->
</div>
<div class="content">
<!--<p class="title">{{ $t('unlockInfo.bindUnlockInfo') }}</p>-->
......@@ -34,7 +34,7 @@
</ul>
<!--<u-swipe-list ref="uswipelist" :init-param="componentsConfig.unlockInfoList.initParam"
v-on:u-swipe-list-button-tap="onUnlockInfoListButtonTap(arguments[0],arguments[1])"></u-swipe-list>-->
<div class="infoList-list">
<div class="infoList-list" ref="infoList" >
<ul class="infoList-list-scroll" v-show="infoList.length">
<li class="infoList-list-row" v-for="(item, index) in infoList">
<div class="infoList-list-handle">
......@@ -42,11 +42,15 @@
<p class="infoList-list-subtitle">{{ item.subtitle }}</p>
</div>
<div class="infoList-list-button">
<v-touch tag="div" class="infoList-list-buttonCont" v-for="(button, buttonIndex) in item.buttons"v-on:tap="onImgButtonTap(index, buttonIndex)">
<v-touch tag="div" class="infoList-list-buttonCont" v-for="(button, buttonIndex) in item.buttons" v-show="button.imgSrc" v-on:tap="onImgButtonTap(index, buttonIndex)">
<img :src="button.imgSrc">
</v-touch>
</div>
</li>
<!--<v-touch tag="li" class="infoList-list-load" v-on:tap="onTapLoad" v-show="loadShowFlag">
<span class="infoList-list-load-animation" v-show="loadFlag"></span>
{{ loadText }}
</v-touch>-->
</ul>
<p class="infoList-list-tip" v-bind:class="{'noHistory-list-tip':selectItem == 0}" v-show="tipShowFlag && (infoList.length == 0)">{{ selectItem == 0 ? noHistoryTip : unlockInfoListTip }}</p>
</div>
......
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