diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js index 452d7f6..c31c72f 100644 --- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js +++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js @@ -454,35 +454,41 @@ 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); - },1000) - - }else{ - //支付支付,返回首页 - ut.m_toast('支付失败'); - setTimeout(()=>{ - getApp().goto("/pages/index/index/index"); - },1000) + + 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); + },1000) + + }else{ + //支付支付,返回首页 + ut.m_toast('支付失败'); + setTimeout(()=>{ + getApp().goto("/pages/index/index/index"); + },1000) + } } - } - }) - },null,null,1); + }) + },null,null,1); + + th.data.back_ord=null; + } + }, 1000) } diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index f5095a1..287d476 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -183,32 +183,35 @@ Page({ 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,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; + } + }