|
@@ -62,11 +62,16 @@
|
|
|
<!--使用过滤器对总价改变-->
|
|
|
<view
|
|
|
class="price"
|
|
|
- :class="PromotionsFormat(pros.promotions) ? 'disabled' : ''"
|
|
|
+ :class="
|
|
|
+ PromotionsFormat(pros.promotions) ||
|
|
|
+ (pros.svipProductFlag == 1 && vipFlag == 1)
|
|
|
+ ? 'disabled'
|
|
|
+ : ''
|
|
|
+ "
|
|
|
>
|
|
|
<text>¥</text>
|
|
|
{{
|
|
|
- (PromotionsFormat(pros.promotions)
|
|
|
+ (PromotionsFormat(pros.promotions) || pros.svipProductFlag == 1
|
|
|
? pros.originalPrice
|
|
|
: pros.price) | NumFormat
|
|
|
}}
|
|
@@ -105,7 +110,9 @@
|
|
|
@click.stop="clickPopupShow(pros, 1)"
|
|
|
>
|
|
|
{{ pros.promotions.name }}
|
|
|
- <text v-if="pros.promotions != null && pros.promotions.type != 3">
|
|
|
+ <text
|
|
|
+ v-if="pros.promotions != null && pros.promotions.type != 3"
|
|
|
+ >
|
|
|
:¥{{
|
|
|
pros.promotions == null
|
|
|
? '0.00'
|
|
@@ -129,11 +136,9 @@
|
|
|
<template v-if="pros.svipProductFlag == 1">
|
|
|
<view class="svip-tags">
|
|
|
<view class="tags" :class="{ none: vipFlag == 0 }">SVIP</view>
|
|
|
- <view
|
|
|
- class="price"
|
|
|
- v-if="isShowVipFlag(pros)"
|
|
|
- >{{ pros.svipPriceTag }}</view
|
|
|
- >
|
|
|
+ <view class="price" v-if="isShowVipFlag(pros)">{{
|
|
|
+ pros.svipPriceTag
|
|
|
+ }}</view>
|
|
|
</view>
|
|
|
</template>
|
|
|
</view>
|
|
@@ -305,8 +310,8 @@ export default {
|
|
|
depositIds: [6060, 6061, 6062, 6063, 6064], //定金商品ID
|
|
|
rechargeIds: [6065, 6066, 6067, 6068, 6069], //充值余额商品ID
|
|
|
isIphoneX: this.$store.state.isIphoneX,
|
|
|
- vipFlag:0,
|
|
|
- userIdentity:0
|
|
|
+ vipFlag: 0,
|
|
|
+ userIdentity: 0
|
|
|
}
|
|
|
},
|
|
|
onLoad() {
|
|
@@ -345,8 +350,8 @@ export default {
|
|
|
this.submitIds = []
|
|
|
this.vipFlag = clubInfo.vipFlag ? clubInfo.vipFlag : 0
|
|
|
this.userIdentity = clubInfo.userIdentity ? clubInfo.userIdentity : 0
|
|
|
- console.log('userIdentity',this.userIdentity)
|
|
|
- console.log('vipFlag',this.vipFlag)
|
|
|
+ console.log('userIdentity', this.userIdentity)
|
|
|
+ console.log('vipFlag', this.vipFlag)
|
|
|
this.listQuery.clubId = clubInfo.clubId ? clubInfo.clubId : 0
|
|
|
this.listQuery.againBuyProductIds = clubInfo.againBuyProductIds ? clubInfo.againBuyProductIds : ''
|
|
|
this.listQuery.serviceProviderId = userInfo.serviceProviderId ? userInfo.serviceProviderId : 0
|
|
@@ -971,15 +976,15 @@ export default {
|
|
|
this.isModallayer = true
|
|
|
this.$api.navigateTo(`/pages/goods/product?id=${id}`)
|
|
|
},
|
|
|
- isShowVipFlag(pros){
|
|
|
- if(pros.priceFlag!=1){
|
|
|
- if(this.userIdentity == 4 && this.vipFlag == 1){
|
|
|
+ isShowVipFlag(pros) {
|
|
|
+ if (pros.priceFlag != 1) {
|
|
|
+ if (this.userIdentity == 4 && this.vipFlag == 1) {
|
|
|
return true
|
|
|
- }else if(this.userIdentity == 2){
|
|
|
+ } else if (this.userIdentity == 2) {
|
|
|
return true
|
|
|
}
|
|
|
}
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
onReachBottom() {
|
|
|
if (this.hasNextPage) {
|