From b3f62ab5fb6adf03a92f62b42e69ad849f903b45 Mon Sep 17 00:00:00 2001
From: D:/workspace/chenjingjing/git/gx_tieta/gx_tieta/.gitignore <chenjingjing@LAPTOP-E51P2139>
Date: 星期五, 28 十二月 2018 17:08:53 +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 | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index db8c133..f7861fb 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -65,8 +65,8 @@
var temp = getCookie("batt");
var batt = JSON.parse(temp);
console.info(batt);
- if(batt.install_user){
- window.location.href="batt-approved.html";
+ if(batt.install_user||batt.install_user==0){
+ window.location.href="batt-approve-index.html";
}else{
window.location.href="testdata.html";
}
@@ -200,7 +200,7 @@
{url: 'testdata.html', txt: '鐢垫睜缁勬暟鎹�'}, // 鐢垫睜缁勬暟鎹�
{url: 'javascript:;', txt: '瀹炴椂-鐩戞祴鏁版嵁'} // 鐢垫睜缁勬暟鎹�
];*/
- if(batt.install_user){
+ if(batt.install_user||batt.install_user==0){
}else{
addBreadCrumb($('.breadcrumb').eq(0), data);
--
Gitblit v1.9.1