From 4e86d8c3e50b3f14af4ac46c5cf8f03ec57f05bf Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 3 Dec 2024 19:25:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=BC=80=E5=8F=91=EF=BC=8C?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E9=A6=96=E9=A1=B5=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       | 271 +++++++++++++++++----------
 locale/en.json                       |   1 +
 locale/zh.json                       |   1 +
 pages/plugins/points/index/index.vue |  52 ++---
 4 files changed, 206 insertions(+), 119 deletions(-)

diff --git a/components/payment/payment.vue b/components/payment/payment.vue
index b81ad05e..04710c86 100644
--- a/components/payment/payment.vue
+++ b/components/payment/payment.vue
@@ -3,7 +3,7 @@
         <!-- 支付二维码展示 -->
         <component-popup :propShow="popup_view_pay_qrcode_is_show" propPosition="bottom" @onclose="popup_view_pay_qrcode_event_close">
             <view class="padding-top-xxxl padding-bottom-xxxl padding-left-xxxl padding-right-xxxl tc">
-                <block v-if="(popup_view_pay_data || null) == null || (popup_view_pay_data.qrcode_url || null) == null || (popup_view_pay_data.name || null) == null || (popup_view_pay_data.check_url || null) == null || (popup_view_pay_data.order_no || null) == null">
+                <block v-if="(popup_view_pay_data || null) == null || (popup_view_pay_data.qrcode_url || null) == null || (popup_view_pay_data.name || null) == null || (popup_view_pay_data.order_no || null) == null">
                     <text class="cr-grey">{{$t('payment.payment.973g2e')}}</text>
                 </block>
                 <block v-else>
@@ -58,7 +58,18 @@
                     <mp-html :content="popup_view_pay_data" />
                 </block>
             </view>
-        </component-popup>
+        </component-popup>
+
+        <!-- 支付中提示弹窗 -->
+        <view v-if="payment_confirm_modal_status" class="payment-confirm-modal">
+            <view class="content padding-xl margin-xxl tc bg-white border-radius-main">
+                <view class="padding-vertical-xxxxl">{{$t('common.payment_in_text')}}</view>
+                <view class="margin-top-lg">
+                    <button type="default" size="mini" class="bg-white br-black cr-black text-size-sm round margin-right-xxxxl" data-type="0" @tap="payment_confirm_event">{{$t('common.not_have_name')}}</button>
+                    <button type="default" size="mini" class="bg-main br-main cr-white text-size-sm round margin-left-xxxxl" data-type="1" @tap="payment_confirm_event">{{$t('order.order.s8g966')}}</button>
+                </view>
+            </view>
+        </view>
     </view>
 </template>
 <script>
@@ -74,10 +85,11 @@
                 payment_list: [],
                 // 弹窗开关
                 is_show_payment_popup: false,
-                popup_view_pay_qrcode_is_show: false,
-                // 定时器
-                popup_view_pay_timer: null,
-                popup_view_pay_data: null,
+                popup_view_pay_qrcode_is_show: false,
+                // 支付弹窗展示数据
+                popup_view_pay_data: null,
+                // 定时器
+                pay_statuc_check_timer: null,
                 // 支付id
                 payment_id: 0,
                 submit_disabled_status: true,
@@ -85,7 +97,11 @@
                 popup_view_pay_html_is_show: false,
                 // 打开url地址定时任务和状态
                 open_pay_url_timer: null,
-                open_pay_url_status: true,
+                open_pay_url_status: true,
+                // 支付返回数据
+                pay_response_data: {},
+                // 支付确认弹窗
+                payment_confirm_modal_status: false,
             };
         },
         props: {
@@ -229,10 +245,13 @@
                 this.$emit('close-payment-popup', false);
             },
             // 支付二维码展示窗口事件
-            popup_view_pay_qrcode_event_close(e) {
+            popup_view_pay_qrcode_event_close(e) {
+                // 关闭弹窗
                 this.setData({
                     popup_view_pay_qrcode_is_show: false,
-                });
+                });
+                // 清除定时和支付数据
+                clearInterval(this.pay_statuc_check_timer);
             },
 
             // 选择支付方式
@@ -347,10 +366,14 @@
                         data: post_data,
                         dataType: 'json',
                         success: (res) => {
-                            uni.hideLoading();
+                            uni.hideLoading();
+                            var data = res.data.data;
+                            this.setData({
+                                pay_response_data: data || {}
+                            });
                             if (res.data.code == 0) {
                                 // 是否直接支付成功
-                                if ((res.data.data.is_success || 0) == 1) {
+                                if ((data.is_success || 0) == 1) {
                                     // 数据设置
                                     this.order_item_pay_success_handle(data, order_id, false);
                                     app.globalData.showToast(this.$t('paytips.paytips.679rxu'), 'success');
@@ -359,11 +382,10 @@
                                     }, 2000);
                                 } else {
                                     // 支付方式类型
-                                    let payment_type = Number(res.data.data.is_payment_type || 0);
+                                    let payment_type = Number(data.is_payment_type || 0);
                                     switch (payment_type) {
                                         // 正常线上支付
                                         case 0:
-                                            var data = res.data.data;
                                             // #ifdef APP
                                             this.app_pay_handle(this, data, order_id);
                                             // #endif
@@ -416,13 +438,13 @@
                                 }
                             } else {
                                 // 是否返回html代码展示、则提示错误
-                                if (res.data.code == -6666 && (res.data.data || null) != null) {
+                                if (res.data.code == -6666 && (data || null) != null) {
                                     this.setData({
-                                        popup_view_pay_data: res.data.data,
+                                        popup_view_pay_data: data,
                                         popup_view_pay_html_is_show: true,
                                     });
                                 } else {
-                                    this.order_item_pay_fail_handle(res.data.data, order_id, res.data.msg);
+                                    this.order_item_pay_fail_handle(data, order_id, res.data.msg);
                                 }
                             }
                         },
@@ -478,7 +500,7 @@
                     }
                     // 显示加载层
                     uni.showLoading({
-                        title: this.$t('common.loading_in_text'),
+                        title: self.$t('common.loading_in_text'),
                         mask: true
                     });
                     // 设置打开url状态
@@ -556,44 +578,65 @@
                 });
             },
             // 小程序: 微信、支付宝、百度、头条、QQ
-            mp_pay_handle(self, data, order_id) {
-                uni.requestPayment({
-                    // #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO
-                    orderInfo: data.data,
-                    // #endif
-                    // #ifdef MP-QQ
-                    package: data.data,
-                    // #endif
-                    // #ifdef MP-WEIXIN
-                    timeStamp: data.data.timeStamp,
-                    nonceStr: data.data.nonceStr,
-                    package: data.data.package,
-                    signType: data.data.signType,
-                    paySign: data.data.paySign,
-                    // #endif
-                    // #ifdef MP-TOUTIAO
-                    service: 5,
-                    // #endif
-                    success: (res) => {
-                        // #ifdef MP-ALIPAY
-                        if (res.resultCode != 9000) {
-                            self.order_item_pay_fail_handle(data, order_id, res.memo || self.$t('paytips.paytips.6y488i'));
-                            return false;
-                        }
+            mp_pay_handle(self, data, order_id) {
+                // 是否打开另一个小程序
+                if (typeof data.data != 'string' && (data.data.appid || null) != null && (data.data.path || null) != null && (data.data.order_no || null) != null) {
+                    uni.navigateToMiniProgram({
+                        appId: data.data.appid,
+                        path: data.data.path,
+                        extraData: data.data.extra_data || {},
+                        success(res) {
+                            // 支付状态验证
+                            self.pay_status_check_handle(self, data, order_id);
+
+                            // 提示弹窗
+                            self.setData({
+                                payment_confirm_modal_status: true,
+                            });
+                        },
+                        fail(res) {
+                            app.globalData.showToast(self.$t('paytips.paytips.6y488i'));
+                        }
+                    });
+                } else {
+                    uni.requestPayment({
+                        // #ifdef MP-ALIPAY || MP-BAIDU || MP-TOUTIAO
+                        orderInfo: data.data,
+                        // #endif
+                        // #ifdef MP-QQ
+                        package: data.data,
+                        // #endif
+                        // #ifdef MP-WEIXIN
+                        timeStamp: data.data.timeStamp,
+                        nonceStr: data.data.nonceStr,
+                        package: data.data.package,
+                        signType: data.data.signType,
+                        paySign: data.data.paySign,
                         // #endif
                         // #ifdef MP-TOUTIAO
-                        if (res.code != 0) {
-                            self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i'));
-                            return false;
-                        }
+                        service: 5,
                         // #endif
-                        // 数据设置
-                        self.order_item_pay_success_handle(data, order_id);
-                    },
-                    fail: (res) => {
-                        self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i'));
-                    },
-                });
+                        success: (res) => {
+                            // #ifdef MP-ALIPAY
+                            if (res.resultCode != 9000) {
+                                self.order_item_pay_fail_handle(data, order_id, res.memo || self.$t('paytips.paytips.6y488i'));
+                                return false;
+                            }
+                            // #endif
+                            // #ifdef MP-TOUTIAO
+                            if (res.code != 0) {
+                                self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i'));
+                                return false;
+                            }
+                            // #endif
+                            // 数据设置
+                            self.order_item_pay_success_handle(data, order_id);
+                        },
+                        fail: (res) => {
+                            self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i'));
+                        },
+                    });
+                }
             },
             // QQ支付处理
             qq_pay_handle(self, data, order_id) {
@@ -662,52 +705,15 @@
                         }
                     }
                     // 二维码展示
-                    if ((data.data.qrcode_url || null) != null && (data.data.name || null) != null && (data.data.check_url || null) != null && (data.data.order_no || null) != null) {
+                    if ((data.data.qrcode_url || null) != null && (data.data.name || null) != null && (data.data.order_no || null) != null) {
                         status = true;
                         // 显示支付窗口
                         self.setData({
                             popup_view_pay_data: data.data,
                             popup_view_pay_qrcode_is_show: true,
-                        });
-                        if (self.propQrcodeUrl) {
-                            // 定时校验支付状态
-                            var timer = setInterval(function () {
-                                uni.request({
-                                    url: self.propQrcodeUrl,
-                                    method: 'POST',
-                                    data: {
-                                        order_no: self.popup_view_pay_data.order_no,
-                                    },
-                                    dataType: 'json',
-                                    success: (res) => {
-                                        uni.hideLoading();
-                                        if (res.data.code == 0) {
-                                            // 清除定时和支付数据
-                                            clearInterval(self.popup_view_pay_timer);
-                                            self.setData({
-                                                popup_view_pay_data: null,
-                                                popup_view_pay_qrcode_is_show: false,
-                                            });
-                                            // 数据设置
-                                            self.order_item_pay_success_handle(data, order_id);
-                                        } else {
-                                            // -300支付中、其它状态则提示错误
-                                            if (res.data.code != -300) {
-                                                clearInterval(self.popup_view_pay_timer);
-                                                app.globalData.showToast(res.data.msg);
-                                            }
-                                        }
-                                    },
-                                    fail: () => {
-                                        clearInterval(self.popup_view_pay_timer);
-                                        self.order_item_pay_fail_handle(data, order_id, self.$t('common.internet_error_tips'));
-                                    },
-                                });
-                            }, 3000);
-                            self.setData({
-                                popup_view_pay_timer: timer,
-                            });
-                        }
+                        });
+                        // 状态验证
+                        self.pay_status_check_handle(self, data, order_id);
                     }
                     // 返回html表单
                     if ((data.data.html || null) != null) {
@@ -726,6 +732,64 @@
                         app.globalData.showToast(data.payment.name + self.$t('payment.payment.2rw3qh'));
                     }
                 }
+            },
+
+            // 支付状态验证处理
+            pay_status_check_handle(self, data, order_id) {
+                // 先清除已存在的定时
+                clearInterval(self.pay_statuc_check_timer);
+                // 定时校验支付状态
+                var timer = setInterval(function () {
+                    uni.request({
+                        url: self.propQrcodeUrl,
+                        method: 'POST',
+                        data: {
+                            order_no: data.data.order_no,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            if (res.data.code == 0) {
+                                // 清除定时、支付数据、弹窗
+                                clearInterval(self.pay_statuc_check_timer);
+                                self.setData({
+                                    popup_view_pay_data: null,
+                                    popup_view_pay_qrcode_is_show: false,
+                                    payment_confirm_modal_status: false,
+                                });
+                                // 数据设置
+                                self.order_item_pay_success_handle(data, order_id);
+                            } else {
+                                // -333支付中、其它状态则提示错误
+                                if (res.data.code != -333) {
+                                    clearInterval(self.pay_statuc_check_timer);
+                                    app.globalData.showToast(res.data.msg);
+                                }
+                            }
+                        },
+                        fail: () => {
+                            clearInterval(self.pay_statuc_check_timer);
+                            self.order_item_pay_fail_handle(data, order_id, self.$t('common.internet_error_tips'));
+                        },
+                    });
+                }, 3000);
+                self.setData({
+                    pay_statuc_check_timer: timer,
+                });
+            },
+
+            // 支付确认弹窗事件
+            payment_confirm_event(e) {
+                // 关闭弹窗清除定时任务
+                this.setData({
+                    payment_confirm_modal_status: false,
+                });
+                clearInterval(this.pay_statuc_check_timer);
+                // 回调处理
+                if(parseInt(e.currentTarget.dataset.type || 0) == 1) {
+                    this.order_item_pay_success_handle(this.pay_response_data, this.order_id);
+                } else {
+                    this.order_item_pay_fail_handle(this.pay_response_data, this.order_id, this.$t('paytips.paytips.6y488i'));
+                }
             },
 
             // 支付成功数据设置 data:后台返回的参数， order_id: 订单id，is_to_page，是否需要跳转页面的参数控制
@@ -804,7 +868,7 @@
             },
             // 页面卸载
             onUnload(e) {
-                clearInterval(this.popup_view_pay_timer);
+                clearInterval(this.pay_statuc_check_timer);
             },
             // 支付html展示窗口事件
             popup_view_pay_html_event_close(e) {
@@ -835,5 +899,24 @@
     }
     .payment-submit {
         padding: 40rpx;
+    }
+
+    /**
+     * 支付确认弹窗
+     */
+    .payment-confirm-modal {
+        position: fixed;
+        top: 0;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        background-color: rgba(0, 0, 0, 0.6);
+        z-index: 100;
+        width: 100%;
+        height: 100%;
+    }
+    .payment-confirm-modal .content {
+        margin-top: 60%;
+        z-index: 101;
     }
 </style>
\ No newline at end of file
diff --git a/locale/en.json b/locale/en.json
index fb8e5a1a..a01e1753 100644
--- a/locale/en.json
+++ b/locale/en.json
@@ -53,6 +53,7 @@
 		"not_more_list_data_tips": "No more list data available",
 		"login_in_text": "Logging in",
 		"sending_in_text": "Sending",
+        "payment_in_text": "Payment in progress",
 		"sending": "Sending",
 		"scan_name": "Scan it",
 		"not_have_name": "not have",
diff --git a/locale/zh.json b/locale/zh.json
index ecfd8ab9..2f25fc96 100644
--- a/locale/zh.json
+++ b/locale/zh.json
@@ -48,6 +48,7 @@
 		"auth_in_text": "授权中...",
 		"login_in_text": "登录中...",
 		"sending_in_text": "发送中...",
+        "payment_in_text": "支付中...",
 		"sending": "发送中",
 		"warm_tips": "温馨提示",
 		"no_relevant_data_tips": "没有相关数据",
diff --git a/pages/plugins/points/index/index.vue b/pages/plugins/points/index/index.vue
index e031518d..601e2390 100644
--- a/pages/plugins/points/index/index.vue
+++ b/pages/plugins/points/index/index.vue
@@ -72,7 +72,7 @@
                         </view>
 
                         <!-- 积分明细和商品兑换都没有的时候展示无数据提示 -->
-                        <block v-if="integral_list.length == 0 && ((data_base.goods_exchange_data || null) === null || data_base.goods_exchange_data.length == 0)">
+                        <block v-if="integral_list.length == 0 && (data_base.is_home_points_record || 0) != 1 && ((data_base.goods_exchange_data || null) === null || data_base.goods_exchange_data.length == 0)">
                             <!-- 提示信息 -->
                             <component-no-data :propStatus="0"></component-no-data>
                         </block>
@@ -297,31 +297,33 @@
             },
 
             // 获取积分数据
-            get_integral_data_list(is_mandatory) {
-                uni.request({
-                    url: app.globalData.get_request_url('index', 'userintegral'),
-                    method: 'POST',
-                    data: {
-                        page: this.integral_page,
-                    },
-                    dataType: 'json',
-                    success: (res) => {
-                        if(this.data_page > 1) {
-                            uni.hideLoading();
-                        }
-                        uni.stopPullDownRefresh();
-                        if (res.data.code == 0) {
-                            if (res.data.data.data.length > 0) {
-                                this.setData({
-                                    integral_list: res.data.data.data.length > 4 ? res.data.data.data.splice(0, 4) : res.data.data.data,
-                                });
+            get_integral_data_list(is_mandatory) {
+                if((this.data_base || null) != null && parseInt(this.data_base.is_home_points_record || 0) == 1) {
+                    uni.request({
+                        url: app.globalData.get_request_url('index', 'userintegral'),
+                        method: 'POST',
+                        data: {
+                            page: this.integral_page,
+                        },
+                        dataType: 'json',
+                        success: (res) => {
+                            if(this.data_page > 1) {
+                                uni.hideLoading();
                             }
-                        }
-                    },
-                    fail: () => {
-                        app.globalData.showToast(this.$t('common.internet_error_tips'));
-                    },
-                });
+                            uni.stopPullDownRefresh();
+                            if (res.data.code == 0) {
+                                if (res.data.data.data.length > 0) {
+                                    this.setData({
+                                        integral_list: res.data.data.data.length > 4 ? res.data.data.data.splice(0, 4) : res.data.data.data,
+                                    });
+                                }
+                            }
+                        },
+                        fail: () => {
+                            app.globalData.showToast(this.$t('common.internet_error_tips'));
+                        },
+                    });
+                }
             },
 
             // 弹层开启