From 2eb21bfe2f40630a46e675211f23b5f240e395a4 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 12 九月 2025 15:01:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into send_coupon
---
pages/mine/activity/applyActivityList.vue | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/pages/mine/activity/applyActivityList.vue b/pages/mine/activity/applyActivityList.vue
index ad493fc..48cbb10 100644
--- a/pages/mine/activity/applyActivityList.vue
+++ b/pages/mine/activity/applyActivityList.vue
@@ -41,7 +41,7 @@
</view>
<!-- 鏀硅繘鐨勫姞杞芥洿澶氭彁绀� -->
<view class="load-more">
- <u-loadmore :status="loading ? 'loading' : noMore ? 'nomore' : 'loadmore'" :load-text="{
+ <u-loadmore v-if="mockData.length > 0" :status="loading ? 'loading' : noMore ? 'nomore' : 'loadmore'" :load-text="{
loadmore: '涓婃媺鍔犺浇鏇村',
loading: '姝ｅ湪鍔犺浇',
nomore: '娌℃湁鏇村浜�'
@@ -65,8 +65,6 @@
data() {
return {
- scrollViewTop: uni.upx2px(50 + 80 + 40), // 50rpx绌虹櫧 + 80rpx鎸夐挳 + 40rpx杈硅窛
- scrollViewBottom: uni.upx2px(120), // 搴曢儴棰勭暀
query: {
pageNumber: 1,
pageSize: 5,
@@ -223,11 +221,6 @@
height: auto;
}
-
- /* 娲诲姩鍒楄〃鏍峰紡 */
- .activity-list {
- padding: 20rpx 24rpx;
- }
.card {
background: #fff;
--
Gitblit v1.8.0