From c58d9f94318d9c8c3c3dfdbcfd6b7d0d436de992 Mon Sep 17 00:00:00 2001
From: 81041 <81041@DESKTOP-025NVD9>
Date: 星期四, 10 一月 2019 09:09:15 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/hcheckAccpet-index.html | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html b/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
index 091179c..7bffaee 100644
--- a/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
+++ b/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
@@ -63,10 +63,13 @@
$('#battList').on('click', 'ul li', function () {
aLi = $(this).index();
console.info(aLi);
+ console.info(stationlist);
station = getbatt(stationlist,aLi);
var arr=setarrbatt(arrdata,station);
console.info(arr);
- window.location.href="hcheckAccpet.html";
+ if(arr){
+ window.location.href="hcheckAccpet.html";
+ }
});
});
@@ -92,6 +95,7 @@
// 鏌ヨ鍐呭
function searchBattLife(){
+ loadshow();
var temp = JSON.stringify(getcreatArr());
console.info(temp);
arrTd = new Array();
@@ -120,17 +124,21 @@
}
}
//console.info(model);
- stationlist=model;
+
}
+ stationlist=model;
//console.info(model);
//if(Page.pageCurr==1){
+ loadclose();
createUl($('#battList'),model);
//}else{
//addteUl($('#battList'),model);
//}
}
}
- });
+
+ });
+ loadclose();
}
function setarrbatt(arrdata,station){
@@ -208,7 +216,7 @@
console.info(arr);
//applyendyanshou(arr);//鐢宠楠屾敹鏂规硶銆�
var json=window.JSON.stringify(arr);
- setCookie("wapproval",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
+ setCookie("happroval",json); //杩欓噷setcookie,鑻ユ湁涓婁竴鏉ookie鍒欐竻绌轰笂涓�绗�
return arr;
}
function addteUl(ulCon,dataList){
--
Gitblit v1.9.1