diff --git a/packageC/pages/presell/cart/cart.js b/packageC/pages/presell/cart/cart.js index 59390d5..8b0a0a0 100644 --- a/packageC/pages/presell/cart/cart.js +++ b/packageC/pages/presell/cart/cart.js @@ -123,7 +123,7 @@ Page({ bconfig: null, showFold:true, - is_wfk:0, //-- 是不是服务卡项的购买 -- + is_fwk:0, //-- 是不是服务卡项的购买 -- }, @@ -156,8 +156,8 @@ Page({ if (t.order_id) this.data.order_id = t.order_id; if (t.order_sn) this.data.order_sn = t.order_sn; - if(t.is_wfk){ - this.data.is_wfk=1; + if(t.is_fwk){ + this.setData({is_fwk:1}); } wx.setNavigationBarTitle({ title: "订单详情", }) @@ -239,7 +239,7 @@ Page({ //-- 如果是服务卡项的时候 -- if(th.data.is_fwk){ ord_url="/api/weshop/recharge/user/page"; - ord_req={store_id:os.stoid,rder_sn:th.data.ok_order_sn,user_id:getApp().globalData.user_id}; + ord_req={store_id:os.stoid,order_sn:th.data.ok_order_sn,user_id:getApp().globalData.user_id}; }else{ ord_url="/api/weshop/order/page"; ord_req={store_id:os.stoid,parent_sn:th.data.ok_order_sn}; @@ -486,6 +486,14 @@ Page({ //-----获取商品------ async get_buy_goods(ord, o_sn) { + + + + if(this.data.is_fwk){ + this.get_buy_card(ord); + return false; + } + var order = null, order_goods = null, goods = null, @@ -497,12 +505,6 @@ Page({ act = null, //订单内容 th = this; - - if(this.data.is_fwk){ - get_buy_card(ord); - return false; - } - if (o_sn) { //获取order信息根据订单编号order_sn await getApp().request.promiseGet("/api/weshop/order/page", { @@ -822,13 +824,25 @@ Page({ } }, + + //-- 服务卡项购买的时候 -- async get_buy_card(ord){ + let order = null, + order_goods = null, + goods = null, + pickup = null, + distr_type = 0, + exp_type = 0, + presell = null, //订单从表 + pre_arr = null, //订单内容 + act = null, //订单内容 + th = this; let url = '/api/weshop/recharge/user/page' let data = { - store_id: app.globalData.setting.stoid, - user_id: this.data.userInfo.user_id, + store_id: os.stoid, + user_id: getApp().globalData.user_id, order_id: ord, }; @@ -837,6 +851,166 @@ Page({ data: data, }); + if(!ut.ajax_ok(res)){ + getApp().confirmBox("未找到订单"); + return false; + } + + order= res.data.data.pageData[0]; + //---获取订单从表--- + await getApp().request.promiseGet("/api/weshop/rechargeServicelist/page", { + data: { + store_id: os.stoid, + order_id: ord + } + }).then(res => { + order_goods = res.data.data.pageData[0]; + }); + + order_goods.goods_num=order_goods.qty; + + await getApp().request.promiseGet("/api/weshop/recharge/rechargePresell/get/" + oo.stoid + "/" + order.order_id, {}).then(res => { + presell = res.data.data; + }); + + //等待定金 + if (order.order_status < 2 && presell.deposit_pay_time <= 0) { + th.setData({ wait_dj: 1 }) + } + //等待尾款 + if (order.order_status < 2 && presell.deposit_pay_time > 0 && presell.tail_pay_state == 0 && presell.presell_type != 1) { + th.setData({ wait_wk: 1 }) + wx.setNavigationBarTitle({ title: "支付尾款", }) + } + //等待发货 + if (order.pay_status == 1 && order.shipping_status == 0) { + th.setData({ wait_fh: 1 }) + } + + if (order.pay_status == 1 && order.shipping_status == 1 && order.order_status < 2) { + th.setData({ wait_sh: 1 }) + } + //------获取预售主表---------- + await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellForm/get/" + os.stoid + "/" + presell.prom_id, {}).then(res => { + if (res.data.code == 0 && res.data.data) { + act = res.data.data; + th.setData({ + act: res.data.data, + }); + } + }) + + //-- 判断一下会员的身份 -- + if (order.pay_status == 0) { + var pre_data = { store_id: os.stoid, presell_id: presell.prom_id, timetype: 12, goods_id: order_goods.card_id }; + pre_data.user_id = order.user_id; + var isok = 1; + await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", { + data: pre_data, + }).then(e => { + if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) { + pre_arr = e.data.data.pageData[0]; + } else { + isok = 0; + } + }) + + if (!isok) { + getApp().confirmBox("会员身份不符合"); + return false; + } + + if (th.data.wait_dj) { + if (act.is_end) { + getApp().confirmBox("活动已经结束"); + return false; + } + if (!act.isuse) { + getApp().confirmBox("活动未启用"); + return false; + } + if (th.data.act.end_time < ut.gettimestamp()) { + getApp().confirmBox("活动的定金时间已经结束", function () { + ut.wx_back(); + }); + return false; + } + + } + if (th.data.wait_wk) { + if (th.data.act.pay_enddate < ut.gettimestamp()) { + getApp().confirmBox("活动的尾款时间已经结束", function () { + ut.wx_back(); + }); + return false; + } + } + } + else { + await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/list", { + data: { store_id: os.stoid, goods_id: order_goods.goods_id, presell_id: order_goods.prom_id } + }).then(re => { + if (re.data.code == 0 && re.data.data && re.data.data.length > 0) { + pre_arr = re.data.data[0]; + } + }) + + if (!pre_arr) { + getApp().confirmBox("未找到商品"); + return false; + } + } + + //---获取商品--- + await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + order_goods.card_id, {}).then(res => { + goods = res.data.data; + order.market_price = goods.show_price; + order.show_img = oo.imghost + goods.imgUrl; + goods.original_img =goods.imgUrl; + }); + + var g_url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + order_goods.card_id + "&pre_id=" + pre_arr.id; + if (act.is_end || th.data.act.end_time < ut.gettimestamp()) { + g_url = "/packageA/pages/goods/goodsInfo/goodsInfo?goods_id=" + order_goods.card_id; + } + + //---获取门店--- + await getApp().request.promiseGet("/api/weshop/pickup/get/" + oo.stoid + "/" + order.pickup_id, {}).then(res => { + pickup = res.data.data; + }); + + order['is_all_return'] = 0; + var price = presell.presell_price; + if (!goods) return false; + + + //等待发货的时候 + if (th.data.wait_fh) { + var send_time = th.data.act.delivery_date; + if (th.data.act.delivery_type == 2) { + send_time = ut.gettimestamp() + th.data.act.delivery_daynum * 3600 * 24; + } + } + + order.order_goods = order_goods; + var tail_pay = pre_arr.presell_price * order_goods.goods_num - presell.presell_deposit; + this.setData({ + order: order, + pickup: pickup, + goods: goods, + presell: presell, + pre_arr: pre_arr, + userInfo: getApp().globalData.userInfo, + tail_pay: tail_pay, + order_goods: order_goods, + all_price: pre_arr.presell_price * order_goods.goods_num, + pickup_id: pickup.pickup_id, + send_time: send_time, + g_url: g_url + }); + th.get_diff(); + //统一进行计算金额 + th.calculatePrice2(); }, async calculatePrice2() { @@ -2562,14 +2736,21 @@ Page({ tail_pay_type: ind,//0微信支付 1余额支付 }; - if (th.data.exp_type == 0 || th.data.exp_type==2 ) { - var index = th.data.index; - dd.shipping_code = th.data.wu_arr[index].code; - dd.shipping_name = th.data.wu_arr[index].name; - dd.shipping_price = parseFloat(th.data.exp_price); - dd.addressid = th.data.user_addr.address_id; - } + //尾款支付的网址 + var wk_url=oo.url + '/api/weshop/order/pay/payPresellWk'; + if(!th.data.is_fwk){ + if (th.data.exp_type == 0 || th.data.exp_type==2 ) { + var index = th.data.index; + dd.shipping_code = th.data.wu_arr[index].code; + dd.shipping_name = th.data.wu_arr[index].name; + dd.shipping_price = parseFloat(th.data.exp_price); + dd.addressid = th.data.user_addr.address_id; + } + }else{ + delete dd.exp_type; + wk_url=oo.url + '/api/weshop/order/pay/payPresellWkCard'; + } if(dd.exp_type==2){ dd.lon=th.data.lon?th.data.lon:0; @@ -2609,7 +2790,7 @@ Page({ console.log(JSON.stringify(dd)); wx.request({ - url: oo.url + '/api/weshop/order/pay/payPresellWk', + url: wk_url, data: JSON.stringify(dd), method: 'POST', header: { diff --git a/packageC/pages/presell/cart/cart.wxml b/packageC/pages/presell/cart/cart.wxml index bd424d9..8d81464 100644 --- a/packageC/pages/presell/cart/cart.wxml +++ b/packageC/pages/presell/cart/cart.wxml @@ -108,7 +108,7 @@ --> - + + + + 支付尾款 + + + 立即支付 + bindtap="pay" data-index="{{index}}" wx:if="{{item.prom_type!=6 && item.order_status==0 && item.pay_status==0 && item.order_status<2}}">立即支付 立即支付