虚拟商品的优化

yvan.ni
1 parent d01195f1
Showing 9 changed files with 54 additions and 31 deletions
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/presell/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/buy_com_pop.wxml
pages/goods/goodsInfo/buy_integral.wxml
pages/goods/goodsInfo/buy_pt.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
utils/filter.wxs
@@ -3218,7 +3218,7 @@ Page({
           //--获取线下库存,而且不是新的门店规则, 同时是普通购买的时候，或者同时不能是活动，秒杀，拼团，积分购--
           if (!getApp().is_virtual(th.data.sele_g) && !th.data.sele_g.whsle_id &&
-              th.data.sales_rules >= 2 && !th.data.is_newsales_rules && ([1,2,4,6,8,9].indexOf(th.data.prom_type)== -1 || is_normal == 1) {
+              th.data.sales_rules >= 2 && !th.data.is_newsales_rules && ([1,2,4,6,8,9].indexOf(th.data.prom_type)== -1 || is_normal == 1)) {
             setTimeout(function () {
               th.deal_pickup_dline(e);
             }, 800)
@@ -436,7 +436,8 @@
                   <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
                     (配送不匹配)
                   </view>
-                  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && prom_type==0}}">
+                  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty
+                        && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">
                     (库存不足)
                   </view>
                 </block>
@@ -1064,12 +1065,17 @@
           <block wx:if="{{prom_type == 0}}">
             <view class="flex">
               <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
+              <!-- 线下门店销售的时候 -->
               <block wx:if="{{sales_rules>=2}}">
-                <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">
-                  可售：{{def_pick_store.CanOutQty}}
-                </view>
-                <view class="spec-goods-stock" wx:else>可售:0</view>
+
+                <block wx:if="{{!filters.is_virtual_gd(sele_g.is_virtual)}}">
+                  <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">
+                    可售：{{def_pick_store.CanOutQty}}
+                  </view>
+                  <view class="spec-goods-stock" wx:else>可售:0</view>
+                </block>
               </block>
+
               <block wx:else>
                 <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
               </block>
@@ -1105,7 +1111,7 @@
           <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
           <block wx:else>
             <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && prom_type==0}}">
+            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">
               (库存不足)
             </view>
           </block>
@@ -1177,7 +1183,7 @@
               </block>
               <block wx:else>
                 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
-                <block wx:if="{{sales_rules>=2 && prom_type==0}}">
+                <block wx:if="{{!filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0}}">
                   <block wx:if="{{!def_pick_store.CanOutQty}}">
                     <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                       库存不足
@@ -194,7 +194,8 @@
                 <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
                   (配送不匹配2)
                 </view>
-                <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">
+                <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty
+                       && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">
                   (库存不足)
                 </view>
               </block>
@@ -630,7 +631,8 @@
           <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
           <block wx:else>
             <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配1)</view>
-            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">
+            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty
+                 && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">
               (库存不足)
             </view>
           </block>
@@ -13,10 +13,14 @@
         <view class="flex">
             <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
             <block wx:if="{{sales_rules>=2}}">
-                <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">
-                    可售：{{def_pick_store.CanOutQty}}
-                </view>
-                <view class="spec-goods-stock" wx:else>可售:0</view>
+
+                <block wx:if="{{!filters.is_virtual_gd(sele_g.is_virtual)}}">
+                    <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">
+                        可售：{{def_pick_store.CanOutQty}}
+                    </view>
+                    <view class="spec-goods-stock" wx:else>可售:0</view>
+                </block>
+
             </block>
             <block wx:else>
                 <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
@@ -53,7 +57,7 @@
         <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
         <block wx:else>
             <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2}}">
+            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules>=2 && !filters.is_virtual_gd(sele_g.is_virtual)  }}">
                 (库存不足)
             </view>
         </block>
@@ -136,7 +140,7 @@
                         </view>
                     </block>
                     <block wx:else>
-                        <block wx:if="{{sales_rules>=2  && !sele_g.whsle_id}}">
+                        <block wx:if="{{sales_rules>=2  && !sele_g.whsle_id && !filters.is_virtual_gd(sele_g.is_virtual) }}">
                             <view wx:if="{{!def_pick_store.CanOutQty}}" class="spec-cart-btn fs32" data-action="add"
                                   style="background-color: #dcdcdc;color: #999">库存不足
                             </view>
@@ -28,7 +28,7 @@
 		                           <view class="flex ai_end" wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
 		                             <text class="fs30 xc-black3 shop_name">{{def_pick_store.pickup_name}}</text>
-		                               <view class="distance fs24 xc-ash"wx:if="{{def_pick_store.distance!=null}}">
+		                               <view class="distance fs24 xc-ash" wx:if="{{def_pick_store.distance!=null}}">
 		                                距离:{{def_pick_store.distance>1000?filters.toFix(def_pick_store.distance/1000,2)+"km":filters.toFix(def_pick_store.distance,0)+"m"}}
 		                                </view>
@@ -47,11 +47,11 @@
 		      				         <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
 		      						 <block wx:else>
 										  <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-		      					     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0}}">(库存不足)</view>
+		      					     	  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && prom_type==0}}">(库存不足)</view>
 		      						 </block>				       
 		      				   </block>
-		                         <view class="fs24 xc-ash-9f xc-distance-top "wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
+		                         <view class="fs24 xc-ash-9f xc-distance-top " wx:if="{{def_pick_store && def_pick_store.fulladdress}}">地址:{{def_pick_store.fulladdress}}</view>
 		              <!--商品的属性项目-->
@@ -71,7 +71,7 @@
               <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
               <block wx:else>
                   <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-                  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && is_normal}}">(库存不足)</view>
+                  <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual)  && sales_rules>=2 && is_normal}}">(库存不足)</view>
               </block>
           </block>
@@ -6897,7 +6897,7 @@ Page({
     var lock = 0;
     //---如果是活动的时候,同时不是普通购买---
-    if (th.data.sele_g.whsle_id || [1, 2, 4, 6, 8, 9].indexOf(th.data.prom_type) > -1 && !th.data.is_normal) {
+    if (getApp().is_virtual(th.data.sele_g) || th.data.sele_g.whsle_id || ([1, 2, 4, 6, 8, 9].indexOf(th.data.prom_type) > -1 && !th.data.is_normal)) {
       func();
       return false;
     }
@@ -681,7 +681,7 @@
                   <view class="no_store" wx:if="{{def_pick_store && def_pick_store.is_no_dis}}">
                     (配送不匹配)
                   </view>
-                  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0 && !sele_g.whsle_id}}">
+                  <view class="no_store" wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0 && !sele_g.whsle_id}}">
                     (库存不足)
                   </view>
                 </block>
@@ -1261,12 +1261,19 @@
           <block wx:if="{{prom_type==0}}">
             <view class="flex">
               <view class="spec-goods-stock">已售：{{sele_g.sales_sum}}</view>
+              <!-- 线下门店销售的时候 -->
               <block wx:if="{{sales_rules>=2}}">
-                <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">
-                  可售：{{def_pick_store.CanOutQty}}
-                </view>
-                <view class="spec-goods-stock" wx:else>可售:0</view>
+
+                <!-- 如果不是虚拟商品的时候 -->
+                <block wx:if="{{!filters.is_virtual_gd(sele_g.is_virtual)}}">
+                  <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">
+                    可售：{{def_pick_store.CanOutQty}}
+                  </view>
+                  <view class="spec-goods-stock" wx:else>可售:0</view>
+                </block>
+
               </block>
+
               <block wx:else>
                 <view class="spec-goods-stock">可售：{{sele_g.store_count}}</view>
               </block>
@@ -1311,7 +1318,7 @@
           <view wx:if="{{def_pickpu_list && !def_pickpu_list.length}}">(库存不足)</view>
           <block wx:else>
             <view class="no_store" wx:if="{{def_pick_store.is_no_dis}}">(配送不匹配)</view>
-            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && sales_rules==2 && prom_type==0 &&!sele_g.whsle_id}}">
+            <view wx:elif="{{def_pick_store && !def_pick_store.CanOutQty && !filters.is_virtual_gd(sele_g.is_virtual) && sales_rules>=2 && prom_type==0 &&!sele_g.whsle_id && !filters.is_virtual_gd(sele_g)}}">
               (库存不足)
             </view>
           </block>
@@ -1391,7 +1398,7 @@
               </block>
               <block wx:else>
                 <!-- 如果是线下库存购买的时候,且是普通商品购买的时候 -->
-                <block wx:if="{{sales_rules>=2 && prom_type==0 && !sele_g.whsle_id}}">
+                <block wx:if="{{sales_rules>=2 && prom_type==0 && !sele_g.whsle_id && !filters.is_virtual_gd(sele_g.is_virtual) }}">
                   <block wx:if="{{!def_pick_store.CanOutQty}}">
                     <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">
                       库存不足
@@ -1607,7 +1614,7 @@
                   <view class="flex-vertical-between butttem5">
                     <view class="flex xc-ash">
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
-                        <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
+                        <text class="c-red22" wx:if="{{item.is_no_qyt && !filters.is_virtual_gd(sele_g.is_virtual)}}">(库存不足)</text>
                       </view>
                     </view>
                     <view>
@@ -1635,7 +1642,7 @@
                   <view class="flex-vertical-between ">
                     <view class="flex xc-ash">
                       <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
-                        <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
+                        <text class="c-red22" wx:if="{{item.is_no_qyt && !filters.is_virtual_gd(sele_g.is_virtual) }}">(库存不足)</text>
                       </view>
                     </view>
                     <view>
@@ -1665,7 +1672,7 @@
                 <view class="flex-vertical-between ">
                   <view class="flex xc-ash">
                     <view class="fs28 xc-black3 address_name">{{item.pickup_name}}
-                      <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
+                      <text class="c-red22" wx:if="{{item.is_no_qyt && !filters.is_virtual_gd(sele_g.is_virtual)}}">(库存不足)</text>
                     </view>
                   </view>
                   <view>
@@ -289,4 +289,8 @@ module.exports = {
 	isExpired: filters.isExpired,
 	gettimestamp: filters.gettimestamp,
 	showStartAndEndDate: filters.showStartAndEndDate,
+	is_virtual_gd:function (is_virtual){
+         if(is_virtual==2) return true;
+		 return false;
+	}
 }
 \ No newline at end of file