From dc1648699dcf131f5bc87d0e01d4ced102c5701c Mon Sep 17 00:00:00 2001
From: "3321822538@qq.com" <3321822538@qq.com>
Date: Mon, 24 Jun 2024 15:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/fengxiang/index.vue                     | 15 ++++++--
 .../pages/fengxiangDetail/index.vue           | 36 +++++++++----------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/pages/fengxiang/index.vue b/pages/fengxiang/index.vue
index 8500c6d..702546b 100644
--- a/pages/fengxiang/index.vue
+++ b/pages/fengxiang/index.vue
@@ -314,7 +314,7 @@
 			// 		// 显示成功的回调  
 			// 	},
 			// });
-			// this.listData = []
+			this.listData = []
 			this.page = 1
 			this.loadData()
 			setTimeout(() => {
@@ -343,6 +343,17 @@
 			}
 		},
 		methods: {
+			  refreshData() {  
+				  this.page = 1
+				  this.refresh()
+			      setTimeout(() => {  
+			        uni.stopPullDownRefresh()  
+			      }, 2000)   
+			  },  
+			  onPullDownRefresh() {  
+			    this.refreshData() 
+			  },
+			
 			backToTop() {
 				uni.pageScrollTo({
 					scrollTop: 0, // 滚动到页面的顶部  
@@ -806,7 +817,6 @@
 							this.masks = false
 						}
 						if (res.data.data.length > 0) {
-							// 有数据,追加到列表  
 							this.listData.push(...res.data.data)
 							if (this.quchongid == '') {
 								let filteredData = this.listData
@@ -853,6 +863,7 @@
 							}
 							this.page++
 						}
+					
 						uni.hideLoading()
 						// 停止下拉刷新状态  
 						wx.stopPullDownRefresh();
diff --git a/pagesFengXiang/pages/fengxiangDetail/index.vue b/pagesFengXiang/pages/fengxiangDetail/index.vue
index 0036908..7fba533 100644
--- a/pagesFengXiang/pages/fengxiangDetail/index.vue
+++ b/pagesFengXiang/pages/fengxiangDetail/index.vue
@@ -10,7 +10,7 @@
 					<view class="group_7 bianhao-top-yi">
 						<view class="bianhao-zuo">
 							<view class="font_2">{{listdata.name}}</view>
-							<view class=" justify-start  self-start text-wrapper" :id="listdata.status_text == '在线' ? 'text-wrapper-bgc1' : '<strong></strong>text-wrapper-bgc2'">
+							<view class=" justify-start  self-start text-wrapper" :id="listdata.status_text == '在线' ? 'text-wrapper-bgc1' : 'text-wrapper-bgc2'">
 								<view class="font_33">{{listdata.status_text}}</view>
 							</view>
 
@@ -803,14 +803,14 @@
 				this.listDataFn()
 			} else {
 				this.id = option.id
-				if (!wx.getStorageSync('userToken')) {
-					uni.reLaunch({
-						url: '/pagesFengXiang/pages/fengxiangDetailtwo/index?id=' + this.id
-					})
-				} else {
+				// if (!wx.getStorageSync('userToken')) {
+				// 	uni.reLaunch({
+				// 		url: '/pagesFengXiang/pages/fengxiangDetailtwo/index?id=' + this.id
+				// 	})
+				// } else {
 					this.listDataFn()
 					// this.getServerDatas()
-				}
+				// }
 			}
 		},
 		onShow() {
@@ -881,11 +881,11 @@
 				request.get('/api/beehive/detail/' + this.id, {}).then(res => {
 					this.idss = res.data.data.id
 					this.getServerDatas()
-					if(res.user_id != wx.getStorageSync('userToken')){
-						uni.reLaunch({
-							url: '/pagesFengXiang/pages/fengxiangDetailtwo/index?id=' + this.id
-						})
-					}
+					// if(res.user_id != wx.getStorageSync('userToken')){
+					// 	uni.reLaunch({
+					// 		url: '/pagesFengXiang/pages/fengxiangDetailtwo/index?id=' + this.id
+					// 	})
+					// }
 					this.listdata = {
 						...res.data.data
 					}
@@ -1100,14 +1100,14 @@
 		position: absolute;
 		    left: 50%;
 		    transform: translateX(-50%);
-		    bottom: 0rpx;
+		    bottom: 50rpx;
 		    width: 100%;
 		    text-align: center;
-		    height: 580rpx;
-		    background: #ccc;
-		    opacity: .5;
-		    color: red;
-		    font-size: 32rpx;
+		    height: 60rpx;
+		    background:rgba(0, 0, 0, 0.5);
+		    // opacity: .5;
+		    color: #fff;
+		    font-size: 28rpx;
 		    font-weight: 600;
 			padding-top: 20rpx;
 	}