From 8c75886b87ac5d1b8fe67391a4c73cc3e875f20e Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Wed, 6 Nov 2024 11:20:48 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E6=B7=BB=E5=8A=A0=E4=BB=98=E8=B4=B9?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BB=B7=E6=A0=BC=E6=98=BE=E7=A4=BA=E7=9A=84?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E3=80=82=EF=BC=88=E7=95=99=E7=9D=80=E5=AD=98?=
 =?UTF-8?q?=E6=A1=A3=EF=BC=8C=E5=90=8E=E7=AB=AF=E4=BB=A3=E7=A0=81=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=AE=BE=E8=AE=A1=E5=A5=BD=E5=BE=85=E5=AF=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=AE=8C=E3=80=82=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/goods/index.vue                         |  7 +++-
 .../s-goods-column/s-goods-column.vue         | 38 ++++++++++++++-----
 .../components/s-select-sku/s-select-sku.vue  |  7 +++-
 3 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 23946f6..30f9949 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -32,9 +32,12 @@
           <view class="title-card detail-card ss-p-y-40 ss-p-x-20">
             <view class="ss-flex ss-row-between ss-col-center ss-m-b-26">
               <view class="price-box ss-flex ss-col-bottom">
-                <view class="price-text ss-m-r-16">
-                  {{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
+                <view class="price-text ss-m-r-16" v-if="state.goodsInfo.paidMemberPrice">
+                  {{ fen2yuan(state.goodsInfo.paidMemberPrice) }}
                 </view>
+				<view  class="price-text ss-m-r-16" v-else>
+					{{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
+				</view>
                 <view class="origin-price-text" v-if="state.goodsInfo.marketPrice > 0">
                   {{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }}
                 </view>
diff --git a/sheep/components/s-goods-column/s-goods-column.vue b/sheep/components/s-goods-column/s-goods-column.vue
index 2d86ee4..58b531c 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -35,9 +35,12 @@
 					</view>
 					<template v-else>
 						<text class="price-unit ss-font-24">{{ priceUnit }}</text>
-						<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+						<text v-if="data.promotionPrice > 0 && !data.paidMemberPrice">{{ fen2yuan(data.promotionPrice) }}</text>
+						<text v-else-if="data.paidMemberPrice">
+							{{ fen2yuan(data.paidMemberPrice) }}
+						</text>
 						<text v-else>
-							{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+							{{ isArray(data.paidMemberPrice) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
 						</text>
 					</template>
 				</view>
@@ -137,9 +140,12 @@
 						</view>
 						<template v-else>
 							<text class="price-unit ss-font-24">{{ priceUnit }}</text>
-							<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+							<text v-if="data.promotionPrice > 0 && !data.paidMemberPrice">{{ fen2yuan(data.promotionPrice) }}</text>
+							<text v-else-if="data.paidMemberPrice">
+								{{ fen2yuan(data.paidMemberPrice) }}
+							</text>
 							<text v-else>
-								{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+								{{ isArray(data.paidMemberPrice) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
 							</text>
 						</template>
 					</view>
@@ -218,16 +224,19 @@
 							</view>
 							<template v-else>
 								<text class="price-unit ss-font-24">{{ priceUnit }}</text>
-								<text v-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
+								<text v-if="data.promotionPrice > 0 && !data.paidMemberPrice">{{ fen2yuan(data.promotionPrice) }}</text>
+								<text v-else-if="data.paidMemberPrice">
+									{{ fen2yuan(data.paidMemberPrice) }}
+								</text>
 								<text v-else>
-									{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+									{{ isArray(data.paidMemberPrice) ? 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 }]">
+							(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>
@@ -292,10 +301,19 @@
 								</text>
 							</view>
 							<template v-else>
-								<text class="price-unit ss-font-24">{{ 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> -->
+								
+								<text class="price-unit ss-font-24">{{ priceUnit }}</text>
+								<text v-if="data.promotionPrice > 0 && !data.paidMemberPrice">{{ fen2yuan(data.promotionPrice) }}</text>
+								<text v-else-if="data.paidMemberPrice">
+									{{ fen2yuan(data.paidMemberPrice) }}
+								</text>
+								<text v-else>
+									{{ isArray(data.paidMemberPrice) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
 								</text>
 							</template>
 						</view>
diff --git a/sheep/components/s-select-sku/s-select-sku.vue b/sheep/components/s-select-sku/s-select-sku.vue
index 4278720..90961db 100644
--- a/sheep/components/s-select-sku/s-select-sku.vue
+++ b/sheep/components/s-select-sku/s-select-sku.vue
@@ -15,9 +15,12 @@
           <view class="goods-title ss-line-2">{{ goodsInfo.name }}</view>
           <view class="header-right-bottom ss-flex ss-col-center ss-row-between">
             <view class="ss-flex">
-              <view class="price-text">
-                {{ fen2yuan(state.selectedSku.price || goodsInfo.price) }}
+              <view class="price-text" v-if="goodsInfo.paidMemberPrice">
+                {{ fen2yuan(goodsInfo.paidMemberPrice) }}
               </view>
+			  <view class="price-text" v-else>
+			    {{ fen2yuan(state.selectedSku.price || goodsInfo.price) }}
+			  </view>
             </view>
             <view class="stock-text ss-m-l-20">
               {{ formatStock('exact', state.selectedSku.stock || goodsInfo.stock) }}