Commit 6dd87a15ad60e35162d03af93b2b5eac32571659
1 parent
8a98c518
秒杀多规格已抢光的时候的优化
Showing
2 changed files
with
45 additions
and
9 deletions
pages/goods/goodsInfo/goodsInfo.js
... | ... | @@ -3454,6 +3454,16 @@ Page({ |
3454 | 3454 | prom_id: prom.id |
3455 | 3455 | }) |
3456 | 3456 | |
3457 | + var pro_null=null; | |
3458 | + if(goodsinfo.prom_type==1){ | |
3459 | + var rs= await getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" + os.stoid + "/1/" + prom.id, {}); | |
3460 | + if(rs && rs.data.code == 0 && rs.data.data <= 0 ){ | |
3461 | + pro_null=1; | |
3462 | + } | |
3463 | + } | |
3464 | + th.setData({pro_null}); | |
3465 | + | |
3466 | + | |
3457 | 3467 | //却换图片 |
3458 | 3468 | th.init(goodsinfo.goods_id); |
3459 | 3469 | var newTime = ut.gettimestamp(); |
... | ... | @@ -4467,7 +4477,7 @@ Page({ |
4467 | 4477 | if (em.data.code == 0) { |
4468 | 4478 | |
4469 | 4479 | if (em.data.data <= 0) ee.setData({ |
4470 | - prom_r_null: 1 | |
4480 | + prom_r_null: 1,pro_null:1 | |
4471 | 4481 | }); |
4472 | 4482 | //拿取价格并且判断时间-- |
4473 | 4483 | getApp().request.get("/api/ms/flash_sale/getNew/" + os.stoid + "/" + user_id + "/" + prom_id, { |
... | ... | @@ -4575,6 +4585,7 @@ Page({ |
4575 | 4585 | |
4576 | 4586 | ee.setData({ |
4577 | 4587 | sku_g: list, |
4588 | + is_more_flash:1 | |
4578 | 4589 | }); |
4579 | 4590 | |
4580 | 4591 | } | ... | ... |
pages/goods/goodsInfo/goodsInfo.wxml
... | ... | @@ -1115,19 +1115,40 @@ |
1115 | 1115 | |
1116 | 1116 | |
1117 | 1117 | <block wx:if="{{prom_r_null}}"> |
1118 | + <block wx:if="{{prom_type==1}}"> | |
1119 | + | |
1120 | + <!-- 多个秒杀的时候 --> | |
1121 | + <block wx:if="{{is_more_flash}}"> | |
1122 | + <block wx:if="{{prom_act.is_shop_buy}}"> | |
1123 | + <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view> | |
1124 | + <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view> | |
1125 | + </block> | |
1126 | + <block wx:else> | |
1127 | + <view bindtap="openSpecModel" data-ind="1" class="join-btn cart-btn">加入购物车</view> | |
1128 | + <view bindtap="openSpecModel" data-ind="2" class="buy-btn cart-btn">立即抢购</view> | |
1129 | + </block> | |
1130 | + </block> | |
1131 | + <block wx:else> | |
1132 | + <block wx:if="{{prom_act.is_shop_buy}}"> | |
1133 | + <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view> | |
1134 | + <view class="buy-btn cart-btn huise">已抢光</view> | |
1135 | + </block> | |
1136 | + <block wx:else> | |
1137 | + <view class="buy-btn cart-btn huise">已抢光</view> | |
1138 | + </block> | |
1139 | + </block> | |
1140 | + | |
1118 | 1141 | |
1119 | - <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}"> | |
1120 | - <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view> | |
1121 | - <view class="buy-btn cart-btn huise">已抢光</view> | |
1122 | 1142 | </block> |
1143 | + | |
1123 | 1144 | <view wx:else class="buy-btn cart-btn cart-btn-lg huise set_width">已抢光</view> |
1145 | + | |
1124 | 1146 | </block> |
1125 | 1147 | <block wx:if="{{prom_st==3 && !prom_r_null}}"> |
1126 | 1148 | <block wx:if="{{prom_type==1 && prom_act.is_shop_buy}}"> |
1127 | 1149 | <view bindtap="openSpecModel_Nor" data-nor="1" class="join-btn cart-btn">单独购买</view> |
1128 | 1150 | <view class="buy-btn cart-btn huise">活动已经结束</view> |
1129 | 1151 | </block> |
1130 | - | |
1131 | 1152 | <view wx:else class="buy-btn cart-btn cart-btn-lg lanse set_width">活动已经结束</view> |
1132 | 1153 | </block> |
1133 | 1154 | </block> |
... | ... | @@ -1266,8 +1287,8 @@ |
1266 | 1287 | 券后¥ |
1267 | 1288 | <text class="fs32">{{sele_g.offline_price}}</text> |
1268 | 1289 | </view> |
1269 | - | |
1270 | 1290 | </view> |
1291 | + | |
1271 | 1292 | <block wx:if="{{prom_type==0}}"> |
1272 | 1293 | <view class="flex"> |
1273 | 1294 | <view class="spec-goods-stock">已售:{{sele_g.sales_sum}}</view> |
... | ... | @@ -1424,8 +1445,6 @@ |
1424 | 1445 | </block> |
1425 | 1446 | <block wx:else> |
1426 | 1447 | |
1427 | - | |
1428 | - | |
1429 | 1448 | <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 --> |
1430 | 1449 | <block wx:if="{{sales_rules>=2 && prom_type==0 && !sele_g.whsle_id}}"> |
1431 | 1450 | |
... | ... | @@ -1445,7 +1464,13 @@ |
1445 | 1464 | </block> |
1446 | 1465 | <!-- 线上销售 --> |
1447 | 1466 | <block wx:else> |
1448 | - <block wx:if="{{ sele_g.store_count<1 && is_no_new}}"> | |
1467 | + | |
1468 | + <block wx:if="{{prom_type==1 && !is_normal && pro_null}}"> | |
1469 | + <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999"> | |
1470 | + 已抢光 | |
1471 | + </view> | |
1472 | + </block> | |
1473 | + <block wx:elif="{{ sele_g.store_count<1 && is_no_new}}"> | |
1449 | 1474 | <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999"> |
1450 | 1475 | 库存不足 |
1451 | 1476 | </view> | ... | ... |