From 8286b4ecebc19f3e1f0f7b5a5e08db42484bf092 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Mon, 30 Oct 2023 16:15:36 +0800
Subject: [PATCH] =?UTF-8?q?1.=E9=92=B1=E5=8C=85=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/payment/payment.vue                | 35 +++++++++++++++----
 .../wallet/user-recharge/user-recharge.vue    |  2 ++
 pages/plugins/wallet/recharge/recharge.vue    |  2 ++
 3 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index 925c6119..907dc797 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -121,7 +121,7 @@
                 type: [Number, String],
                 default: 0,
             },
-            // 支付跳转页面
+            // 支付跳转页面------跳转成功页面---后返回的页面
             propToPage: {
                 type: Object,
                 default: () => {
@@ -133,11 +133,21 @@
                 type: String,
                 default: '',
             },
-            //
+            //是否需要关闭页面进行跳转
             propIsRedirectTo: {
                 type: Boolean,
                 default: false,
             },
+            // 是否需要停留在当前页面
+            propIsKeepThisPage: {
+                type: Boolean,
+                default: false,
+            },
+            // 指定跳转页面----不进入充值成功页面
+            propToAppointPage: {
+                type: String,
+                default: '',
+            },
         },
         components: {
             componentPopup,
@@ -297,16 +307,14 @@
                                             break;
                                         // 线下支付
                                         case 1:
+                                            let $self = this;
                                             // 现金支付
                                             uni.showModal({
                                                 content: res.data.msg,
                                                 showCancel: false,
                                                 success(res) {
                                                     if (res.confirm) {
-                                                        // 跳转订单列表页
-                                                        uni.redirectTo({
-                                                            url: '/pages/user-order/user-order?data=' + order_id,
-                                                        });
+                                                        $self.to_other(order_id);
                                                     }
                                                 },
                                             });
@@ -598,6 +606,21 @@
                     }
                 }
             },
+            to_other(order_id) {
+                if (!this.propIsKeepThisPage) {
+                    if (this.propToAppointPage) {
+                        // 跳转订单列表页
+                        uni.redirectTo({
+                            url: this.propToAppointPage,
+                        });
+                    } else {
+                        // 跳转订单列表页
+                        uni.redirectTo({
+                            url: '/pages/user-order/user-order?data=' + order_id,
+                        });
+                    }
+                }
+            },
             // 页面卸载
             onUnload(e) {
                 clearInterval(this.popup_view_pay_timer);
diff --git a/components/wallet/user-recharge/user-recharge.vue b/components/wallet/user-recharge/user-recharge.vue
index d355628a..9e00e7b1 100644
--- a/components/wallet/user-recharge/user-recharge.vue
+++ b/components/wallet/user-recharge/user-recharge.vue
@@ -49,6 +49,7 @@
             :prop-temp-pay-index="temp_pay_index"
             :prop-pay-price="pay_price"
             :prop-payment-id="payment_id"
+            :prop-to-appoint-page="to_appoint_page"
             :prop-default-payment-id="default_payment_id"
             :prop-is-show-payment="is_show_payment_popup"
             @close-payment-poupon="payment_popup_event_close"
@@ -111,6 +112,7 @@
                 default_payment_id: 0,
                 is_show_payment_popup: false,
                 pay_price: 0,
+                to_appoint_page:'/pages/plugins/wallet/user/user?type=1'
             };
         },
 
diff --git a/pages/plugins/wallet/recharge/recharge.vue b/pages/plugins/wallet/recharge/recharge.vue
index d9761981..b381a731 100644
--- a/pages/plugins/wallet/recharge/recharge.vue
+++ b/pages/plugins/wallet/recharge/recharge.vue
@@ -61,6 +61,7 @@
             :prop-payment-id="payment_id"
             :propIsRedirectTo="true"
             :prop-to-fail-page="to_fail_page"
+            :prop-to-appoint-page="to_appoint_page"
             :prop-is-show-payment="is_show_payment_popup"
             @close-payment-poupon="payment_popup_event_close"
         ></component-payment>
@@ -98,6 +99,7 @@
                 payment_id: 0,
                 // 支付失败跳转的页面
                 to_fail_page: '/pages/plugins/wallet/user/user',
+                to_appoint_page:'/pages/plugins/wallet/user/user?type=3'
             };
         },