From e5d00f7e3a1fef43c580e04dec040316b830675c Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Wed, 19 Jul 2023 10:21:24 +0800
Subject: [PATCH] 礼包和专享礼包的优化

---
 packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js | 67 ++++++++++++++++++++++++++++++++++++-------------------------------
 pages/giftpack/buygiftpack/giftpackbuy.js                   | 59 +++++++++++++++++++++++++++++++++--------------------------
 2 files changed, 69 insertions(+), 57 deletions(-)

diff --git a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
index 5886fe1..6e62b14 100644
--- a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
+++ b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js
@@ -191,38 +191,43 @@ Page({
                   }
               })
 
-              var money = th.data.payMoney;
-              var bk_url = "/packageE/pages/user/monthgiftbag/payment/payment?money=" + money + "&order_sn=" + th.data.back_ord;
-              //-- 通联的第三方支付的返回优化 --
-              ut.is_pay_ok(bk_url, "none", function () {
-                  if (!th.data.back_ord) return false;
-                  //订单查询的接口
-                  getApp().request.promiseGet("/api/weshop/marketing/marketingMonthgiftbagRecord/page",
-                      {
-                          data: {
-                              store_id: os.stoid,
-                              order_sn: th.data.back_ord,
-                              user_id: getApp().globalData.user_id
-                          }
-                      }).then(res => {
-                      if (ut.ajax_ok(res)) {
-
-                          var item = res.data.data.pageData[0];
-                          if (item.pay_state == 1) {
-                              //支付支付，返回首页
-                              ut.m_toast('支付成功');
-                              th.data.back_ord=null;
-                              setTimeout(()=>{
-                                   getApp().goto(bk_url);
-                              },1500)
-
-                          } else {
-                              //支付支付，返回首页
-                              ut.m_toast('支付失败');
+
+              if(th.data.back_ord){
+                  var money = th.data.payMoney;
+                  var bk_url = "/packageE/pages/user/monthgiftbag/payment/payment?money=" + money + "&order_sn=" + th.data.back_ord;
+                  //-- 通联的第三方支付的返回优化 --
+                  ut.is_pay_ok(bk_url, "none", function () {
+                      if (!th.data.back_ord) return false;
+                      //订单查询的接口
+                      getApp().request.promiseGet("/api/weshop/marketing/marketingMonthgiftbagRecord/page",
+                          {
+                              data: {
+                                  store_id: os.stoid,
+                                  order_sn: th.data.back_ord,
+                                  user_id: getApp().globalData.user_id
+                              }
+                          }).then(res => {
+                          if (ut.ajax_ok(res)) {
+
+                              var item = res.data.data.pageData[0];
+                              if (item.pay_state == 1) {
+                                  //支付支付，返回首页
+                                  ut.m_toast('支付成功');
+                                  th.data.back_ord=null;
+                                  setTimeout(()=>{
+                                      getApp().goto(bk_url);
+                                  },1500)
+
+                              } else {
+                                  //支付支付，返回首页
+                                  ut.m_toast('支付失败');
+                              }
                           }
-                      }
-                  })
-              }, null, null, 1);
+                      })
+                  }, null, null, 1);
+
+                  th.data.back_ord=null;
+              }
 
 
           }, 1000)
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
index 123493d..7a78f95 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.js
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -157,33 +157,40 @@ Page({
           i.fy_back('',0);
           com.set_py_fir();
 
-          //-- 通联的第三方支付的返回优化 --
-          var money=th.data.payMoney;
-          var back_url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" +    th.data.ok_order_sn;
-
-          ut.is_pay_ok(back_url,'none',function (){
-              if(!th.data.ok_order_sn) return false;
-              getApp().request.promiseGet("/api/weshop/marketing/my/giftbag/detail/get",
-                  {data:{storeId:os.stoid,orderSn:th.data.ok_order_sn,userId:getApp().globalData.user_id}}).then(res=>{
-
-                  th.data.ok_order_sn=null;
-
-                  if(res.data.code==0 && res.data.data){
-                      var item=res.data.data;
-                      if(item.payState==1){
-                          //支付支付，返回首页
-                          ut.m_toast('支付成功');
-                          setTimeout(()=>{
-                              getApp().goto(back_url);
-                          },1000)
-
-                      }else{
-                          //支付支付，返回首页
-                          ut.m_toast('支付失败');
+
+          if(th.data.ok_order_sn){
+              //-- 通联的第三方支付的返回优化 --
+              var money=th.data.payMoney;
+              var back_url = "/pages/giftpack/payment/payment?money=" + money + "&order_sn=" +    th.data.ok_order_sn;
+
+              ut.is_pay_ok(back_url,'none',function (){
+                  if(!th.data.ok_order_sn) return false;
+                  getApp().request.promiseGet("/api/weshop/marketing/my/giftbag/detail/get",
+                      {data:{storeId:os.stoid,orderSn:th.data.ok_order_sn,userId:getApp().globalData.user_id}}).then(res=>{
+
+                      th.data.ok_order_sn=null;
+
+                      if(res.data.code==0 && res.data.data){
+                          var item=res.data.data;
+                          if(item.payState==1){
+                              //支付支付，返回首页
+                              ut.m_toast('支付成功');
+                              setTimeout(()=>{
+                                  getApp().goto(back_url);
+                              },1000)
+
+                          }else{
+                              //支付支付，返回首页
+                              ut.m_toast('支付失败');
+                          }
                       }
-                  }
-              })
-          },null,null,1);
+                  })
+              },null,null,1);
+
+              th.data.ok_order_sn=null;
+          }
+
+
 
 
       }
--
libgit2 0.21.4