diff --git a/app.json b/app.json index c0d8e82..9adcee3 100644 --- a/app.json +++ b/app.json @@ -168,6 +168,7 @@ "pages/goods/goodsList/goodsList", "pages/payForAnother/payForAnother", "pages/luckyGo/luckyGo_cart/luckyGo_cart", + "pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct", "pages/luckyGo/luckyGo_list/luckyGo_list", "pages/luckyGo/luckyGo_order/luckyGo_order", "pages/luckyGo/luckyGo_details/luckyGo_details", diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js index 3fda55e..c311c38 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js @@ -139,10 +139,7 @@ Page({ success: function (s) { } }); - - // console.log('t=======================>', t); - - + }, onUnload: function () { @@ -808,13 +805,12 @@ Page({ } } - + gd.prom_type=gg.prom_type; gd.prom_id=gg.prom_id; - + switch (gd.prom_type) { case 0: - case 2: case 3: case 4: case 5: @@ -987,6 +983,7 @@ Page({ //t.data.data.shop_price = tt.data.data.prom_price; t.data.data.shop_price = tt.data.data.prom_user_price; th.data.ckeck_quan_price=0; + gd.is_xz_yh=1; } else { t.data.data.prom_id = 0; t.data.data.prom_type = 0; @@ -1013,6 +1010,45 @@ Page({ }); break; + + case 2: //--- 团购 --- + var quanlist = null; + getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +gd.goods_id+"/"+ gd.prom_id, { + success: async function (tt) { + if (tt.data.code == 0) { + //t.data.data.shop_price = tt.data.data.prom_price; + t.data.data.shop_price = tt.data.data.price; + } else { + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + } + + if(tt.data.data.isQuan){ + th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num; + th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + ""; + th.data.check_quan_ware_list = t.data.data.erpwareid + ""; + }else{ + gd.is_xz_yh=1; + } + + th.setData({ + bn_goods: gd, + bn_pickname: gg.pick_name, + bn_exp_type: et, + index: m_wind, + bn_pick: gg.pick_id, + bn_t_exp_t: distr_t, + bn_exp_type: et + }); + + //-- 计算价格 -- + th.calculatePrice2(); + //获取优惠券,如果有券的钱，就调用 + if(th.data.ckeck_quan_price>0) th.get_buy_now_quan(); + } + }); + + break; } }, }); @@ -1389,7 +1425,7 @@ Page({ } //--如果是物流，且选择了地址，就要开始显示包邮券，且包邮券也已经优惠了优惠活动的金额-- - if (cart_item.exp_type == 0 && th.data.user_addr != null) { + if (cart_item.exp_type == 0 && th.data.user_addr != null && !cart_item.is_xz_yh) { //看是不是有调用过包邮券 if (!th.data.isget_by_quan[pickid]) { //--判断要不要显示包邮券,调用接口，因为有for循环--- @@ -1397,7 +1433,8 @@ Page({ data: { store_id: os.stoid, isuse: 0, - condition: q_conditin, + //condition: q_conditin, + condition:cart_item.ckeck_quan_price, user_id: getApp().globalData.user_id, pageSize: 2000 } @@ -1422,10 +1459,10 @@ Page({ } if (arr) { th.data.get_by_quan_list_cart[pickid] = arr; - //th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart}); - if (th.data.is_b_now) { - th.setData({get_by_quan_list: arr}); - } + th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart}); + //if (th.data.is_b_now) { + // th.setData({get_by_quan_list: arr}); + //} } th.data.isget_by_quan[pickid] = 1; } @@ -2030,29 +2067,9 @@ Page({ }); }); }, - - - submitConfirm(e) { - var th = this; - wx.showModal({ - title: '温馨提示', - content: this.data.param.alert, - success (res) { - if (res.confirm) { - console.log('用户点击确定'); - th.submitForm(e); - } else if (res.cancel) { - console.log('用户点击取消') - } - } - }) - }, //--------------------提交订单----------------------- - async submitForm(t) { - - - + async submitForm(t){ var sub_value = t; if (this.data.is_summit_ing == 1) return false; //--提交中退出-- @@ -2178,10 +2195,8 @@ Page({ 'goods_price': th.data.bn_goods.shop_price, 'member_goods_price': th.data.bn_goods.shop_price, 'store_id': oo.stoid, - //'prom_type': th.data.bn_goods.prom_type, //促销活动类型 - 'prom_type': 9, //促销活动类型 - 'prom_id': th.data.param.group_id, //促销活动id - // 'prom_id': 118, + 'prom_type': th.data.bn_goods.prom_type, //促销活动类型 + 'prom_id': th.data.bn_goods.prom_id, //促销活动id }; //-- 把导购的信息填入-- @@ -2445,6 +2460,7 @@ Page({ //--判断活动的类型-- switch (g_item.prom_type) { case 1: + case 2: goods.prom_type = g_item.prom_type; goods.prom_id = g_item.prom_id; break; @@ -2583,42 +2599,19 @@ Page({ var dd = { parent_sn: data.data, store_id: oo.stoid, - type: 1, + type: 2, }; - wx.showLoading({ - title: '支付中', - mask: true, - }); a.post("/api/weshop/order/pay/createOrder", { data: dd, - isShowLoading: false, success: function (t) { //console.log(t); - wx.hideLoading(); if (t.data.code == 0) { //app.my_warnning("支付成功",1,th); //setTimeout(function () { th.setData({isclose: 0}); - - wx.showToast({ - title: '支付成功', - icon: 'success', - duration: 2000, - success: function() { - // 幸运购 - setTimeout(function() { - wx.redirectTo({ - url: "/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?type=1&ordersn=" + data.data + "&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id + "&goods_name=" + th.data.bn_goods.goods_name, - }); - }, 0); - - }, - }) - - // wx.redirectTo({ - // url: "/pages/payment/pay_success/pay_success?type=1&order_sn=" + data.data, - // }) - + wx.redirectTo({ + url: "/pages/payment/pay_success/pay_success?type=2&order_sn=" + data.data, + }) //}, 1000) } }, @@ -3441,6 +3434,19 @@ Page({ if (gd.prom_type == 1 || gd.is_gift || gd.prom_type == 7) { continue; } + + //--如果是团购，要判断有没有限制使用优惠券 + if(gd.prom_type == 2){ + var prom1=null; + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gd.goods_id + "/" + gd.prom_id, { + }).then(res => { + if (res.data.code == 0) prom1 = res.data.data; + }) + if(!prom1.isQuan){ + continue; + } + } + //如果有限制使用优惠券，就要返回 if (gd.prom_type == 3) { if (th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue; @@ -3479,6 +3485,7 @@ Page({ arr[ind].ckeck_quan_price = ckeck_quan_price - cut_price; arr[ind].check_quan_ware_list = check_quan_ware_list; arr[ind].check_quan_price_list = check_quan_price_list; + arr[ind].is_xz_yh = is_xz_yh; //是否关闭使用优惠券 if (th.data.is_close_quan != 1 && !is_xz_yh) { @@ -3488,7 +3495,7 @@ Page({ data: { storeId: oo.stoid, userId: app.globalData.user_id, - BuySum: ckeck_quan_price, + BuySum: arr[ind].ckeck_quan_price, WareIds: check_quan_ware_list, pageSize: 100 } @@ -3843,7 +3850,6 @@ Page({ } }, - //取消使用线下取价 cancle_offline: function () { //判断是不是立即购买 diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.json b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.json index 0cfb931..c78ad85 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.json +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.json @@ -1,5 +1,5 @@ { - "navigationBarTitleText": "填写订单", + "navigationBarTitleText": "提交订单", "enablePullDownRefresh": false, "usingComponents": { "warn": "/components/long_warn/long_warn" diff --git a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml index 6c3b5dd..1350caf 100644 --- a/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml +++ b/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.wxml @@ -2,7 +2,7 @@ -
+ @@ -268,6 +268,7 @@ + ￥{{filters.toFix(bn_goods.shop_price,2)}} x{{bn_goods.buynum}} @@ -426,6 +427,7 @@ 优惠活动 - ￥ {{filters.toFix(formData.cut_price,2)}}元 + 组合购优惠 diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js new file mode 100644 index 0000000..2aacf9b --- /dev/null +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js @@ -0,0 +1,991 @@ +var t = getApp(),app=t, a = t.request, e = require("../../../../utils/common.js"), + s = require("../../../../utils/util.js"), o = require("../../../../utils/md5.js"), to = getApp(); +var oo=t.globalData.setting,os=oo; +var regeneratorRuntime = require('../../../../utils/runtime.js'); +var util_pay = require("../../../../utils/pay.js"); + +Page({ + data: { + prom_type: 9, + + url: t.globalData.setting.url, + resourceUrl: t.globalData.setting.resourceUrl, + imgUrl: t.globalData.setting.imghost, + goods: null, + order: null, + orderPrices: null, + coupons: null, + coupon: null, + invoiceToggle: !0, + payWithUserMoney: !0, + payWithPoints: !0, + maxWord: 0, + enterAddressPage: !1, + firstEnter: !0, + //页面获取的参数 + param:null, + postdata:null, + //提交订单的格式 + formData: { + order_amount:0,//支付金额 + total_amount:0,//总价 + all_price:0,//商品卖的总价 + pay_points: 0,//使用积分 + user_money: 0,//使用余额 + couponCode: "",//使用优惠券(多单就用逗号隔开) + shipping_price:0,//物流费用 + }, + + /*----------------立即购买---------------------*/ + is_b_now:0, //0是购物车结算 1立即购买 + bn_goods:null, //立即购买时候的调用商品 + bn_use_money:0,//是否使用余额 + bn_exp_type:1, //0是物流 1自提 + bn_pick:0, //选择的门店 + bn_pickname: "", //选择的门店名称 + bn_t_exp_t:0, //判断商品和门店一起决定的物流自提的方式0 都可以 1自提 2物流 + /*------------------------*/ + user_addr:null,//物流 + userinfo:null, //获取会员 + /*----------物流选择--------*/ + wu_arr:null, + index:0, + + //判断页面是返回回来的还是 首次进入的 + isclose:1, + kt_type:0, //开团类型 + is_pt_tz:0,//是否开团团长 + qh:'', //期号 + pt_listno:'',//期号 + is_normal:0, + is_express:0,//选择物流的控制器 + yuer:0, + + rank_switch:0, //是不是开同等级卡 + show_card:null, //显示的等级卡 + card_name:'', //显示的卡的名称 + card_cut_price:null,//减价多少钱 + }, + onLoad: function(t) { + // console.log("onLoad_pt_cart"); + var th = this; this.setData({ + is_b_now: t.is_bnow == undefined ? 0 : t.is_bnow, + param: t, + }); + var appD=getApp().get_b_now(); + + th.data.postdata=appD; + //如果期号有值 + if(appD.qh){ + th.data.qh=appD.qh; + th.data.pt_listno=appD.qh; + } + //th.data.kt_type=appD.kt_type; + th.setData({kt_type:appD.kt_type}); + if(appD.is_pt_tz) th.data.is_pt_tz=appD.is_pt_tz; + // th.data.param=t; + //先获取物流，再获取用户信息，再展示页面 + //th.get_wuliu(th.get_info(th.show_page)); + }, + onUnload: function () { this.setData({ isclose: 1 })}, + + //------获取会员信息-----先获取用户信息，在进行下一步--- + get_info:function(func){ + var user_id = t.globalData.user_id; + to.auth.get_u(func); + }, + + //-------------------获取物流--------------- + get_wuliu(func) { + var th = this; + console.log("getwuliu4545"); + to.getwuliu(function (e) { + if (th.data.is_default_logistics) { + //如果第一个不是开启默认，说明要让用户自己选 + if (!e[0].is_default) { + th.setData({ is_default_logistics: 0 }); + } + } + th.setData({ wu_arr: e }) + typeof func == "function" && func(); + }) + }, + + //------获取会员收货地址----- + getuser_addr:function(func){ + if (to.globalData.baddr!=null){ + var user_addr = to.globalData.baddr; + to.globalData.baddr=null; + func(user_addr); + }else{ + a.get("/api/weshop/useraddress/page", { + data: { user_id: to.globalData.user_id, store_id: oo.stoid, pageSize: 600 }, + success: function (su) { + + var user_addr = su.data.data.pageData; + var item = null; + var def_item=null; + for (var i = 0; i < user_addr.length; i++) { + if (user_addr[i]['is_default'] == 1) { def_item = user_addr[i]; } + if (user_addr[i]['is_pickup'] == 1) { item = user_addr[i]; } + } + if (item == null) item = def_item; + if (item == null) item = user_addr[0]; + if (item == undefined) item = null; + func(item); + } + }); + } + }, + //----------------展示页面,是再获取用户信息之后-------------- + show_page:function(){ + var th=this; + //th.setData({ userinfo: to.globalData.userInfo}); 会员信息要时时获取 + var user=getApp().globalData.userInfo; + getApp().request.get("/api/weshop/users/get/" + oo.stoid + "/" + user.user_id, { + data:{r:Math.random()}, + success: function (e) { + + getApp().globalData.userInfo = e.data.data; + th.setData({userinfo:e.data.data}); + //获取立即购买的商品信息 + th.get_buy_goods(); + + //获取提现金额 + getApp().request.get("/api/weshop/withdrawals/summoney", { + data: { user_id: to.globalData.user_id, store_id: oo.stoid, status: 0 }, + success: function (su) { + if (su.data.code == 0) { + var yuer = parseFloat(th.data.userinfo.user_money - + (th.data.userinfo.frozen_money>0?th.data.userinfo.frozen_money:0) - su.data.data.summoney).toFixed(2); + if(yuer<0) yuer=0; + th.setData({ txmon: su.data.data.summoney, yuer: yuer }); + } + } + }); + } + }); + }, + + //-----获取立即购买的商品信息---- + get_buy_goods: function (){ + var th=this,a=getApp().request; + var gg = th.data.postdata; + //调用商品 + a.get("/api/weshop/goods/get/" + oo.stoid+"/"+gg.goods_id, { + success: function (t) { + var gd = t.data.data; + if(!gd) return false; + + t.data.data.original_img = oo.imghost + t.data.data.original_img; + t.data.data['buynum'] = gg.goods_num; + console.log(t.data.data); + var distr_t = 0, et = 0 + if (t.data.data.distr_type == 0) { + distr_t = gg.pick_dis; + } else { + distr_t = t.data.data.distr_type; + } + switch (distr_t) { + case 0: + et = 1; + //-- 系统后台有设置要默认的 -- + if(th.data.json_d.pickupway && th.data.json_d.pickupway==1) et=0; + break; + case 1: + et = 1; + break; + case 2: + et = 0; + break; + } + + t.data.data.shop_price=gg.goods_price; + //--如果是普通购买的时候-- + if(gg.is_normal==1){ + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + t.data.data.is_normal=0; + + var gd=t.data.data; + //-- 用商品的手店价来显示 -- + gg.goods_price=gd.shop_price; + //---是不是购买等级卡成功的返回---等级卡显示的判断--- + var is_card_back=getApp().globalData.is_card_back; + if(is_card_back){ + gg.goods_price=gd[th.data.card_name]; + t.data.data.shop_price=gg.goods_price; + getApp().globalData.is_card_back=0; + th.setData({card_cut_price:0}); + }else{ + //--- 商品不能是搭配购，商家等级卡开通的情况下, 会员不是等级会员的情况， 商品有设置等级卡价格，同时等级卡价格小于商品的价格 + if(th.data.card_name && gd[th.data.card_name]>0 && gg.goods_price>gd[th.data.card_name] && !th.data.userinfo.card_field){ + var cut_p= gg.goods_price-gd[th.data.card_name]; + th.setData({card_cut_price:cut_p}); + } + } + + if(th.data.bn_goods){ + et=th.data.bn_exp_type; + } + + + th.setData({ + bn_goods: t.data.data, bn_pickname: gg.pick_name, + bn_pick: gg.pick_id, bn_t_exp_t: distr_t, is_normal:1,bn_exp_type:et + }); + + + + th.calculatePrice2(); + }else{ + + //--阶梯团很特殊，不能用总表来拿价格-- + getApp().request.get("/api/weshop/teamlist/get/"+oo.stoid+"/"+gd.prom_id, { + success: function (tt) { + + if (tt.data.code == 0) { + var pt_data=tt.data.data; + var now=s.gettimestamp(); + + if(pt_data.is_end==1){ + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + // t.data.data.is_normal=1; + }else if(now>pt_data.end_time){ + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + // t.data.data.is_normal=1; + }else{ + t.data.data.shop_price = tt.data.data.price; //活动价格 + t.data.data.is_normal=0; + if(pt_data.kttype==3){ + t.data.data.shop_price = tt.data.data.yf_price; //用定金来购买 + } + } + } else { + t.data.data.prom_id = 0; + t.data.data.prom_type = 0; + // t.data.data.is_normal=1; + } + + if(th.data.bn_goods){ + et=th.data.bn_exp_type; + } + + th.setData({ + bn_goods: t.data.data, bn_pickname: gg.pick_name, + bn_pick: gg.pick_id, bn_t_exp_t: distr_t,bn_exp_type:et + }); + + + //计算价格 + th.calculatePrice2(); + } + }); + } + } + }); + }, + + //----------子页返回父页触发---------- + onShow: function () { + var th = this; + + if (th.data.isclose == 0) { + wx.navigateTo({ + url: "/pages/index/index/index" + }) + } else { + this.getuser_addr(function (ie) { + //更换地址回来要重新调用计算价钱的接口 + th.setData({ user_addr: ie }); + if (!th.data.user_addr || th.data.user_addr.address_id != ie.address_id) { + th.setData({ add_back: 1 }); + if (this.data.bn_goods) th.calculatePrice2(); + } + }) + //--更新默认地址--,看一下是不是跳到地址页面 + if (!getApp().globalData.is_cart_old) { + this.update_code(); + } else { + getApp().globalData.is_cart_old = 0; + } + } + + + //先获取是否有关闭使用优惠券 + getApp().getConfig2(function (ee) { + var json_d = JSON.parse(ee.switch_list); + th.data.json_d = json_d; + th.data.ispt_goods = json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 + var is_default_logistics = json_d.is_default_logistics; + + th.setData({ is_close_quan: json_d.is_close_quan, sales_rules: ee.sales_rules, rank_switch: json_d.rank_switch, is_default_logistics: is_default_logistics }); + + var rank_switch = json_d.rank_switch; + var max_price = -1; + var show_card = null; + var name = ""; + //如果有开等级卡的时候, + //因为都是调接口，要返回在计算 + if (rank_switch == 2) { + //-- 获取所有的等级卡, -- + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?storeId=" + os.stoid, + {}).then(res => { + if (res.data.code == 0) { + var plusCard = res.data.data; + //-- 循环判断，拿到最贵的那张卡 -- + for (var ih in plusCard) { + if (plusCard[ih].IsStopBuy == true) { continue; } + if (max_price < 0) { + max_price = plusCard[ih].CardFee; + name = 'card' + plusCard[ih]['CorrPrice']; + show_card = plusCard[ih]; + } else { + if (max_price < plusCard[ih].CardFee) { + max_price = plusCard[ih].CardFee; + name = 'card' + plusCard[ih]['CorrPrice']; + show_card = plusCard[ih]; + } + } + } + + if (show_card) { + name = name.toLowerCase(); + th.setData({ card_name: name, show_card: show_card }) + } + } + //-----先获取物流，再获取用户信息，再展示页面----- + th.get_wuliu(th.get_info(th.show_page)); + }) + } else { + //-----先获取物流，再获取用户信息，再展示页面----- + th.get_wuliu(th.get_info(th.show_page)); + } + }, 1) + + }, + //---------------检查是否有收货地址------------------- + checkAddressList: function() { + var t = this; + return !(!this.data.order || null == this.data.order.userAddress) || (wx.showModal({ + title: "请先填写或选择收货地址~", + success: function(a) { + a.confirm ? t.enterAddressPage() : wx.navigateBack(); + }, + fail: function() { + wx.navigateBack(); + } + }), !1); + }, + showInvoice: function() { + this.setData({ + invoiceToggle: !this.data.invoiceToggle + }); + }, + keyUpChangePay1: function(t) { + this.setData({ + payWithUserMoney: !(t.detail.value.length > 0) + }); + }, + keyUpChangePay2: function(t) { + this.setData({ + payWithPoints: !(t.detail.value.length > 0) + }); + }, + keyUpChangeNum: function(t) { + this.setData({ + maxWord: t.detail.value.length + }); + }, + //---------计算立即购买---------- + calculatePrice2: function () { + console.log('calculatePrice2'); + var th = this, good = this.data.bn_goods; + //-----------计算商品总价-------------- + var allpice = good.shop_price * good.buynum; + allpice=parseFloat(allpice).toFixed(2); + var txt = "formData.all_price"; + th.setData({ [txt]: allpice, }); + console.log(th.data.formData); + + to.getConfig2(function (ee) { + to.getwuliuprice(function (rs) { + console.log('calculatePrice2222'); + console.log(rs); + var o_shipping_price = 0, goods_weight = -1, goods_piece = -1; + //-----------当地址不为空，且是物流时，计算物流费用,同时阶梯团不计算拼团价格---------- + if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && (th.data.kt_type!=3 || th.data.bn_goods.is_normal==1) ){ + switch (good['exp_sum_type']) { + case 1: + //统一运费 + o_shipping_price += good['uniform_exp_sum']; break; + case 2: + if (goods_weight < 0) goods_weight = 0; + //累积商品重量 每种商品的重量 * 数量 + goods_weight += good['weight'] * good['buynum'];break; + case 3: + if (goods_piece < 0) goods_piece = 0; + //累积商品数量 + goods_piece += good['buynum']; break; + } + + console.log(o_shipping_price + ":" + goods_weight + ":" + goods_piece); + console.log(th.data.wu_arr); + var code = th.data.wu_arr[th.data.index].code; + var freight_free = ee.freight_free; //全场满多少包邮 + var shipping_price= + th.calculatewuliu(code, o_shipping_price, goods_weight, + goods_piece, th.data.user_addr, freight_free, allpice, rs); + + shipping_price = parseFloat(shipping_price).toFixed(2); + var wl_txt = "formData.shipping_price"; + th.setData({ [wl_txt]: shipping_price, }) + + }else{ + var wl_txt = "formData.shipping_price"; + th.setData({ [wl_txt]: 0, }) + } + //-----------------总价----------------- + // 幸运购 + // var total_m = parseFloat(allpice) + parseFloat( th.data.formData.shipping_price); + var total_m = parseFloat(th.data.param.goods_price) + parseFloat( th.data.formData.shipping_price); + total_m = parseFloat(total_m).toFixed(2); + + var atxt= "formData.total_amount"; + th.setData({ [atxt]: total_m, }) + var order_m = total_m; + + var txt = "formData.user_money"; + var txt2 = "formData.order_amount"; + //--------------如果使用余额--------------------- + if (th.data.bn_use_money == 1 && th.data.yuer>0) { + if ( parseFloat(th.data.yuer) > total_m) { + th.setData({ [txt]: total_m, [txt2]:0 }) + }else{ + order_m = parseFloat(order_m) - parseFloat(th.data.yuer); + order_m = order_m.toFixed(2); + th.setData({ [txt]: th.data.yuer, [txt2]: order_m }) + } + }else{ + th.setData({ [txt]: 0, [txt2]: order_m }) + } + + }); + }); + }, + + + submitConfirm(e) { + var th = this; + wx.showModal({ + title: '温馨提示', + content: this.data.param.alert, + success (res) { + if (res.confirm) { + console.log('用户点击确定'); + th.submitForm(e); + } else if (res.cancel) { + console.log('用户点击取消') + } + } + }) + }, + + + //--------------------提交订单----------------------- + submitForm: async function(t){ + if(this.data.is_summit_ing==1) return false; //--提交中退出-- + this.data.is_summit_ing=1; + + var th=this,pdata=new Array(); + var ff=true; + //------------立即购买------------- + console.log("buy_new"); + + //如果不是阶梯团，或者是普通购买，商家选择了物流，以及地址为空的时候 + if(th.data.bn_exp_type == 0 && th.data.user_addr==null && (th.data.kt_type!=3 || th.data.bn_goods.is_normal==1) ){ + ff = false; + getApp().my_warnning("请选择收货地址",0,this); + this.data.is_summit_ing = 0; + } + if (!ff) return false; + var addr = th.data.user_addr; + if (th.data.bn_exp_type == 1) addr=null; + + console.log(th.data.formData); + console.log(th.data.wu_arr); + console.log(th.data.bn_exp_type); + + if(th.data.bn_exp_type==0 && (th.data.kt_type!=3 || th.data.bn_goods.is_normal==1)) { + if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) { + getApp().my_warnning("读取物流失败",0,this); + this.data.is_summit_ing = 0; + return false; + } + } + + //阶梯团强制带1，自提~~~ + if(th.data.kt_type==3 ){ + th.data.bn_exp_type=1; + } + + var item={ + 'user_id': to.globalData.user_id, + 'consignee': addr == null ? "" : addr.consignee, + 'province': addr == null ? 0 : addr.province, + 'city': addr == null ? 0 : addr.city, + 'district': addr == null ? 0 : addr.district, + 'twon': addr == null ? 0 : addr.twon, + 'address': addr == null ? "": addr.address, + 'more_address': addr == null ? "" : addr.more_address, + 'mobile': addr == null ? th.data.userinfo.mobile:addr.mobile, + 'email':'', + 'invoice_title':'', + 'goods_price': th.data.param.goods_price, //商品总价 + //'goods_price': th.data.formData.all_price, //商品总价 + 'shipping_price': th.data.formData.shipping_price, //物流金额 + 'user_money': th.data.formData.user_money, //使用余额 + 'total_amount': th.data.formData.total_amount, //订单总价 + 'order_amount': th.data.formData.order_amount, //应付 + 'user_note': t.detail.value.user_note, //用户备注 + 'store_id':oo.stoid, //商家 + 'pickup_id': th.data.bn_pick, //门店 + 'exp_type': th.data.bn_exp_type, //配送方式 + 'is_normal':th.data.bn_goods.is_normal, //是否是普通购买 + 'pt_prom_id':th.data.bn_goods.prom_id, //拼单ID + 'is_pt_tz':th.data.is_pt_tz, //开团类型 + 'order_goods':new Array(), + }; + + //如果不是阶梯团，或者是普通购买， + if((th.data.kt_type!=3 || th.data.bn_goods.is_normal==1)){ + item['shipping_code']= th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code; + item['shipping_name']= th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name; + } + + if(!th.data.bn_goods.is_normal){ + item.is_zsorder=th.data.kt_type+1; //开团类型 + } + //老会员成为分销下线需要的参数 + if(getApp().globalData.first_leader && !getApp().globalData.userInfo.first_leader){ + //判断一下分享人是不是分享商 + await app.request.promiseGet("/api/weshop/users/get/" + os.stoid+"/"+getApp().globalData.first_leader,{}).then(res=>{ + if(res.data.code==0){ + var user= res.data.data; + if(user.is_distribut==1){ + item.first_leader=parseInt(getApp().globalData.first_leader); + } + } + }) + } + + if(th.data.qh!='') + { + item.team_qh=th.data.qh; + item.pt_listno=th.data.qh; + } + + var gg = to.get_b_now(); + var goods={ + 'goods_id': gg.goods_id, + 'goods_name': gg.goods_name, + 'goods_sn': gg.goods_sn, + 'goods_num': gg.goods_num, + 'market_price': th.data.bn_goods.market_price, + 'goods_price': th.data.param.goods_price, + // 'goods_price': th.data.bn_goods.shop_price, + 'member_goods_price': th.data.bn_goods.shop_price, + 'store_id': oo.stoid, + // 'prom_type':th.data.bn_goods.prom_type, //促销活动类型 + // 'prom_id': th.data.bn_goods.prom_id, //促销活动id + + 'prom_type': 9, //促销活动类型 + 'prom_id': th.data.param.group_id, //促销活动id + }; + + //--导购分享过来的id-- + if(gg.guide_id){ + goods.guide_id=gg.guide_id; + goods.guide_type=gg.guide_type; + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/"+oo.stoid+"/"+gg.guide_id,{}).then(res=>{ + if(res.data.code==0){ + goods.guide_name=res.data.data.salesman; + goods.guide_sn=res.data.data.salesman_no; + } + }) + } + + //--商品的房间号-- + if(gg.room_id && gg.room_id>0){ + item.room_ids=gg.room_id; + goods.room_id=gg.room_id; + } + + if(th.data.bn_goods.is_normal){goods.is_pd_normal=0;} + + item.order_goods.push(goods); + pdata.push(item); + + if (pdata.length==0) return; + var str = JSON.stringify(pdata); + console.log("支付数据"); + console.log(str); + //return false; + wx.showLoading({title: "加载中"}); + wx.request({ + url: oo.url + '/api/weshop/order/createWxdOrder', + data: str, + method: 'POST', + header: { + 'content-type': 'application/json' + },// 设置请求的 header + success: function (res) { + + wx.hideLoading(); + if (res.statusCode == 200) { + var data=res.data; + if(data.code==0){ + console.log(th.data.is_b_now); + //如果是购物车结算，还要删除购物车 + if (th.data.is_b_now == 0) { + console.log(th.data.cartlist_y); + var list = th.data.cartlist_y; + for (var i = 0; i < list.length; i++) { + //删除购物车 + getApp().request.delete("/api/weshop/cart/del/" + oo.stoid + "/" + list[i].id, {}); + } + } + var order_amount = 0; + pdata.forEach(function (em, ind) { + order_amount += em.order_amount; + }) + //要进行判断，如果是用微信支付，就要跳转到支付界面 + if (order_amount > 0) { + th.setData({ isclose: 0 }); + //void e.jumpToCart4({ + // order_sn: data.data, + // type:1, + // }, 1); + util_pay.pay(data.data, function() { + setTimeout(function () { + wx.reLaunch({ + //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, + url: "/pages/team/team_success/team_success?ordersn=" + data.data, + }) + },1000) + }, function () { + //支付失败 + setTimeout(function () { + //wx.navigateBack({ delta: 1 }) + wx.reLaunch({ + url: "/pages/user/order_list/order_list", + }) + },1000) + + },oo.stoid,1); + + } else { + var dd = { + parent_sn: data.data, + store_id: oo.stoid, + type: 1, + }; + wx.showLoading({ + title: '支付中', + mask: true, + }); + //return false; + getApp().request.post("/api/weshop/order/pay/createOrder", { + data: dd, + success: function (t) { + // console.log(t); + // app.my_warnning("支付成功",1,th); + wx.hideLoading(); + if (t.data.code == 0) { + + // setTimeout(function () { + th.setData({ isclose: 0 }); + + wx.showToast({ + title: '支付成功', + icon: 'success', + duration: 2000, + success: function() { + // 幸运购 + setTimeout(function() { + wx.redirectTo({ + url: "/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?type=1&ordersn=" + data.data + "&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id + "&goods_name=" + th.data.bn_goods.goods_name, + }); + }, 0); + + }, + }) + + + // if(th.data.is_normal==1){ + // /*-- + // wx.navigateTo({ + // url: "/pages/user/order_list/order_list", + // })--*/ + + // // var url="/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data; + // // wx.reLaunch({ + // // url: url + // // }) + + // }else{ + // // wx.reLaunch({ + // // url: "/pages/team/team_success/team_success?ordersn=" + data.data, + // // }) + // } + + + // }, 1000) + + } else { + wx.showToast({ + title: t.data.msg, + icon: 'none', + duration: 2000, + success: function() { + + + }, + }) + }; + + + } + }); + } + } + else{ + th.data.is_summit_ing=0; //是否提交中 + getApp().confirmBox(data.msg); + } + } else { + th.data.is_summit_ing=0; //是否提交中 + console.log("index.js wx.request CheckCallUser statusCode" + res.statusCode); + } + }, + fail: function () { + th.data.is_summit_ing=0; //是否提交中 + wx.hideLoading(); + console.log("index.js wx.request CheckCallUser fail"); + }, + complete: function () {} + }) + }, + useCoupon: function() { + if (this.data.order.couponNum <= 0) { + //return t.showWarning("无可用优惠券"); + getApp().my_warnning("无可用优惠券",0,this); + return; + } + var a = { + lid: this.data.coupon ? this.data.coupon.id : "0" + }; + wx.navigateTo({ + url: "/pages/user/checkcoupon/checkcoupon?" + s.Obj2Str(a) + }); + }, + enterAddressPage: function() { + getApp().globalData.is_cart_old=1; + this.data.enterAddressPage = !0, wx.navigateTo({ + url: "/pages/user/address_list/address_list" + }); + }, + + //--------立即购买时，选择自提和物流----------- + setexptype_w:function(t){ + var th=this; + var ty = t.currentTarget.dataset.t,txt = t.currentTarget.dataset.txt; + th.setData({ [txt]: ty }); + var iszt=1; + if(ty==0){ + th.setData({ is_all_zt: 0 }); + }else{ + for(var i=0;i 0 && o_price > freight_free){ return 0;} + if (user_addr==null) { return 0; } + //计算物流的config item; + var item=null; + //先根据 镇 县 区找计算的config + item = th.get_wuliu_config(user_addr.district,code,rs); + if (item==null) item = th.get_wuliu_config(user_addr.city, code, rs); + if (item==null) item = th.get_wuliu_config(user_addr.province, code, rs); + if (item == null) item = th.get_wuliu_default(code,rs); + if (item == null) return o_shipping_price; + var fw_price = 0, fp_price=0; + item=item.config; + if (item == null) return o_shipping_price; + //------按重量---------- + if (goods_weight>0) { + fw_price =parseFloat(item['money']); + if (goods_weight > item['first_weight']){ + var fw = goods_weight - item['first_weight']; + var n = Math.ceil(fw/item['second_weight']) + fw_price = fw_price + n * parseFloat(item['add_money']); + } + } + //------按件数---------- + if (goods_piece > 0) { + fp_price = parseFloat(item['piecemoney']); + if (goods_piece > item['first_piece']) { + var fp = goods_piece - item['first_piece']; + var m = Math.ceil(fp / item['second_piece']) + fp_price = fp_price + m * parseFloat(item['add_piecemoney']); + } + } + var rspice =parseFloat(price + fw_price + fp_price); + return rspice; + }, + + //------------循环获取config----------- + get_wuliu_config:function(region_id,code,rs){ + var item=null,rslist = rs.pageData; + for (var i = 0; i < rslist.length;i++){ + if (rslist[i].code == code && rslist[i].region_id == region_id) { item = rslist[i];} + } + return item; + }, + //-------循环获取config,code default------- + get_wuliu_default: function (code, rs) { + var item = null, rslist=rs.pageData; + for (var i = 0; i < rslist.length; i++) { + if (rslist[i].shipping_code == code && rslist[i].is_default == 1) { item = rslist[i]; } + } + return item; + }, + + //----------立即购买，选择物流------------- + bindPickerChange:function(e){ + var ind = e.detail.value + this.setData({ index: ind }); + this.calculatePrice2(); + }, + + //----------购物车结算，选择物流------------- + bindPickerChange_w: function (e) { + var ind=e.detail.value, txt = e.currentTarget.dataset.txt; + this.setData({ [txt]: ind }); + this.calculatePrice(); + }, + + cart_set_err: function (e) { + var txt = e.currentTarget.dataset.err; + var ob = {}; + ob[txt] = this.data.imgUrl + "/miniapp/images/default_g_img.gif"; + this.setData(ob); + }, + + //// 开启物流的弹窗 + show_wu_arr:function(e){ + this.setData({ open_express: 1}); + }, + + //更新下默认，在onshow里面 + update_code(){ + var th=this,m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code; + + var uii=setInterval(function () { + if(th.data.wu_arr){ + clearInterval(uii); + for (var k = 0; k < th.data.wu_arr.length; k++) { + var item = th.data.wu_arr[k]; + if (def_exp_code == item.code) { + m_wind = k; + } + } + //--如果是立即购买-- + th.setData({ index: m_wind, is_express: m_wind}); + } + },500) + }, + + // 关闭物流的弹窗 + close_express:function(){ + this.setData({ open_express:0 }); + }, + // 选择物流 + click_express_name:function(e){ + var express_name = e.currentTarget.dataset.name, shippingcode = e.currentTarget.dataset.shippingcode; + var index=e.currentTarget.dataset.idxe; + var ob={ is_express: index, is_shipping_code: shippingcode,index:index}; + this.setData(ob); + }, + + //点击确定物流 + determine_expres:function(e){ + this.setData({ open_express: 0}); + this.calculatePrice2(); + }, + //设置默认物流 + select_default_logistics: function () { + var th=this; + var is_shipping_code=this.data.is_shipping_code + getApp().request.put("/api/weshop/users/update",{ + data: { user_id: getApp().globalData.user_id, store_id: oo.stoid, def_exp_code: is_shipping_code}, + success:function(rse){ + if (rse.data.code==0){ + getApp().globalData.userInfo.def_exp_code=is_shipping_code; + th.setData({ open_express: 0 }); + //----计算此时购物车的价格，这个页面没有calculatePrice(),2021.7.19---- + //if(th.data.is_b_now==1) th.calculatePrice2(); + //else th.calculatePrice(); + th.calculatePrice2(); + } + } + }) + }, + + + //跳转到购买卡 + buycard:function(){ + getApp().goto("/pages/user/plus/plus"); + getApp().globalData.plus_buy_back=1; + } +}); diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.json b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.json new file mode 100644 index 0000000..0cfb931 --- /dev/null +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "填写订单", + "enablePullDownRefresh": false, + "usingComponents": { + "warn": "/components/long_warn/long_warn" + } +} \ No newline at end of file diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml new file mode 100644 index 0000000..d8ac4ac --- /dev/null +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxml @@ -0,0 +1,211 @@ + + + + + + + + + + + + + + + + + + + + + + + {{bn_pickname}} + + + + + + {{bn_goods.goods_name}} + + + {{filters.show_gui_ge(bn_goods.goods_spec,bn_goods.goods_color)}} + + + + + ￥{{filters.toFix(param.goods_price,2)}} + x{{bn_goods.buynum}} + + + + + + + + + + + {{show_card.CardName}} + + 立减 {{filters.toFix(card_cut_price,2) }} 元 + + + vip超级会员仅需{{show_card.CardFee}}元 + + + + + 立即开通 + + + + + {{order.store_prom}} + + + + + + 选择物流 + + {{wu_arr[index].name}} + + + + + + + + + + + 留言 + + + + + + + + + + + + + 使用余额 :￥{{yuer}} + + + + 商品金额 + + ￥ {{param.goods_price}}元 + + + + 定金金额 + ￥ {{formData.all_price}}元 + + + + 配送费用 + ￥ {{formData.shipping_price}}元 + + + 使用余额 + - ￥ {{formData.user_money}}元 + + + + + + + + 应付金额：￥{{formData.order_amount}} + + + + + + + + + + + + + + + + 选择物流名字 + + + + × + + + + + + + + Γ + + + + + {{express_list.name}} + + + + + + + 确定 + + + 设为默认 + + + + + + + diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxss b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxss new file mode 100644 index 0000000..686099e --- /dev/null +++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.wxss @@ -0,0 +1,983 @@ +.bdr_t-14 { + border-top-left-radius: 14rpx; + border-top-right-radius: 14rpx; +} +.bdr_b-14 { + border-bottom-left-radius: 14rpx; + border-bottom-right-radius: 14rpx; +} +.bdr14 { + border-radius: 14rpx; +} +.mgt20 { + margin-top: 20rpx; +} +.shadow { + box-shadow: 0 4rpx 12px #e7e9eb; +} +.shadow-1 { + box-shadow: 16rpx 0px 12px #e7e9eb; +} + + +page { + /* background-color: #FAFAFA; */ + background-color: #F0F0F0; + padding: 0 22rpx; + box-sizing: border-box; +} +.container { + background-color: #F0F0F0; + /* padding-top: 28rpx; */ + padding-bottom: 120rpx; +} +.user-mes { + position: relative; + background-color: #fff; + font-size: 32rpx; + color: #444; + /* margin-top: 28rpx; */ + border-radius: 14rpx; +} +.user-contact { + padding: 24rpx 26rpx; + font-weight: 600; +} + +.location { + position: relative; + padding: 0 70rpx 24rpx; +} + +.pos-icon { + position: absolute; + left: 28rpx; + top: 6rpx; + width: 30rpx; + height: 36rpx; +} + +.border-img { + width: 100%; + height: 12rpx; +} + +.update-logistics { + position: absolute; + right: 0; + top: 0; + width: 80rpx; + height: 100%; + display: flex; + align-items: center; + justify-content: center; +} + +.arrow-rigth { + width: 32rpx; + height: 32rpx; +} + +.order-meg { + margin-bottom: 20rpx; + font-size: 28rpx; + +} + +.order-detail { + padding: 30rpx 0; + border-bottom: 2rpx solid #eee; + color: #777; + min-height: 190rpx; + background-color: #fff; + +} + +.goods-img { + float: left; + width: 200rpx; + height: 200rpx; + margin: 0 20rpx; +} + +.order-cont { + float: left; + width: 438rpx; +} + +.goods-name { + height: 74rpx; + line-height: 40rpx; + overflow: hidden; + margin-bottom: 16rpx; + font-size: 28rpx; + color: #333; + +} + +.goods-color { + font-size: 24rpx; +} + +.order-num { + margin-top: 25rpx; + font-size: 24rpx; + line-height: 42rpx; +} + +.set-mes{ + background-color: #fff; + /* margin-top: 20rpx; */ +} +.use-item{ + display: flex; + align-items: center; + height: 80rpx; + /* border-bottom: 1px solid #ddd; */ + font-size: 30rpx; + /* width:95%; +margin:auto; */ + padding: 0 26rpx; +} +.use-item>view{ + display: flex; + /* margin-right: 12rpx; */ +} +.use-item.bfff{ + background-color: #fff; +} +.use-item .dp{ + display: block; + width: 50rpx; + height: 50rpx; + margin-left: -6rpx; +} + +.set-item { + justify-content: space-between; + background-color: #fff; +} + +.set-btn { + display: flex; + font-size: 24rpx; +} + +.set-mes input { + width: 380rpx; + height: 50rpx; + line-height: 50rpx; + border: 1px solid #ddd; +} + +.use-btn { + width: 100rpx; + height: 50rpx; + margin-left: 20rpx; + line-height: 50rpx; + text-align: center; + background-color: #f23030; + color: #fff; +} + +.coupon-mes { + /* box-sizing: border-box; */ + height:95rpx; + padding: 0 26rpx; + background-color: #fff; + font-size: 30rpx; + color: #444; + /* width: 100%; */ + border-radius: 14rpx; + margin-top: 20rpx; + margin-bottom: 20rpx; +} + +.coupon-title { + display: flex; + justify-content: space-between; + align-items: center; + height: 92rpx; +} + +.coupon-title>view { + display: flex; +} + +.coupon-num { + height: 36rpx; + margin-left: 20rpx; + padding: 0 16rpx; + line-height: 36rpx; + text-align: center; + background-color: #f23030; + color: #fff; + font-size: 24rpx; +} + +.leave-word { + position: relative; + font-size: 24rpx; + margin-left: 20rpx; + flex-grow: 1; +} + +.word-box { + font-size: 26rpx; + /* width: 600rpx; */ + padding: 10rpx; + height: 28rpx; + line-height: 40rpx; +} + +.max-word { + position: absolute; + right: 0; + bottom: 0; +} + +.information { + padding: 0 26rpx; + background-color: #fff; + /* margin-bottom: 120rpx; */ +} + +.information .item { + display: flex; + justify-content: space-between; + height: 60rpx; + line-height: 60rpx; + font-size: 26rpx; + color: #777; +} + +.btn-wrap { + height: 94rpx; + box-sizing: border-box; + display: flex; + justify-content: space-between; + background-color: white; + align-items: center; + position: fixed; + bottom: 0; + left: 0; + width: 100%; + padding: 0 30rpx; +} + +.tips-btn { + /* float: right; + width: 200rpx; + height: 100rpx; + line-height: 100rpx; + text-align: center; + font-size: 30rpx; + color: #fff; + background-color: #f23030; */ + color: white; + background-color: #FE4445; + height: 72rpx; + line-height: 72rpx; + padding: 0 42rpx; + border-radius: 36rpx; + margin-left: 0; + margin-right: 0; +} + +.pay-amount { + /* float: right; + display: flex; + align-items: center; + height: 100rpx; + font-size: 26rpx; + margin-right: 40rpx; */ +} + +.payable { + color: #444; + /* margin-right: 20rpx; */ +} + +.shipping-modal { + z-index: 20; + position: fixed; + bottom: 0; + left: 0; + right: 0; + overflow-y: hidden; + color: #666666; + background-color: white; +} + +.shipping-nav { + text-align: center; + font-size: 35rpx; + padding-top: 30rpx; +} + +.shipping-list { + padding: 20rpx 30rpx 40rpx; + font-size: 28rpx; +} + +.shipping-item { + display: block; + padding: 20rpx 0; +} + +.shipping-btn { + width: 100%; + color: white; + background-color: #f23030; + line-height: 90rpx; + text-align: center; + font-size: 40rpx; +} + +/*----------nyf新增，地址---------*/ +.add_new{ + height: 90rpx; + display: flex; + align-items: center; + padding: 0 26rpx; +} +.addr_jia{width: 45rpx; height: 45rpx; border: 1rpx solid #ddd; + margin-right: 15rpx;vertical-align: middle;} +.yu_er{ + margin-left: 10rpx; + /* margin-right: 60rpx; */ +} +.wuliu{margin-left: 20rpx;} + + +/*---- 优惠券列表 -----*/ +.xc-coupon-frame{ + width: 100%; + height: 92rpx; + +} +.xc-coupon-frame .work-frame{ + width: 100%; + height: 100%; + border-bottom:3rpx solid #eee; + padding: 0 26rpx; + background-color: white; +} +.xc-right{ + width:20rpx; + height:20rpx; + border-top:2rpx solid #000; + border-right:2rpx solid #000; + transform:rotate(45deg); + display:inline-block; +} + +.xc-coupon-frame .work-frame .work{ font-size: 30rpx; line-height: 92rpx; } +.xc-right-frame{font-size: 30rpx;line-height: 92rpx; margin-right: 10rpx } + +/* 自定义弹出窗口 */ +.cx-popup{ + width:100%; + height:880rpx; + background: #fff; + z-index: 35; + border-top-left-radius: 20rpx; + border-top-right-radius: 20rpx; + position:fixed; + bottom:0; + left: 0; + /* padding-bottom: 25rpx; */ +} + +.cx-popup .top{ + width:95%; + height:100rpx; + border-bottom:3rpx solid #ddd; + margin: auto; + margin-top: 30rpx; + +} +.xc-top-content{ + width: 93%; + height:85rpx; + padding-top: 30rpx; + font-size: 34rpx; + font-weight: 600; + +} + + +.xc-valid-coupon{ + width: 90%; + height:40rpx; + padding-top: 24rpx; + overflow: hidden; +} +.xc-frame{ + width: 100%; + height:60%; +} + +.xc-frame .list-frame{ + width: 95%; + height: 100%; + overflow-y:scroll; + +} +.xc-close-frame{ + margin-top:-10rpx; + +} + +.xc-close{ + width: 37rpx; +height: 37rpx; +border-radius: 50%; +border: 3rpx solid #333; +text-align: center; +line-height: 34rpx; +font-size: 29rpx; +color: #333; + +} +.xc-money{ + color: #af2346; + font-size: 35rpx; +} + +.xc-money-frame{ + margin-left:35rpx; + +} +.xc-coupon-effect{ + width: 99%; + min-height: 100rpx; + border-bottom:3rpx solid #ddd; + + +} +.xc-goods-coupon{ + width: 85%; + height:100%; + +} +.xc-title{ + width:50%; + margin-left:222rpx; + +} +.xc-coupon-money0{ + color: #c91e31; + font-size: 35rpx; + line-height: 40rpx; + +} +.xc-coupon-money{ + color: #c91e31; + font-size: 35rpx; + line-height: 40rpx; + padding-top: 10px; + +} +.xc-coupon-money1{ + color: #444; + font-size: 28rpx; + line-height: 60rpx; + + +} +.xc-coupon-time{ + height: 50rpx; + font-size: 27rpx; + color: #a4a4a4; +} +.xc-coupon-time .time{ + margin-left: 15rpx; + font-size: 27rpx; +} +.xc-coupon-selection{ + height:100%; +} + +.xc-confirm { + width: 50%; + border-radius: 50rpx; + height: 80rpx; + margin:0 auto; + background:#d60021; + color:#fff; + font-size:28rpx; + margin-top: 28rpx; +} + +.up{ animation: up .7s; } +.down{ animation: down 1s; } +@keyframes up { 0% { transform: translateY(550rpx); } 100% { transform: translateY(0); } } +@keyframes down { 0% { transform: translateY(0); } 100% { transform: translateY(550rpx); } } + +.xc-not-Selection{ + width: 40rpx; +height: 40rpx; + background: #eeeeee; +} + + +.xc-close-express{ + width: 40rpx; +height: 40rpx; +border-radius: 50%; +border: 3rpx solid #333; +text-align: center; +font-size:32rpx; +line-height: 38rpx; +color: #333; +margin-top: 5rpx; +} +.cx-popup .tops{ + width: 100%; +height: 145rpx; +border-bottom: 3rpx solid #eee; + +} +.top-content { + width: 82%; +padding-top: 33px; +height: 100%; +padding-left: 40rpx; +} +.close-frame{ + margin-top: 30rpx; + +} + +.xc-hook { +width: 33rpx; +height: 33rpx; +transform: rotate(-135deg); +line-height: 35rpx; +text-align: center; +margin-right: 20rpx + + +} +.xc-hooks { +width: 30rpx; +height: 30rpx; +border: 1rpx solid #999; +margin-right: 20rpx; +} +.express_list_frame{ + display: flex; +height: 80rpx; +align-items: center; +padding-left: 40rpx; +border-bottom: 1rpx solid #eee; + +} +.express_list{ + width: 100%; + height: 65%; + overflow-y: auto; + margin-bottom: 40rpx; + +} +.xc-confirms { + box-sizing: border-box; + width: 40%; + border-radius: 50rpx; + height: 80rpx; + margin:0 auto; + font-size:28rpx; + background: #fff; + color: #333; + border: 2rpx solid #333; +} + + +/* 优惠券的改版样式 */ +.xc-coupon-frame{ + /* width: 710rpx; */ + width: 100%; + height:auto; + margin: 0 auto; + +} +.xc-coupon-frame .coupon-frame{ + width: 100%; + height: 200rpx; + margin-top:10rpx; + border-bottom: 1rpx solid #eee; + +} +.xc-coupon-frame .coupon-frame .coupon-left{ + width: 215rpx; + height:100%; + overflow: hidden; +} +.xc-money-frames{ + width:96%; + margin-top: -10px; +} + +.xc-rmb-symbol{ + font-size:40rpx; + +} + +.xc-rmb-val{ + font-size:60rpx; + +} +.coupon-explain{ + font-size:25rpx; +width:100%; + + +} +.xc-valuer{ + margin-top:39rpx; + margin-left:28rpx; + font-size:25rpx; +} +.coupon-frame .oval{ + width:155rpx; + height:83rpx; + border-radius: 50%; + right:-78rpx; + top:-37rpx; +} +.coupon-right{ + /* width:490rpx; */ + height: 99%; + border-top: 1rpx solid #eaeaea; + /* //border-bottom: 1rpx solid #eaeaea; */ + border-right: 1rpx solid #eaeaea; + flex-grow: 1; +} +.coupon-annotation{ + width: 95%; + height: 100%; + +} +.xc-brand{ + width:100rpx; + height:35rpx; + line-height: 35rpx; + font-size:21rpx; + border-radius:10rpx; position: relative; top:-1px; + margin-right: 8rpx +} +.top-frame{ + width:82%; + height: 75rpx; + margin-top:10rpx; +} +.top-frame .coupon-wode{ + font-size: 25rpx; + margin-left:10rpx; + width:340rpx; + height:88rpx; +} +.coupon-code{ + width:60rpx; + height:60rpx; + margin-top:5rpx; + +} +.frame{ + width: 100% +} +.coupon-time{ + font-size: 23rpx; + line-height:33rpx; + color: #333; +} + +.clik-get{ + width:125rpx; + height:45rpx; + border-radius: 25rpx; + line-height: 45rpx; + font-size:25rpx; + bottom:67rpx; + right:6px; +} + +.code-img{ + margin-left:20rpx; +} +.bottmo-explain{ +top:145rpx; +width:94%; +border-top:1rpx dashed #eee; +padding-top:8rpx; +height:38rpx; +line-height: 51rpx; + +} +.font-word{ + font-size: 22rpx; +} +.circle-size{ + background: #a0a0a0; + width: 27rpx; + height: 27rpx; + margin-top:13rpx; +margin-left:8rpx; +display: flex; + +align-items: center; +} +.xc-jiantou{ + /* width: 9rpx; + height: 9rpx; */ + /* border-top: 2rpx solid #fff; + border-right: 2rpx solid #fff; */ + transform: rotate(-90deg); + color: #fff; + font-size: 15rpx; + /* display:inline-block; + margin-top: 6.5rpx; */ + text-align: center; +width: 24rpx; +} +.xc-buttom{ + box-sizing: border-box; + width:100%; + min-height:76rpx; + height:auto; + line-height:40rpx; + border-left:1rpx solid #eee; + border-right:1rpx solid #eee; + border-bottom:1rpx solid #eee; +/* margin-left: 6rpx; */ +} + +.goods-num{ + font-size: 28rpx; + color: #333; +} + +.explain-coupon{ + font-size:25rpx; + padding: 10rpx 10rpx +} +.circle-frame{ + width: 20rpx; + height: auto; + z-index:1; + left:210rpx; + +} +.circle-sawtooth{ + width: 11rpx; + height: 11rpx; + background: #fff; +} + +.red{background-color: #fe7496;} +.green{ background-color: #22c7c1;} +.blue{background-color:#5e82e3;} +.g_gray{background-color: #aaaaaa} + +.f_text{text-align: center; height:96rpx; } +.xc-hook.sn { + margin-top:12%; +width:45rpx; +height:45rpx; +font-size:28rpx; +line-height:44rpx; + + +} +.xc-hooks.on{ + margin-top:12%; +width:42rpx; +height:42rpx; +} +.may_use_coupon{ + /* width: 95%; */ + /* height: 68rpx; */ + line-height:78rpx; + padding: 0 26rpx; + justify-content: space-between; + align-items: center; +} +.determine-frame{ + width: 100%; + height: 130rpx; + +} +.xc-determine{ + height: 80rpx; + width: 40%; + border-radius: 50rpx; +background: #d60021; +color: #fff; +font-size: 28rpx; +margin: 0 auto; + +} +.click-buttem{ +width: 90%; +margin: auto; +} +.logistics-name{ + margin-right:20rpx; +} +.xc-border{ + border-top:8rpx solid #eee; +width: 100% +} +.main-top{ +margin-top: 20rpx; + +} +.xc-hookts{ +border: 1rpx solid #999; + +} +.xc-hookts.on{ + width:30rpx; +height:30rpx; + +} +.xc-hookt.sn{ + width: 32rpx; +height: 32rpx; +font-size: 28rpx; +line-height: 34rpx; +} +.xc-hookt{ + transform: rotate(-135deg); +text-align: center; + +} +.main-bottom{ + margin-bottom: 20rpx; + +} +.xc-hookst{ + border: 1rpx solid #999; + +} +.xc-hookst.ons{ + width: 42rpx; +height: 42rpx; +margin-left: 20rpx; + +} +.is_use_coupon{ + width: 65%; +justify-content: flex-end; +padding-top: 10rpx; + + +} +.xc-hooka{ + transform: rotate(-135deg); +text-align: center; + +} +.xc-hooka.sn{ + width: 45rpx; +height: 45rpx; +font-size: 28rpx; +line-height: 44rpx; +margin-left: 20rpx; + +} +.color-gray{ + color: #808080; +} +.n_guige{ display: inline-block; background:rgb(236, 236, 236); color: rgb(63,63,63); padding: 3rpx 10rpx; border-radius: 3rpx } +.gift_image{ width: 60rpx; height: 60rpx; position: absolute; top: 0; left: 0} + +.quan_num_show{ padding: 4rpx 6rpx; background-color:#ea5551; color:#fff; border-radius: 6rpx;margin-left:10rpx;font-size:24rpx;} + +.navigator-hover { + background: none; + opacity: 1; +} + +.plus_buy{ + background-color: #fff; + margin:15rpx 0; + padding: 20rpx 10rpx; + position: relative; +} + + +.card_bg { + box-sizing: border-box; + padding: 2rpx 10rpx; + height: 28rpx; + border-radius: 26rpx; + font-size: 18rpx; + line-height: 28rpx; + max-width: 210rpx; + background: #333; + color: #fff; + margin-left: 8rpx; + position:relative; + top:7rpx; +} + +.card_bg image { + width: 19rpx; + height: 19rpx; + margin-right: 8rpx; +} + +/* .card_bg .card_name { + max-width: 76rpx; + width: auto; + overflow: hidden; + white-space: nowrap; +} */ + +.card_name { + position: relative; + top: -4rpx; + margin-left: 6px; +} + +.car_tri_up { + width: 0;height: 0; + border-left: 20rpx solid transparent; + border-right: 20rpx solid transparent; + border-bottom: 20rpx solid #fff; + position: absolute; + right: 20rpx; + top:-10rpx +} +.card_op{ + position: absolute; + right: 20rpx; + top:36rpx +} + + +.tab-container { + font-size: 28rpx; + margin-top: 20rpx; + display: flex; +} + +.tab-wrapper { + background-color: #ccc; + display: flex; + border-radius: 40rpx; + overflow: hidden; +} + +.tab { + padding: 20rpx 30rpx; + +} + + +.tab.active { + background-color: white; + border-radius: 40rpx; +} diff --git a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js index 1ee2e18..d668d04 100644 --- a/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js +++ b/packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js @@ -343,9 +343,9 @@ Page({ wx.hideLoading(); - wx.setNavigationBarTitle({ - title: "拼团详情", - }); + // wx.setNavigationBarTitle({ + // title: "拼团详情", + // }); // ee.countDown2(); diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml index 80bc77c..c283a6e 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml @@ -195,7 +195,7 @@ 库存不足 - 立即购买 + 立即购买 @@ -212,7 +212,7 @@ 配送不匹配 - 确定 + 确定 diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index c8b4439..8a4c614 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -303,7 +303,7 @@ Page({ prom_id, }); } - console.log('type********>>',this.data.prom_type); + // console.log('type********>>',this.data.prom_type); //-- 自定义海报 -- // getApp().request.promiseGet("/api/weshop/goods/poster/page", { // data: { store_id: os.stoid, type: 1, is_use: 1 } @@ -448,7 +448,6 @@ Page({ var user = getApp().globalData.userInfo; if (!user) return false; clearInterval(ti); - if (user.card_field && user['card_expiredate']) { var str = user['card_expiredate'].replace(/-/g, '/'); var end = new Date(str); @@ -1198,18 +1197,20 @@ Page({ open_ind_store: ind }); //如果是秒杀的话，要看redis够不够 - if (this.data.prom_type == 1) { - this.getactLen(function (num) { - if (num < th.data.goodsInputNum) { - getApp().my_warnning("秒杀库存不足!", 0, th); - return false; - } else { - th.add_cart_func(t); - } - }); - } else { - th.add_cart_func(t); - } + // if (this.data.prom_type == 1) { + // this.getactLen(function (num) { + // if (num < th.data.goodsInputNum) { + // getApp().my_warnning("秒杀库存不足!", 0, th); + // return false; + // } else { + // th.add_cart_func(t); + // } + // }); + // } else { + // th.add_cart_func(t); + // } + + th.add_cart_func(t); }, @@ -1662,13 +1663,13 @@ Page({ switch (condition_t) { case 0: //按钱 if (newd.goods_price >= condition_t) { - newd.prom_type = 3; + newd.prom_type = 9; newd.prom_id = prom_d[i].prom_id; } break case 1://按购买数量 if (newd.goods_num >= condition_t) { - newd.prom_type = 3; + newd.prom_type = 9; newd.prom_id = prom_d[i].prom_id; } break; @@ -1707,6 +1708,7 @@ Page({ // this.data.shippingCost < 0 || this.data.select.stock <= 0 || (Object.assign(e, { // action: "buy_now" // }), + var th = this; this.setData({ openSpecModal: 0, openSpecModal_inte: 0, @@ -1714,34 +1716,42 @@ Page({ openSpecModal_pt: 0, }) - if (e.prom_type == 9) { - s.set_b_now(e); - var url = "/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id; - getApp().goto(url); - } else { + // if (e.prom_type == 9) { + // s.set_b_now(e); + // // var url = ''; + // var url = "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id; + // getApp().goto(url); + // } else + + // if(e.prom_type == 9){ + if(true){ //要判断积分购的普通购买有没有参加优惠活动 - if (e.is_integral_normal == 1) { + if (e.is_normal == 1) { this.check_nor_promgood(e.goods_id, function (res) { if (res && res.cat_id) { - e.prom_type = 3; - e.prom_id = res.cat_id + e.prom_type = 0; + e.prom_id = res.cat_id; } s.set_b_now(e); /*-- wx.redirectTo({ url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id, });--*/ - getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id) + + console.log('11111111111111111111111111======》'); + getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id); + // getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&group_id=" + th.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + th.data.luckGoInfo.lc_alert); }) } else { - // console.log('xxxxxxxxxxxxx======》', this.data.prom_id); - s.set_b_now(e); + //console.log('222222222222222222222222222222======》'); + //s.set_b_now(e); /*-- wx.redirectTo({ url: "/pages/cart/cart2/cart2?is_bnow=1&goods_id=" + e.goods_id, });--*/ - getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&group_id=" + this.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + this.data.luckGoInfo.lc_alert); + //getApp().goto("/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct?is_bnow=1&goods_id=" + e.goods_id) + // getApp().goto("/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct?is_bnow=1&group_id=" + this.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + this.data.luckGoInfo.lc_alert); } } @@ -3756,6 +3766,9 @@ Page({ var th = this; var ind = parseInt(e.currentTarget.dataset.ind); + + console.log('当前ind========>>>>', ind); + //ind == 1是普通购买 if (ind == 1) { //如果拼单的sku data是空的，就要先获取一下 @@ -3845,18 +3858,17 @@ Page({ //-----------------拼单生成方法--------------------- addCart_pt: function () { - var th = this; if (this.data.is_normal == 0) { //看一下有没有起购数，如果有起购数，要计算起购数 - var qnum = parseFloat(th.data.prom_act.minbuynum); - if (qnum > 0 && th.data.goodsInputNum < qnum) { - getApp().confirmBox("拼团商品至少要买" + qnum + "件!"); - return false; - } + // var qnum = parseFloat(th.data.prom_act.minbuynum); + // if (qnum > 0 && th.data.goodsInputNum < qnum) { + // getApp().confirmBox("拼团商品至少要买" + qnum + "件!"); + // return false; + // } - th.addcart_pt_func(); + this.addcart_pt_func(); } else { - th.addcart_pt_func(); + this.addcart_pt_func(); } }, @@ -3868,73 +3880,75 @@ Page({ var e = this, th = e, o = this.data.sele_g; - if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); + // if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); //----------添加到购物车时，要判断限购数量，-------- e.get_buy_num(o, async 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) { - wx.showModal({ - title: '提示', - content: '超出商品限购' - }); - - var num = th.data.prom_buy_limit - th.data.prom_buy_num; - if (num < 0) num = 0; - th.setData({ goodsInputNum: num }) - return false; - } - } + // 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) { + // wx.showModal({ + // title: '提示', + // content: '超出商品限购' + // }); + + // var num = th.data.prom_buy_limit - th.data.prom_buy_num; + // if (num < 0) num = 0; + // th.setData({ goodsInputNum: num }) + // return false; + // } + // } + //---判断商品是否超出活动限购,拼团的普通购买不计算活动的限购--- - if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal != 1) { - if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) { - wx.showModal({ - title: '提示', - content: '超出商品活动限购' - }); - - var num = th.data.prom_buy_limit - th.data.prom_buy_num; - if (num < 0) num = 0; - th.setData({ goodsInputNum: num }) - return false; - } - } + // if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0 && th.data.is_normal != 1) { + // if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) { + // wx.showModal({ + // title: '提示', + // content: '超出商品活动限购' + // }); + + // var num = th.data.prom_buy_limit - th.data.prom_buy_num; + // if (num < 0) num = 0; + // th.setData({ goodsInputNum: num }) + // return false; + // } + // } var redis_num = 0 //不是普通购买的时候 - if (th.data.is_normal != 1) { - //-------判断活动是否抢光--------- - await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, { - 1: 1 - }).then(res => { - redis_num = res.data.data; - }) - - if (th.data.goodsInputNum > redis_num) { - wx.showModal({ - title: '提示', - content: '超出商品活动库存' - }); + // if (th.data.is_normal != 1) { + // //-------判断活动是否抢光--------- + // await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/6/" + th.data.sele_g.prom_id, { + // 1: 1 + // }).then(res => { + // redis_num = res.data.data; + // }) + + // if (th.data.goodsInputNum > redis_num) { + // wx.showModal({ + // title: '提示', + // content: '超出商品活动库存' + // }); + + // th.setData({ goodsInputNum: redis_num }) + + // return false; + // } + // } - th.setData({ goodsInputNum: redis_num }) - - return false; - } - } - - if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); - if (th.data.goodsInputNum > o.store_count) { - th.setData({ goodsInputNum: o.store_count }) - return s.my_warnning("超出商品库存", 0, th); - } + // if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); + // if (th.data.goodsInputNum > o.store_count) { + // th.setData({ goodsInputNum: o.store_count }) + // return s.my_warnning("超出商品库存", 0, th); + // } if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) this.setData({ sto_sele_name: "" }); if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); + //--------------此时操作的数据------------ var newd = { goods_id: o.goods_id, @@ -4006,10 +4020,12 @@ Page({ th.data.sto_sele_distr = 1; } - } else if (th.data.prom_type == 3) { - newd.prom_type = 0; - newd.prom_id = 0; } + + // else if (th.data.prom_type == 3) { + // newd.prom_type = 0; + // newd.prom_id = 0; + // } newd['pick_name'] = th.data.sto_sele_name; newd['pick_dis'] = th.data.sto_sele_distr; @@ -4020,21 +4036,27 @@ Page({ //判断一下有没有全局优惠活动 th.check_nor_promgood(newd.goods_id, function (e) { if (e && e.act_id) { - newd['prom_type'] = 3; + newd['prom_type'] = 0; newd['prom_id'] = e.act_id; } - th.buyNow(newd) - }) + console.log('aaaaa'); + th.buyNow(newd); + }); } - else th.buyNow_pt(newd); + else { + console.log('bbbb'); + th.buyNow_pt(newd); + }; }) }, //----------立即购买_pt----------- buyNow_pt: function (e) { s.set_b_now(e); wx.navigateTo({ - url: "/packageC/pages/luckyGo_cart/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id, + url: "/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct?is_bnow=1&group_id=" + this.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + this.data.luckGoInfo.lc_alert + '&goods_price=' + this.data.luckGoInfo.group_price/100, }); + + // getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&group_id=" + th.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + th.data.luckGoInfo.lc_alert); }, //-------跳转pt商品------- diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml index acd66d0..fa99c85 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml @@ -5,7 +5,7 @@ - + 规则 @@ -71,7 +71,35 @@
- + + + + + + 距活动结束还有 + 距活动开始还有 + + + + {{djs.day}} + + 天 + + + {{djs.hou}} + + 时 + + {{djs.min}} + + 分 + + {{djs.sec}} + + 秒 + + + @@ -82,22 +110,15 @@ ￥ - {{filters.toFix(data.shop_price,2)}} + + {{filters.toFix(luckGoInfo.group_price/100,2)}} - 零售价￥{{filters.toFix(data.market_price,2)}} + 手店价￥{{filters.toFix(data.shop_price,2)}} - + @@ -883,13 +904,13 @@ - - {{filters.toFix(data.market_price,2)}} + + {{filters.toFix(data.shop_price,2)}} 单独购买 - 立即参团 + 立即参团 - + {{filters.toFix(sele_g[card_field],2)}} {{filters.toFix(sele_g.shop_price,2)}} 单独购买 - - + --> + - + - + - + - + + + + - +