|
|
@@ -129,25 +129,38 @@
|
|
|
<text class="small">x</text>{{ pros.num }}
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="floor-item-act" v-if="pros.productPromotion != null">
|
|
|
- <view v-if="PromotionsFormat(pros.productPromotion)" class="floor-tags">
|
|
|
- {{ pros.productPromotion.name }}
|
|
|
- <text
|
|
|
- v-if="
|
|
|
- pros.productPromotion != null &&
|
|
|
- pros.productPromotion.type != 3
|
|
|
- "
|
|
|
+ <view class="floor-item-act">
|
|
|
+ <template v-if="pros.productPromotion">
|
|
|
+ <view
|
|
|
+ v-if="PromotionsFormat(pros.productPromotion)"
|
|
|
+ class="floor-tags"
|
|
|
+ @click.stop="clickPopupShow(pros.productPromotion)"
|
|
|
>
|
|
|
- :￥{{
|
|
|
- pros.productPromotion == null
|
|
|
- ? '0.00'
|
|
|
- : pros.productPromotion.touchPrice | NumFormat
|
|
|
- }}
|
|
|
- </text>
|
|
|
- </view>
|
|
|
- <view v-else-if="pros.productPromotion.type != 3" class="floor-tags">{{
|
|
|
- pros.productPromotion.name
|
|
|
- }}</view>
|
|
|
+ {{ pros.productPromotion.name }}
|
|
|
+ <text v-if="pros.productPromotion != null && pros.productPromotion.type != 3">
|
|
|
+ :￥{{
|
|
|
+ pros.productPromotion == null
|
|
|
+ ? '0.00'
|
|
|
+ : pros.productPromotion.touchPrice | NumFormat
|
|
|
+ }}
|
|
|
+ </text>
|
|
|
+ </view>
|
|
|
+ <view
|
|
|
+ v-else-if="pros.productPromotion.type != 3"
|
|
|
+ class="floor-tags"
|
|
|
+ @click.stop="clickPopupShow(pros.productPromotion)"
|
|
|
+ >{{ pros.productPromotion.name }}</view
|
|
|
+ >
|
|
|
+ </template>
|
|
|
+ <template v-else>
|
|
|
+ <view class="svip-tags" v-if="pros.ladderPriceFlag == 1 && pros.productType ==0">
|
|
|
+ <view class="tags">SVIP</view> <view class="price">8折</view>
|
|
|
+ </view>
|
|
|
+ <view class="svip-tags" v-if="pros.ladderPriceFlag == 0 && pros.productType ==0">
|
|
|
+ <view class="tags">SVIP</view>
|
|
|
+ <view class="price">￥{{ pros.price | NumFormat }}</view>
|
|
|
+ </view>
|
|
|
+ </template>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -937,19 +950,6 @@ page {
|
|
|
float: left;
|
|
|
padding: 10rpx 0;
|
|
|
margin-right: 12rpx;
|
|
|
- .floor-tags {
|
|
|
- height: 28rpx;
|
|
|
- border-radius: 6rpx;
|
|
|
- background-color: #ffffff;
|
|
|
- line-height: 28rpx;
|
|
|
- color: $color-system;
|
|
|
- text-align: center;
|
|
|
- display: inline-block;
|
|
|
- padding: 0 16rpx;
|
|
|
- font-size: $font-size-20;
|
|
|
- border: 1px solid #e15616;
|
|
|
- float: left;
|
|
|
- }
|
|
|
}
|
|
|
.title-text {
|
|
|
width: 400rpx;
|
|
|
@@ -1038,19 +1038,6 @@ page {
|
|
|
box-sizing: border-box;
|
|
|
float: left;
|
|
|
padding: 0 0 10rpx 0;
|
|
|
- .floor-tags {
|
|
|
- height: 28rpx;
|
|
|
- border-radius: 6rpx;
|
|
|
- background-color: #ffffff;
|
|
|
- line-height: 28rpx;
|
|
|
- color: $color-system;
|
|
|
- text-align: center;
|
|
|
- display: inline-block;
|
|
|
- padding: 0 16rpx;
|
|
|
- font-size: $font-size-20;
|
|
|
- border: 1px solid #e15616;
|
|
|
- float: left;
|
|
|
- }
|
|
|
}
|
|
|
}
|
|
|
.order-footer {
|
