From 4e986993ece3525b26a45e3c2052bf9cce7092db Mon Sep 17 00:00:00 2001
From: cheng.xu <cheng.xu@meidd.com>
Date: Mon, 14 Oct 2019 09:55:03 +0800
Subject: [PATCH] 秒杀拼单

---
 pages/goods/goodsInfo/goodsInfo.js   |  7 ++-----
 pages/goods/goodsInfo/goodsInfo.wxml | 11 +++--------
 pages/goods/goodsInfo/goodsInfo.wxss |  5 +++--
 3 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 8e80987..163eec6 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -1453,7 +1453,7 @@ Page({
                 var t_gd = ee.data.data;
                 var prom_end_time = ut.formatTime(t.data.data.end_time, "yyyy-MM-dd hh:mm:ss");
                 var prom_start_time = ut.formatTime(t.data.data.start_time, "yyyy-MM-dd hh:mm:ss");
-
+                
                 ee.setData({
                   prom_price: t.data.data.price,
                   prom_type: 1,
@@ -2766,9 +2766,6 @@ Page({
      }
    })
    }
-   else{
-     th.get_sto();
-   }
    this.setData({
      //open_ind_store: ind,
      store:1,
@@ -2816,7 +2813,7 @@ close_popup:function(e){
       var openindstore = e.currentTarget.dataset.openindstore;
 
       if(th.data.choice_sort_store==0 ){
-          var index=th.data.fir_pick_index;
+           var index=th.data.fir_pick_index;
           if(th.data.is_show_sto_cat==1){
               item=th.data.def_pickpu_list[index];
           }else{
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 42eb52f..a532d05 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -838,15 +838,10 @@
       </view>
        <view class="spec-cart-btns">
    
-      <block wx:if="{{prom_act.buy_num!=0}}">
+    
         <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>
         <view wx:if="{{openSpecModal_ind==2}}" bindtap="addCart"data-openSpecModal_ind="{{openSpecModal_ind}}" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view>
-      </block>
-      <block wx:else>
-      <view class="is_stock cart-btn is_stock fs28">
-      库存不足
-      </view>
-      </block>
+    
     </view>
 
       <view class="clear"></view>
@@ -1063,7 +1058,7 @@
   <view class="mongolia-layer" bindtap="close_popup"></view>
   <view class="popup-frame">
   <block  wx:if="{{sort_store==0}}">
-      <!-- 头部 标题 -->
+  <!-- 头部 标题 -->
      <view class="popup-top flex-space-between">
        <text class="fs32 nearby_store">{{choice_sort_store==0?'附近的门店':region_name}}</text>
         <view>
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 1c58dcd..5b5b5e8 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -734,7 +734,8 @@ left:31rpx;}
 
 .pt_fir .pt_fir_title .js{padding: 0 15rpx;height: 40rpx;background:#e9030d; text-align: center; border-radius: 8rpx; color: #fff; margin-left: 10rpx;}
 .pt_fir .pt_fir_title .tuannum{color: #e9030d; position: absolute; right: 20rpx; font-size: 26rpx;}
-.pding{padding-top: 20rpx;padding-left: 20rpx; padding-right: 20rpx;font-size: 26rpx;color: #ea120f}
+.pding{padding-top: 20rpx;padding-left: 20rpx;height: 81%;
+ padding-right: 20rpx;font-size: 26rpx;color: #ea120f}
 .pdres{margin-left: 10rpx;color: #8f8f94}
 .ptgz{position: relative;font-size: 30rpx;padding-left: 20rpx;margin-top: 10rpx; overflow: hidden }
 .shuxian{width: 6rpx;height: 28rpx; background: #ea120f; display: inline-block;top: 5rpx;position: relative; margin-right: 5rpx}
@@ -793,7 +794,7 @@ left:31rpx;}
 .juzhong .xq .title .close{position: absolute;top: 0; right: 0; width: 45rpx; height: 45rpx;}
 
 .pt_qd{margin-top: 40rpx; height: auto;}
-.spec-cart-btn.w100{width: 100%; margin-left: 0; height: 80rpx; line-height: 80rpx;}
+.spec-cart-btn.w100{width: 95%; margin-left: 0; height: 75rpx; line-height:75rpx;margin: auto; }
 
 .sto_v{color: #333;}
 .ellipsis{overflow: hidden; white-space: nowrap; text-overflow: ellipsis;}
--
libgit2 0.21.4