From a7f8b199f5b340a10515fba42ff36a6d08b4cc15 Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Wed, 26 Oct 2022 09:59:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat(=E5=88=9B=E5=BB=BA=E4=BC=98=E6=83=A0?=
 =?UTF-8?q?=E5=88=B8=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98)=EF=BC=9A?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9Etoken=EF=BC=8C=E4=BE=BF?=
 =?UTF-8?q?=E4=BA=8E=E5=9B=9E=E8=B0=83=E8=BF=94=E5=9B=9Etoken=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 coupon/details.html | 2 +-
 coupon/myOrder.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/coupon/details.html b/coupon/details.html
index c229b5f..9fe65b3 100644
--- a/coupon/details.html
+++ b/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 {
diff --git a/coupon/myOrder.html b/coupon/myOrder.html
index 4fa1f83..c2bd4b5 100644
--- a/coupon/myOrder.html
+++ b/coupon/myOrder.html
@@ -233,7 +233,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)

From 5f90def6082162de21b63b8ce44998a75711aab8 Mon Sep 17 00:00:00 2001
From: Apple <>
Date: Wed, 26 Oct 2022 10:06:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E3=80=90C=E7=AB=AF?=
 =?UTF-8?q?=E3=80=91=E3=80=90=E8=AE=A2=E5=8D=95=E3=80=91=E7=AB=8B=E5=87=8F?=
 =?UTF-8?q?=E9=87=91=E8=AE=A2=E5=8D=95=E6=94=AF=E4=BB=98=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E8=BF=94=E5=9B=9E=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=BF=94=E5=9B=9E=E5=88=B0=E6=AD=A3=E7=A1=AE?=
 =?UTF-8?q?=E7=9A=84=E8=AE=A2=E5=8D=95=E5=88=97=E8=A1=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 paysuccess.html | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/paysuccess.html b/paysuccess.html
index 0969a04..dcc40c0 100644
--- a/paysuccess.html
+++ b/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();