From 1176e928bf75f5bbdf1117a8d76d5d5f57754400 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Fri, 1 Dec 2023 11:42:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=89=B9=E5=8F=91=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/product/goodsOnSale/index.vue | 20 ++++++++++++++++++--
 pages/product/list/index.vue        | 12 +++++++++---
 2 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/pages/product/goodsOnSale/index.vue b/pages/product/goodsOnSale/index.vue
index 0e355f3..01e45e9 100644
--- a/pages/product/goodsOnSale/index.vue
+++ b/pages/product/goodsOnSale/index.vue
@@ -45,8 +45,14 @@
 									<span>销量：{{ item.sales }}</span>
 								</view>
 								<view class="shop_list_item_shop_con_price">
-									<span>￥{{ item.price }}</span>
-									<del>￥{{ item.ot_price }}</del>
+									<block v-if="mer_info.type_code=='TypeSupplyChain'">
+									  <block v-if="item.attrValue[0]">
+									    <text class='price font-color'>￥{{item.attrValue[0].procure_price}}</text>
+									    <text class='ot_price'>零售价￥{{item.attrValue[0].price}}</text>
+									  </block>
+									  <text v-else class='ot_price'>商品规格错误</text>
+									</block>
+									<text v-else class='price font-color'>￥{{item.price}}</text>
 								</view>
 							</view>
 						</view>
@@ -87,6 +93,7 @@ export default {
 			childIndex: 0,
 			menuList: [],
 			merId: '',
+      mer_info: {},
 			shopList: [],
 			loaded: false,
 			loading: false,
@@ -110,6 +117,9 @@ export default {
 	},
 
 	onLoad(opt) {
+    let user = this.$store.state.app.userInfo;
+    if(typeof user == 'string') user = JSON.parse(user);
+    this.mer_info = user.mer_info;
 		this.merId = opt.mer_id;
 		this.getProductTitle();
 		this.$set(this, 'type', opt.type ? Number(opt.type) : 1);
@@ -420,6 +430,12 @@ export default {
 						font-size: 26rpx;
 					}
 				}
+        .ot_price {
+        	color: #bebebe;
+        	font-size: 26rpx;
+          margin-left: 10rpx;
+        	// text-decoration: line-through;
+        }
 			}
 		}
 		&_handle {
diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue
index bbd9228..7e39175 100644
--- a/pages/product/list/index.vue
+++ b/pages/product/list/index.vue
@@ -112,8 +112,14 @@
 									<text class="num">销量: {{item.sales}}</text>
 								</view>
 								<view class='money-wrap'>
-									<text class='price font-color'>￥{{item.price}}</text>
-									<text class='ot_price'>￥{{item.ot_price}}</text>
+									<block v-if="mer_info.type_code=='TypeSupplyChain'">
+                    <block v-if="item.attrValue[0]">
+                      <text class='price font-color'>￥{{item.attrValue[0].procure_price}}</text>
+                      <text class='ot_price'>零售价￥{{item.attrValue[0].price}}</text>
+                    </block>
+                    <text v-else class='ot_price'>商品规格错误</text>
+                  </block>
+                  <text v-else class='price font-color'>￥{{item.price}}</text>
 								</view>
 							</view>
 
@@ -985,7 +991,7 @@
 					.ot_price {
 						color: #bebebe;
 						font-size: 26rpx;
-						text-decoration: line-through;
+						// text-decoration: line-through;
 					}
 				}