From bfb6a525630dc0b3bc51b8dcb1110e25b795973b Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Thu, 27 Apr 2023 10:22:34 +0800
Subject: [PATCH] 支付回退的事件的优化

---
 packageE/pages/cart/cart2/cart2.js | 8 ++++++++
 utils/pay.js                       | 4 ++++
 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index 58a010d..892de9f 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -201,6 +201,14 @@ Page({
 
   //----------子页返回父页触发----------
   onShow: function () {
+
+    if(getApp().globalData.fuiou_pay){
+       getApp().globalData.fuiou_pay=0;
+       getApp().goto('pages/index/index/index');
+       return false;
+    }
+
+
     util_pay.set_fir();
     var th = this;
     th.data.g_cart_q_time = null;
diff --git a/utils/pay.js b/utils/pay.js
index 960faf9..85934a7 100644
--- a/utils/pay.js
+++ b/utils/pay.js
@@ -52,6 +52,8 @@ module.exports = {
                     if(t.data.data.is_fuioupay){
                         const plugin = requirePlugin('fuiou-pay')
                         getApp().globalData.no_clear=1;
+                        getApp().globalData.fuiou_pay=1;
+
 
                         var paramsJson={
                             reqType:"11",//必填 01-商户模式，11-机构模式
@@ -60,6 +62,7 @@ module.exports = {
                         console.log(plugin, plugin.fuioupay)
                         plugin.fuioupay(parseInt(t.data.data.amt),paramsJson,function (res){
                           console.log(res);
+                            getApp().globalData.fuiou_pay=0;
                             i.wx_paying=0;
                             getApp().showSuccess("支付成功！", e);
 
@@ -67,6 +70,7 @@ module.exports = {
                           console.log("插件支付错误",error);
                             //支付失败的时候
                             i.wx_paying=0;
+                            getApp().globalData.fuiou_pay=0;
                             var msg='取消支付';
                             if(error.code){
                                 msg=error.code+":"+error.message;
--
libgit2 0.21.4