From b47b702ef9572165cf2bac2ed11f698832ce91ad Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Sat, 15 Jul 2023 21:48:38 +0800
Subject: [PATCH] 专享礼包的优化

---
 pages/giftpack/buygiftpack/giftpackbuy.js   | 48 +++++++++++++++++++++++++++++++++++++++++++++---
 pages/giftpack/giftpacklist/giftpacklist.js | 42 ++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 85 insertions(+), 5 deletions(-)

diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js
index 4e65afb..1e078be 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.js
+++ b/pages/giftpack/buygiftpack/giftpackbuy.js
@@ -1,4 +1,5 @@
 var i = require("../../../utils/util.js");
+var ut=i;
 var com = require("../public/buy_com.js");
 var e = getApp(),
   a = e.globalData.setting,
@@ -74,6 +75,9 @@ Page({
   onLoad: function (options) {
     var th=this;
 
+    //定义第一次进入
+    this.data.fir_in=1;
+
     this.setData({
       params: options,
       now:Date.parse(new Date()) / 1000,
@@ -143,10 +147,48 @@ Page({
   onShow: function () {
 
       this.setData({submit:0})
-      i.fy_back('',0);
-      com.set_py_fir();
-      getApp().check_can_share();
       var th=this;
+
+      //判断是不是第一次进入
+      if(this.data.fir_in){
+          this.data.fir_in=0;
+      }else{
+          //富友支付插件
+          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,parent_sn:th.data.ok_order_sn,userId:getApp().globalData.user_id}}).then(res=>{
+                  if(ut.ajax_ok(res)){
+                      var item=res.data.data.pageData[0];
+                      if(item.pay_status==1){
+                          //支付支付，返回首页
+                          ut.m_toast('支付成功');
+                          setTimeout(()=>{
+                              getApp().goto(back_url);
+                          },1000)
+
+                      }else{
+                          //支付支付，返回首页
+                          ut.m_toast('支付失败');
+                      }
+                  }
+              })
+          });
+
+
+      }
+
+
+
+      getApp().check_can_share();
+
     //--先判断会员状态--
     getApp().is_Single_page(this, function () {
       var user_info = getApp().globalData.userInfo;
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 8e94a5d..fcaa832 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -82,6 +82,9 @@ Page({
     },
     onLoad: function (options) {
 
+        //定义第一次进入
+        this.data.fir_in=1;
+
         var th = this;
 
         this.setData({
@@ -170,8 +173,43 @@ Page({
 
     onShow: function () {
         this.setData({submit:0})
-        ut.fy_back('',0);
-        com.set_py_fir();
+
+        var th=this;
+        //判断是不是第一次进入
+        if(this.data.fir_in){
+            this.data.fir_in=0;
+        }else{
+            //富友支付插件的判断
+            ut.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,parent_sn:th.data.ok_order_sn,userId:getApp().globalData.user_id}}).then(res=>{
+                    if(ut.ajax_ok(res)){
+                        var item=res.data.data.pageData[0];
+                        if(item.pay_status==1){
+                            //支付支付，返回首页
+                            ut.m_toast('支付成功');
+                            setTimeout(()=>{
+                                getApp().goto(back_url);
+                            },1000)
+
+                        }else{
+                            //支付支付，返回首页
+                            ut.m_toast('支付失败');
+                        }
+                    }
+                })
+            });
+        }
+
+
         getApp().check_can_share(this);
         getApp().is_Single_page(this, function () {
             //--先判断会员状态--
--
libgit2 0.21.4