Merge remote-tracking branch 'origin/master'

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

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

src/utils/wxpay.js

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