From cfa12a50f8e6de09a2e57fa8359dbec5e2b07628 Mon Sep 17 00:00:00 2001
From: 81041 <81041@192.168.10.30>
Date: 星期二, 23 十月 2018 11:02:52 +0800
Subject: [PATCH] Merge branch 'dev_lxw' of https://whyclxw1@gitlab.com/whyclxw1/gx_tieta.git into dev_lxw
---
gx_tieta/WebRoot/js/base.js | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/gx_tieta/WebRoot/js/base.js b/gx_tieta/WebRoot/js/base.js
index 6bb8f63..8f573f9 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;
}
@@ -1176,4 +1177,29 @@
// 鍒ゆ柇鏄惁涓哄璞�
function isObject(s) {
return (typeof s === 'object' && !isArray(s));
+}
+
+//浣跨敤XMLHttpRequest鐨勬柟寮忚幏鍙栨ā鏉块〉
+function getTpl(url) {
+ var xmlhttp; // 瀹炰緥鍖朮MLHttpRequest瀵硅薄
+ if(window.XMLHttpRequest) {
+ xmlhttp = new XMLHttpRequest();
+ }else {
+ xmlhttp = new ActiveXObject('Mocrosoft.XMLHTTP');
+ }
+
+ // 璁剧疆璇锋眰
+ xmlhttp.open('GET', url, false);
+
+ // 鍙戦�佽姹�
+ xmlhttp.send();
+
+ var tpl;
+ if(xmlhttp.readyState == 4 && xmlhttp.status == 200) {
+ tpl = xmlhttp.responseText;
+ }else {
+ tpl = "";
+ }
+
+ return tpl;
}
\ No newline at end of file
--
Gitblit v1.9.1