From ed6b9b2affe6514a06b5c0855bf40ec1327d6b3f Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Sat, 15 Jul 2023 22:29:02 +0800 Subject: [PATCH] 月包的支付的优化 --- packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------- packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------- 2 files changed, 113 insertions(+), 30 deletions(-) diff --git a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js index cee8739..4c6820f 100644 --- a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js +++ b/packageE/pages/user/monthgiftbag/giftpackbuy/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,9 @@ Page({ onShow: function () { var th=this; this.setData({submit:0}) - - com.set_py_fir(); + getApp().check_can_share(); - var th=this; + //--先判断会员状态-- getApp().is_Single_page(this, function () { var user_info = getApp().globalData.userInfo; @@ -164,23 +167,60 @@ Page({ }) this.init(); - setTimeout(()=> { - i.fy_back('', 0, function () { + //判断是不是第一次进入 + if(this.data.fir_in){ + this.data.fir_in=0; + }else{ + //富友支付插件 + com.set_py_fir(); + + setTimeout(() => { + i.fy_back('', 0, function () { - console.log(getApp().globalData.py_month_bg, '111111'); - console.log(th.data.back_ord, '22222'); + console.log(getApp().globalData.py_month_bg, '111111'); + console.log(th.data.back_ord, '22222'); - if (getApp().globalData.py_month_bg && th.data.back_ord) { - getApp().globalData.fuyou_clear = 1; - var b_ord = th.data.back_ord; - com.reduce(b_ord, os.stoid); - //要进行清空粗粒 - getApp().globalData.py_month_bg = 0; - th.data.back_ord = null; + if (getApp().globalData.py_month_bg && th.data.back_ord) { + getApp().globalData.fuyou_clear = 1; + var b_ord = th.data.back_ord; + com.reduce(b_ord, os.stoid); + //要进行清空粗粒 + getApp().globalData.py_month_bg = 0; + th.data.back_ord = null; - } - }) - },1000) + } + }) + + 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_status == 1) { + //支付支付，返回首页 + ut.m_toast('支付成功'); + } else { + //支付支付，返回首页 + ut.m_toast('支付失败'); + } + } + }) + }, null, null, 1); + + + }, 1000) + } }, //获取搜索门店输入的值 input_store: function(e) { diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js index aabc5dd..65d3bb2 100644 --- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js +++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js @@ -83,6 +83,8 @@ Page({ sec_i:-1,//选中分类门店 下标 }, onLoad: function (options) { + //定义第一次进入 + this.data.fir_in=1; var th = this; console.log('分享参数---'); @@ -412,7 +414,10 @@ Page({ onShow: function () { var th=this; this.setData({submit:0}) - com.set_py_fir(); + + //res = res.data.data.result; + //if (!res) return false; + getApp().check_can_share(this); getApp().is_Single_page(this, function () { //--先判断会员状态-- @@ -429,19 +434,57 @@ Page({ } }) - setTimeout(()=>{ - ut.fy_back('',0,function (){ - if(getApp().globalData.py_month_bg && th.data.back_ord){ - getApp().globalData.fuyou_clear=1; - var b_ord=th.data.back_ord; - com.reduce(b_ord,os.stoid); - //要进行清空粗粒 - getApp().globalData.py_month_bg=0; - th.data.back_ord=null; - } - }) - },1000) + //判断是不是第一次进入 + if(this.data.fir_in){ + this.data.fir_in=0; + }else { + com.set_py_fir(); + + setTimeout(() => { + ut.fy_back('', 0, function () { + if (getApp().globalData.py_month_bg && th.data.back_ord) { + getApp().globalData.fuyou_clear = 1; + var b_ord = th.data.back_ord; + com.reduce(b_ord, os.stoid); + //要进行清空粗粒 + getApp().globalData.py_month_bg = 0; + th.data.back_ord = null; + + } + }) + + 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_status==1){ + //支付支付，返回首页 + ut.m_toast('支付成功'); + setTimeout(()=>{ + getApp().goto("/pages/payment/pay_success/pay_success?type=2&order_sn=" + th.data.ok_order_sn); + },1000) + + }else{ + //支付支付，返回首页 + ut.m_toast('支付失败'); + setTimeout(()=>{ + getApp().goto("/pages/index/index/index"); + },1000) + } + } + }) + },null,null,1); + + }, 1000) + } }, GetBuyPrice: function (e) { -- libgit2 0.21.4