Skip to content

D
DoorLock
Commit b09d38d7 by wangying
Options

Merge branch 'zjx' of http://116.62.143.3:10080/iot-project-js/doorlock into wangying 

# Conflicts:
#	web/lib/less/device/device.less
#	web/lib/less/myInfo/help.less
#	web/view/myInfo/help.css
parents d2cdee4c a5c4372f
Showing with 454 additions and 153 deletions
dev/package.json
......@@ -10,7 +10,7 @@
"iscroll": "5.2.0",
"moment": "^2.18.1",
"qrcode": "^0.9.0",
"ugen-components": "^0.2.4",
"ugen-components": "^0.3.1",
"underscore": "1.8.3",
"vue": "2.2.6",
"vue-i18n": "5.0.3",
......
dev/src/lang/zh.json
{
"loading": "loading...",
"scroll": {
"clickToLoadMore": "点击加载更多",
"loading": "loading..."
"clickToLoadMore": "上拉加载更多",
"loading": "loading"
},
"btn": {
"confirm": "确定",
......@@ -191,8 +191,8 @@
"wifiAdd": {
"unbindWifiTip": "当前无Wi-Fi",
"wifiBinding": "配网中",
"wifiBindSuccess": "配网成功，请激活设备",
"deviceActivating": "设备激活中",
"wifiBindSuccess": "Wi-Fi连接成功,正在激活设备",
"deviceActivating": "Wi-Fi连接成功,正在激活设备",
"deviceActivateSuccess":"激活成功",
"deviceActivateFailure":"激活失败",
"bindTimeout":"连接超时",
......@@ -272,10 +272,10 @@
},
"inviteBind":{
"qrcodeExpireTip": "二维码已过期，请重新生成",
"title": "注意事项：",
"cont1": "1.被邀请的用户选择添加设备页面中的扫二维码方式进行添加门锁",
"cont2": "2.长按二维码保存为图片，发送给被邀请用户，用户通过长按识别二维码",
"cont3": "3.有效时间10分钟，失效后请点击“重新生成二维码"
"title": "绑定方法：",
"cont1": "1.受邀用户登录“U智锁”APP",
"cont2": "2.选择“扫描绑定设备”",
"cont3": "3.扫描上方二维码完成绑定"
},
"unlockInfo":{
"bindUnlockInfo": "已关联的开锁信息",
......
dev/src/public/defaultConfig.js 0 → 100644
export default {
"url": "https://cloud.iot.u-gen.net/"
}
\ No newline at end of file
dev/src/public/public.js
import config from './config.js';
import VueI18n from 'vue-i18n';
import defaultConfig from './defaultConfig';
var VueTouch = require('vue-touch');
Vue.use(VueTouch);
......@@ -19,7 +20,7 @@ const iot = new UIOT({
cloud: {
// url: 'http://wx.iotface.com'
//96环境
url: 'http://192.168.2.96:20000'
url: defaultConfig.url
//96外网
// url: 'http://jycinema.u-gen.net'
//正式
......
dev/src/public/uloop.js
......@@ -3,16 +3,15 @@
* loop
*/
//轮询通用方法：http://116.62.143.3:10080/iot-project-js/doorlock/issues/1
class Loop{
constructor(params) {
this.handle = null;
this.watcher = null;
this.time = null;
// this.url = params.request.url;
// this.opts = params.request.opts;
this.loopContent = params.loopContent;
this.timeout = params.timeout || 10;
this.times = params.times || 10;
this.fincb = params.fincb;
this.intervalTime = params.interval.delay;
this.intervalcb = params.interval.cb;
......@@ -22,15 +21,6 @@ class Loop{
this.i = 0;
}
requestsend(url, opts, needAuth, isPublic, i){
let data = [0,0,0,0,0,0,0,1,0,0,0];
console.log("请求时间"+this.i+'-'+new Date().getTime());
setTimeout(() => {
console.log("返回时间"+this.i+'-'+new Date().getTime());
opts.success(data[this.i]);
},100);
}
clearTime(){
clearInterval(this.handle);
clearInterval(this.watcher);
......@@ -74,15 +64,6 @@ class Loop{
start(){
console.log("开始");
// this.time = setTimeout(() => {
// this.clearTime();
// this.canDo = false;
// this.fincb.error('timeout');
// this.fincb.complete();
// console.log("超时");
// this.intervalcb = null;
// this.fincb = null;
// },this.timeout);
console.log("第"+this.i+"次发送了请求");
console.log("发送时间"+new Date().getTime());
this.i++;
......@@ -101,7 +82,7 @@ class Loop{
this.handle = setInterval(() => {
times++;
console.log('times'+times);
if(times > this.timeout){
if(times > this.times){
this.clearTime();
this.canDo = false;
this.fincb.error('timeout');
......@@ -114,43 +95,4 @@ class Loop{
},this.intervalTime);
}
}
//new Loop({
// request: {
// url: 'http://www.baidu.com',
// opts: {
// type: 'post',
// data: {}
// }
// },
// timeout: 6000,
// interval:{
// delay: 1000,
// cb: {
// success: (response) => {
// console.log('intervalcbSuccess:'+response);
// },
// error: (error) => {
// console.log('intervalcbSuccess:'+error);
// }
// }
// },
// fincb: {
// success: (response) => {
// console.log('fincbSuccess:'+response);
// },
// error: (error) => {
// console.log('fincbError:'+error);
// },
// complete: () => {}
// },
// stopcondition: (response) => {
// if(response == 1){
// return true;
// }else{
// return false;
// }
// }
//}).start();
export default Loop;
//module.exports = Loop;
\ No newline at end of file
dev/src/public/unotify.js
......@@ -4,6 +4,8 @@
*/
import uloop from './uloop';
//获取cid: http://116.62.143.3:10080/iot-project-js/doorlock/issues/4
class unotify{
//在一个周期内获取cid
static getCid(successCallback, errorCallback){
......@@ -15,43 +17,13 @@ class unotify{
}
//周期性获取cid,周期可调整
static getCidPeriotic(times){
// var self = this;
// return new Promise(function(resolve, reject){
// var i = 0;
// var cid = null;
// var handle = null;
// i++;
// cid = self.getCidOnce(i);
// console.log("第"+i+"次"+"获取的cid为"+cid);
// if(cid != null && cid != 'null' || i >= times){
// window.clearInterval(handle);
// resolve(cid);
// }else{
// handle = setInterval(function(){
// i++;
// cid = self.getCidOnce(i);
// console.log("第"+i+"次"+"获取的cid为"+cid);
// if(cid != null && cid != 'null' || i >= times){
// window.clearInterval(handle);
// resolve(cid);
// }
// },1000);
// }
// });
var self = this;
return new Promise(function(resolve, reject){
new uloop({
loopContent: () => {
// var urlParams = {
// type: 'get',
// data: {},
// };
// return iot.network.send('http://192.168.2.75:3000/get', urlParams);
console.log(self.getCidOnce());
return self.getCidOnce();
},
timeout: times,
times: times,
interval:{
delay: 1000,
cb: {
......@@ -77,9 +49,6 @@ class unotify{
complete: () => {}
},
stopcondition: async (response) => {
// if(response.data.msg == 5){
// return true;
// }
if(response != null && response != 'null' ){
return true;
}
......@@ -88,14 +57,10 @@ class unotify{
});
}
//单次获取cid
static getCidOnce(i){
static getCidOnce(){
var clientInfo = plus.push.getClientInfo();
if(clientInfo && clientInfo.hasOwnProperty('clientid') && clientInfo.clientid){
// if(i == 6){
return(clientInfo.clientid);
// }else{
// return(null);
// }
}else{
return(null);
}
......@@ -112,6 +77,7 @@ class unotify{
clienId: cid
},
success: (response) => {
console.log(response);
if(typeof successCallback == 'function'){
successCallback('cid updateSuccess');
}
......
dev/src/view/addDevice/v_index.js
......@@ -13,7 +13,7 @@ iot.ready(init);
function init() {
//通用 dialog、loading组件
uPublic.componentsInit(['u-dialog','u-loading']);
uPublic.closeSlideBack();
// uPublic.closeSlideBack();
const app = new Vue({
data:{
//配置组件
......
dev/src/view/addDevice/v_scanCodeAdd.js
......@@ -14,7 +14,7 @@ function init() {
console.log("init" + new Date().getTime());
//通用 dialog、loading组件
uPublic.componentsInit(['u-dialog','u-loading']);
uPublic.closeSlideBack();
// uPublic.closeSlideBack();
const app = new Vue({
data:{
//配置组件
......@@ -145,7 +145,9 @@ function deviceBind(self, lockId, relId){
if(data.success){
uComponents.openAlert(self, Vue.t('addDevice.bindSuccess'), {
text: Vue.t('dialog.confirm'), callback: function () {
iot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{});
iot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{
needClose: true
});
iot.navigator.openWindow({
url: '../device/index.html',
id: 'device'
......
dev/src/view/addDevice/v_wifiAdd.js
......@@ -354,7 +354,9 @@ function commLoadingButtonTap(self) {
if(self.getStatus() == 1){
//绑定成功
uComponents.hideCommLoading(self);
iot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{});
iot.navigator.fire(plus.webview.getWebviewById('device'),'returnPage',{
needClose: true
});
iot.navigator.openWindow({
url: '../device/index.html',
id: 'device'
......
dev/src/view/addDevice/v_wifiAddHelp.js
......@@ -13,7 +13,7 @@ iot.ready(init);
function init() {
//通用 按钮、dialog、loading组件
uPublic.componentsInit(['u-button','u-dialog','u-loading']);
uPublic.closeSlideBack();
// uPublic.closeSlideBack();
const app = new Vue({
data:{
//配置组件
......
dev/src/view/device/v_alarmInfo.js
......@@ -26,6 +26,7 @@ function init() {
flag: true
},
mounted(){
uComponents.showLoading(this);
resolve(this);
},
methods:{
......@@ -48,8 +49,11 @@ function init() {
this.deviceId = id;
},
//tap 点击加载更多
onListLoadTap(){
listLoadTap(this);
onListLoad(){
listLoad(this);
},
onRefreshFresh(){
refreshFresh(this);
},
//tap <
onBackTap(){
......@@ -67,7 +71,8 @@ function initComponentsConfig() {
class: 'custom-list',
list: [],
tip: Vue.t('alarmInfo.noInfoTip'),
pagesize: PAGE_SIZE
pagesize: PAGE_SIZE,
pullup: true
}
},
dialog: {
......@@ -86,14 +91,15 @@ function initComponentsConfig() {
// 获取历史记录
function resolve(self) {
self.setDeviceId(iot.navigator.getExtras().deviceId);
uComponents.showLoading(self);
// uComponents.showLoading(self);
iot.business.api.sendCustom('lock/getHistoryRecord',
{
data: {
device_id: self.getDeviceId(),
action: 2,
start_id: self.getStartId(),
page_size: PAGE_SIZE
page_size: PAGE_SIZE,
pullUpLoading: true
},
success: async (response) => {
console.log(response);
......@@ -149,6 +155,6 @@ mui.back = function(){
}
//tap 点击加载更多
function listLoadTap(self) {
function listLoad(self) {
resolve(self);
}
\ No newline at end of file
dev/src/view/device/v_hijackRecord.js
......@@ -28,6 +28,7 @@ function init() {
flag: true
},
mounted(){
uComponents.showLoading(this);
resolve(this);
},
methods:{
......@@ -55,8 +56,11 @@ function init() {
setUserInfo(info){
this.userInfo = info;
},
onListLoadTap(){
listLoadTap(this);
onListLoad(){
listLoad(this);
},
onRefreshFresh(){
refreshFresh(this);
},
//tap <
onBackTap(){
......@@ -74,7 +78,8 @@ function initComponentsConfig() {
class: 'custom-list',
list: [],
tip: Vue.t('hijackRecord.noRecordTip'),
pagesize: PAGE_SIZE
pagesize: PAGE_SIZE,
pullup: true
}
},
dialog: {
......@@ -92,7 +97,7 @@ function initComponentsConfig() {
function resolve(self) {
self.setDeviceId(iot.navigator.getExtras().deviceId);
uComponents.showLoading(self);
//
iot.business.api.sendCustom('lock/getHistoryRecord',
{
data: {
......@@ -168,6 +173,10 @@ mui.back = function(){
}
//tap 点击加载更多
function listLoadTap(self) {
function listLoad(self) {
resolve(self);
}
function refreshFresh(self){
resolve(self);
}
\ No newline at end of file
dev/src/view/device/v_index.js
......@@ -125,6 +125,9 @@ function init() {
getDevices(self);
//注册监听上报
registerPushListener(self);
if(event.detail.needClose){
iot.navigator.closeAllBesidesItself();
}
});
},
......@@ -635,6 +638,10 @@ async function updateHistoryMap(self, historyRecord){
}
}
console.log(oldHistory);
console.log(newHistory);
iot.storage.setMap('history', newHistory, (response) => {
console.log(res);
}, () => {
......@@ -689,7 +696,7 @@ async function loopGetLockInfo(self, delay, timeout){
return iot.business.api.send('lock/getNewInfo', urlParams, true, false);
// return plus.push.getClientInfo().clientid;
},
timeout: 3,
times: 3,
interval:{
delay: config.intervalTime*1000,
cb: {
......
dev/src/view/device/v_opendoorRecord.js
......@@ -27,6 +27,7 @@ function init() {
flag: true
},
mounted(){
uComponents.showLoading(this);
resolve(this);
},
methods:{
......@@ -54,8 +55,11 @@ function init() {
setDeviceId(id){
this.deviceId = id;
},
onListLoadTap(){
listLoadTap(this);
onListLoad(){
listLoad(this);
},
onRefreshFresh(){
refreshFresh(this);
},
//tap <
onBackTap(){
......@@ -73,7 +77,8 @@ function initComponentsConfig() {
class: 'custom-list',
list: [],
tip: Vue.t('opendoorRecord.noRecordTip'),
pagesize: PAGE_SIZE
pagesize: PAGE_SIZE,
pullup: true
}
},
dialog: {
......@@ -92,7 +97,7 @@ function initComponentsConfig() {
//调用接口获取开门记录
function resolve(self) {
console.log("in");
uComponents.showLoading(self);
// uComponents.showLoading(self);
self.setDeviceId(iot.navigator.getExtras().deviceId);
console.log(iot.navigator.getExtras());
if(iot.navigator.getExtras().relId){
......@@ -115,7 +120,7 @@ mui.back = function(){
}
//tap 点击加载更多
function listLoadTap(self) {
function listLoad(self) {
resolve(self);
}
......@@ -186,7 +191,7 @@ function setListData(self, response){
for(let i=0; i<record.length; i++){
list[i] = {
value: record[i].openId,
title: "ID:"+record[i].openId,
title: ((record[i].mode == 30 ) || (record[i].mode == 5 )) ? '':"ID:"+record[i].openId,
leftImage: '../../resources/image/green_opendoor'+record[i].mode+'_icon.png',
subtitle: Vue.t('opendoorRecord.'+config.openDoorMode[record[i].mode]+''),
rightText: moment(record[i].time).format("YYYY.MM.DD HH:mm:ss")
......
dev/src/view/doorlockManage/v_index.js
......@@ -284,6 +284,12 @@ function unbind(self){
},
success: (response) => {
console.log(response);
iot.storage.delMaps(['historyId','history'], (response) => {
console.log("clearMap"+response);
}, (error) => {
console.log(error);
uPublic.openRequestErrorAlert(self);
});
self.setStateShowFlag(true);
self.setShowMsg(Vue.t('doorlockManage.unbindSuccess'));
self.setUnbindSucceess(true);
......
dev/src/view/doorlockUsers/v_index.js
......@@ -30,6 +30,8 @@ function init() {
userListData: [],
startId: 0,
role: null,
//当前用户id
currentId: null
},
mounted(){
this.extras = iot.navigator.getExtras();
......@@ -151,9 +153,8 @@ function getUserInfoMap() {
}
async function sortUsers(self, data){
let id = [];
try {
id = await getUserInfoMap();
self.currentId = await getUserInfoMap();
}
catch (err) {
console.log(err);
......@@ -161,7 +162,7 @@ async function sortUsers(self, data){
let users = [];
let manage = [];
for(let i=0;i<data.length;i++){
if(data[i].user_id == null ||data[i].role && data[i].user_id != id){
if(data[i].user_id == null ||data[i].role && data[i].user_id != self.currentId){
users.push(data[i]);
}else{
manage.push(data[i]);
......
dev/src/view/login/v_index.js
......@@ -177,6 +177,9 @@ function cloudsLogin(self, id){
iot.navigator.openWindow({
url: '../device/index.html',
id: 'device',
styles: {
popGesture: 'none'
},
extras: {
needClose: true
}
......
dev/src/view/myInfo/v_index.js
......@@ -13,7 +13,7 @@ iot.ready(init);
function init() {
//通用 dialog、loading组件
uPublic.componentsInit(['u-button','u-dialog','u-loading']);
uPublic.closeSlideBack();
// uPublic.closeSlideBack();
const app = new Vue({
data:{
//配置组件
......
dev/src/view/test/v_notify.js 0 → 100644
/**
* v_index.js
* Version: 0.1
* User: zjx
* Date: 2017-09-26
* Copyright(c) 2017. U-GEN Tech.Co,Ltd. All Rights Reserved.
* 引导页面
*/
import {iot, uPublic, uComponents} from '../../public/public.js';
import unotify from '../../public/unotify.js';
import uloop from '../../public/uloop.js';
iot.ready(init);
function init() {
const app = new Vue({
data:{
},
mounted(){
unotify.getCid((response) => {
console.log(response);
},(error) => {
console.log(error);
});
mui("#refreshContainer").pullRefresh({
up:{
contentrefresh : "正在加載...",//可選，正在加載狀態時，上拉加載控件上顯示的標題內容
contentnomore:'沒 有 更 多 數 據 了',//可選，請求完畢若沒有更多數據時顯示的提醒內容；
callback: beginLoopTap()
},
down : {
height:50,//可選,默認50.觸發下拉刷新拖動距離,
auto: true,//可選,默認false.首次加載自動下拉刷新一次
contentdown : "下拉可以刷新",//可選，在下拉可刷新狀態時，下拉刷新控件上顯示的標題內容
contentover : "釋放立即刷新",//可選，在釋放可刷新狀態時，下拉刷新控件上顯示的標題內容
contentrefresh : "正在刷新...",//可選，正在刷新狀態時，下拉刷新控件上顯示的標題內容
callback : beginLoopTap()
}
});
},
methods:{
// onBeginLoopTap(){
// beginLoopTap();
// }
}
}).$mount('#app');
}
function beginLoopTap(){
console.log("innnnn");
mui('#refreshContainer').pullRefresh().endPullupToRefresh(true);
}
web/lib/less/device/device.less
......@@ -481,9 +481,9 @@
animation: none;
}
.u-notice{
.u-notification{
.mask(1051,@CUSTOM-BACKDROP-BG);
.u-notice-box{
.u-notification-box{
width: 335px;
height: 300px;
.transform_center();
......@@ -491,13 +491,13 @@
color: #00ffff;
border: 1px solid;/*no*/
border-radius: 5px;
.u-notice-title{
.u-notification-title{
position: relative;
padding-top: 10px;
font-size: 16px;
text-align: center;
}
.u-notice-close{
.u-notification-close{
position: absolute;
top: 0;
right: 0;
......@@ -506,17 +506,17 @@
padding-top: 10px;
.iconfont(25px);
}
.u-notice-content{
.u-notification-content{
.bgImgSize(100%,147px,"noticeContBg.png",center,auto 100%);
padding-top: 61px;
}
.u-notice-switch{
.u-notification-switch{
width: 150px;
margin: 15px auto;
padding: 10px 0;
text-align: center;
font-size: 12px;
.u-notice-switch-handle{
.u-notification-switch-handle{
display: inline-block;
vertical-align: middle;
position: relative;
......@@ -530,20 +530,22 @@
.iconfont(17px);
}
}
&.u-notice-switch-on .u-notice-switch-handle:before{
&.u-notification-switch-on .u-notification-switch-handle:before{
content: '\e6aa';
}
&.u-notice-switch-off .u-notice-switch-handle:before{
&.u-notification-switch-off .u-notification-switch-handle:before{
content: '\e6a9';
}
}
.u-notice-button{
.u-notification-button{
li{
.button(235px);
line-height: 1;
margin: 0 auto;
text-align: center;
padding: 10px 0;
}
}
.clearfix{
overflow: hidden;
padding: 0 54px;
......
web/lib/less/device/recordList.less
......@@ -33,8 +33,39 @@
}
.u-list-load{
.listLoad();
.u-list-load-animation{
width: 24px;
height: 24px;
display: inline-block;
.bgImg("loading.png");
-webkit-animation: refresh 1s steps(8, end) infinite;
animation: refresh 1s steps(8, end) infinite;
background-size: cover;
vertical-align: middle;
}
}
.u-list-tip{
.listNoCont();
}
}
@-webkit-keyframes refresh {
0% {
-webkit-transform: rotate3d(0, 0, 1, 0deg);
transform: rotate3d(0, 0, 1, 0deg);
}
100% {
-webkit-transform: rotate3d(0, 0, 1, 360deg);
transform: rotate3d(0, 0, 1, 360deg);
}
}
@keyframes refresh {
0% {
-webkit-transform: rotate3d(0, 0, 1, 0deg);
transform: rotate3d(0, 0, 1, 0deg);
}
100% {
-webkit-transform: rotate3d(0, 0, 1, 360deg);
transform: rotate3d(0, 0, 1, 360deg);
}
}
\ No newline at end of file
web/lib/less/doorlockUsers/userList.less
......@@ -134,3 +134,7 @@
}
.mediaPosition();
.currentUser{
color: @CUSTOM-SWIPELIST-COMPONENT-TITLE-COLOR;
}
web/lib/less/myInfo/help.less
......@@ -35,3 +35,12 @@
margin-bottom: 20px;
}
}
.u-button();
.custom-button{
.button();
.buttonPosition();
}
.mediaPosition();
\ No newline at end of file
web/lib/less/public/variables.less
......@@ -254,6 +254,7 @@
@CUSTOM-SWIPELIST-COMPONENT-BUTTON-COLOR: @C_BLUE_4;
@CUSTOM-SWIPELIST-COMPONENT-BUTTON-ICON-FONTSIZE: @F_SIZE_16;
@CUSTOM-SWIPELIST-COMPONENT-DELETEBUTTON-BG: @BODY-BG-COLOR;
@CUSTOM-SWIPELIST-COMPONENT-TITLE-COLOR: @C_BLUE_4;
//门锁用户列表
@USERLIST-ROW-BG: @BODY-BG-COLOR;
......
web/view/device/alarmInfo.html
......@@ -25,7 +25,7 @@
<v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
<p>{{ $t('title.alarmInfo') }}</p>
</div>
<u-list ref="ulist" :init-param="componentsConfig.alarmInfoList.initParam" v-on:u-list-load-tap="onListLoadTap()"></u-list>
<u-list ref="ulist" :init-param="componentsConfig.alarmInfoList.initParam" v-on:u-list-load="onListLoad()"></u-list>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
</div>
......
web/view/device/device.css
......@@ -1632,3 +1632,153 @@ p {
-webkit-animation: none;
animation: none;
}
.u-notification {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
z-index: 1051;
background-color: rgba(36, 38, 53, 0.9);
}
.u-notification .u-notification-box {
width: 8.933rem;
height: 8rem;
position: absolute;
top: 50%;
left: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
background-color: #242635;
color: #00ffff;
border: 1px solid;
border-radius: 0.133rem;
}
.u-notification .u-notification-box .u-notification-title {
position: relative;
padding-top: 0.267rem;
font-size: 0.427rem;
text-align: center;
}
.u-notification .u-notification-box .u-notification-close {
position: absolute;
top: 0;
right: 0;
width: 1.067rem;
height: 100%;
padding-top: 0.267rem;
font-family: iconfont;
font-size: 0.667rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
}
.u-notification .u-notification-box .u-notification-content {
width: 100%;
height: 3.92rem;
background: url("../../resources/image/noticeContBg.png") no-repeat center;
-webkit-background-size: auto 100%;
background-size: auto 100%;
padding-top: 1.627rem;
}
.u-notification .u-notification-box .u-notification-switch {
width: 4rem;
margin: 0.4rem auto;
padding: 0.267rem 0;
text-align: center;
font-size: 0.32rem;
}
.u-notification .u-notification-box .u-notification-switch .u-notification-switch-handle {
display: inline-block;
vertical-align: middle;
position: relative;
margin-right: 0.267rem;
width: 0.453rem;
height: 0.453rem;
}
.u-notification .u-notification-box .u-notification-switch .u-notification-switch-handle:before {
position: absolute;
top: 0;
left: 0;
font-family: iconfont;
font-size: 0.453rem;
-webkit-font-smoothing: antialiased;
line-height: 1;
}
.u-notification .u-notification-box .u-notification-switch.u-notification-switch-on .u-notification-switch-handle:before {
content: '\e6aa';
}
.u-notification .u-notification-box .u-notification-switch.u-notification-switch-off .u-notification-switch-handle:before {
content: '\e6a9';
}
.u-notification .u-notification-box .u-notification-button li {
width: 6.267rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
line-height: 1;
margin: 0 auto;
text-align: center;
padding: 0.267rem 0;
}
.u-notification .u-notification-box .u-notification-button li:active {
background-color: #153D4C;
}
.u-notification .u-notification-box .u-notification-button li.disabled {
background-color: transparent;
color: #999;
}
.u-notification .u-notification-box .clearfix {
overflow: hidden;
padding: 0 1.44rem;
}
.u-notification .u-notification-box .leftCont {
float: left;
}
.u-notification .u-notification-box .rightCont {
float: right;
}
.u-notification .u-notification-box .logo {
width: 0.4rem;
height: 0.4rem;
background: url("../../resources/image/logo1.png") no-repeat center;
-webkit-background-size: cover;
background-size: cover;
display: inline-block;
vertical-align: middle;
margin: 0 -0.213rem 0 0.213rem;
}
.u-notification .u-notification-box .smallFont {
color: #00b2b2;
font-size: 0.427rem;
-webkit-transform: scale(0.5);
transform: scale(0.5);
display: inline-block;
vertical-align: middle;
}
.u-notification .u-notification-box .tip {
text-align: center;
font-size: 0.32rem;
margin-top: 0.24rem;
line-height: 0.427rem;
}
\ No newline at end of file
web/view/device/hijackRecord.html
......@@ -25,7 +25,7 @@
<v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
<p>{{ $t('title.hijackRecord') }}</p>
</div>
<u-list ref="ulist" :init-param="componentsConfig.hijackRecordList.initParam" v-on:u-list-load-tap="onListLoadTap()"></u-list>
<u-list ref="ulist" :init-param="componentsConfig.hijackRecordList.initParam" v-on:u-list-load="onListLoad()"></u-list>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
</div>
......
web/view/device/index.html
......@@ -22,7 +22,7 @@
<div id="app" v-cloak>
<div class="header">
<v-touch tag="span" class="header-left icon" v-on:tap="onMyInfoTap">&#xe69b;</v-touch>
<v-touch tag="span" class="header-left icon" v-on:tap="onMyInfoTap">&#xe6bf;</v-touch>
<p>{{ $t('title.device') }}</p>
</div>
<div class="content">
......
web/view/device/opendoorRecord.html
......@@ -25,7 +25,7 @@
<v-touch tag="span" class="header-left icon" v-on:tap="onBackTap">&#xe611;</v-touch>
<p>{{ $t('title.opendoorRecord') }}</p>
</div>
<u-list ref="ulist" :init-param="componentsConfig.opendoorRecordList.initParam" v-on:u-list-load-tap="onListLoadTap()"></u-list>
<u-list ref="ulist" :init-param="componentsConfig.opendoorRecordList.initParam" v-on:u-list-load="onListLoad()"></u-list>
<u-dialog ref="udialog" :init-param="componentsConfig.dialog.initParam"></u-dialog>
<u-loading ref="uloading" :init-param="componentsConfig.loading.initParam"></u-loading>
</div>
......
web/view/device/recordList.css
......@@ -577,6 +577,17 @@ p {
line-height: 0.933rem;
}
.custom-list .u-list-load .u-list-load-animation {
width: 0.64rem;
height: 0.64rem;
display: inline-block;
background-image: url("../../resources/image/loading.png");
-webkit-animation: refresh 1s steps(8, end) infinite;
animation: refresh 1s steps(8, end) infinite;
background-size: cover;
vertical-align: middle;
}
.custom-list .u-list-tip {
background-image: url("../../resources/image/noCont.png");
background-position: top center;
......@@ -587,3 +598,27 @@ p {
font-size: 0.427rem;
padding-top: 2.347rem;
}
@-webkit-keyframes refresh {
0% {
-webkit-transform: rotate3d(0, 0, 1, 0deg);
transform: rotate3d(0, 0, 1, 0deg);
}
100% {
-webkit-transform: rotate3d(0, 0, 1, 360deg);
transform: rotate3d(0, 0, 1, 360deg);
}
}
@keyframes refresh {
0% {
-webkit-transform: rotate3d(0, 0, 1, 0deg);
transform: rotate3d(0, 0, 1, 0deg);
}
100% {
-webkit-transform: rotate3d(0, 0, 1, 360deg);
transform: rotate3d(0, 0, 1, 360deg);
}
}
\ No newline at end of file
web/view/doorlockUsers/index.html
......@@ -33,7 +33,7 @@
v-on:tap="onTapUserList(index)">
<img class="user-list-image" v-if="item.image && item.role == 0" v-bind:src="item.image">
<div>
<p class="user-list-title">{{ item.title == (null || '')? $t('userList.defaultName'):item.title}}</p>
<p class="user-list-title" v-bind:class="{'currentUser': userListData[index].user_id == currentId }" >{{ item.title == (null || '')? $t('userList.defaultName'):item.title}}</p>
<p class="user-list-subtitle">
<img class="user-list-subimage" v-if="item.image && item.role != 0" v-bind:src="item.image">
<span v-if="item.subtitle">{{ item.subtitle }}</span>
......
web/view/doorlockUsers/userList.css
......@@ -807,3 +807,7 @@ p {
bottom: 1.2rem;
}
}
.currentUser {
color: #00ffff;
}
\ No newline at end of file
web/view/myInfo/help.css
......@@ -489,3 +489,54 @@ p {
margin-top: 0.747rem;
margin-bottom: 0.533rem;
}
.u-button {
width: 6.4rem;
color: #fff;
font-size: inherit;
background-color: #007aff;
border-radius: 0.533rem;
text-align: center;
line-height: 1;
margin: 0 auto;
padding: 0.267rem 0;
-webkit-transition: all 0.2s linear;
transition: all 0.2s linear;
background-clip: padding-box;
}
.u-button:active {
background-color: #0065ff;
}
.u-button.disabled {
background-color: #bbb;
}
.custom-button {
width: 7.333rem;
border-radius: 0.133rem;
background-color: transparent;
border: 1px solid;
color: #00ffff;
font-size: 0.427rem;
position: absolute;
bottom: 1.733rem;
left: 0;
right: 0;
}
.custom-button:active {
background-color: #153D4C;
}
.custom-button.disabled {
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
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