From b6e8fdb6f9bb50d29aeb29aa62b19a75c9a1ef9d Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 02 十一月 2018 17:31:23 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/pages/js/common.js |   23 +++++++++++++++++++++--
 1 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/WebRoot/pages/js/common.js b/gx_tieta/WebRoot/pages/js/common.js
index 2991199..a690ea9 100644
--- a/gx_tieta/WebRoot/pages/js/common.js
+++ b/gx_tieta/WebRoot/pages/js/common.js
@@ -499,7 +499,26 @@
 }
 
 // 鐢熸垚璺宠浆鐨勯摼鎺�
-function skipUrl(page, province, city, county, home) {
-	var str = page+'?province='+province+'&city='+city+'&county='+county+'&home='+home;
+function skipUrl(page, province, city, county, home,battid,monnum) {
+	var str = page+'?';
+	if(province){
+		str += '&province='+province;
+	}
+	if(city){
+		str +='&city='+city;
+	}
+	if(county){
+		str += '&county='+county;
+	}
+	if(home){
+		str += '&home='+home;
+	}
+	if(battid){
+		str += '&battid='+battid;
+	}
+	if(monnum){
+		str += '&monnum'+monnum;
+	}
+	//var str = page+'?province='+province+'&city='+city+'&county='+county+'&home='+home;
 	return str;
 }
\ No newline at end of file

--
Gitblit v1.9.1