Browse Source

Merge branch 'developerC' into developerA

# Conflicts:
#	pages/seller/cart/cart.vue
zhengjinyi 3 years ago
parent
commit
c7433eceba
1 changed files with 37 additions and 38 deletions
  1. 37 38
      pages/seller/cart/cart.vue

+ 37 - 38
pages/seller/cart/cart.vue

@@ -99,44 +99,43 @@
 											</view>
 											<view class="floor-item-act">
 												<template v-if="pros.actStatus == 1 && pros.promotions">
-													<view
-														v-if="PromotionsFormat(pros.promotions)"
-														class="floor-tags"
-														@click.stop="clickPopupShow(pros, 1)"
-													>
-														{{ pros.promotions.name }}
-														<text v-if="pros.promotions != null && pros.promotions.type != 3">
-															:¥{{
-																pros.promotions == null
-																	? '0.00'
-																	: pros.promotions.touchPrice | NumFormat
-															}}
-														</text>
-													</view>
-													<view
-														v-else-if="pros.promotions.type != 3"
-														class="floor-tags"
-														@click.stop="clickPopupShow(pros, 2)"
-													>
-														{{ pros.promotions.name }}
-													</view>
-												</template>
-												<template v-if="pros.actStatus == null && pros.ladderFlag == 1">
-													<view class="floor-tags" @click.stop="clickPopupShow(pros, 2)"
-														>阶梯价格</view
-													>
-												</template>
-												<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>
-												</template>
-											</view>
+                                                <view
+                                                    v-if="PromotionsFormat(pros.promotions)"
+                                                    class="floor-tags"
+                                                    @click.stop="clickPopupShow(pros, 1)"
+                                                >
+                                                    {{ pros.promotions.name }}
+                                                    <text v-if="pros.promotions != null && pros.promotions.type != 3">
+                                                        :¥{{
+                                                            pros.promotions == null
+                                                                ? '0.00'
+                                                                : pros.promotions.touchPrice | NumFormat
+                                                        }}
+                                                    </text>
+                                                </view>
+                                                <view
+                                                    v-else-if="pros.promotions.type != 3"
+                                                    class="floor-tags"
+                                                    @click.stop="clickPopupShow(pros, 2)"
+                                                >
+                                                    {{ pros.promotions.name }}
+                                                </view>
+                                            </template>
+                                            <template v-if="pros.actStatus == null && pros.ladderFlag == 1">
+                                                <view class="floor-tags" @click.stop="clickPopupShow(pros, 2)"
+                                                    >阶梯价格</view
+                                                >
+                                            </template>
+                                            <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>
+                                            </template>
 										</view>
 									</view>
 								</view>