diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js index 8713ee2..b51c027 100644 --- a/components/diy_seckill/diy_seckill.js +++ b/components/diy_seckill/diy_seckill.js @@ -132,7 +132,7 @@ Component({ } for(let i in all_array){ - let item=data[i]; + let item=all_array[i]; if(item.user_price) item.price=item.user_price; } diff --git a/components/userqy_pop_up/userqy_pop_up.js b/components/userqy_pop_up/userqy_pop_up.js index d5f7bfe..33c21f0 100644 --- a/components/userqy_pop_up/userqy_pop_up.js +++ b/components/userqy_pop_up/userqy_pop_up.js @@ -28,9 +28,4 @@ Component({ }, }, - - - - - }) \ No newline at end of file diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index d596b82..cdb0482 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -2004,7 +2004,7 @@ Page({ await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { data: { store_id: os.stoid, - user_id: user_id, + user_id: oo.user_id, goods_id: item_j.goods_id, prom_type: 7, prom_id: th.data.act.id diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index 796c802..6aa3822 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -392,7 +392,9 @@ 总数量:{{prom_act.goods_num+prom_act.virtual}}件 - 限购:{{prom_act.buy_limit}}件 + 限购:{{prom_act.buy_limit}}件 + 限购:不限 + 已购:0件 @@ -402,7 +404,8 @@ 总数量:{{prom_act.goods_num}}件 - 限购:{{prom_act.buy_limit}}件 + 限购:{{prom_act.buy_limit}}件 + 限购:不限 已购:{{prom_act.buy_num}}件 diff --git a/pages/goods/goodsList/g_filter.wxs b/pages/goods/goodsList/g_filter.wxs index 50744b0..2c32da9 100644 --- a/pages/goods/goodsList/g_filter.wxs +++ b/pages/goods/goodsList/g_filter.wxs @@ -81,12 +81,13 @@ var g_filters = { }, //跳转的接口 get_goods_url:function(item){ - - console.log(item,111) var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id if(item.prom_type==8){ - url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id - } + url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id + } + if(item.prom_type==1){ + url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1"; + } return url1; } } diff --git a/pages/goods/search/g_filter.wxs b/pages/goods/search/g_filter.wxs index f8e423a..67fece5 100644 --- a/pages/goods/search/g_filter.wxs +++ b/pages/goods/search/g_filter.wxs @@ -83,11 +83,14 @@ var g_filters = { get_goods_url:function(item){ - console.log(item,111) + var url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id if(item.prom_type==8){ url1="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id } + if(item.prom_type==1){ + url1="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id+"&prom_type=1"; + } return url1; } } diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 9153165..e8b0e0f 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -153,9 +153,9 @@ - - - + + + @@ -163,7 +163,7 @@ - {{aitem.goods_name}} + {{aitem.goods_name}} {{aitem.price}}