Merge branch 'couponV2.0' of codeup.aliyun.com:5f9118049cffa29cfdd3be1c/marketing/mobileclient into couponV2.0

coupon/details.html

@@ -570,7 +570,7 @@
 
             //优惠券订单支付
             createdPay (orderNumber) {
-                req.axiosGet('/key/coupon/createPay/' + orderNumber).then(res => {
+                req.axiosGet('/key/coupon/createPay/' + orderNumber,{token:localStorage.getItem('token')}).then(res => {
                     if (res.code == 200) {
                         this.payWayRun(res.data);
                     } else {

coupon/myOrder.html

@@ -253,7 +253,7 @@
 
                 /* 调用支付 */
                 payRealFunction (isSupport) {
-                    req.axiosGet(`/key/coupon/createPay/${this.activeOrder.order_number}`).then(({ code, data, message }) => {
+                    req.axiosGet(`/key/coupon/createPay/${this.activeOrder.order_number}`,{token:localStorage.getItem('token')}).then(({ code, data, message }) => {
                         if (code === 403) {
                             this.popFunction({ title: '温馨提示', text: message, status: 2, b_text: '我知道了', show: true })
                             this.toPage(3)

paysuccess.html

@@ -72,7 +72,7 @@
                 );
                 this.orderNumber = orderNumber;
                 this.getOrderDetail(orderNumber);
-               
+                localStorage.setItem('token',this.getQueryString( window.location.search,"token"));
             },
             methods: {
                 getQueryString(path, name) {
@@ -109,15 +109,14 @@
                     req.axiosGet("/key/order/detail/" + id).then((res) => {
                         if (res.code == 200) {
                             this.orderInfo = res.data;
+                            this.payResult=true;
                             if (res.data.type == 2) { //1 商品  2立减金
                                 //channel  1支付宝   2微信
                                 this.plaflam = res.data.product.entity.channel;//只有立减金商品才有channel字段
                                 this.redirect_url = res.data.wechat_redirect_url;
                                 this.payStatus=res.data.pay_status;
-                                this.payResult=true;
-                                if(res.data.type!=2){
-                                    this.countdownFn();
-                                }
+                            }else{
+                                this.countdownFn();
                             }
                         }
                     }).catch();