From 98cd37e22ae11376692241a62a8b5d932cbcd24e Mon Sep 17 00:00:00 2001
From: hdw <496960745@qq.com>
Date: 星期五, 19 十月 2018 13:25:16 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whychdw@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw

---
 gx_tieta/WebRoot/js/base.js |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 6bb8f63..61bbde9 100644
--- a/gx_tieta/WebRoot/js/base.js
+++ b/gx_tieta/WebRoot/js/base.js
@@ -506,8 +506,9 @@
 function getQueryString(name) { 
 	var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i"); 
 	var r = window.location.search.substr(1).match(reg); 
-	if (r != null) 
-		return unescape(r[2]); 
+	if (r != null) {
+		return decodeURI(r[2]);
+	}	 
 	return null; 
 }
 

--
Gitblit v1.9.1