Merge remote-tracking branch 'origin/master'

src/projects/business/views/Master/Live/Pay.vue

@@ -145,8 +145,6 @@
 				this.isLoading=true;
 				if(this.paytypeindex=="1"){
 					API_Pay.wxJsapiPay(this.detail.id,this.paycode).then(data=>{
-						//公共页面
-						data.url=window.location.href.split("#")[0]+"/#/master";
 
 						this.isLoading=false;
 						wxPayJs(data)

src/projects/pension/views/Master/Live/Pay.vue

@@ -145,9 +145,7 @@
 				this.isLoading=true;
 				if(this.paytypeindex=="1"){
 					API_Pay.wxJsapiPay(this.detail.id,this.paycode).then(data=>{
-						//公共页面
-						data.url=window.location.href.split("#")[0]+"/#/master/live/paySuccess";
-
+						//公共页
 						this.isLoading=false;
 						wxPayJs(data)
 					}).catch(error => {

src/utils/wxpay.js

@@ -27,7 +27,9 @@ function onBridgeReady(params) {
 }
 
 export const wxPayJs = (params) => {
-	params.url=window.location.href.split("#")[0]+"/#/master";
+	if(!params.url){
+		params.url=window.location.href.split("#")[0]+"/#/master";
+	}
 
 	if (typeof window.WeixinJSBridge === 'undefined') {
 		if (document.addEventListener) {