Merge branch 'master' of github.com:phpzlc/admin

ExodusHT · ExodusHT · commit 1bd8f6a78112 · 2021-02-04T17:57:46.000+08:00
diff --git a/Bundle/Resources/public/strategy/index.js b/Bundle/Resources/public/strategy/index.js
@@ -71,14 +71,15 @@ function resultPreprocess(that, result, go_url, resultPreprocessFunction)
 }
 
 function goUrlPreprocess(go_url) {
+
     //如果是数组,则在新窗口打开, gp_url[1]等同于target="_blank
     if(go_url instanceof Array){
-        window.open(go_url[0]);
+        window.open(urlPreprocess(go_url[0]));
     }else{
         if(go_url == ''){
             window.location.reload();
         }else {
-            window.location.href = go_url;
+            window.location.href =  urlPreprocess(go_url);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -71,14 +71,15 @@ function resultPreprocess(that, result, go_url, resultPreprocessFunction)`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`function goUrlPreprocess(go_url) {`
	`74`	`+`
`74`	`75`	`//如果是数组,则在新窗口打开, gp_url[1]等同于target="_blank`
`75`	`76`	`if(go_url instanceof Array){`
`76`		`- window.open(go_url[0]);`
	`77`	`+ window.open(urlPreprocess(go_url[0]));`
`77`	`78`	`}else{`
`78`	`79`	`if(go_url == ''){`
`79`	`80`	`window.location.reload();`
`80`	`81`	`}else {`
`81`		`- window.location.href = go_url;`
	`82`	`+ window.location.href = urlPreprocess(go_url);`
`82`	`83`	`}`
`83`	`84`	`}`
`84`	`85`	`}`