From 43fc159e27da43686263ac960799fc0fe8f71c23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
 <17633066053@163.com>
Date: Thu, 19 Jan 2023 15:59:10 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8=E6=9C=89=E4=BF=83=E9=94=80=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8D=E6=98=BE=E7=A4=BABug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/m-goods-list/list.vue      | 5 +++--
 components/m-goods-list/promotion.vue | 4 ++++
 pages/mine/set/setUp.vue              | 2 ++
 pages/product/comment.vue             | 2 +-
 pages/promotion/point/pointList.vue   | 2 +-
 5 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/components/m-goods-list/list.vue b/components/m-goods-list/list.vue
index 4c1ac7f..a41ac7d 100644
--- a/components/m-goods-list/list.vue
+++ b/components/m-goods-list/list.vue
@@ -179,9 +179,10 @@
 			},
 			// 数据去重一下 只显示一次 减免 劵 什么的
 			getPromotion(item) {
-				if (item.promotionMap) {
+				if (item.content ? item.content.promotionMap : item.promotionMap) {
+					const fieldList = item.content ? item.content.promotionMap : item.promotionMap
 					let array = [];
-					Object.keys(item.promotionMap).forEach((child) => {
+					Object.keys(fieldList).forEach((child) => {
 						if (!array.includes(child.split("-")[0])) {
 							array.push(child.split("-")[0]);
 						}
diff --git a/components/m-goods-list/promotion.vue b/components/m-goods-list/promotion.vue
index 356874e..cda283c 100644
--- a/components/m-goods-list/promotion.vue
+++ b/components/m-goods-list/promotion.vue
@@ -24,6 +24,10 @@
 										$options.filters.goodsFormatPrice(item.purchasePrice )[1]
 									}}
 							</div>
+							<!-- 兜底策略如果金额是0 -->
+							<div class="price" v-if="!item.price">
+								¥<span>0 </span>.00
+							</div>
 						</view>
 						<div>
 							<image class='buy' :src="buy"></image>
diff --git a/pages/mine/set/setUp.vue b/pages/mine/set/setUp.vue
index c2d33e7..a8b4f56 100644
--- a/pages/mine/set/setUp.vue
+++ b/pages/mine/set/setUp.vue
@@ -15,7 +15,9 @@
       <!-- #ifdef APP-PLUS -->
       <u-cell-item title="清除缓存" :value="fileSizeString" @click="clearCache"></u-cell-item>
       <!-- #endif -->
+      <!-- #ifndef MP-WEIXIN -->
       <u-cell-item title="安全中心" @click="navigateTo('/pages/mine/set/securityCenter/securityCenter')"></u-cell-item>
+      <!-- #endif -->
       <u-cell-item title="意见反馈" @click="navigateTo('/pages/mine/set/feedBack')"></u-cell-item>
       <!-- #ifndef H5 -->
       <!-- #endif -->
diff --git a/pages/product/comment.vue b/pages/product/comment.vue
index 37ba751..c306e2b 100644
--- a/pages/product/comment.vue
+++ b/pages/product/comment.vue
@@ -20,7 +20,7 @@
           </div>
           <view class="eva-box" v-for="(item, index) in commDetail" :key="index">
             <view class="section-info">
-              <image class="portrait" :src="item.memberProfile || userImage" mode="aspectFill"></image>
+              <image class="portrait" :src="item.memberProfile || userImage" mode="aspectFit"></image>
               <view class="star-content">
                 <text class="name">{{ item.memberName | noPassByName }}</text>
                 <text class="time">{{ item.createTime }}</text>
diff --git a/pages/promotion/point/pointList.vue b/pages/promotion/point/pointList.vue
index 59ddfd6..9a91bb9 100644
--- a/pages/promotion/point/pointList.vue
+++ b/pages/promotion/point/pointList.vue
@@ -19,7 +19,7 @@
           <view class="index-items">
             <view class="index-item" v-for="(item, key) in nav.goods" :key="key" @click="toGoods(item)">
               <view class="index-item-img">
-                <u-image :src="item.thumbnail" mode="aspectFill">
+                <u-image :src="item.thumbnail" mode="aspectFit">
                   <u-loading slot="loading"></u-loading>
                 </u-image>
                 <view class="index-item-title">{{ item.goodsName }}</view>