Эх сурвалжийг харах

feat: 代用户下单支付返回不重定向

cuiyalong 1 сар өмнө
parent
commit
bdee8fadc1

+ 42 - 40
src/web/templates/weixin/commonPay/checkout.html

@@ -293,47 +293,49 @@
                         } else if (r.err_msg === "get_brand_wcpay_request:cancel") {
                             //取消支付 跳转订单详情
                             console.log("取消支付")
-                            switch (checkout.orderInfo.productType) {
-                                case "subvip": {
-                                    window.location.replace("/front/vipsubscribe/toOrderDetailPage?orderCode=" + checkout.orderInfo.ordercode)
-                                    break
-                                }
-                                case "dataexport" : {
-                                    window.location.replace("/front/wx_dataExport/wxToOrderDetail?orderCode=" + checkout.orderInfo.ordercode)
-                                    break
-                                }
-                                case "onlineCourse": {
-                                    window.location.replace("/weixin/pay/xs_payNow?code=" + checkout.orderInfo.ordercode)
-                                    break
-                                }
-                                case "member": {
-                                    window.location.replace("/front/wxMyOrder/memberDetail/" + checkout.orderInfo.ordercode)
-                                    break
-                                }
-                                case "member": {
-                                    window.location.replace("/front/wxMyOrder/aiForecastPackdetail/" + orderCode)
-                                    break
-                                }
-                                case "bidfile": {
-                                    var  bigmemberBid=checkout.getUrlParam("b");
-                                    var href="/front/wxMyOrder/bidfileDetail/" + orderCode;
-                                    if (bigmemberBid==="1"){
-                                      href="/front/wxMyOrder/aiForecastPackdetail/" + orderCode;
+                            if (!this.data.token) {
+                                switch (checkout.orderInfo.productType) {
+                                    case "subvip": {
+                                        window.location.replace("/front/vipsubscribe/toOrderDetailPage?orderCode=" + checkout.orderInfo.ordercode)
+                                        break
+                                    }
+                                    case "dataexport" : {
+                                        window.location.replace("/front/wx_dataExport/wxToOrderDetail?orderCode=" + checkout.orderInfo.ordercode)
+                                        break
+                                    }
+                                    case "onlineCourse": {
+                                        window.location.replace("/weixin/pay/xs_payNow?code=" + checkout.orderInfo.ordercode)
+                                        break
+                                    }
+                                    case "member": {
+                                        window.location.replace("/front/wxMyOrder/memberDetail/" + checkout.orderInfo.ordercode)
+                                        break
+                                    }
+                                    case "member": {
+                                        window.location.replace("/front/wxMyOrder/aiForecastPackdetail/" + orderCode)
+                                        break
+                                    }
+                                    case "bidfile": {
+                                        var  bigmemberBid=checkout.getUrlParam("b");
+                                        var href="/front/wxMyOrder/bidfileDetail/" + orderCode;
+                                        if (bigmemberBid==="1"){
+                                        href="/front/wxMyOrder/aiForecastPackdetail/" + orderCode;
+                                        }
+                                        window.location.replace(href);
+                                        break
+                                    }
+                                    case "integral": {
+                                        window.location.replace("/front/wxMyOrder/integraldetail/" + orderCode)
+                                        break
+                                    }
+                                    case 'dataPack': {
+                                        window.location.replace("/weixin/common/dataPack/orderDetail?order_code=" + orderCode)
+                                        break
+                                    }
+                                    case 'docMember': {
+                                        window.location.replace("/weixin/common/docMember/orderDetail?order_code=" + orderCode)
+                                        break
                                     }
-                                    window.location.replace(href);
-                                    break
-                                }
-                                case "integral": {
-                                    window.location.replace("/front/wxMyOrder/integraldetail/" + orderCode)
-                                    break
-                                }
-                                case 'dataPack': {
-                                    window.location.replace("/weixin/common/dataPack/orderDetail?order_code=" + orderCode)
-                                    break
-                                }
-                                case 'docMember': {
-                                    window.location.replace("/weixin/common/docMember/orderDetail?order_code=" + orderCode)
-                                    break
                                 }
                             }
                         } else {