diff --git a/packageA/pages/details_serviceCard/details_serviceCard.js b/packageA/pages/details_serviceCard/details_serviceCard.js index 8886adb..2b7ae26 100644 --- a/packageA/pages/details_serviceCard/details_serviceCard.js +++ b/packageA/pages/details_serviceCard/details_serviceCard.js @@ -871,19 +871,17 @@ Page({ //-- 判断一下限购的计算 -- if(act_details.vip_butyqty>0){ - await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { + await getApp().request.promiseGet("/api/weshop/recharge/rechargePresell/countBuyGoodsSum", { data: { store_id: store_id, user_id: user_id, - card_id: it.card_id, - prom_type: it.prom_type, - prom_id: it.prom_id, - ispay:1 + goods_id: it.card_id, + prom_id: it.prom_id } }).then(res => { if (res.data.code == 0) { console.log('已经购买的数量：', res.data.data); - promcardbuynum = res.data.data.promcardbuynum; + promcardbuynum = res.data.data.sumgoodsnum; } }) let limited = act_details.buy_limit; // 限购数量a @@ -911,7 +909,7 @@ Page({ }, function () { app.showWarning('支付成功'); - if(pt_act.kttype==1){ + if(pt_act && pt_act.kttype==1){ //--如果商家团的时候--- getApp().request.promisePost("/api/weshop/order/pay/vipAutoTuan", { data: {orderSn:order_sn,storeId:os.stoid } diff --git a/packageC/pages/presell/cardInfo/goodsInfo.js b/packageC/pages/presell/cardInfo/goodsInfo.js index 8215396..42d44fc 100644 --- a/packageC/pages/presell/cardInfo/goodsInfo.js +++ b/packageC/pages/presell/cardInfo/goodsInfo.js @@ -876,7 +876,7 @@ Page({ var e = this, th = e, o = this.data.sele_g, a = o.goods_id; //----------添加到购物车时，要判断限购数量，-------- - e.get_buy_num2(o, function (ee) { + e.get_buy_num2(function (ee) { //---判断商品是否超出限购--- if (th.data.g_buy_num != null && th.data.sele_g.viplimited > 0) { if (th.data.goodsInputNum + th.data.g_buy_num.get(th.data.sele_g.goods_id) > th.data.sele_g.viplimited) { @@ -1058,7 +1058,7 @@ Page({ // 如果限购数量a>redis可购买数量d，当增加数量t>d, 提示超出库存 // 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购 let actInfo = th.data.sele_g; - await th.get_buy_num2().then(function (data) { + th.get_buy_num2(function (data) { let limited = actInfo.buy_limit==0?100000:actInfo.buy_limit; // 限购数量a let promcardbuynum = data.data.data.promcardbuynum; let buyedNum = promcardbuynum; // 自己已经购买的数量b @@ -3422,7 +3422,7 @@ Page({ }, - get_buy_num2: async function () { + get_buy_num2: async function (func) { // var map = this.data.g_buy_num, var th = this,user_id = getApp().globalData.user_id; // if (user_id == null) { @@ -3436,46 +3436,25 @@ Page({ // } - getApp().request.get("/api/weshop/order/orderPresell/countBuyGoodsSum", { - data: { store_id: os.stoid, user_id: user_id, goods_id: gd.goods_id, prom_id: t_prom_id }, + getApp().request.get("/api/weshop/recharge/rechargePresell/countBuyGoodsSum", { + data: { store_id: os.stoid, user_id: user_id, goods_id: th.data.options.goods_id, prom_id: th.data.options.prom_id }, success: function (e) { if (e.data.code == 0) { - th.setData({ prom_buy_num: e.data.data.sumgoodsnum }) - "function" == typeof func && func(); + + th.setData({ prom_buy_num: e.data.data.sumgoodsnum,promcardbuynum: e.data.data.sumgoodsnum }) + + let dd={promcardbuynum: e.data.data.sumgoodsnum } + + "function" == typeof func && func(dd); } else { - th.setData({ prom_buy_num: 0, }) - "function" == typeof func && func(); + let dd={promcardbuynum: 0 } + th.setData({ prom_buy_num: 0,promcardbuynum:0 }) + "function" == typeof func && func(dd); } } }); - - - //----获取商品购买数---- - - //----获取活动购买数---- - return await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { - data: { - store_id: os.stoid, - user_id: user_id, - card_id: th.data.options.goods_id, - prom_type: th.data.options.prom_type, - prom_id: th.data.options.prom_id - }, - //-----获取----- - success: function (tt) { - if (tt.data.code == 0) { - // map.set(gd.goods_id, g_buy_num); - th.setData({ - // g_buy_num: map, - promcardbuynum: tt.data.data.promcardbuynum, - cardbuynum: tt.data.data.cardbuynum, - }); - } - } - }); - }, diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index 7620697..65a9247 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -221,12 +221,12 @@ Page({ if(fy) return false; util_pay.set_fir(); - let error_url="/pages/user/order_list/order_list"; + let err_url="/pages/user/order_list/order_list"; let ok_url="/pages/payment/pay_success/pay_success?type=2&order_sn=" + this.data.ok_order_sn; if(th.data.is_fwk){ err_url='/pages/user/order_list/order_list?index=2&tabindex=1'; - ok_url="/pages/payment/pay_success/pay_success?type=3&order_sn=" + this.data.ok_order_sn; + ok_url="/pages/payment/pay_success/pay_success?card=1&order_id=" + this.data.order_id; } //-- 通联的第三方支付的返回优化 -- @@ -247,6 +247,12 @@ Page({ getApp().request.promiseGet(ord_url, {data:ord_req}).then(res=>{ + + console.log(ord_url); + console.log(ord_req); + console.log(res); + + if(ut.ajax_ok(res)){ var item=res.data.data.pageData[0]; if(item.pay_status==1){ @@ -260,7 +266,7 @@ Page({ //支付支付，返回首页 ut.m_toast('支付失败'); setTimeout(()=>{ - getApp().goto("/pages/index/index/index"); + getApp().re_to(err_url); },1000) } } @@ -1339,6 +1345,7 @@ Page({ var data = res.data; if (data.code == 0) { th.data.order_id = data.data.order_id; + th.data.ok_order_sn = data.data.order_sn; // console.log('myyyyyyyyyyyyyyyyyy', data.data); if (th.data.is_cart) { var list = th.data.cartlist_y; diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js index 75b5fdf..014a738 100644 --- a/packageC/pages/presell/cart/cart2_pre.js +++ b/packageC/pages/presell/cart/cart2_pre.js @@ -96,6 +96,12 @@ Page({ }); }, 1); + var gg = getApp().get_b_now(); + debugger; + if(gg.fwk){ + this.setData({is_fwk: 1}); + } + }, onUnload: function () { this.setData({ isclose: 1 }) }, @@ -365,6 +371,12 @@ Page({ ord_req={store_id:os.stoid,parent_sn:th.data.ok_order_sn}; } + + console.log('onshow-py-1111'); + console.log(ord_url); + console.log(ord_req); + + getApp().request.promiseGet(ord_url, {data:ord_req}).then(res=>{ if(ut.ajax_ok(res)){ @@ -925,6 +937,7 @@ Page({ var data = res.data; if (data.code == 0) { th.data.order_id = data.data.order_id; + th.data.ok_order_sn = data.data.order_sn; var order_amount = pdata.account; //要进行判断，如果是用微信支付，就要跳转到支付界面 @@ -945,11 +958,10 @@ Page({ duration: 2000 }); - var url = "/packageC/pages/presell/cart/cart?order_sn=" + data.data.order_sn; - + var rurl = "/packageC/pages/presell/cart/cart?is_fwk=1&order_sn=" + data.data.order_sn; setTimeout(function () { wx.reLaunch({ - url: "/pages/payment/pay_success/pay_success?card=1&order_id=" + th.data.order_id, + url: rurl, }) }, 1000) diff --git a/packageC/pages/presell/cart/cart2_pre.wxml b/packageC/pages/presell/cart/cart2_pre.wxml index 64e133c..0d7bbc6 100644 --- a/packageC/pages/presell/cart/cart2_pre.wxml +++ b/packageC/pages/presell/cart/cart2_pre.wxml @@ -92,7 +92,7 @@ - + 选择物流 @@ -143,14 +143,14 @@ - + 使用预存 - + 使用余额 :￥{{yuer}} diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 90a00cc..f223af5 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -3158,19 +3158,17 @@ Page({ //-- 判断一下限购的计算 -- if(act_details.vip_butyqty>0){ - await getApp().request.promiseGet("/api/weshop/rechargeServicelist/getUserBuyGoodsNum", { + await getApp().request.promiseGet("/api/weshop/recharge/rechargePresell/countBuyGoodsSum", { data: { store_id: store_id, user_id: user_id, - card_id: it.card_id, - prom_type: it.prom_type, + goods_id: it.card_id, prom_id: it.prom_id, - ispay:1 } }).then(res => { if (res.data.code == 0) { console.log('已经购买的数量：', res.data.data); - promcardbuynum = res.data.data.promcardbuynum; + promcardbuynum = res.data.data.sumgoodsnum; } }) let limited = act_details.buy_limit; // 限购数量a @@ -3203,7 +3201,7 @@ Page({ duration: 2000 }); - if(pt_act.kttype==1){ + if(pt_act && pt_act.kttype==1){ //--如果商家团的时候,这个要改,要用服务卡的接口--- getApp().request.promisePost("/api/weshop/rechargeServicelist/vipAutoTuan", {