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 | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/control.html b/gx_tieta/WebRoot/mobil/control.html
index 3658a99..f7861fb 100644
--- a/gx_tieta/WebRoot/mobil/control.html
+++ b/gx_tieta/WebRoot/mobil/control.html
@@ -18,7 +18,7 @@
<body>
<div data-role="page">
<div data-role="header" data-position="fixed">
- <a href="testdata.html" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
+ <a id= "return" class="ui-btn ui-corner-all ui-shadow ui-icon-back ui-btn-icon-left" target="_top" style="padding-top:0.7em;padding-bottom:0.7em;">杩斿洖</a>
<h1>瀹炴椂鈥旀娴嬫暟鎹�</h1>
</div>
@@ -61,7 +61,16 @@
//findrtstate();
searchBattInfo();
});
-
+ $("#return").click(function(){
+ var temp = getCookie("batt");
+ var batt = JSON.parse(temp);
+ console.info(batt);
+ if(batt.install_user||batt.install_user==0){
+ window.location.href="batt-approve-index.html";
+ }else{
+ window.location.href="testdata.html";
+ }
+ });
var timeer ;
//鏍规嵁鐢垫睜缁刬d鏌ヨ鐢垫睜缁勪俊鎭�
/* function findrtstate(){
@@ -191,7 +200,11 @@
{url: 'testdata.html', txt: '鐢垫睜缁勬暟鎹�'}, // 鐢垫睜缁勬暟鎹�
{url: 'javascript:;', txt: '瀹炴椂-鐩戞祴鏁版嵁'} // 鐢垫睜缁勬暟鎹�
];*/
- addBreadCrumb($('.breadcrumb').eq(0), data);
+ if(batt.install_user||batt.install_user==0){
+
+ }else{
+ addBreadCrumb($('.breadcrumb').eq(0), data);
+ }
});
function sethoubeiTime(value){
--
Gitblit v1.9.1