Commit d2da33ba078dd0d246e4f045112e8169491ba24a
1 parent
a49bbccb
商品列表的优化
Showing
4 changed files
with
8 additions
and
8 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
| ... | ... | @@ -523,7 +523,7 @@ |
| 523 | 523 | <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> |
| 524 | 524 | <!--如果有显示价格 --> |
| 525 | 525 | <view class='zs_wz2' wx:if="{{object.goodsprice}}"> |
| 526 | - <block wx:if="{{item.prom_price || item.prom_integral}}"> | |
| 526 | + <block wx:if="{{(item.prom_price && item.prom_type!=3 && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10) || item.prom_integral}}"> | |
| 527 | 527 | <view class='wz_red'> |
| 528 | 528 | <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> |
| 529 | 529 | <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> |
| ... | ... | @@ -693,7 +693,7 @@ |
| 693 | 693 | <view class='zs_wz1_2l ellipsis-2' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> |
| 694 | 694 | <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> |
| 695 | 695 | |
| 696 | - <block wx:if="{{item.prom_price || item.prom_integral}}"> | |
| 696 | + <block wx:if="{{(item.prom_price && item.prom_type!=3 && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10) || item.prom_integral}}"> | |
| 697 | 697 | <view class='wz_red'> |
| 698 | 698 | <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> |
| 699 | 699 | <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> |
| ... | ... | @@ -862,7 +862,7 @@ |
| 862 | 862 | |
| 863 | 863 | <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> |
| 864 | 864 | <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> |
| 865 | - <block wx:if="{{item.prom_price || item.prom_integral}}"> | |
| 865 | + <block wx:if="{{(item.prom_price && item.prom_type!=3 && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10) || item.prom_integral}}"> | |
| 866 | 866 | <view class='wz_red'> |
| 867 | 867 | <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> |
| 868 | 868 | <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> |
| ... | ... | @@ -1033,7 +1033,7 @@ |
| 1033 | 1033 | <view class='zs_wz1_x ellipsis-2' style="width: 360rpx; margin-top: 10rpx" wx:if="{{object.goodstit}}">{{item.goods_name}}</view> |
| 1034 | 1034 | <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> |
| 1035 | 1035 | |
| 1036 | - <block wx:if="{{item.prom_price || item.prom_integral}}"> | |
| 1036 | + <block wx:if="{{(item.prom_price && item.prom_type!=3 && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10) || item.prom_integral}}"> | |
| 1037 | 1037 | <view class='wz_red'> |
| 1038 | 1038 | <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> |
| 1039 | 1039 | <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> |
| ... | ... | @@ -1224,7 +1224,7 @@ |
| 1224 | 1224 | <view class='sp_wz'> |
| 1225 | 1225 | <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{aitem.goods_name}}</view> |
| 1226 | 1226 | <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> |
| 1227 | - <block wx:if="{{aitem.prom_price || aitem.prom_integral }}"> | |
| 1227 | + <block wx:if="{{(aitem.prom_price && aitem.prom_type!=3 && aitem.prom_type!=5 && aitem.prom_type!=7 && aitem.prom_type!=10) || aitem.prom_integral }}"> | |
| 1228 | 1228 | <view class='wz_red'> |
| 1229 | 1229 | <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}</text> |
| 1230 | 1230 | <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text> | ... | ... |
components/goods_list/goods_list.wxml
| ... | ... | @@ -15,7 +15,7 @@ |
| 15 | 15 | <!-- 商品名称 --> |
| 16 | 16 | <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view> |
| 17 | 17 | <!-- 判断是否有活动价 --> |
| 18 | - <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10}}"> | |
| 18 | + <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=3 && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10 }}"> | |
| 19 | 19 | <view class="pdt10"> |
| 20 | 20 | <view class="money flex xc-wc" style="line-height:28rpx"> |
| 21 | 21 | <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text> | ... | ... |
pages/goods/goodsList/goodsList.wxml
| ... | ... | @@ -88,7 +88,7 @@ |
| 88 | 88 | <view class="item-cont"> |
| 89 | 89 | <view class="title ellipsis-2">{{item.goods_name}}</view> |
| 90 | 90 | <!-- 判断是否有活动价 --> |
| 91 | - <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10 }}"> | |
| 91 | + <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=3 && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10 }}"> | |
| 92 | 92 | <view class="flex on"> |
| 93 | 93 | <!-- 活动价 --> |
| 94 | 94 | <view class="price"> | ... | ... |
pages/goods/search/search.wxml
| ... | ... | @@ -87,7 +87,7 @@ |
| 87 | 87 | <view class="item-cont"> |
| 88 | 88 | <view class="title ellipsis-2">{{item.goods_name}}</view> |
| 89 | 89 | <!-- 判断是否有活动价，小程序没有有团购和拼单 --> |
| 90 | - <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10}}"> | |
| 90 | + <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0 && item.prom_type!=3 && item.prom_type!=5 && item.prom_type!=7 && item.prom_type!=10}}"> | |
| 91 | 91 | <!-- 活动价 --> |
| 92 | 92 | <view class="price"> |
| 93 | 93 | <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | ... | ... |