From b1d386cf1ad0d8d8f2d0af83f6d1ede284f38e76 Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期三, 21 十一月 2018 13:36:50 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/mobil/selectcounty.html | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/gx_tieta/WebRoot/mobil/selectcounty.html b/gx_tieta/WebRoot/mobil/selectcounty.html
index ddfba49..ac27a89 100644
--- a/gx_tieta/WebRoot/mobil/selectcounty.html
+++ b/gx_tieta/WebRoot/mobil/selectcounty.html
@@ -47,7 +47,7 @@
</body>
<script type="text/javascript" src="js/battNav.js"></script>
<script type="text/javascript">
- var countylist = new Array();
+ var countrylist = new Array();
// 鍒濆鍖栭〉闈㈠唴瀹�
$(document).ready(function(){
@@ -65,7 +65,7 @@
var json=window.JSON.stringify(county);
setCookie("county",json);
- window.location.href="battM.html";
+ window.location.href="selectbatt.html";
});
});
@@ -80,22 +80,30 @@
];
addBreadCrumb($('.breadcrumb').eq(0),data);
});
-
+ //var temp=getCookie("StationName1");
+ var temp = getCookie("city");
+ temp = JSON.parse(temp);
+ //console.info(temp);
+ //console.info(temp2);
//鏌ヨ鎵�鏈夋満鎴�
function seachAllCounty(){
loadshow();
+ var data = {
+ StationName1: temp.StationName1,
+ StationName2: temp.StationName2
+ };
$.ajax({
type: "post",
- url: "",
+ url: "BattInfAction!serchStationName5",
async:true,
dataType:'text',
- data:null,
+ data:"json = "+JSON.stringify(data),
success: function(data){
data = eval('('+data+')');
var model = eval('('+data.result+')');
console.info(model);
if(model.code == 1){
- countylist = model.data;
+ countrylist = model.data;
createUl($('#battList'),model.data);
}else {
//alert(213);
@@ -126,7 +134,7 @@
for (var i = 0; i < dataList.length; i++){
var _li = $('<li></li');
- var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i].StationName+'</a>');
+ var _a = $('<a href="#page1" value="" data-transition="slide">'+dataList[i].StationName5+'</a>');
// 灏哶a娣诲姞鍒癬li锛屽皢_li娣诲姞鍒癬ul涓�
_li.append(_a);
--
Gitblit v1.9.1