浏览代码

【代码优化】商城装修:修复布局为单列小图时价格显示方式不正确的问题

puhui999 10 月之前
父节点
当前提交
4cdb595a2a
共有 2 个文件被更改,包括 15 次插入19 次删除
  1. 1 1
      sheep/components/s-block-item/s-block-item.vue
  2. 14 18
      sheep/components/s-goods-column/s-goods-column.vue

+ 1 - 1
sheep/components/s-block-item/s-block-item.vue

@@ -39,7 +39,7 @@
     <s-groupon-block v-if="type === 'PromotionCombination'" :data="data" :styles="styles" />
     <!-- 营销组件:秒杀 -->
     <s-seckill-block v-if="type === 'PromotionSeckill'" :data="data" :styles="styles" />
-    <!-- 营销组件:积分商城(模式不一样,无法适配) -->
+    <!-- 营销组件:积分商城 -->
     <s-point-block v-if="type === 'PromotionPoint'" :data="data" :styles="styles" />
     <!-- 营销组件:小程序直播(暂时没有这个功能) -->
     <s-live-block v-if="type === 'MpLive'" :data="data" :styles="styles" />

+ 14 - 18
sheep/components/s-goods-column/s-goods-column.vue

@@ -254,36 +254,32 @@
               {{ item }}
             </view>
           </view>
-          <view class="ss-flex ss-col-bottom ss-m-t-10">
-            <view
-              v-if="goodsFields.price?.show"
-              class="lg-goods-price ss-m-r-12 ss-flex ss-col-bottom font-OPPOSANS"
-              :style="[{ color: goodsFields.price.color }]"
-            >
-              <text class="ss-font-24">{{ priceUnit }}</text>
-              {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
-            </view>
-            <view
-              v-if="
-                (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
-                (data.original_price > 0 || data.marketPrice > 0)
-              "
-              class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
-              :style="[{ color: originPriceColor }]"
-            >
+          <view v-if="goodsFields.price?.show" class="ss-flex ss-col-bottom font-OPPOSANS">
+            <view class="sl-goods-price ss-m-r-12" :style="[{ color: goodsFields.price.color }]">
               <!-- 活动价格 -->
               <text v-if="data.activityType && data.activityType === PromotionActivityTypeEnum.POINT.type">
                 {{ data.point }}积分
                 {{ !data.pointPrice || data.pointPrice === 0 ? '' : `+${fen2yuan(data.pointPrice)}元` }}
               </text>
               <template v-else>
-                <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+                <text class="price-unit ss-font-24">{{ priceUnit }}</text>
                 <text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
                 <text v-else>
                   {{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
                 </text>
               </template>
             </view>
+            <view
+              v-if="
+                (goodsFields.original_price?.show || goodsFields.marketPrice?.show) &&
+                (data.original_price > 0 || data.marketPrice > 0)
+              "
+              class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
+              :style="[{ color: originPriceColor }]"
+            >
+              <text class="price-unit ss-font-20">{{ priceUnit }}</text>
+              <view class="ss-m-l-8">{{ fen2yuan(data.marketPrice) }}</view>
+            </view>
           </view>
           <view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
             <view class="sales-text">{{ salesAndStock }}</view>