Commit 4e986993ece3525b26a45e3c2052bf9cce7092db

Authored by 后端开发-许程
1 parent 63de8231

秒杀拼单

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 - 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,
@@ -2766,9 +2766,6 @@ Page({ @@ -2766,9 +2766,6 @@ Page({
2766 } 2766 }
2767 }) 2767 })
2768 } 2768 }
2769 - else{  
2770 - th.get_sto();  
2771 - }  
2772 this.setData({ 2769 this.setData({
2773 //open_ind_store: ind, 2770 //open_ind_store: ind,
2774 store:1, 2771 store:1,
@@ -2816,7 +2813,7 @@ close_popup:function(e){ @@ -2816,7 +2813,7 @@ close_popup:function(e){
2816 var openindstore = e.currentTarget.dataset.openindstore; 2813 var openindstore = e.currentTarget.dataset.openindstore;
2817 2814
2818 if(th.data.choice_sort_store==0 ){ 2815 if(th.data.choice_sort_store==0 ){
2819 - var index=th.data.fir_pick_index; 2816 + var index=th.data.fir_pick_index;
2820 if(th.data.is_show_sto_cat==1){ 2817 if(th.data.is_show_sto_cat==1){
2821 item=th.data.def_pickpu_list[index]; 2818 item=th.data.def_pickpu_list[index];
2822 }else{ 2819 }else{
pages/goods/goodsInfo/goodsInfo.wxml
@@ -838,15 +838,10 @@ @@ -838,15 +838,10 @@
838 </view> 838 </view>
839 <view class="spec-cart-btns"> 839 <view class="spec-cart-btns">
840 840
841 - <block wx:if="{{prom_act.buy_num!=0}}"> 841 +
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 - </block>  
845 - <block wx:else>  
846 - <view class="is_stock cart-btn is_stock fs28">  
847 - 库存不足  
848 - </view>  
849 - </block> 844 +
850 </view> 845 </view>
851 846
852 <view class="clear"></view> 847 <view class="clear"></view>
@@ -1063,7 +1058,7 @@ @@ -1063,7 +1058,7 @@
1063 <view class="mongolia-layer" bindtap="close_popup"></view> 1058 <view class="mongolia-layer" bindtap="close_popup"></view>
1064 <view class="popup-frame"> 1059 <view class="popup-frame">
1065 <block wx:if="{{sort_store==0}}"> 1060 <block wx:if="{{sort_store==0}}">
1066 - <!-- 头部 标题 --> 1061 + <!-- 头部 标题 -->
1067 <view class="popup-top flex-space-between"> 1062 <view class="popup-top flex-space-between">
1068 <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text> 1063 <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
1069 <view> 1064 <view>
pages/goods/goodsInfo/goodsInfo.wxss
@@ -734,7 +734,8 @@ left:31rpx;} @@ -734,7 +734,8 @@ 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; padding-right: 20rpx;font-size: 26rpx;color: #ea120f} 737 +.pding{padding-top: 20rpx;padding-left: 20rpx;height: 81%;
  738 + padding-right: 20rpx;font-size: 26rpx;color: #ea120f}
738 .pdres{margin-left: 10rpx;color: #8f8f94} 739 .pdres{margin-left: 10rpx;color: #8f8f94}
739 .ptgz{position: relative;font-size: 30rpx;padding-left: 20rpx;margin-top: 10rpx; overflow: hidden } 740 .ptgz{position: relative;font-size: 30rpx;padding-left: 20rpx;margin-top: 10rpx; overflow: hidden }
740 .shuxian{width: 6rpx;height: 28rpx; background: #ea120f; display: inline-block;top: 5rpx;position: relative; margin-right: 5rpx} 741 .shuxian{width: 6rpx;height: 28rpx; background: #ea120f; display: inline-block;top: 5rpx;position: relative; margin-right: 5rpx}
@@ -793,7 +794,7 @@ left:31rpx;} @@ -793,7 +794,7 @@ left:31rpx;}
793 .juzhong .xq .title .close{position: absolute;top: 0; right: 0; width: 45rpx; height: 45rpx;} 794 .juzhong .xq .title .close{position: absolute;top: 0; right: 0; width: 45rpx; height: 45rpx;}
794 795
795 .pt_qd{margin-top: 40rpx; height: auto;} 796 .pt_qd{margin-top: 40rpx; height: auto;}
796 -.spec-cart-btn.w100{width: 100%; margin-left: 0; height: 80rpx; line-height: 80rpx;} 797 +.spec-cart-btn.w100{width: 95%; margin-left: 0; height: 75rpx; line-height:75rpx;margin: auto; }
797 798
798 .sto_v{color: #333;} 799 .sto_v{color: #333;}
799 .ellipsis{overflow: hidden; white-space: nowrap; text-overflow: ellipsis;} 800 .ellipsis{overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}