From c88ddedda422835b2337a68a993db645f42f8458 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139.mshome.net>
Date: 星期三, 09 一月 2019 09:59:16 +0800
Subject: [PATCH] 修改实时数据BUG
---
gx_tieta/WebRoot/mobil/wcheckAccept.html | 9 +++++----
gx_tieta/WebRoot/mobil/control.html | 7 ++++++-
gx_tieta/WebRoot/mobil/hcheckAccpet-index.html | 1 +
gx_tieta/WebRoot/mobil/hcheckAccpet.html | 6 +++---
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 71920ff..5b98709 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -68,7 +68,12 @@
if(batt.install_user||batt.install_user==0){
//console.info(batt);
if(batt.address||batt.address==""){
- window.location.href="wcheckAccept-index.html";
+ console.info(batt.check_en);
+ if(batt.check_en==1){
+ window.location.href="hcheckAccpet-index.html";
+ }else{
+ window.location.href="wcheckAccept-index.html";
+ }
}else{
window.location.href="batt-approve-index.html";
}
diff --git a/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html b/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
index 7808a1b..fe47948 100644
--- a/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
+++ b/gx_tieta/WebRoot/mobil/hcheckAccpet-index.html
@@ -199,6 +199,7 @@
install_user : arrdata[i].binf.install_user, //瀹夎浜哄憳
address : arrdata[i].address,
confirm_name : arrdata[i].confirm_name,
+ check_en:arrdata[i].check_en,
}
}
arr.push(obj);
diff --git a/gx_tieta/WebRoot/mobil/hcheckAccpet.html b/gx_tieta/WebRoot/mobil/hcheckAccpet.html
index 0980e12..40fdd03 100644
--- a/gx_tieta/WebRoot/mobil/hcheckAccpet.html
+++ b/gx_tieta/WebRoot/mobil/hcheckAccpet.html
@@ -222,11 +222,11 @@
var tbl = $('.tbl-container');
var temp = getCookie("wapproval");
temp = JSON.parse(temp);
- console.info(temp);
+ //console.info(temp);
createTbl(tbl, arrTh, dataArr);
$(document).ready(function(){
Page.pageCurr=1;
- console.info(temp);
+ //console.info(temp);
setBattLife();
battnumber();
//searchBattLife();
@@ -290,7 +290,7 @@
function battnumber(){
var selected=''
- console.info(temp);
+ // console.info(temp);
if(temp.length>0){
for(var i=0;i<temp.length;i++){
selected+= '<option '+'value='+i+'>'+temp[i].binf.BattGroupName+'</option>';
diff --git a/gx_tieta/WebRoot/mobil/wcheckAccept.html b/gx_tieta/WebRoot/mobil/wcheckAccept.html
index e8faef3..0f197aa 100644
--- a/gx_tieta/WebRoot/mobil/wcheckAccept.html
+++ b/gx_tieta/WebRoot/mobil/wcheckAccept.html
@@ -242,12 +242,13 @@
});
$("#sure").click(function(){
- var temp = getCookie("wapproval");
- temp = JSON.parse(temp);
+ // var temp = getCookie("wapproval");
+ //temp = JSON.parse(temp);
var data = temp;
- if(data[i].check_en==0){
+ console.info(data);
+ if(data[0].check_en==0){//涓�涓熀绔欏唴鐨勬墍鏈夌數姹犵粍鍚屾椂鐢宠锛屽洜姝ゅ垽鏂竴缁勭數姹犵粍鐘舵�佸嵆鍙��
alert("鐜板満鏈彁浜ょ敵璇烽獙鏀�");
- }else if(data[i].check_en==2){
+ }else if(data[0].check_en==2){
exBattGroupAjax(data);
}
});
--
Gitblit v1.9.1