From 30a2ec4e99673976daf8bf444dcc69a239383092 Mon Sep 17 00:00:00 2001
From: wangdong <1551135706@qq.com>
Date: Thu, 23 May 2024 09:43:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=85=B3=E8=81=94=E5=95=86?=
 =?UTF-8?q?=E5=93=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/squareDynamic/index.vue |  8 ++++----
 pages/user/index.vue          | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pages/squareDynamic/index.vue b/pages/squareDynamic/index.vue
index e8cdca6..cc6d902 100644
--- a/pages/squareDynamic/index.vue
+++ b/pages/squareDynamic/index.vue
@@ -24,13 +24,13 @@
 					<view v-if="item.imgs && item.imgs.length > 0" class="pic-list">
 						<image v-for="(pic, k) in item.imgs" :key="k" :src="pic.external_url" mode="aspectFill" @click="previewImage(k, item.imgs)"></image>
 					</view>
-					<view class="goods">
+					<view v-if="item.goodsInfo" class="goods">
 						<view class="goods-box">
-							<image :src="item.goods_image" mode="aspectFill"></image>
+							<image :src="item.goodsInfo.goods_image" mode="aspectFill"></image>
 							<view class="goods-info">
-								<view class="name">{{ item.goods_name }}</view>
+								<view class="name">{{ item.goodsInfo.goods_name }}</view>
 								<view class="price">
-									<text>￥{{ item.goods_price_min>0?Number(item.goods_price_min):0.00 }}</text>
+									<text>￥{{ item.goodsInfo.goods_price_min>0?Number(item.goodsInfo.goods_price_min):0.00 }}</text>
 									<text @click="toGoodsDetail(item)">加购</text>
 								</view>
 							</view>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 2936b49..b6b1a17 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -398,6 +398,12 @@
 							投诉
 						</view>
 					</view>
+					<view class="serveIcon" v-if="userInfo.user_type == 40" @click="goJump('/pages/feedback/index')">
+						<image src="/static/feedback/feedback.png" class="icons"></image>
+						<view class="serveInfo">
+							意见反馈
+						</view>
+					</view>
 					<view class="serveIcon" @click="goJump('/pages/news/park/addressList')">
 						<image :src="$picUrl+'/static/user/address.png'" class="icons"></image>
 						<view class="serveInfo">
@@ -509,12 +515,6 @@
 							进群有礼
 						</view>
 					</view>
-					<view class="serveIcon" v-if="userInfo.user_type == 40" @click="goJump('/pages/feedback/index')">
-						<image src="/static/feedback/feedback.png" class="icons"></image>
-						<view class="serveInfo">
-							意见反馈
-						</view>
-					</view>
 				</view>
 			</view>
 			<!-- 商品推荐 -->