Skip to content

D
DoorLock
Commit fedf09d1 by 朱建香
Options

Merge remote-tracking branch 'remotes/origin/wangying' into zjx 

# Conflicts:
#	History.md
#	dev/src/view/device/v_hijackRecord.js
#	dev/src/view/device/v_opendoorRecord.js
#	doorlockApp/web/view/device/device.css
#	doorlockApp/web/view/device/recordList.css
#	doorlockApp/web/view/doorlockManage/doorlockManage.css
#	web/lib/less/addDevice/addDevice.less
#	web/lib/less/bindUser/bindUser.less
#	web/lib/less/device/device.less
#	web/lib/less/device/recordList.less
#	web/lib/less/doorlockManage/doorlockManage.less
#	web/lib/less/login/login.less
#	web/lib/less/public/animation.less
#	web/resources/lang/zh.json
#	web/view/device/device.css
#	web/view/device/recordList.css
#	web/view/doorlockManage/doorlockManage.css
parents 21e04849 61c5bd7c
Showing with 21 additions and 160 deletions
dev/src/lang/zh.json
...@@ -43,9 +43,8 @@ ...@@ -43,9 +43,8 @@
"bindUser": "绑定用户", "bindUser": "绑定用户",
"userList": "用户列表" "userList": "用户列表"
}, },
"footer":{ "guide":{
"guide": "指纹改变生活", "footer": "指纹改变生活"
"recordList": "记录时间以锁为准"
}, },
"login":{ "login":{
"telInputTip": "请输入手机号", "telInputTip": "请输入手机号",
...@@ -83,7 +82,7 @@ ...@@ -83,7 +82,7 @@
"remoteOpendoor": "远程开门", "remoteOpendoor": "远程开门",
"hijackAlarm": "劫持报警", "hijackAlarm": "劫持报警",
"followTitle": "关注服务号", "followTitle": "关注服务号",
"followCont1": "关注“i智信”微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知，赶紧按下方提示试试吧", "followCont1": "关注 “i智信” 微信服务号可随时随地掌握设备动态<br>再也不担心错过重要通知，赶紧按下方提示试试吧",
"followCont2": "1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注", "followCont2": "1.保存二维码-2.用微信从<span>相册选取扫码</span>-3.关注",
"laterFollow": "稍后关注" "laterFollow": "稍后关注"
}, },
...@@ -127,8 +126,8 @@ ...@@ -127,8 +126,8 @@
"wifiAddHelp": { "wifiAddHelp": {
"helpTitle": "配置Wi-Fi说明：", "helpTitle": "配置Wi-Fi说明：",
"helpCont1": "1.按下指纹锁背面的按钮，进入主菜单，选择Wi-Fi设置→配置Wi-Fi，门锁进入等待配网状态", "helpCont1": "1.按下指纹锁背面的按钮，进入主菜单，选择Wi-Fi设置→配置Wi-Fi，门锁进入等待配网状态",
"helpCont2": "2.点击页面“开始配置Wi-Fi”按钮，进入Wi-Fi配网画面", "helpCont2": "2.点击页面 “开始配置Wi-Fi” 按钮，进入Wi-Fi配网画面",
"helpCont3": "3.输入Wi-Fi密码，点击“l连接”按钮，等待锁端相应，直至配网成功", "helpCont3": "3.输入Wi-Fi密码，点击 “l连接” 按钮，等待锁端相应，直至配网成功",
"helpCont4": "（提示：如果指纹锁已经绑定过用户，重新绑定成功后会清除之前所有绑定信息）" "helpCont4": "（提示：如果指纹锁已经绑定过用户，重新绑定成功后会清除之前所有绑定信息）"
}, },
"wifiAdd": { "wifiAdd": {
......
dev/src/view/addDevice/v_wifiAddHelp.js
...@@ -39,7 +39,7 @@ function initComponentsConfig() { ...@@ -39,7 +39,7 @@ function initComponentsConfig() {
//开始配置Wi-Fi button 参数 //开始配置Wi-Fi button 参数
wifiAddButton: { wifiAddButton: {
initParam: { initParam: {
class: 'custom-button', class: 'custom-help-button',
text: Vue.t('btn.wifiAdd') text: Vue.t('btn.wifiAdd')
} }
}, },
......
dev/src/view/bindUser/r_bindUserHelp.vue
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<li>{{ $t('bindUserHelp.helpCont4') }}</li> <li>{{ $t('bindUserHelp.helpCont4') }}</li>
</ul> </ul>
<u-button :init-param="componentsConfig.bindUserButton.initParam" v-on:u-button-tap="onBindUserButtonTap"></u-button> <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> </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>
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
//绑定姓名 button 参数 //绑定姓名 button 参数
bindUserButton: { bindUserButton: {
initParam: { initParam: {
class: 'custom-button', class: 'custom-help-button',
text: Vue.t('btn.bindUser') text: Vue.t('btn.bindUser')
} }
}, },
......
dev/src/view/c_grid-list.vue
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
<p class="grid-list-subtitle" v-if="item.subtitle">{{ item.subtitle }}</p> <p class="grid-list-subtitle" v-if="item.subtitle">{{ item.subtitle }}</p>
</div> </div>
<span class="grid-list-right-text" v-if="item.rightText">{{ item.rightText }}</span> <span class="grid-list-right-text" v-if="item.rightText">{{ item.rightText }}</span>
<span class="grid-list-right-icon">&#xe67f;</span> <span class="grid-list-right-icon">&#xe611;</span>
</v-touch> </v-touch>
<div class="grid-list-content"> <div class="grid-list-content">
<v-touch tag="div" class="grid-list-button" v-for="(buttonItem, buttonIndex) in item.buttons" v-on:tap="onTapButton(index, buttonIndex)"> <v-touch tag="div" class="grid-list-button" v-for="(buttonItem, buttonIndex) in item.buttons" v-on:tap="onTapButton(index, buttonIndex)">
......
dev/src/view/device/v_alarmInfo.js
...@@ -11,10 +11,8 @@ import {iot, uPublic, uComponents} from '../../public/public.js'; ...@@ -11,10 +11,8 @@ 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']);
//项目 时间轴组件
uPublic.componentsExtend(['timeline']);
const app = new Vue({ const app = new Vue({
data:{ data:{
//配置组件 //配置组件
...@@ -36,12 +34,12 @@ function initComponentsConfig() { ...@@ -36,12 +34,12 @@ function initComponentsConfig() {
return { return {
alarmInfoList:{ alarmInfoList:{
initParam: { initParam: {
class: '', class: 'custom-list',
list: [ list: [
{value: 1, leftText: '2017.06.2315:56:26', leftImage: '../../resources/image/green_alarmInfo0_icon.png', title:'禁试报警'}, {value: 1, leftImage: '../../resources/image/green_alarmInfo0_icon.png', title:'', subtitle:'禁试报警', rightText: '2017.06.2315:56:26'},
{value: 2, leftText: '2017.06.2315:01:01', leftImage: '../../resources/image/green_alarmInfo1_icon.png', title:'防撬报警'}, {value: 2, leftImage: '../../resources/image/green_alarmInfo1_icon.png', title:'', subtitle:'防撬报警', rightText: '2017.06.2315:01:01'},
{value: 3, leftText: '2017.05.2315:56:26', leftImage: '../../resources/image/green_alarmInfo2_icon.png', title:'欠电报警'}, {value: 3, leftImage: '../../resources/image/green_alarmInfo2_icon.png', title:'', subtitle:'欠电报警', rightText: '2017.05.2315:56:26'},
{value: 4, leftText: '2017.03.2315:01:01', leftImage: '../../resources/image/green_alarmInfo3_icon.png', title:'假锁报警'} {value: 4, leftImage: '../../resources/image/green_alarmInfo3_icon.png', title:'', subtitle:'假锁报警', rightText: '2017.03.2315:01:01'}
], ],
tip: Vue.t('alarmInfo.noInfoTip') tip: Vue.t('alarmInfo.noInfoTip')
} }
......
dev/src/view/device/v_hijackRecord.js deleted 100644 → 0
/**
* v_hijackRecord.js
* Version: 0.1
* User: wy
* Date: 2017-09-06
* Copyright(c) 2017. U-GEN Tech.Co,Ltd. All Rights Reserved.
* 劫持记录页面
*/
import {iot, uPublic, uComponents} from '../../public/public.js';
iot.ready(init);
function init() {
//通用 dialog、loading组件
uPublic.componentsInit(['u-dialog','u-loading']);
//项目 时间轴组件
uPublic.componentsExtend(['timeline']);
const app = new Vue({
data:{
//配置组件
componentsConfig: initComponentsConfig()
},
mounted(){
},
methods:{
//tap <
onBackTap(){
backTap();
}
}
}).$mount('#app');
}
//配置组件参数
function initComponentsConfig() {
return {
hijackRecordList:{
initParam: {
class: '',
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'}
],
tip: Vue.t('hijackRecord.noRecordTip')
}
},
dialog: {
initParam: {
class: 'custom-dialog'
}
},
loading: {
initParam: {
class: 'custom-loading'
}
}
}
}
//tap <
function backTap(){
iot.navigator.back();
}
\ No newline at end of file
dev/src/view/device/v_index.js
...@@ -24,7 +24,7 @@ function init() { ...@@ -24,7 +24,7 @@ function init() {
//劫持报警 //劫持报警
valueHijackAlarm: 1, valueHijackAlarm: 1,
activeFlag: true, activeFlag: true,
followShowFlag: true, followShowFlag: false,
//配置组件 //配置组件
componentsConfig: initComponentsConfig() componentsConfig: initComponentsConfig()
}, },
...@@ -110,8 +110,8 @@ function initComponentsConfig() { ...@@ -110,8 +110,8 @@ function initComponentsConfig() {
}, },
marquee: { marquee: {
initParam: { initParam: {
class: "custom-marquee-top", class: "custom-marquee",
text: "1234567890dsddgsadytsd<br>fytsfahdghsadgsyuagdh<br>sdfsdfdffgdfgfd12122" text: "2017.08.02 18:45 宝贝指纹开门<br>2017.08.02 18:45 宝贝指纹开门<br>2017.08.02 18:45 宝贝指纹开门"
} }
}, },
//开门记录switch 参数 //开门记录switch 参数
......
dev/src/view/device/v_opendoorRecord.js deleted 100644 → 0
/**
* v_opendoorRecord.js
* Version: 0.1
* User: wy
* Date: 2017-09-06
* Copyright(c) 2017. U-GEN Tech.Co,Ltd. All Rights Reserved.
* 开门记录页面
*/
import {iot, uPublic, uComponents} from '../../public/public.js';
iot.ready(init);
function init() {
//通用 dialog、loading组件
uPublic.componentsInit(['u-dialog','u-loading']);
//项目 时间轴组件
uPublic.componentsExtend(['timeline']);
const app = new Vue({
data:{
//配置组件
componentsConfig: initComponentsConfig()
},
mounted(){
},
methods:{
//tap <
onBackTap(){
backTap();
}
}
}).$mount('#app');
}
//配置组件参数
function initComponentsConfig() {
return {
opendoorRecordList:{
initParam: {
class: '',
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'}
],
tip: Vue.t('opendoorRecord.noRecordTip')
}
},
dialog: {
initParam: {
class: 'custom-dialog'
}
},
loading: {
initParam: {
class: 'custom-loading'
}
}
}
}
//tap <
function backTap(){
iot.navigator.back();
}
\ No newline at end of file
dev/src/view/doorlockManage/v_editName.js
...@@ -43,8 +43,8 @@ function initComponentsConfig() { ...@@ -43,8 +43,8 @@ function initComponentsConfig() {
return { return {
nameInput: { nameInput: {
initParam: { initParam: {
class: 'custom-text', class: 'custom-editName-text',
placeholder: Vue.t('login.nameInputTip') placeholder: Vue.t('editName.nameInputTip')
} }
}, },
//保存 button 参数 //保存 button 参数
......
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