From 0494e61382aa48aec5dd5b781a28d918657b83c6 Mon Sep 17 00:00:00 2001 From: yvan.ni Date: Thu, 26 Oct 2023 16:51:32 +0800 Subject: [PATCH] 预售服务卡项的优化 --- packageA/pages/goodsInfo/goodsInfo.wxml | 2 +- packageC/pages/presell/cardInfo/goodsInfo.js | 510 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ packageC/pages/presell/cardInfo/goodsInfo.wxml | 282 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------- packageC/pages/presell/cardInfo/goodsInfo.wxss | 45 +++++++++++++++++++++++++++++++++++++++++++++ packageC/pages/presell/cart/cart2.js | 134 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------- packageC/pages/presell/cart/cart2.wxml | 4 ++-- 6 files changed, 434 insertions(+), 543 deletions(-) diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index d0aa400..ab8265e 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -34,7 +34,7 @@ - + diff --git a/packageC/pages/presell/cardInfo/goodsInfo.js b/packageC/pages/presell/cardInfo/goodsInfo.js index dbe592b..140cecf 100644 --- a/packageC/pages/presell/cardInfo/goodsInfo.js +++ b/packageC/pages/presell/cardInfo/goodsInfo.js @@ -715,26 +715,30 @@ Page({ listServiceItem: t.data.data.listServiceItem, }); }; + + var data={ + 'goods_name': t.data.data.serviceName, + 'shop_price': t.data.data.money, + 'show_price': t.data.data.show_price, + 'validDays': t.data.data.validDays, + 'serviceContent': t.data.data.serviceContent, + 'image_url': t.data.data.imgUrl, + 'goods_id': t.data.data.id, + 'id': t.data.data.id, + 'sales_sum': t.data.data.sales_sum, + 'storageId':t.data.data.storageId, + 'service_sn':t.data.data.serviceSn, + 'goods_sn':t.data.data.serviceSn, + 'listServiceVideos': t.data.data.listServiceVideos, + } + that.setData({ - 'data.goods_name': t.data.data.serviceName, - 'data.shop_price': t.data.data.money, - 'data.show_price': t.data.data.show_price, - 'data.validDays': t.data.data.validDays, - 'data.serviceContent': t.data.data.serviceContent, - 'data.image_url': t.data.data.imgUrl, - 'data.goods_id': t.data.data.id, - 'data.id': t.data.data.id, - 'data.sales_sum': t.data.data.sales_sum, - 'data.storageId':t.data.data.storageId, - 'data.service_sn':t.data.data.serviceSn, - 'data.listServiceVideos': t.data.data.listServiceVideos, - // gallery: t.data.data.listServiceImages, - // mapurl: t.data.data.listServiceVideos[0].video_url, - // mapurl_f_img: t.data.data.listServiceVideos[0].video_img, - //listServiceItem: t.data.data.listServiceItem, + data:data, + sele_g:data }); that.getTaohe(); + that.get_sto(); // ----> 预售 let prom_type = th.data.options.prom_type; @@ -840,360 +844,158 @@ Page({ activeCategoryId: 1 }); }, - - - //------------加入购物车-------------- - addCart: async function(t) { - var th = this; - var ind = t.currentTarget.dataset.openSpecModal_ind; - var action= t.currentTarget.dataset.action; - if(getApp().is_sp_hao() && action=='add'){ - wx.showToast({ - title: "视频号商品不允许加入购物车", - icon: 'none', - duration: 2000 - }); - return false; - } + //------------加入购物车-------------- + addCart: function (t) { + var th = this; + var ind = t.currentTarget.dataset.openSpecModal_ind; + if (!ind) ind = t.currentTarget.dataset.openspecmodal_ind; + th.setData({ + open_ind_store: ind + }); + th.add_cart_func(t); - if(this.data.goodsInputNum==0){ - getApp().my_warnning('请输入购买数量', 1, th, 450); - return false; - } + }, + //-- 加入购物的函数 -- + add_cart_func: function (t) { + var i = getApp().request; + if (oo.user_id == null) { + return s.my_warnning("还未登录！", 0, this); + } - if(!ind) ind = t.currentTarget.dataset.openspecmodal_ind; - - th.setData({ - open_ind_store: ind - }); + if (!getApp().globalData.userInfo) { + return s.my_warnning("还未登录！", 0, this); + } - if(!th.data.sto_sele_name) { - getApp().my_warnning('请选择门店', 1, th, 450); - return false; - }; - - // 库存 - var redisNums = 0; - // 限购数 - var limitNum = 0; - // 已购买数量 - var boughtNum = 0; - - var is_ok=1; - - // 秒杀活动 - if(this.data.prom_type == 1) { - // 如果是秒杀活动下的单独购买，is_normal为1 - if(this.data.openSpecModal_flash_normal) this.data.is_normal = 1; - - if(!this.data.is_normal) {// 秒杀购买 - - // 获取redis当前可以购买的数量 - // 如果数量为0，设置和显示已抢光 - // 否则，进一步判断是否超出限购或超出库存 - await this.getactLen().then(async function(res) { - redisNums = res; - let curNum = th.data.goodsInputNum; - // res: redis可购买数量 - console.log('当前可以购买的数量:', res); - if(res <= 0) { - // 可购买数量<=0, 设置和显示已抢光 - th.setData({ - prom_r_null: 1, - }); - // wx.showModal({ - // title: '超出活动库存', - // }); - getApp().my_warnning('超出活动库存', 0, self); - is_ok=0; - return false; - } else { - // 可购买数量>0 - // 计算自己还可以购买的数量 - // 自己还可购买的数量c = 每人活动限购数量a - 自己已经购买的数量b - // 如果限购数量a>redis可购买数量d，当增加数量t>d, 提示超出库存 - // 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购 - let actInfo = th.data.sele_g; - await th.get_buy_num2().then(function (data) { - let limited = actInfo.buy_limit==0?100000:actInfo.buy_limit; // 限购数量a - let promcardbuynum = data.data.data.promcardbuynum; - let buyedNum = promcardbuynum; // 自己已经购买的数量b - let canBuyNum = limited - buyedNum; // 自己还可购买的数量c - limitNum = limited; - boughtNum = buyedNum; + var e = this, th = e, o = this.data.sele_g, a = o.goods_id; + //----------添加到购物车时，要判断限购数量，-------- + e.get_buy_num(o, 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: '超出商品限购' + }); + return false; + } + } + //---判断商品是否超出活动限购--- + if (th.data.prom_buy_num != -1 && th.data.prom_buy_limit > 0) { + if (th.data.goodsInputNum + th.data.prom_buy_num > th.data.prom_buy_limit) { + wx.showModal({ + title: '提示', + content: '超出商品活动限购' + }); + return false; + } + } - if(canBuyNum <= 0) { - canBuyNum = 0; - }; - - if(canBuyNum > res) { - if(curNum > res) { // t当前增减的数量 - // wx.showModal({ - // title: '超出活动库存', - // }); - getApp().my_warnning('超出活动库存', 0, self); - th.setData({ - goodsInputNum: res || 1 - }); - is_ok=0; - return false; - }; - }; - - if(canBuyNum <= res) { - if(curNum > canBuyNum) { - // wx.showModal({ - // title: '超出限购数量', - // }); - getApp().my_warnning('超出限购数量', 0, self); - th.setData({ - goodsInputNum: canBuyNum || 1, - }); - is_ok=0; - return false; - } - } - }) + if (th.data.goodsInputNum <= 0) return s.my_warnning("商品数量不能为0", 0, th); + if (th.data.sto_sele_name == null || th.data.sto_sele_name == undefined) + th.setData({ + sto_sele_name: "" + }); + if (th.data.sto_sele_name == "") return s.my_warnning("请选择门店", 0, th); - } - }) - - } - } - + //--------------此时操作的数据------------ + var newd = { + goods_id: o.id, + goods_num: th.data.goodsInputNum, + pick_id: th.data.sto_sele_id, + user_id: oo.user_id, + store_id: th.data.stoid, + goods_price: o.shop_price, + member_goods_price: o.shop_price, + goods_name: o.goods_name, + goods_sn: o.goods_sn, + presell_list_id: th.data.presellList.id, + }; + + //---是不是从收藏夹出来的--- + if (th.data.c_guide_id) { + newd['guide_id'] = th.data.c_guide_id; + newd['guide_type'] = 2; + if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 3; + } else { + if (getApp().globalData.guide_id) { + newd['guide_id'] = getApp().globalData.guide_id; + newd['guide_type'] = 0; + if ("add" == t.currentTarget.dataset.action) newd['guide_type'] = 1; + } + } - if(!is_ok) return false; + if(getApp().globalData.groupchat_id){ + newd['groupchat_id'] = getApp().globalData.groupchat_id; + } + //让商品带上房间号 + if (th.data.sys_switch.is_skuroom_id == 1) { + if (th.data.data.goods_id == getApp().globalData.room_goods_id) { + newd.room_id = getApp().globalData.room_id; + } + } else { + if (newd.goods_id == getApp().globalData.room_goods_id) newd.room_id = getApp().globalData.room_id; + } - if(action=="buy"){ - //--------------此时操作的数据------------ - var newd = { - id: th.data.data.id, - goods_num: th.data.goodsInputNum, - pick_id: th.data.sto_sele_id, - keyid: th.data.sto_sele_keyid, - }; - newd['pick_name'] = th.data.sto_sele_name; - newd['guide_id'] = getApp().globalData.guide_id; - newd['guide_type']=0; - - if(getApp().globalData.groupchat_id){ - newd['groupchat_id'] = getApp().globalData.groupchat_id; - } - if(this.data.prom_type && this.data.prom_type == 1) { - newd['prom_type'] = this.data.prom_type; - newd['prom_id'] = this.data.prom_id; - newd['prom_price'] = this.data.prom_price; - }; - - if(this.data.prom_type == 1 && this.data.openSpecModal_flash_normal) { - newd['prom_type'] = 0; - newd['prom_price'] = this.data.data.shop_price; - }; - - console.log('newd++++++++', newd); - th.buyNow(newd); - } else { - - var newd = { - service_id: th.data.data.id, - service_sn:th.data.data.service_sn, - service_name:th.data.data.goods_name, - goods_num: th.data.goodsInputNum, - pick_id: th.data.sto_sele_id, - user_id:oo.user_id, - store_id:os.stoid, - money:th.data.data.shop_price, - }; - if(getApp().globalData.guide_id) { - newd['guide_id'] = getApp().globalData.guide_id; - newd['guide_type']=0; - }; - if(getApp().globalData.groupchat_id){ - newd['groupchat_id'] = getApp().globalData.groupchat_id; + //如果有线下取价 + if (o.offline_price) { + newd.offline_price = o.offline_price; + newd.pricing_type = o.pricing_type; + } + + newd.goods_price = th.data.prom_price; + newd.member_goods_price = th.data.prom_price, + newd.prom_type = 8; + newd.prom_id = th.data.presell_id; + + if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th); + if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th); + th.add_cart_next(e, t, a, o, newd); //加入购物车下一步 + + + }) + }, + + //---加入购物车的最后一步--- + add_cart_next(e, t, a, o, newd, CanOutQty) { + var th = this, i = getApp().request; + newd['pick_name'] = th.data.sto_sele_name; + newd['pick_dis'] = th.data.sto_sele_distr; + th.buyNow(newd); + + }, + + //----------立即购买----------- + buyNow: function (e) { + + this.setData({ + openSpecModal: 0, + openSpecModal_inte: 0, + openSpecModal_inte_normal: 0, + openSpecModal_pt: 0, + }) + + getApp().set_b_now(e); + + //如果是全额付款的话 + if (this.data.presellForm.presell_type == 1) { + getApp().goto("/packageC/pages/presell/cart/cart2") + } else { + getApp().goto("/packageC/pages/presell/cart/cart2_pre"); } - // 秒杀：单独购买的情况下，加入购物车显示的是零售价，否则显示秒杀活动价 - if(th.data.options.prom_type == 1) { - newd['prom_type'] = th.data.options.prom_type; - newd['prom_id'] = th.data.options.prom_id; - if(th.data.openSpecModal_flash_normal) { - newd['money'] = th.data.data.shop_price; - newd['is_pd_normal'] = 1; - } else { - newd['money'] = th.data.prom_price; - }; - }; - + }, + + - //----先看会员在购物车中是否加入了该商品----- - getApp().request.get("/api/weshop/cartService/page", { - data: { - store_id: os.stoid, - user_id: oo.user_id, - service_id: th.data.data.id, - }, - success: function(re) { - //-------如果购物车中有相关的数据--------- - if (re.data.data.total > 0) { - var item = null; - // 多门店问题 - var cartGoodsNum = 0; - const tmpObj = re.data.data.pageData; - for (let i = 0; i < tmpObj.length; i++) { - if (th.data.sto_sele_id != tmpObj[i].pick_id) { - cartGoodsNum += parseInt(tmpObj[i].goods_num); - } else { - item = tmpObj[i]; - } - } - // 当前门店同类商品还没加入到购物车 但是有其他门店的同类商品 - if (th.data.prom_type == 1 && !th.data.is_normal && !item) { - - // 秒杀购物车购买 修正数量 - var snum = limitNum - boughtNum; - if (snum <= 0) { - // wx.showModal({ - // title: '超出限购数量', - // }); - getApp().my_warnning('超出限购数量', 0, self); - return false; - } - - var cSnum = snum- cartGoodsNum <= 0 ? 0 : snum- cartGoodsNum; - var cRedisNums = redisNums- cartGoodsNum <= 0 ? 0 : redisNums- cartGoodsNum; - - if (newd['goods_num'] >= redisNums){ - if (redisNums > snum) { - newd['goods_num'] = cSnum; - } else { - newd['goods_num'] = cRedisNums; - } - } else { - if (newd['goods_num'] > snum) newd['goods_num'] = cSnum; - } - - if (newd['goods_num'] <= 0) { - getApp().my_warnning('加入购物车成功', 1, th, 450); - th.closeSpecModal(); - return false; - } - getApp().request.post("/api/weshop/cartService/save", { - data: newd, - success: function(t) { - getApp().my_warnning('加入购物车成功', 1, th, 450); - var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; - th.setData({ - cartGoodsNum: c_num - }); - th.closeSpecModal(); - } - }); - return false; - } - - // 以下为当前门店同类商品已经加入到购物车 - var totalNum = th.data.goodsInputNum + item.goods_num; - - // 秒杀购物车购买 修正数量 - if (th.data.prom_type == 1 && !th.data.is_normal) { - var snum = limitNum - boughtNum; - if (snum <= 0) { - // wx.showModal({ - // title: '超出限购数量', - // }); - getApp().my_warnning('超出限购数量', 0, self); - return false; - } - if (totalNum >= redisNums){ - if (redisNums > snum) { - totalNum = snum- cartGoodsNum; - } else { - totalNum = redisNums- cartGoodsNum; - } - } else { - if (totalNum > snum) - totalNum = snum- cartGoodsNum; - } - } - - var updata = { - id: item.id, - goods_num: totalNum, - money: th.data.data.shop_price, - store_id: os.stoid, - }; - - // 秒杀：单独购买的情况下，加入购物车显示的是零售价，否则显示秒杀活动价 - if(th.data.options.prom_type == 1) { - // updata['prom_type'] = th.data.options.prom_type; - // updata['prom_id'] = th.data.options.prom_id; - if(th.data.openSpecModal_flash_normal) { - updata['money'] = th.data.data.shop_price; - updata['is_pd_normal'] = 1; - } else { - updata['money'] = th.data.prom_price; - }; - }; - - if (getApp().globalData.guide_id) { - updata['guide_id'] = getApp().globalData.guide_id; - updata['guide_type'] = 1; - } - if(getApp().globalData.groupchat_id){ - updata['groupchat_id'] = getApp().globalData.groupchat_id; - } - getApp().request.put("/api/weshop/cartService/update", { - data: updata, - success: function(t) { - getApp().my_warnning('加入购物车成功', 1, th, 450); - var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; - th.setData({ - cartGoodsNum: c_num - }); - th.closeSpecModal(); - } - }); - } else { - getApp().request.post("/api/weshop/cartService/save", { - data: newd, - success: function(t) { - getApp().my_warnning('加入购物车成功', 1, th, 450); - var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; - th.setData({ - cartGoodsNum: c_num - }); - th.closeSpecModal(); - } - }); - } - } - }); - }; - - - - - - - - }, - - //----------立即购买----------- - buyNow: function(e) { - getApp().globalData.service_now=e; - wx.redirectTo({ - url: "/packageA/pages/cart2_ser/cart2_ser", - }); - }, //----------增加购买数量----------- addCartNum: function(t) { this.checkCartNum(this.data.goodsInputNum + 1); @@ -1663,12 +1465,11 @@ Page({ e.data.data.pageData.splice(k--, 1); } } - } //如果有秒杀的指定门店 - if(th.data.prom_type==1 && th.data.prom_act && th.data.prom_act.pick_up_lists && e.data.data.pageData.length && !is_normal){ - var pick_up_lists=th.data.prom_act.pick_up_lists; + if(th.data.presellForm && th.data.presellForm.pick_up_lists && e.data.data.pageData.length && !is_normal){ + var pick_up_lists=th.data.presellForm.pick_up_lists; for (var kq = 0; kq < e.data.data.pageData.length; kq++) { var it0=e.data.data.pageData[kq]; var idx0=pick_up_lists.findIndex(function (e){ @@ -4036,6 +3837,7 @@ Page({ pre_arr = e.data.data.pageData[idx]; th.setData({ pre_arr: pre_arr, show: 1 }) th.data.prom_buy_limit = pre_arr.vip_butyqty; + th.data.prom_price=pre_arr.presell_price; //定义一下活动的价格 } }) if (!pre_arr) { diff --git a/packageC/pages/presell/cardInfo/goodsInfo.wxml b/packageC/pages/presell/cardInfo/goodsInfo.wxml index 616f29c..019b54c 100644 --- a/packageC/pages/presell/cardInfo/goodsInfo.wxml +++ b/packageC/pages/presell/cardInfo/goodsInfo.wxml @@ -53,7 +53,7 @@ - + @@ -208,6 +208,8 @@ + + @@ -262,89 +264,82 @@ + + - - - - 商品详情 - - - - - - 商品名称 - - - {{data.goods_name}} + + + 卡项详情 + + + + + + + {{item.projectName}}（无限次） + {{item.projectName}}（{{item.frequency}}次） + + {{item.vipprice}} + 零售价：￥{{item.showPrice}} - - - 商品编号 - - - {{data.goods_sn}} - + + 备注：{{filters.show_default(item.remark, '无')}} + + 有效期：{{filters.showStartAndEndDate(item, data.validDays)}} - - - 商品条码 - - - {{data.sku}} - - - - - 品类 + + + + + + + + {{item.goods_name}} ({{item.goods_sn}}) ({{item.frequency}}个) + + {{item.vipprice}} + 零售价：￥{{item.show_price}} + - - {{cat_name}} + + 备注：{{filters.show_default(item.remark, '无')}} + 有效期：{{filters.showStartAndEndDate(item,data.validDays)}} - - - 品牌 - - - {{brand_name}} - + + + + + + --> + - - - - + + @@ -362,83 +357,76 @@ - + @@ -600,7 +589,7 @@ - + {{sele_g.goods_name}} @@ -831,6 +820,7 @@ + diff --git a/packageC/pages/presell/cardInfo/goodsInfo.wxss b/packageC/pages/presell/cardInfo/goodsInfo.wxss index c1d6105..aab62c0 100644 --- a/packageC/pages/presell/cardInfo/goodsInfo.wxss +++ b/packageC/pages/presell/cardInfo/goodsInfo.wxss @@ -3019,3 +3019,48 @@ button.custom-service::after{ .c-red22{ color: #d60021 } + + + +.card, +.taohe { + position: relative; + padding: 20rpx; + margin-bottom: 20rpx; + border-radius: 8rpx; + background: #ffdcdc; + overflow: hidden; + /* background: #ffdcdc url(https://mshopimg.yolipai.net/miniapp/images/fwk/crown_bg.png) no-repeat left top; + background-position: 10rpx 10rpx; + background-size: 206rpx 136rpx; */ +} + +.card::before { + position: absolute; + font-family: iconfont; + content: '\e62a'; + color: rgba(255,0,0,.1); + font-size: 260rpx; + /* transform: rotateZ(45deg); */ + top: -110rpx; + left: -70rpx; +} + +.taohe::before { + position: absolute; + font-family: iconfont; + content: '\e64e'; + color: rgba(255,0,0,.1); + font-size: 260rpx; + top: -20rpx; + left: -30rpx; +} + +.rmb::before { + content: '￥'; + font-size: 24rpx; +} + +.c-red { + color: #f23030; +} \ No newline at end of file diff --git a/packageC/pages/presell/cart/cart2.js b/packageC/pages/presell/cart/cart2.js index dd7e077..448b80f 100644 --- a/packageC/pages/presell/cart/cart2.js +++ b/packageC/pages/presell/cart/cart2.js @@ -467,11 +467,58 @@ Page({ }, //-----获取立即购买的商品信息，入口---- - get_buy_goods: function (e) { + get_buy_goods:async function (e) { var th = this; th.data.gg = to.get_b_now(); + + //定义变量 + var gg = th.data.gg, act = null, prelist = null; + var url = "/api/weshop/marketing/marketingPresellForm/get/" + os.stoid + "/" + gg.prom_id; + await getApp().request.promiseGet(url, {}).then(res => { + if (res.data.code == 0) { + act = res.data.data; + } + }) + if (!act) { + wx.showToast({ title: "未找到活动", icon: 'none', duration: 3000 }); + return false; + } + if (act.is_end == 1) { + wx.showToast({ title: '活动已经结束', icon: 'none', duration: 3000 }); + return false; + } + if (ut.gettimestamp() > act.end_time) { + wx.showToast({ title: "活动定金支付时间已过期", icon: 'none', duration: 3000 }); + return false; + } + + var url = "/api/weshop/marketing/marketingPresellList/get/" + os.stoid + "/" + gg.presell_list_id; + await getApp().request.promiseGet(url, {}).then(res => { + if (res.data.code == 0) { + prelist = res.data.data; + } + }) + if (!prelist) { + wx.showToast({ title: "未找到商品", icon: 'none', duration: 3000 }); + return false; + } + + //如果是服务卡是时候 + if(act.goods_type==1){ + th.get_card_detail(act, prelist,gg); + } + //如果是商品的时候 + else{ + th.get_goods_detail(act, prelist,gg); + } + }, + + //-- 获取到服务卡项的详情 -- + get_card_detail(act, prelist,gg){ + var th = this; //--------如果goods_id一样，就是要立即购买----- - getApp().request.get("/api/weshop/goods/get/" + oo.stoid + "/" + th.data.gg.goods_id, { + var cd_url="/api/weshop/serviceCard/get/" + oo.stoid + "/" + th.data.gg.goods_id + getApp().request.get(cd_url, { success: async function (t) { var gd = t.data.data; if (!gd) return false; @@ -486,9 +533,51 @@ Page({ th.setData({show_same_city:1}) } } - }) + } + + t.data.data.original_img = oo.imghost + t.data.data.imgUrl; + t.data.data['buynum'] = th.data.gg.goods_num; + t.data.data.prom_id=th.data.gg.prom_id; + t.data.data.prom_type=8; + + + //这个位置要拿活动的预售价 + t.data.data.shop_price = prelist.presell_money; + th.setData({ + bn_goods: t.data.data, + bn_pickname: gg.pick_name, + bn_pick: gg.pick_id, + act: act + }); + + //计算价格 + th.calculatePrice2(); + + }, + }); + }, + + //-- 获取到服务卡项的详情 -- + get_goods_detail(act, prelist,gg){ + var th = this; + //--------如果goods_id一样，就是要立即购买----- + getApp().request.get("/api/weshop/goods/get/" + oo.stoid + "/" + th.data.gg.goods_id, { + success: async function (t) { + var gd = t.data.data; + if (!gd) return false; + + //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 -- + if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){ + await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+th.data.gg.pick_id, {}).then(res=>{ + if(res.data.code==0){ + var pk=res.data.data; + if(pk && pk.is_same_city){ + th.setData({show_same_city:1}) + } + } + }) } t.data.data.original_img = oo.imghost + t.data.data.original_img; @@ -578,38 +667,6 @@ Page({ } } - //定义变量 - var gg = th.data.gg, act = null, prelist = null; - var url = "/api/weshop/marketing/marketingPresellForm/get/" + os.stoid + "/" + gg.prom_id; - await getApp().request.promiseGet(url, {}).then(res => { - if (res.data.code == 0) { - act = res.data.data; - } - }) - if (!act) { - wx.showToast({ title: "未找到活动", icon: 'none', duration: 3000 }); - return false; - } - if (act.is_end == 1) { - wx.showToast({ title: '活动已经结束', icon: 'none', duration: 3000 }); - return false; - } - if (ut.gettimestamp() > act.end_time) { - wx.showToast({ title: "活动定金支付时间已过期", icon: 'none', duration: 3000 }); - return false; - } - - var url = "/api/weshop/marketing/marketingPresellList/get/" + os.stoid + "/" + gg.presell_list_id; - await getApp().request.promiseGet(url, {}).then(res => { - if (res.data.code == 0) { - prelist = res.data.data; - } - }) - if (!prelist) { - wx.showToast({ title: "未找到商品", icon: 'none', duration: 3000 }); - return false; - } - //如果有开启佣金抵扣，同时会员是分销商的时候 if(getApp().globalData.userInfo.is_distribut @@ -652,16 +709,13 @@ Page({ th.data.check_quan_ware_list = t.data.data.erpwareid + ""; } - //计算价格 th.calculatePrice2(); //获取优惠券,如果有券的钱，就调用 if (th.data.ckeck_quan_price > 0) th.get_buy_now_quan(); - }, }); - }, //---------------检查是否有收货地址------------------- @@ -820,8 +874,8 @@ Page({ }) } - //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮---------- - if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_past != 1) { + //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮,同时商品购买时候，服务卡项购买不计算运费---------- + if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_past != 1 && act.goods_type==0) { //看是不是有调用过包邮券 if (!th.data.isget_by_quan[th.data.bn_pick] && good.is_xz_yh != 1) { var condition = allpice - cut_price - quan_price; diff --git a/packageC/pages/presell/cart/cart2.wxml b/packageC/pages/presell/cart/cart2.wxml index 8969207..27d3d62 100644 --- a/packageC/pages/presell/cart/cart2.wxml +++ b/packageC/pages/presell/cart/cart2.wxml @@ -6,7 +6,7 @@ - + @@ -22,7 +22,7 @@ -