Commit 1e90deda10725e655e78f5f78400b5a06fda57d7
1 parent
b1e49b4b
Revert "秒杀 评弹窗修改"
This reverts commit b1e49b4bf5663ed541f00f41019cf5d01dd55400.
Showing
3 changed files
with
10 additions
and
6 deletions
pages/goods/goodsInfo/goodsInfo.js
@@ -1453,7 +1453,7 @@ Page({ | @@ -1453,7 +1453,7 @@ Page({ | ||
1453 | var t_gd = ee.data.data; | 1453 | var t_gd = ee.data.data; |
1454 | var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); | 1454 | var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss"); |
1455 | var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss"); | 1455 | var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss"); |
1456 | - console.log("秒杀的数据", t.data.data); | 1456 | + |
1457 | ee.setData({ | 1457 | ee.setData({ |
1458 | prom_price: t.data.data.price, | 1458 | prom_price: t.data.data.price, |
1459 | prom_type: 1, | 1459 | prom_type: 1, |
pages/goods/goodsInfo/goodsInfo.wxml
@@ -838,10 +838,15 @@ | @@ -838,10 +838,15 @@ | ||
838 | </view> | 838 | </view> |
839 | <view class="spec-cart-btns"> | 839 | <view class="spec-cart-btns"> |
840 | 840 | ||
841 | - | 841 | + <block wx:if="{{prom_act.buy_num!=0}}"> |
842 | <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add">加入购物车{{prom_act.buy_num}}</view> | 842 | <view wx:if="{{openSpecModal_ind==1}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn yellow fs32" data-action="add">加入购物车{{prom_act.buy_num}}</view> |
843 | <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> | 843 | <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> |
844 | - | 844 | + </block> |
845 | + <block wx:else> | ||
846 | + <view class="is_stock cart-btn is_stock fs28"> | ||
847 | + 库存不足 | ||
848 | + </view> | ||
849 | + </block> | ||
845 | </view> | 850 | </view> |
846 | 851 | ||
847 | <view class="clear"></view> | 852 | <view class="clear"></view> |
pages/goods/goodsInfo/goodsInfo.wxss
@@ -734,8 +734,7 @@ left:31rpx;} | @@ -734,8 +734,7 @@ left:31rpx;} | ||
734 | 734 | ||
735 | .pt_fir .pt_fir_title .js{padding: 0 15rpx;height: 40rpx;background:#e9030d; text-align: center; border-radius: 8rpx; color: #fff; margin-left: 10rpx;} | 735 | .pt_fir .pt_fir_title .js{padding: 0 15rpx;height: 40rpx;background:#e9030d; text-align: center; border-radius: 8rpx; color: #fff; margin-left: 10rpx;} |
736 | .pt_fir .pt_fir_title .tuannum{color: #e9030d; position: absolute; right: 20rpx; font-size: 26rpx;} | 736 | .pt_fir .pt_fir_title .tuannum{color: #e9030d; position: absolute; right: 20rpx; font-size: 26rpx;} |
737 | -.pding{padding-top: 20rpx;padding-left: 20rpx;margin-bottom: 245rpx; | ||
738 | - padding-right: 20rpx;font-size: 26rpx;color: #ea120f} | 737 | +.pding{padding-top: 20rpx;padding-left: 20rpx; padding-right: 20rpx;font-size: 26rpx;color: #ea120f} |
739 | .pdres{margin-left: 10rpx;color: #8f8f94} | 738 | .pdres{margin-left: 10rpx;color: #8f8f94} |
740 | .ptgz{position: relative;font-size: 30rpx;padding-left: 20rpx;margin-top: 10rpx; overflow: hidden } | 739 | .ptgz{position: relative;font-size: 30rpx;padding-left: 20rpx;margin-top: 10rpx; overflow: hidden } |
741 | .shuxian{width: 6rpx;height: 28rpx; background: #ea120f; display: inline-block;top: 5rpx;position: relative; margin-right: 5rpx} | 740 | .shuxian{width: 6rpx;height: 28rpx; background: #ea120f; display: inline-block;top: 5rpx;position: relative; margin-right: 5rpx} |
@@ -794,7 +793,7 @@ left:31rpx;} | @@ -794,7 +793,7 @@ left:31rpx;} | ||
794 | .juzhong .xq .title .close{position: absolute;top: 0; right: 0; width: 45rpx; height: 45rpx;} | 793 | .juzhong .xq .title .close{position: absolute;top: 0; right: 0; width: 45rpx; height: 45rpx;} |
795 | 794 | ||
796 | .pt_qd{margin-top: 40rpx; height: auto;} | 795 | .pt_qd{margin-top: 40rpx; height: auto;} |
797 | -.spec-cart-btn.w100{width: 95%; margin-left: 0; height: 75rpx; line-height:75rpx;margin: auto; } | 796 | +.spec-cart-btn.w100{width: 100%; margin-left: 0; height: 80rpx; line-height: 80rpx;} |
798 | 797 | ||
799 | .sto_v{color: #333;} | 798 | .sto_v{color: #333;} |
800 | .ellipsis{overflow: hidden; white-space: nowrap; text-overflow: ellipsis;} | 799 | .ellipsis{overflow: hidden; white-space: nowrap; text-overflow: ellipsis;} |