From 587acb1557cebb464aa0e250ff3dbfc436a860fd Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 06 八月 2025 16:27:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_fix_sub' into dev_fix_sub
---
pages/mine/activity/reportActivity.vue | 53 +++++++++++++----------------------------------------
1 files changed, 13 insertions(+), 40 deletions(-)
diff --git a/pages/mine/activity/reportActivity.vue b/pages/mine/activity/reportActivity.vue
index 35a3f4e..5741ab1 100644
--- a/pages/mine/activity/reportActivity.vue
+++ b/pages/mine/activity/reportActivity.vue
@@ -1,10 +1,14 @@
<template>
<view class="wrapper">
<top-bar selectedTitleIndex="activity" textColor="black" @changeTab="topBarChange" class="topBar"></top-bar>
-
- <view style="height: 100rpx;margin-top: 50px"></view>
+
+ <view style="height: 50rpx;margin-top: 150rpx"></view>
+ <u-empty v-if="mockData.length === 0 && !loading" style="margin-top: 130rpx;"
+ mode="data"
+ icon="http://cdn.uviewui.com/uview/empty/data.png">
+ </u-empty>
<!-- 鍐呭鍖哄煙 -->
- <scroll-view scroll-y class="content" style="height: 40vh;" @scrolltolower="loadMore" :lower-threshold="100">
+ <scroll-view scroll-y class="scroll-view-container" style="height: 40vh;" @scrolltolower="loadMore" :lower-threshold="100">
<view class="waterfall">
<view class="column" v-for="(column, index) in columns" :key="index">
<!-- 閬嶅巻姣忓垪鍐呭 -->
@@ -26,7 +30,8 @@
</view>
</view>
</view>
- <!-- <view style="height: 150rpx;"></view> -->
+
+
<!-- 鏀硅繘鐨勫姞杞芥洿澶氭彁绀� -->
<view class="load-more">
<u-loadmore v-if="mockData.length > 0" :status="loading ? 'loading' : noMore ? 'nomore' : 'loadmore'"
@@ -165,7 +170,7 @@
[]
];
this.colHeight = [0, 0];
-
+
this.mockData.forEach(item => {
const minIndex = this.colHeight.indexOf(Math.min(...this.colHeight));
this.columns[minIndex].push(item); //鑾峰緱楂樺害鏇村皬鐨� 鏀惧叆鍏冪礌
@@ -215,7 +220,8 @@
</script>
<style lang="scss">
- /* 鏂板鍔犺浇鏇村鏍峰紡 */
+
+ /*鏂板鍔犺浇鏇村鏍峰紡 */
.load-more {
padding: 20rpx 0;
text-align: center;
@@ -223,15 +229,6 @@
font-size: 26rpx;
background-color: #f8f9fa;
}
-
- .btn-container {
- display: flex;
- justify-content: center;
- align-items: center;
- margin-top: 8px;
- /* 涓庝笂鏂规爣棰樹繚鎸侀棿璺� */
- }
-
/* 鍏ㄥ眬鏍峰紡浼樺寲 */
.wrapper {
height: 100vh;
@@ -240,13 +237,9 @@
background-color: #f8f9fa;
}
- /* 瀵艰埅鏍忎紭鍖� */
- .u-navbar {
- box-shadow: 0 2rpx 10rpx rgba(0, 0, 0, 0.05);
- }
/* 鍐呭鍖哄煙浼樺寲 */
- .content {
+ .scroll-view-container {
flex: 1;
overflow: hidden;
padding: 0 20rpx;
@@ -364,26 +357,6 @@
}
}
- /* 绌虹姸鎬佹牱寮� */
- .empty-state {
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- height: 60vh;
- text-align: center;
-
- image {
- width: 240rpx;
- opacity: 0.6;
- margin-bottom: 30rpx;
- }
-
- text {
- color: #c0c4cc;
- font-size: 28rpx;
- }
- }
.topBar {
position: fixed;
--
Gitblit v1.8.0