Merge branch 'zjx' into 'test/96'

2018/01/03

See merge request iot-project-js/doorlock!9

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/view/device/v_alarmInfo.js

@@ -49,8 +49,8 @@ function init() {
         		this.deviceId = id;
         	},
         	//tap 点击加载更多
-        	onListLoadTap(){
-        		listLoadTap(this);
+        	onListLoad(){
+        		listLoad(this);
         	},
         	onRefreshFresh(){
         		refreshFresh(this);
@@ -155,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

@@ -56,8 +56,8 @@ function init() {
         	setUserInfo(info){
         		this.userInfo = info;
         	},
-        	onListLoadTap(){
-        		listLoadTap(this);
+        	onListLoad(){
+        		listLoad(this);
         	},
         	onRefreshFresh(){
         		refreshFresh(this);
@@ -173,7 +173,7 @@ mui.back = function(){
 }
 
 //tap 点击加载更多
-function listLoadTap(self) {
+function listLoad(self) {
 	resolve(self);
 }
 

dev/src/view/device/v_opendoorRecord.js

@@ -55,8 +55,8 @@ function init() {
         	setDeviceId(id){
         		this.deviceId = id;
         	},
-        	onListLoadTap(){
-        		listLoadTap(this);
+        	onListLoad(){
+        		listLoad(this);
         	},
         	onRefreshFresh(){
         		refreshFresh(this);
@@ -120,7 +120,7 @@ mui.back = function(){
 }
 
 //tap 点击加载更多
-function listLoadTap(self) {
+function listLoad(self) {
 	resolve(self);
 }
 

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/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/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>