From f6bfafc3a6cd50f11fbf498ecf21498bd9112ff4 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期二, 08 一月 2019 17:37:51 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyccjj@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/control.html | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index ec9d6b4..71920ff 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -66,7 +66,12 @@
var batt = JSON.parse(temp);
console.info(batt);
if(batt.install_user||batt.install_user==0){
- window.location.href="batt-approve-index.html";
+ //console.info(batt);
+ if(batt.address||batt.address==""){
+ window.location.href="wcheckAccept-index.html";
+ }else{
+ window.location.href="batt-approve-index.html";
+ }
}else{
window.location.href="testdata.html";
}
--
Gitblit v1.9.1