From dfebcf4ec412798f33049c9252c853841b1e3ab7 Mon Sep 17 00:00:00 2001 From: yvan.ni <765199919@qq.com> Date: Fri, 9 Oct 2020 14:08:28 +0800 Subject: [PATCH] 1， 自定义海报不显示的bug 2. 优惠促销的商品，在再来一单的时候，要判断是不是优惠活动过期 --- pages/goods/goodsInfo/goodsInfo.js | 3 +-- pages/goods/goodsInfo/goodsInfo.wxml | 1 - pages/team/team_success/team_success.js | 2 +- pages/user/order_detail/order_detail.js | 14 +++++++++++++- pages/user/order_list/order_list.js | 31 +++++++++++++++++++++++++------ 5 files changed, 40 insertions(+), 11 deletions(-) diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index 7cc5f7a..4b4e7c1 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -18,7 +18,6 @@ var more = function(e) { var utils = require('../../../utils/util.js'); var regeneratorRuntime = require('../../../utils/runtime.js'); - Page({ data: { start_stop: 2, //秒杀开始 结束 的控制(1正在进行，2即将开始) @@ -258,7 +257,7 @@ Page({ //-- 自定义海报 -- getApp().request.promiseGet("/api/weshop/goods/poster/page",{ - data:{store_id:os.stoid, type:1, is_user:1 } + data:{store_id:os.stoid, type:1, is_use:1 } }).then(res=>{ if(res.data.code==0){ diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index fb956f2..7f06a39 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -1481,7 +1481,6 @@ - diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index 0c72ea1..539edb2 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -60,7 +60,7 @@ Page({ //-- 自定义海报 -- getApp().request.promiseGet("/api/weshop/goods/poster/page",{ - data:{store_id:os.stoid, type:1, is_user:1 } + data:{store_id:os.stoid, type:1, is_use:1 } }).then(res=>{ if(res.data.code==0){ diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index fdb3f02..cc755c5 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -779,8 +779,20 @@ Page({ b_item.is_pd_normal=1; break; } + //如果有优惠促销的时候,要看下商品的优惠活动有没有过期 + if(g_item.prom_type==3 || good.prom_type==3){ + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => { + if (res.data.code == 0) { + var r_data = res.data.data; + if (r_data.promGoodsLists) { + b_item.prom_type=3; + b_item.prom_id=r_data.promGoodsLists[0].prom_id; + } + } + }) + } - + //判断是不是线下库存的购买， 是不是秒杀活动 if(th.data.sales_rules==2 && !prom){ diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index d4f8a41..ed589b9 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -820,7 +820,7 @@ Page({ } //如果商品的配送方式和门店不匹配 - if(good['distr_type']>0 && pick_up['distr_type']>0 && good['distr_type']!=pick_up['distr_type'] ){ + if(good['distr_type']>0 && pickup['distr_type']>0 && good['distr_type']!=pickup['distr_type'] ){ err_text+= good['goods_name']+"配送方式不一致\n"; continue; } @@ -846,6 +846,7 @@ Page({ //--判断商品当前的活动情况-- switch(good.prom_type){ + //秒杀 case 1: var flash=null; await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + good.prom_id, { @@ -859,16 +860,29 @@ Page({ prom=flash; b_item.price=prom.price; // } - break; + break; + + //拼团 case 6: b_item.is_pd_normal=1; break; } - - + //如果有优惠促销的时候,要看下商品的优惠活动有没有过期 + if(g_item.prom_type==3 || good.prom_type==3){ + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => { + if (res.data.code == 0) { + var r_data = res.data.data; + if (r_data.promGoodsLists) { + b_item.prom_type=3; + b_item.prom_id=r_data.promGoodsLists[0].prom_id; + } + } + }) + } + //判断是不是线下库存的购买， 是不是秒杀活动 if(th.data.sales_rules==2 && !prom){ - + //-- 看一下购物车上有多少商品 -- var cart_num=0; await getApp().request.promiseGet("/api/weshop/cart/page", { @@ -1150,7 +1164,12 @@ Page({ if(newd.guide_id){ updata.guide_id=newd.guide_id; updata.guide_type=newd.guide_type; - } + } + if(newd.prom_type){ + updata.prom_type=newd.prom_type; + updata.prom_id=newd.prom_id; + } + await getApp().request.promisePut("/api/weshop/cart/update", { data: updata }).then(res=>{ -- libgit2 0.21.4