From 0cdab583f096bbd0e84aacbb515083b800409420 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Thu, 28 Mar 2024 11:18:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/my.vue      | 59 +++++++++++---------------------------------
 subpkg/list/list.vue | 25 ++++++++++++++++---
 2 files changed, 36 insertions(+), 48 deletions(-)

diff --git a/pages/my/my.vue b/pages/my/my.vue
index 008ec15..a6537ec 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -11,7 +11,7 @@
 			<swiper style="height: 100%;" :indicator-dots="false" :autoplay="true" :interval="3000" :duration="1000" :circular="true">
 				<swiper-item v-for="(item, i) in swiperList" :key="i">
 					<navigator style="height: 100%;" class="swiper-item">
-						<img :src="item"></img>
+						<img :src="item.uploadPath"></img>
 					</navigator>
 				</swiper-item>
 			</swiper>
@@ -28,50 +28,7 @@
 		<tabbar :page="page"></tabbar>
 	  </view>
 	</view>
-	
-	<!-- <view class="my-userinfo-container">
-		<view class="top-box">
-			<image :src="avatarUrl" class="avatar"></image>
-			<view class="nickname">{{name}}</view>
-		</view>
-
-		<view class="panel-list">
-			<view class="panel">
-				<view class="panel-body">
-					<view class="panel-item" @click="showMedal()">
-						<text>{{medalNum}}</text>
-						<text>勋章</text>
-					</view>
-					<view class="panel-item">
-						<text>0</text>
-						<text>挑战历史</text>
-					</view>
-				</view>
-			</view>
 
-			<view class="panel">
-				<swiper :indicator-dots="false" :autoplay="true" :interval="3000" :duration="1000" :circular="true">
-					<swiper-item v-for="(item, i) in swiperList" :key="i">
-						<navigator class="swiper-item">
-							<image :src="item"></image>
-						</navigator>
-					</swiper-item>
-				</swiper>
-			</view>
-
-			<view class="panel">
-				<view class="function-list">
-					<view class="panel-list-item" v-for="(item,i) in functionList" :key="i" @click="navClickHandler(item)">
-						<image class="function-img" :src="item.uploadPath"></image>
-						<text style="margin-right: 220px;">{{item.name}}</text>
-						<uni-icons type="arrowright" size="15"></uni-icons>
-					</view>
-				</view>
-			</view>
-		</view>
-
-		<tabbar :page="page"></tabbar>
-	</view> -->
 </template>
 
 <script>
@@ -103,6 +60,18 @@
 		},
 		onShow() {
 			this.page = "my"
+			this.getSwiperList()
+			this.getFunctionList()
+			this.getMyMedalList()
+			this.getChallengeTotal()
+			this.getStatus()
+		},
+		onPullDownRefresh() {
+			this.getSwiperList()
+			this.getFunctionList()
+			this.getMyMedalList()
+			this.getChallengeTotal()
+			this.getStatus()
 		},
 		computed: {
 			...mapState('m_user', ['userinfo','userId'])
@@ -163,8 +132,8 @@
 
 				res.data.forEach(item => {
 					item.uploadPath = uni.$http.baseUrl + item.uploadPath
-					this.swiperList.push(item.uploadPath)
 				})
+				this.swiperList = res.data
 				// uni.$showMsg('数据请求成功！')
 			},
 			async getFunctionList() {
diff --git a/subpkg/list/list.vue b/subpkg/list/list.vue
index 4bc29a6..8cf8cb0 100644
--- a/subpkg/list/list.vue
+++ b/subpkg/list/list.vue
@@ -14,7 +14,7 @@
 					<image :src="item.image_src"></image>
 				</view> -->
 				<navigator class="swiper-item">
-					<image :src="item"></image>
+					<image :src="item.uploadPath"></image>
 				</navigator>
 			</swiper-item>
 		</swiper>
@@ -67,6 +67,14 @@
 			this.getSwiperList();
 			this.getSceneList();
 		},
+		onShow() {
+			this.getSwiperList();
+			this.getSceneListReload();
+		},
+		onPullDownRefresh() {
+			this.getSwiperList();
+			this.getSceneListReload();
+		},
 		methods: {
 			async getSwiperList() {
 				const {
@@ -76,9 +84,8 @@
 		
 				res.data.forEach(item=>{
 					item.uploadPath = uni.$http.baseUrl +item.uploadPath
-					this.swiperList.push(item.uploadPath)
 				})
-				
+				this.swiperList = res.data
 				// uni.$showMsg('数据请求成功！')
 			},
 			async getSceneList() {
@@ -100,6 +107,18 @@
 				this.total = res.total
 				// uni.$showMsg('数据请求成功！')
 			},
+			async getSceneListReload() {
+				const {
+					data: res
+				} = await uni.$http.post('/small/scene/manage/listApp',this.queryObj)
+				
+				res.rows.forEach(item=>{
+					item.uploadPath = uni.$http.baseUrl +item.uploadPath
+				})
+				this.sceneList = res.rows
+				this.total = res.total
+				// uni.$showMsg('数据请求成功！')
+			},
 			navClickHandler(item) {
 				if(item !== ""){
 					uni.navigateTo({