diff --git a/packageE/pages/cart/cart2_inte/cart2_inte.js b/packageE/pages/cart/cart2_inte/cart2_inte.js index fb09df7..942aec1 100644 --- a/packageE/pages/cart/cart2_inte/cart2_inte.js +++ b/packageE/pages/cart/cart2_inte/cart2_inte.js @@ -110,6 +110,8 @@ Page({ }) }, onLoad: function (t) { + + this.data.fir_in=1; wx.setNavigationBarTitle({ title: "填写订单", }) var th = this; th.data.param = t; @@ -204,20 +206,51 @@ Page({ //----------子页返回父页触发---------- onShow: function () { - var fy=ut.fy_back('',1,function (){ - var cps = getCurrentPages(); - if (cps.length > 1) { - wx.navigateBack({ delta: 1 }) - } else { - getApp().goto("/pages/index/index/index"); - } - }); - if(fy) return false; + var th = this; + //判断是不是第一次进入 + if(this.data.fir_in){ + this.data.fir_in=0; + }else{ + //-- 富有的支付插件 -- + var fy=ut.fy_back('',1,function (){ + var cps = getCurrentPages(); + if (cps.length > 1) { + wx.navigateBack({ delta: 1 }) + } else { + getApp().goto("/pages/index/index/index"); + } + }); + if(fy) return false; + util_pay.set_fir(); + + //-- 通联的第三方支付的返回优化 -- + ut.is_pay_ok("/pages/payment/pay_success/pay_success?type=2&order_sn=" + this.data.ok_order_sn,null,function (){ + if(!th.data.ok_order_sn) return false; + getApp().request.promiseGet("/api/weshop/order/page", + {data:{store_id:os.stoid,parent_sn:this.data.ok_order_sn}}).then(res=>{ + if(ut.ajax_ok(res)){ + var item=res.data.data.pageData[i]; + if(item.pay_status==1){ + //支付支付,返回首页 + ut.m_toast('支付成功'); + setTimeout(()=>{ + getApp().goto("/pages/payment/pay_success/pay_success?type=2&order_sn=" + this.data.ok_order_sn); + },1000) + + }else{ + //支付支付,返回首页 + ut.m_toast('支付失败'); + setTimeout(()=>{ + getApp().goto("/pages/index/index/index"); + },1000) + } + } + }) + }); + } - util_pay.set_fir(); - var th = this; th.data.g_cart_q_time = null; if (th.data.isclose == 0) { @@ -1330,6 +1363,8 @@ Page({ //void e.jumpToCart4({ // order_sn: data.data, //}, 1); + + th.data.ok_order_sn=data.data; util_pay.pay(data.data, function () { //app.my_warnning("支付成功",1,th); //setTimeout(function () { diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 5c093b8..e1e91b6 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -101,7 +101,7 @@ Page({ }) }, onLoad: function (t) { - console.log("onLoad_pt_cart"); + this.data.fir_in=1; var th = this; getApp().getConfig2(function (e) { th.setData({ @@ -575,12 +575,43 @@ Page({ //----------子页返回父页触发---------- onShow: function () { - var fy=ut.fy_back("/pages/user/order_list/order_list",1); - if(fy) return false; + var th = this; + //判断是不是第一次进入 + if(this.data.fir_in){ + this.data.fir_in=0; + }else{ + //-- 富有的支付 -- + var fy=ut.fy_back("/pages/user/order_list/order_list",1); + if(fy) return false; + util_pay.set_fir(); + //-- 通联的第三方支付的返回优化 -- + ut.is_pay_ok("/pages/team/team_success/team_success?ordersn=" + this.data.ok_order_sn,null,function (){ + if(!th.data.ok_order_sn) return false; + getApp().request.promiseGet("/api/weshop/order/page", + {data:{store_id:os.stoid,parent_sn:this.data.ok_order_sn}}).then(res=>{ + if(ut.ajax_ok(res)){ + var item=res.data.data.pageData[i]; + if(item.pay_status==1){ + //支付支付,返回首页 + ut.m_toast('支付成功'); + setTimeout(()=>{ + getApp().goto("/pages/team/team_success/team_success?ordersn=" + this.data.ok_order_sn); + },1000) + + }else{ + //支付支付,返回首页 + ut.m_toast('支付失败'); + setTimeout(()=>{ + getApp().goto("/pages/index/index/index"); + },1000) + } + } + }) + }); + + } - util_pay.set_fir(); - var th = this; if (th.data.isclose == 0) { wx.navigateTo({ url: "/pages/index/index/index" @@ -1339,6 +1370,7 @@ Page({ // order_sn: data.data, // type:1, // }, 1); + th.data.ok_order_sn=data.data; util_pay.pay(data.data, function () { setTimeout(function () { wx.reLaunch({ diff --git a/utils/util.js b/utils/util.js index 15b2af5..fa9cc29 100644 --- a/utils/util.js +++ b/utils/util.js @@ -874,7 +874,8 @@ module.exports = { } return more_arr }, - + + //-- 长的提示框 -- m_toast(txt){ wx.showToast({ title: txt,