Commit 123f736e92ff86bf24786b4e07e5dd42e2841fea
1 parent
0c69980f
小程序商品详情
Showing
1 changed file
with
7 additions
and
5 deletions
pages/goods/goodsInfo/goodsInfo.wxml
| @@ -325,6 +325,9 @@ | @@ -325,6 +325,9 @@ | ||
| 325 | </view> | 325 | </view> |
| 326 | <!-- 不是拼团，不是积分购 --> | 326 | <!-- 不是拼团，不是积分购 --> |
| 327 | <block wx:if="{{prom_type!=6 && prom_type!=4}}"> | 327 | <block wx:if="{{prom_type!=6 && prom_type!=4}}"> |
| 328 | + | ||
| 329 | + | ||
| 330 | + | ||
| 328 | <view class="goods-price"> | 331 | <view class="goods-price"> |
| 329 | <view class="flex jc_sb"> | 332 | <view class="flex jc_sb"> |
| 330 | <view class="co-red" style="" wx:if="{{prom_type==0 || prom_type==3}}"> | 333 | <view class="co-red" style="" wx:if="{{prom_type==0 || prom_type==3}}"> |
| @@ -360,7 +363,8 @@ | @@ -360,7 +363,8 @@ | ||
| 360 | </view> | 363 | </view> |
| 361 | <!-- 不是秒杀 --> | 364 | <!-- 不是秒杀 --> |
| 362 | <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 --> | 365 | <!-- 等级卡的价格,不是等级卡会员，且商品又有设置等级级价，商家后台有开通升级卡同能 --> |
| 363 | - <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && card_list && card_list.length>0}}"> | 366 | + <view class="flex ai_and" wx:if="{{!card_field && g_filters.is_has_rank(rank_switch,data) && prom_type!=1 && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}"> |
| 367 | + | ||
| 364 | <view class="flex ai-center grade-card-frame card-frame"> | 368 | <view class="flex ai-center grade-card-frame card-frame"> |
| 365 | <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> | 369 | <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image> |
| 366 | <view class="fs24 white view card-name ellipsis-1"> | 370 | <view class="fs24 white view card-name ellipsis-1"> |
| @@ -374,7 +378,7 @@ | @@ -374,7 +378,7 @@ | ||
| 374 | <!-- 等级卡的显示,购买, 等级卡近30天要显示续费 --> | 378 | <!-- 等级卡的显示,购买, 等级卡近30天要显示续费 --> |
| 375 | <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}"> | 379 | <block wx:if="{{g_filters.is_has_rank(rank_switch,data)}}"> |
| 376 | <!-- 不是秒杀，且会员不是等级会员 --> | 380 | <!-- 不是秒杀，且会员不是等级会员 --> |
| 377 | - <view wx:if="{{!card_field && prom_type!=1 && card_list && card_list.length>0}}"> | 381 | + <view wx:if="{{!card_field && prom_type!=1 && card_list && card_list.length>0 && g_filters.get_card_price(data,card_list,1)!=''}}"> |
| 378 | <view class="beauty-makeup-frame flex ai-center"> | 382 | <view class="beauty-makeup-frame flex ai-center"> |
| 379 | <view class="left flex ai-center jc_sa"> | 383 | <view class="left flex ai-center jc_sa"> |
| 380 | <view class="flex ai-center grade-card-frame card-frame advert-card"> | 384 | <view class="flex ai-center grade-card-frame card-frame advert-card"> |
| @@ -570,9 +574,7 @@ | @@ -570,9 +574,7 @@ | ||
| 570 | </view> | 574 | </view> |
| 571 | </view> | 575 | </view> |
| 572 | </block> | 576 | </block> |
| 573 | - | ||
| 574 | - | ||
| 575 | - | 577 | + |
| 576 | <!-- 要判断是不是有订单优惠 --> | 578 | <!-- 要判断是不是有订单优惠 --> |
| 577 | <block wx:if="{{order_prom}}"> | 579 | <block wx:if="{{order_prom}}"> |
| 578 | <view class="cx-frame flex" style="position: relative; height: auto"> | 580 | <view class="cx-frame flex" style="position: relative; height: auto"> |