From de072c451bdf8b49efea074e86d129e043e9df6b Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期二, 08 一月 2019 08:50:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/batt-unapproved-index.html | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/batt-unapproved-index.html b/gx_tieta/WebRoot/mobil/batt-unapproved-index.html
index cbd6e4f..608540d 100644
--- a/gx_tieta/WebRoot/mobil/batt-unapproved-index.html
+++ b/gx_tieta/WebRoot/mobil/batt-unapproved-index.html
@@ -83,6 +83,7 @@
function getcreatArr(){
obj = {
apply_en : 0,
+ check_en:0,
binf : {
page:Page,
}
@@ -103,6 +104,7 @@
dataType: 'json',
success:function(data) {
data = JSON.parse(data.result);
+ console.info(data);
if(data.code!=0&&data.data.length>0){
data=data.data
var model = new Array();
@@ -119,13 +121,60 @@
console.info(model);
stationlist=model;
}
- createUl($('#battList'),model);
+ if(Page.pageCurr==1){
+ createUl($('#battList'),model);
+ }else{
+ addUl($('#battList'),model);
+ }
}
}
});
}
+
+ // 鐩戞祴椤甸潰婊氬姩鍒版枃妗ｇ殑搴曢儴
+ $(document).on('scrollstop', function() {
+ var tblCont = $('.tbl-container');
+ var loading = $('.ui-loading');
+ var scrollTop = $(this).scrollTop();
+ var pageNum = Math.ceil(Page.pageAll/Page.pageSize);
+ console.info(pageNum);
+ console.info(loading.length);
+ console.info(scrollTop);
+ console.info("$(window).height()"+$(window).height());
+ console.info(" $(this).height()"+ $(this).height());
+ if(loading.length == 0) {
+ var winHt = $(window).height();
+ var docHt = $(this).height();
+ var shiftHt = docHt - winHt;
+ if(shiftHt < scrollTop || shiftHt == scrollTop) {
+ Page.pageCurr++;
+ searchBattLife()
+ }
+ }
+ });
+
+ function addUl(ulCon, dataList) {
+ // 鍒涘缓ul
+ var _ul = $('<ul data-role="listview" data-inset="true"></ul>');
+
+ // 閬嶅巻dataList鐢熸垚li鍜宎
+ for (var i = 0; i < dataList.length; i++){
+ var _li = $('<li></li');
+
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i]+'</a>');
+
+ // 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
+ _li.append(_a);
+ _ul.append(_li);
+ }
+
+ // 灏哶ul娣诲姞鍒板鍣ㄤ腑
+ ulCon.append(_ul).trigger('create');
+ loadclose();
+ }
+
function setarrbatt(arrdata,station){
console.info(arrdata);
if(arrdata.length>0){ //瀛樺叆鐨勪负鎵�鏈夊凡鏌ュ嚭鏁版嵁
--
Gitblit v1.9.1