From a715a91a1991a2fbe577cef1941ad004780c0123 Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Wed, 6 Nov 2024 11:22:07 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=BF=98=E5=8E=9F=E4=B8=8A=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E7=89=88=E6=9C=AC=E5=AF=B9=E4=BB=98=E8=B4=B9=E4=BC=9A?=
 =?UTF-8?q?=E5=91=98=E6=98=BE=E7=A4=BA=E7=9A=84=E4=BF=AE=E6=94=B9=EF=BC=8C?=
 =?UTF-8?q?=E5=BE=85=E5=AF=B9=E6=8E=A5?=
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, 14 insertions(+), 38 deletions(-)

diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 30f9949..23946f6 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -32,12 +32,9 @@
           <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" v-if="state.goodsInfo.paidMemberPrice">
-                  {{ fen2yuan(state.goodsInfo.paidMemberPrice) }}
+                <view class="price-text ss-m-r-16">
+                  {{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
                 </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 58b531c..2d86ee4 100644
--- a/sheep/components/s-goods-column/s-goods-column.vue
+++ b/sheep/components/s-goods-column/s-goods-column.vue
@@ -35,12 +35,9 @@
 					</view>
 					<template v-else>
 						<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-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
 						<text v-else>
-							{{ isArray(data.paidMemberPrice) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+							{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
 						</text>
 					</template>
 				</view>
@@ -140,12 +137,9 @@
 						</view>
 						<template v-else>
 							<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-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
 							<text v-else>
-								{{ isArray(data.paidMemberPrice) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+								{{ isArray(data.price) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
 							</text>
 						</template>
 					</view>
@@ -224,19 +218,16 @@
 							</view>
 							<template v-else>
 								<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-if="data.promotionPrice > 0">{{ fen2yuan(data.promotionPrice) }}</text>
 								<text v-else>
-									{{ isArray(data.paidMemberPrice) ? fen2yuan(data.price[0]) : fen2yuan(data.price) }}
+									{{ 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 }]">
+                (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>
@@ -301,19 +292,10 @@
 								</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 90961db..4278720 100644
--- a/sheep/components/s-select-sku/s-select-sku.vue
+++ b/sheep/components/s-select-sku/s-select-sku.vue
@@ -15,12 +15,9 @@
           <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" v-if="goodsInfo.paidMemberPrice">
-                {{ fen2yuan(goodsInfo.paidMemberPrice) }}
+              <view class="price-text">
+                {{ fen2yuan(state.selectedSku.price || goodsInfo.price) }}
               </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) }}