From 64a7bda61f1fdc0c035f2b27114c304a23dab252 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 23 Oct 2023 17:42:34 +0800
Subject: [PATCH] 通联支付在切换的时候的测试出来的bug

---
 pages/user/assistance/task_assistance.js |  1 -
 utils/pay.js                             |  8 ++++++++
 utils/pay2.js                            | 10 ++++++++++
 utils/util.js                            |  4 ++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/pages/user/assistance/task_assistance.js b/pages/user/assistance/task_assistance.js
index 0a1ef37..7a9f34c 100644
--- a/pages/user/assistance/task_assistance.js
+++ b/pages/user/assistance/task_assistance.js
@@ -220,7 +220,6 @@ Page({
          th.setData({ openSpecModal: 1 })
          th.pp_bacK_func=th.add_onlicke_next; //设置回调函数
       }else{
-        return false;
         add_onlicke_next();
       }
   },
diff --git a/utils/pay.js b/utils/pay.js
index d841749..3aabead 100644
--- a/utils/pay.js
+++ b/utils/pay.js
@@ -42,6 +42,8 @@ module.exports = {
 
         console.log(dd,'支付场景');
 
+        getApp().globalData.is_tonglian_pay=0; //是通联支付的时候
+
         wx.showLoading();
         n.post(this.url, {
             data: dd,
@@ -150,6 +152,8 @@ module.exports = {
                             return false;
                         }
 
+                        getApp().globalData.is_tonglian_pay=1; //是通联支付的时候
+
                         wx.openEmbeddedMiniProgram({
                             appId: 'wxef277996acc166c3',
                             extraData: p_data,
@@ -204,6 +208,9 @@ module.exports = {
             fail('支付参数错误');
             return false;
         }
+
+        getApp().globalData.is_tonglian_pay=0; //是通联支付的时候
+
         //富友插件的优化
         if(ob.is_fuioupay){
             const plugin = requirePlugin('fuiou-pay')
@@ -234,6 +241,7 @@ module.exports = {
         //-- 通联的支付插件 --
         else if(ob.is_pos_pay){
 
+            getApp().globalData.is_tonglian_pay=1; //是通联支付的时候
             var p_data=t.data.data;
             delete p_data.is_pos_pay; //清理掉，不然签名不通过
             wx.openEmbeddedMiniProgram({
diff --git a/utils/pay2.js b/utils/pay2.js
index 8382532..25decb8 100644
--- a/utils/pay2.js
+++ b/utils/pay2.js
@@ -15,6 +15,9 @@ module.exports = {
         if(this.wx_paying) return false;
         this.wx_paying=1;
         wx.showLoading();
+
+        getApp().globalData.is_tonglian_pay=0; //是通联支付的时候
+
         var i = this;
         n.post(this.url, {
             data: dd,
@@ -69,6 +72,8 @@ module.exports = {
                                 th.data.ok_order_sn=ordno;
                             }
 
+                            getApp().globalData.is_tonglian_pay=1; //是通联支付的时候
+
                             wx.openEmbeddedMiniProgram({
                                 appId: 'wxef277996acc166c3',
                                 extraData: p_data,
@@ -113,6 +118,9 @@ module.exports = {
             fail('支付参数错误');
             return false;
         }
+
+        getApp().globalData.is_tonglian_pay=1; //是通联支付的时候
+
         if(ob.is_fuioupay){
             const plugin = requirePlugin('fuiou-pay')
 
@@ -153,6 +161,8 @@ module.exports = {
                 get_order(p_data.reqsn); //把单号返回
             }
 
+            getApp().globalData.is_tonglian_pay=1; //是通联支付的时候
+
             wx.openEmbeddedMiniProgram({
                 appId: 'wxef277996acc166c3',
                 extraData: p_data,
diff --git a/utils/util.js b/utils/util.js
index 1a9bd6f..7987d9e 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -895,6 +895,10 @@ module.exports = {
      */
     is_pay_ok(ok_order_sn,back_url,err_url,func,success,fail,is_navigateTo){
 
+        //如果不是通联支付，立即返回
+        if(!getApp().globalData.is_tonglian_pay) return false;
+        getApp().globalData.is_tonglian_pay=0;
+
         if(!ok_order_sn) {
             return false;
         }
--
libgit2 0.21.4