|
|
@@ -37,8 +37,9 @@
|
|
|
<view class="productspec">规格:{{pros.unit ? pros.unit : ''}}</view>
|
|
|
<view class="productprice">
|
|
|
<!--使用过滤器对总价改变-->
|
|
|
- <view class="price" :class="[pros.validFlag == 3 || pros.promotions.type == 1 && pros.promotions.mode == 1 ?'disabled' : '']">
|
|
|
- <text :class="[pros.validFlag == 3 || pros.promotions.type == 1 && pros.promotions.mode == 1 ?'disabled' : 'money-sign']">￥</text>
|
|
|
+ <view class="price"
|
|
|
+ :class="[pros.validFlag == 3 || promotionsFn(pros.promotions) ?'disabled' : '']">
|
|
|
+ <text :class="[pros.validFlag == 3 || promotionsFn(pros.promotions) ?'disabled' : 'money-sign']">￥</text>
|
|
|
{{pros.price | NumFormat}}
|
|
|
</view>
|
|
|
<view class="count" v-if="pros.validFlag == 2" :class="[isshowDelbtn ? 'none':'show']">
|
|
|
@@ -52,7 +53,7 @@
|
|
|
</view>
|
|
|
</view>
|
|
|
<view v-show="pros.actStatus==1" class="floor-item-act">
|
|
|
- <view v-if="pros.promotions.type == 1 && pros.promotions.mode == 1" class="floor-tags" @click.stop="clickPopupShow(pros,1)">
|
|
|
+ <view v-if="promotionsFn(pros.promotions)" class="floor-tags" @click.stop="clickPopupShow(pros,1)">
|
|
|
{{pros.promotions.name}}
|
|
|
<text v-if ="pros.promotions!=null">
|
|
|
:￥{{ pros.promotions == null ? '0.00' : pros.promotions.touchPrice | NumFormat}}
|
|
|
@@ -732,6 +733,16 @@
|
|
|
},
|
|
|
})
|
|
|
return systeminfo
|
|
|
+ },
|
|
|
+ promotionsFn(promo){//处理数据
|
|
|
+ if(promo!=null){
|
|
|
+ if(promo.type == 1 && promo.mode == 1){
|
|
|
+ return true
|
|
|
+ }else{
|
|
|
+ return false
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return false
|
|
|
}
|
|
|
},
|
|
|
watch:{//深度监听所有数据，每次改变重新计算总价和总数
|
|
|
@@ -962,6 +973,7 @@
|
|
|
.productprice{
|
|
|
width: 100%;
|
|
|
height: 48rpx;
|
|
|
+ margin: 10rpx 0;
|
|
|
.price{
|
|
|
line-height: 48rpx;
|
|
|
font-size: $font-size-28;
|
