From d4d14e45d947daa6c8b7bfd1c97afb2ea12abdb0 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 9 Oct 2023 10:15:02 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96=E6=94=AF=E4=BB=98=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/payment/payment.vue             | 15 +++++++++------
 pages/buy/buy.vue                          |  8 ++++----
 pages/plugins/wallet/recharge/recharge.vue |  1 +
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index e75d0e74..9114fa54 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -124,7 +124,7 @@
                 },
             },
             // 支付失败跳转页面
-            propTofailPage: {
+            propToFailPage: {
                 type: String,
                 default: '',
             },
@@ -311,6 +311,7 @@
                                 } else {
                                     app.globalData.showToast(res.data.msg);
                                 }
+                                this.order_item_pay_fail_handle(res.data.data, order_id);
                             }
                         },
                         fail: () => {
@@ -511,7 +512,7 @@
                     }
                 }
             },
-            // 支付成功数据设置 bool:成功是否需要跳转页面
+            // 支付成功数据设置 data:后台返回的参数， order_id: 订单id，is_to_page，是否需要跳转页面的参数控制
             order_item_pay_success_handle(data, order_id, is_to_page = true) {
                 let newData = {
                     data: data,
@@ -523,18 +524,18 @@
                     this.to_success_page_event();
                 }
             },
-            // 支付失败数据设置 bool:失败是否需要跳转页面
+            // 支付失败数据设置 data:后台返回的参数， order_id: 订单id
             order_item_pay_fail_handle(data, order_id) {
                 let newData = {
                     data: data,
                     order_id: order_id,
-                    is_to_page: is_to_page,
                     temp_pay_index: this.propTempPayIndex,
                     payment_id: this.propPaymentId,
                 };
                 this.$emit('pay-fail', newData);
                 this.to_fail_page_event();
             },
+            // 成功跳转
             to_success_page_event() {
                 let url_data = {
                     code: '9000',
@@ -552,11 +553,13 @@
                     });
                 }
             },
+            // 失败跳转
             to_fail_page_event() {
-                if (this.propTofailPage) {
+                console.log(this.propToFailPage);
+                if (this.propToFailPage) {
                     // 跳转支付页面
                     uni.navigateTo({
-                        url: this.propTofailPage + '?data=' + data.order_id,
+                        url: this.propToFailPage,
                     });
                 }
             },
diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue
index 207ca5b2..fead5f6b 100644
--- a/pages/buy/buy.vue
+++ b/pages/buy/buy.vue
@@ -326,7 +326,7 @@
                     page: 'user-order/user-order',
                 },
                 // 支付失败跳转的页面
-                to_fail_page: 'page/user-order/user-order',
+                to_fail_page: '/pages/user-order/user-order',
             };
         },
 
@@ -647,10 +647,10 @@
                                 this.buy_submit_response_handle(res.data.data);
                             } else {
                                 app.globalData.showToast(res.data.msg);
-                                this.setData({
-                                    buy_submit_disabled_status: false,
-                                });
                             }
+                            this.setData({
+                                buy_submit_disabled_status: false,
+                            });
                         },
                         fail: () => {
                             uni.hideLoading();
diff --git a/pages/plugins/wallet/recharge/recharge.vue b/pages/plugins/wallet/recharge/recharge.vue
index 5a59a05f..a67e7b03 100644
--- a/pages/plugins/wallet/recharge/recharge.vue
+++ b/pages/plugins/wallet/recharge/recharge.vue
@@ -17,6 +17,7 @@
             :prop-temp-pay-value="temp_pay_value"
             :prop-pay-price="pay_price"
             :propIsRedirectTo="true"
+            :prop-to-fail-page="to_fail_page"
             @close-payment-poupon="payment_popup_event_close"
         ></component-payment>
     </view>