diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js index 5b07fef..60447e6 100644 --- a/packageE/pages/cart/cart2/cart2.js +++ b/packageE/pages/cart/cart2/cart2.js @@ -6520,7 +6520,7 @@ Page({ var pk_list_goods = alllist[index].goods; var url = "/api/weshop/cart/delGift?store_id=" + os.stoid + "&user_id=" - + getApp().globalData.user_id + "&is_gift=1&pick_id=" + this.data.gift_pkid + "&prom_id=" + this.data.prom_id; + + getApp().globalData.user_id + "&is_gift=1&pick_id=" + this.data.gift_pkid + "&prom_id=" + this.data.gf_prom_id; await getApp().request.promiseDelete(url, {}); var new_pk_list_goods = []; @@ -6560,9 +6560,9 @@ Page({ uniform_exp_sum: gf_item.goodsinfo.uniform_exp_sum, goods_spec: gf_item.goodsinfo.goods_spec, goods_color: gf_item.goodsinfo.goods_color, + is_post_temp:1 //赠品暂时的是要包邮运算, 后面和主商品是不是包邮一样 }; - //-- 如果是代发商品的时候 -- if (gf_item.goodsinfo.whsle_id) { newd.whsle_id = gf_item.goodsinfo.whsle_id; diff --git a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js index 5a87bb3..752fa44 100644 --- a/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js +++ b/packageE/pages/user/monthgiftbag/giftpackbuy/giftpackbuy.js @@ -141,25 +141,12 @@ Page({ onShow: function () { var th=this; this.setData({submit:0}) - i.fy_back('',0,function (){ - - 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){ - var b_ord=th.data.back_ord; - com.reduce(b_ord,os.stoid); - //要进行清空粗粒 - getApp().globalData.py_month_bg=0; - th.data.back_ord=null; - - } - }) + com.set_py_fir(); getApp().check_can_share(); var th=this; - //--先判断会员状态-- - getApp().is_Single_page(this, function () { + //--先判断会员状态-- + getApp().is_Single_page(this, function () { var user_info = getApp().globalData.userInfo; if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { getApp().goto('/packageE/pages/togoin/togoin'); @@ -173,7 +160,25 @@ Page({ th.data.is_get_guide=0; }) - this.init(); + this.init(); + + setTimeout(()=> { + i.fy_back('', 0, function () { + + 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; + + } + }) + },1000) }, //购买礼包 diff --git a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js index 15d73e6..811704c 100644 --- a/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js +++ b/packageE/pages/user/monthgiftbag/giftpackinfo/giftpackinfo.js @@ -201,16 +201,6 @@ Page({ onShow: function () { var th=this; this.setData({submit:0}) - ut.fy_back('',0,function (){ - if(getApp().globalData.py_month_bg && th.data.back_ord){ - var b_ord=th.data.back_ord; - com.reduce(b_ord,os.stoid); - //要进行清空粗粒 - getApp().globalData.py_month_bg=0; - th.data.back_ord=null; - - } - }) com.set_py_fir(); getApp().check_can_share(); getApp().is_Single_page(this, function () { @@ -222,6 +212,21 @@ Page({ } this.init(); }) + + 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) + }, GetBuyPrice: function (e) { var that = this.data; diff --git a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js index 6fd6cbe..c7e8fd9 100644 --- a/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js +++ b/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js @@ -175,18 +175,25 @@ Page({ onShow: function () { var th=this; this.setData({submit:0}) - ut.fy_back('',0,function (){ - if(getApp().globalData.py_month_bg && th.data.back_ord){ - var b_ord=th.data.back_ord; - com.reduce(b_ord,os.stoid); - //要进行清空粗粒 - getApp().globalData.py_month_bg=0; - th.data.back_ord=null; - } - }); - com.set_py_fir(); getApp().check_can_share(); + + 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; + + console.log(b_ord,111) + + com.reduce(b_ord,os.stoid); + //要进行清空粗粒 + getApp().globalData.py_month_bg=0; + th.data.back_ord=null; + } + }); + },1000) + getApp().is_Single_page(this, function () { //--先判断会员状态-- var user_info = getApp().globalData.userInfo; @@ -196,6 +203,8 @@ Page({ } this.init(); }) + + }, GetBuyPrice: function (e) { var that = this.data; diff --git a/packageE/pages/user/monthgiftbag/public/buy_com.js b/packageE/pages/user/monthgiftbag/public/buy_com.js index dea70ad..0b6c428 100644 --- a/packageE/pages/user/monthgiftbag/public/buy_com.js +++ b/packageE/pages/user/monthgiftbag/public/buy_com.js @@ -272,10 +272,15 @@ module.exports = { t_pay.pay_data(res,function (){ th.setData({submit:0}) getApp().goto(url); - },function (){ + },function (e){ th.setData({submit:0}) getApp().my_warnning("取消支付", 0, th); - then1.reduce(order_sn,that.data.getStorageID) + if(!getApp().globalData.fuyou_clear){ + then1.reduce(order_sn,that.data.getStorageID) + console.log(order_sn,222) + } + + getApp().globalData.fuyou_clear=0; }) // wx.requestPayment({