Commit b6eb5aeb37be11720d268ae55701d5ca45261925

Authored by yvan.ni
1 parent 98d92dc2

1、幸运购要显示购买按钮

2、预售的虚拟销量的由阿胡
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -911,7 +911,7 @@ @@ -911,7 +911,7 @@
911 <!-- 普通商品购买 --> 911 <!-- 普通商品购买 -->
912 <block> 912 <block>
913 <!-- 线上销售的时候,要判断库存量, 线下库存的时候不用判断 --> 913 <!-- 线上销售的时候,要判断库存量, 线下库存的时候不用判断 -->
914 - <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}"> 914 + <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules>=2 }}">
915 <view class="btn-container f1"> 915 <view class="btn-container f1">
916 <view bindtap="openSpecModel_pt" data-ind="1" data-it="1" class="btn-yellow flex f1 fdc jc-center"> 916 <view bindtap="openSpecModel_pt" data-ind="1" data-it="1" class="btn-yellow flex f1 fdc jc-center">
917 <view class="lh1"> 917 <view class="lh1">
packageC/pages/presell/goodsInfo/goodsInfo.wxml
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
132 <view class="stock" style="color:#999">尾款:{{filters.format_time(presellForm.pay_begindate,1)}}-{{filters.format_time(presellForm.pay_enddate,1)}}</view> 132 <view class="stock" style="color:#999">尾款:{{filters.format_time(presellForm.pay_begindate,1)}}-{{filters.format_time(presellForm.pay_enddate,1)}}</view>
133 </view> 133 </view>
134 <view class="goods-num"> 134 <view class="goods-num">
135 - <block wx:if="{{presellList.virtual_qty}}"> 135 + <block wx:if="{{presellList.virtual_qty && type !=0}}">
136 <view class="stock">总数量:{{presellList.presell_sumqty+presellList.virtual_qty}}件</view> 136 <view class="stock">总数量:{{presellList.presell_sumqty+presellList.virtual_qty}}件</view>
137 <view class="stock" wx:if="{{presellList.vip_butyqty}}">限购:{{presellList.vip_butyqty}}件</view> 137 <view class="stock" wx:if="{{presellList.vip_butyqty}}">限购:{{presellList.vip_butyqty}}件</view>
138 <view class="stock" wx:else>限购:不限</view> 138 <view class="stock" wx:else>限购:不限</view>
pages/goods/goodsInfo/goodsInfo.wxml
@@ -1552,7 +1552,7 @@ @@ -1552,7 +1552,7 @@
1552 <view class="flex-vertical-between butttem5"> 1552 <view class="flex-vertical-between butttem5">
1553 <view class="flex xc-ash"> 1553 <view class="flex xc-ash">
1554 <view class="fs30 xc-black3 address_name">{{item.pickup_name}} 1554 <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
1555 - <text class="c-red2" wx:if="{{item.is_no_qyt}}">(无货)</text> 1555 + <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
1556 </view> 1556 </view>
1557 </view> 1557 </view>
1558 <view> 1558 <view>
@@ -1580,7 +1580,7 @@ @@ -1580,7 +1580,7 @@
1580 <view class="flex-vertical-between "> 1580 <view class="flex-vertical-between ">
1581 <view class="flex xc-ash"> 1581 <view class="flex xc-ash">
1582 <view class="fs30 xc-black3 address_name">{{item.pickup_name}} 1582 <view class="fs30 xc-black3 address_name">{{item.pickup_name}}
1583 - <text class="c-red2" wx:if="{{item.is_no_qyt}}">(无货)</text> 1583 + <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
1584 </view> 1584 </view>
1585 </view> 1585 </view>
1586 <view> 1586 <view>
@@ -1610,7 +1610,7 @@ @@ -1610,7 +1610,7 @@
1610 <view class="flex-vertical-between "> 1610 <view class="flex-vertical-between ">
1611 <view class="flex xc-ash"> 1611 <view class="flex xc-ash">
1612 <view class="fs28 xc-black3 address_name">{{item.pickup_name}} 1612 <view class="fs28 xc-black3 address_name">{{item.pickup_name}}
1613 - <text class="c-red2" wx:if="{{item.is_no_qyt}}">(无货)</text> 1613 + <text class="c-red22" wx:if="{{item.is_no_qyt}}">(库存不足)</text>
1614 </view> 1614 </view>
1615 </view> 1615 </view>
1616 <view> 1616 <view>
pages/goods/goodsInfo/goodsInfo.wxss
@@ -3649,11 +3649,12 @@ button.custom-service::after { @@ -3649,11 +3649,12 @@ button.custom-service::after {
3649 border: 0; 3649 border: 0;
3650 } 3650 }
3651 3651
3652 -.no_store { 3652 +.no_store,.c-red22 {
3653 color: #d60021; 3653 color: #d60021;
3654 font-size: 26rpx; 3654 font-size: 26rpx;
3655 } 3655 }
3656 3656
  3657 +
3657 .cx_show_view { 3658 .cx_show_view {
3658 width: 580rpx; 3659 width: 580rpx;
3659 /* line-height: 30rpx; margin-bottom: 6rpx; */ 3660 /* line-height: 30rpx; margin-bottom: 6rpx; */