支付问题修复

src/components/order/payOrder/PayOrder.js

@@ -115,7 +115,7 @@ export default class PayOrder extends Component {
             http.get(`${API['base-api']}/pay/wxpay/wap_charge/oid/${orderId}`).then((res) => {
                 console.log(res);
                 if (res.data.errno === 0) {
-                    window.location.href = res.data.data.url + "&redirect_url=" + encodeURIComponent(window.location.href + "&weixinpay=1&oid=" + orderId).toLowerCase();
+                    window.location.href = res.data.data.url + "&redirect_url=" + encodeURIComponent(window.location.href + "&weixinpay=1").toLowerCase();
                 } else {
                     Toast.info(res.data.msg + 'weixinPay', 2)
                 }
@@ -130,18 +130,20 @@ export default class PayOrder extends Component {
                 return
             } else {
                 http.get(`${API['base-api']}/pay/wxpay/pub_charge/oid/${getParam('oid')}/code/${weixin_code}`).then((res) => {
+                    Toast.info(`测试结果用${res.data.errno === 0}`, 2);
                     if (res.data.errno === 0) {
-                        let data = res.data.data;
-                        this.onBridgeReady(data);
+                        // let data = res.data.data;
+                        this.BridgeData = res.data.data;
+                        // this.onBridgeReady(data); // 这个应该不需要
                         if (typeof WeixinJSBridge == "undefined") {
                             if (document.addEventListener) {
                                 document.addEventListener('WeixinJSBridgeReady', this.onBridgeReady, false)
                             } else if (document.attachEvent) {
-                                document.attachEvent('WeixinJSBridgeReady', this.onBridgeReady)
+                                document.attachEvent('WeixinJSBridgeReady', this.onBridgeReady);
                                 document.attachEvent('onWeixinJSBridgeReady', this.onBridgeReady)
                             }
                         } else {
-                            this.onBridgeReady()
+                            this.onBridgeReady(this.BridgeData);
                         }
                     } else {
                         Toast.info(res.data.msg + 'isweixinPay', 2)
@@ -176,6 +178,8 @@ export default class PayOrder extends Component {
     }
 
     onBridgeReady = (data) => {
+        let _this = this;
+        data = data || _this.BridgeData;
         WeixinJSBridge.invoke(
             'getBrandWCPayRequest', {
                 "appId": data.appId,                //公众号名称，由商户传入
@@ -187,7 +191,8 @@ export default class PayOrder extends Component {
             },
             function (res) {
                 if (res.err_msg == "get_brand_wcpay_request:ok") {
-                    this.payCallback()
+                    Toast.info('支付成功', 2);
+                    _this.payCallback();
                 } else {
                     alert('支付失败')
                 }