diff --git a/packageD/pages/user/deposit/prepaid/prepaid.js b/packageD/pages/user/deposit/prepaid/prepaid.js index 7ddfb53..0997313 100644 --- a/packageD/pages/user/deposit/prepaid/prepaid.js +++ b/packageD/pages/user/deposit/prepaid/prepaid.js @@ -105,10 +105,32 @@ Page({ if(this.data.fir_in){ this.data.fir_in=0; }else{ - - //富友插件 + //-- 富友插件 -- ut.fy_back('',0) t_pay.set_fir(); + + //-- 通联的第三方支付的返回优化 -- + ut.is_pay_ok("/packageD/pages/user/deposit/prepaid/msg/msg","none",function (){ + if(!th.data.ok_order_sn) return false; + var ck_url="/api/weshop/recharge/get/"+os.stoid+"/"+th.data.ok_order_sn; + getApp().request.promiseGet(ck_url,{}).then(res=>{ + if(ut.ajax_ok(res)){ + var item=res.data.data.pageData[0]; + if(item.pay_status==1){ + //支付支付,返回首页 + ut.m_toast('支付成功'); + setTimeout(()=>{ + getApp().re_to("/packageD/pages/user/deposit/prepaid/msg/msg"); + },1000) + + }else{ + //支付支付,返回首页 + ut.m_toast('支付失败'); + + } + } + }) + }); } wx.setNavigationBarTitle({ @@ -182,6 +204,8 @@ Page({ var parentSn = msg.order_sn; var store_id = os.stoid; t_pay.set_pay_url("/api/weshop/order/pay/createRechargeOrder"); + + th.data.ok_order_sn=parentSn; t_pay.pay({ parentSn: parentSn, store_id: store_id diff --git a/packageD/pages/user/integral/integral.js b/packageD/pages/user/integral/integral.js index 048e1a3..6863078 100644 --- a/packageD/pages/user/integral/integral.js +++ b/packageD/pages/user/integral/integral.js @@ -208,6 +208,9 @@ Page({ */ onLoad: function (options) { + //定义第一次进入 + this.data.fir_in=1; + var th=this; getApp().request.get("/api/wx/weappSendlist/page", { data: { @@ -258,6 +261,8 @@ Page({ var store_id = os.stoid; t_pay.set_pay_url("/api/weshop/order/pay/createRechargeOrder"); + + th.data.ok_order_sn=parentSn; t_pay.pay({ parentSn: parentSn, store_id: store_id @@ -331,9 +336,40 @@ Page({ */ onShow: function () { - ut.fy_back('',0); + + var th=this; + //判断是不是第一次进入 + if(this.data.fir_in){ + this.data.fir_in=0; + }else{ + //-- 富友的插件 -- + ut.fy_back('',0); + t_pay.set_fir(); + + //-- 通联的第三方支付的返回优化 -- + ut.is_pay_ok("/packageD/pages/user/deposit/prepaid/msg/msg",null,function (){ + if(!th.data.ok_order_sn) return false; + var ck_url="/api/weshop/recharge/get/"+os.stoid+"/"+th.data.ok_order_sn; + getApp().request.promiseGet(ck_url,{}).then(res=>{ + if(ut.ajax_ok(res)){ + var item=res.data.data.pageData[0]; + if(item.pay_status==1){ + //支付支付,返回首页 + ut.m_toast('支付成功'); + setTimeout(()=>{ + getApp().re_to("/packageD/pages/user/deposit/prepaid/msg/msg"); + },1000) + + }else{ + //支付支付,返回首页 + ut.m_toast('支付失败'); + } + } + }) + }); + } + this.data.paying=0; - t_pay.set_fir(); getApp().check_can_share(); //--先判断会员状态-- var user_info = getApp().globalData.userInfo; diff --git a/utils/util.js b/utils/util.js index a8732e5..bf4e5cc 100644 --- a/utils/util.js +++ b/utils/util.js @@ -913,7 +913,8 @@ module.exports = { setTimeout(function () { if(err_url=='back'){ wx.navigateBack(); - }else{ + } + else if(err_url!='none'){ getApp().goto(err_url); }