From a362bdb47a18024248d3163d0ffad668d3f1db57 Mon Sep 17 00:00:00 2001
From: Wen Fangping <front_wenfp@163.com>
Date: Mon, 14 Mar 2022 10:22:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=8A=9F=E5=BE=B7=E7=AE=B1?=
 =?UTF-8?q?=E6=9C=AA=E6=98=BE=E7=A4=BA=E5=AE=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Thanksgiving/index.vue | 6 ++++--
 src/components/user-merit/index.vue   | 6 +++---
 src/pages/merit-box/index.vue         | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/Thanksgiving/index.vue b/src/components/Thanksgiving/index.vue
index d715ac3..edef3ef 100644
--- a/src/components/Thanksgiving/index.vue
+++ b/src/components/Thanksgiving/index.vue
@@ -8,8 +8,8 @@
         </div>
         <div class="body">
             <div :options="swiperOptions">
-                <div v-for="slide in type_nav"  :key="slide.id">
-                    <div v-if="type_id === slide.id">
+                <div v-for="slide in type_nav"  :key="slide.id" class="1231">
+                    <div v-if="type_id === slide.id" class="123">
                         <user-merit v-for="dynamic in slide.list" :key="dynamic.id" :data="dynamic" ></user-merit>
                     </div>
                 </div>
@@ -71,7 +71,9 @@ export default {
                 res = await getOrderCompareByAgentId(this.agentId, this.type_id, this.goodsId, this.goodsType)
             }
             const current = this.type_nav.find(item => item.id === this.type_id);
+            console.log('current', current)
             current.list = res.list
+            console.log(this.type_nav)
         },
         onThankMore(){
             this.$router.push({
diff --git a/src/components/user-merit/index.vue b/src/components/user-merit/index.vue
index b0837b6..5d17be4 100644
--- a/src/components/user-merit/index.vue
+++ b/src/components/user-merit/index.vue
@@ -1,13 +1,13 @@
 <template>
-	<div class="user-merit border-bottom" v-if="data && data.user_info">
+	<div class="user-merit border-bottom" v-if="data">
 		<img
-			:src="data.user_info.avatar"
+			:src="data.avatar || data.user_info.avatar"
 			alt=""
 		/>
 		<div class="profile">
 			<div>
 				<div class="name">
-					<span>{{data.user_info.nickname}}</span>
+					<span>{{data.nickname || data.user_info.nickname}}</span>
 <!--					<span>{{data.user_info.region}}</span>-->
 				</div>
 				<p class="goods_name">{{data.goods_name}}</p>
diff --git a/src/pages/merit-box/index.vue b/src/pages/merit-box/index.vue
index 5b7987f..a251ed2 100644
--- a/src/pages/merit-box/index.vue
+++ b/src/pages/merit-box/index.vue
@@ -26,7 +26,7 @@
                         pulldown
                         pullup
                         @pulldown="refresh"
-                        @pullup="loadMore"
+                        @pullup="loadMoreFn"
                     >
                         <user-merit v-for="(merit, _index) in list" :key="_index" :data="merit"></user-merit>
                         <div class="loadmore" v-if="!noMore">
@@ -131,7 +131,7 @@ export default {
             this.list = [];
             this.getMeritBox();
         },
-		loadMore(){
+		loadMoreFn(){
             if(this.noMore) return;
             this.loading = true;
             this.page += 1;