From 65ad41d1a4302fee3bcea8093df60c77ec8e412a Mon Sep 17 00:00:00 2001
From: zerosaturation <zerosaturation@163.com>
Date: Mon, 13 Apr 2026 17:34:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=B7=B2=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/components/ConfirmModal.vue          |  4 ++
 frontend/pages/castlove/create.vue            | 13 +++--
 frontend/pages/components/CastloveContent.vue |  4 +-
 frontend/pages/components/RankingModal.vue    | 50 +++++++++----------
 frontend/pages/profile/profile.vue            |  3 +-
 .../pages/square/composables/useBanner.js     |  2 +-
 frontend/utils/activity-config.js             |  4 +-
 frontend/utils/api.js                         |  2 +-
 8 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/frontend/components/ConfirmModal.vue b/frontend/components/ConfirmModal.vue
index bfa8a6d..da309a6 100644
--- a/frontend/components/ConfirmModal.vue
+++ b/frontend/components/ConfirmModal.vue
@@ -25,6 +25,10 @@
 </template>
 
 <script setup>
+defineOptions({
+  inheritAttrs: false
+})
+
 const props = defineProps({
   visible: {
     type: Boolean,
diff --git a/frontend/pages/castlove/create.vue b/frontend/pages/castlove/create.vue
index 2573389..2ab7c25 100644
--- a/frontend/pages/castlove/create.vue
+++ b/frontend/pages/castlove/create.vue
@@ -101,6 +101,10 @@
 </template>
 
 <script setup>
+defineOptions({
+  inheritAttrs: false
+})
+
 import { ref, onMounted } from 'vue';
 import { getOssSignatureApi, createMintOrderApi } from '@/utils/api.js';
 import ConfirmModal from '@/components/ConfirmModal.vue';
@@ -477,13 +481,16 @@ const handleBack = async () => {
 			content: '确定要返回吗？未保存的数据将会丢失',
 			success: async (res) => {
 				if (res.confirm) {
-					resetForm();
-					uni.navigateBack();
+					uni.redirectTo({
+						url: '/pages/castlove/mall'
+					});
 				}
 			}
 		});
 	} else {
-		uni.navigateBack();
+		uni.redirectTo({
+			url: '/pages/castlove/mall'
+		});
 	}
 };
 
diff --git a/frontend/pages/components/CastloveContent.vue b/frontend/pages/components/CastloveContent.vue
index cb8a6b2..30fc0d1 100644
--- a/frontend/pages/components/CastloveContent.vue
+++ b/frontend/pages/components/CastloveContent.vue
@@ -432,7 +432,7 @@ const handleBack = () => {
 }
 
 .content-wrapper.fixed-category {
-	margin-top: 5rem;
+	margin-top: 192rpx;
 }
 
 /* 区域一：轮播图 */
@@ -518,7 +518,7 @@ const handleBack = () => {
 
 .category-section.fixed {
 	position: fixed;
-	top: 64rpx;
+	top: 96rpx;
 	left: 24rpx;
 	right: 24rpx;
 	z-index: 100;
diff --git a/frontend/pages/components/RankingModal.vue b/frontend/pages/components/RankingModal.vue
index 587dbc1..f61caa2 100644
--- a/frontend/pages/components/RankingModal.vue
+++ b/frontend/pages/components/RankingModal.vue
@@ -264,34 +264,34 @@ const displayTabs = computed(() => {
 	// 如果是活动榜单,显示活动列表作为标签
 	if (currentRankingType.value === RANKING_TYPES.ACTIVITY) {
 		// 如果还没有加载活动列表，显示加载提示
-		if (isLoadingActivities.value) {
-			return [{
-				name: '加载中...',
-				type: 'loading',
-				icon: null,
-				id: null
-			}];
-		}
+		// if (isLoadingActivities.value) {
+		// 	return [{
+		// 		name: '加载中...',
+		// 		type: 'loading',
+		// 		icon: null,
+		// 		id: null
+		// 	}];
+		// }
 
 		// 如果加载失败，显示错误提示
-		if (activityLoadError.value) {
-			return [{
-				name: '加载失败',
-				type: 'error',
-				icon: null,
-				id: null
-			}];
-		}
+		// if (activityLoadError.value) {
+		// 	return [{
+		// 		name: '加载失败',
+		// 		type: 'error',
+		// 		icon: null,
+		// 		id: null
+		// 	}];
+		// }
 
 		// 如果没有活动，显示空提示
-		if (activityList.value.length === 0) {
-			return [{
-				name: '暂无活动',
-				type: 'empty',
-				icon: null,
-				id: null
-			}];
-		}
+		// if (activityList.value.length === 0) {
+		// 	return [{
+		// 		name: '暂无活动',
+		// 		type: 'empty',
+		// 		icon: null,
+		// 		id: null
+		// 	}];
+		// }
 
 		// 显示活动列表
 		return activityList.value.map(activity => ({
@@ -340,7 +340,7 @@ const fetchActivityList = async () => {
 	try {
 		isLoadingActivities.value = true;
 		activityLoadError.value = null;
-		const response = await getActivityListApi(starId, 1, 20);
+		const response = await getActivityListApi(starId, 1, 10);
 
 		if (response && response.code === 200 && response.data) {
 			activityList.value = response.data.activities || [];
diff --git a/frontend/pages/profile/profile.vue b/frontend/pages/profile/profile.vue
index 7fcbe18..a0fc279 100644
--- a/frontend/pages/profile/profile.vue
+++ b/frontend/pages/profile/profile.vue
@@ -257,7 +257,8 @@
 </template>
 
 <script setup>
-import { ref, computed, onShow } from 'vue';
+import { ref, computed } from 'vue';
+import { onShow } from '@dcloudio/uni-app';
 import { useStore } from 'vuex';
 import { onReady } from "@dcloudio/uni-app";
 import Header from '../components/Header.vue';
diff --git a/frontend/pages/square/composables/useBanner.js b/frontend/pages/square/composables/useBanner.js
index c10ba85..361ac98 100644
--- a/frontend/pages/square/composables/useBanner.js
+++ b/frontend/pages/square/composables/useBanner.js
@@ -7,7 +7,7 @@ export function useBanner() {
   const loadBannerActivities = async () => {
     try {
       const starId = uni.getStorageSync('star_id') || null
-      const res = await getActivityListApi(starId, 'active', 1, 3)
+      const res = await getActivityListApi(starId, 1, 10)
       
       if (res.code === 200 && res.data?.activities) {
         const activities = res.data.activities
diff --git a/frontend/utils/activity-config.js b/frontend/utils/activity-config.js
index 8768e6d..3630656 100644
--- a/frontend/utils/activity-config.js
+++ b/frontend/utils/activity-config.js
@@ -40,9 +40,9 @@ const DEFAULT_BUBBLE_TEXTS = ['加油!', '一起努力!', '继续前进!']
  * @param {number} pageSize - 每页数量
  * @returns {Promise} 活动列表
  */
-export async function fetchActivityList(starId, status = '', page = 1, pageSize = 10) {
+export async function fetchActivityList(starId, page = 1, pageSize = 10) {
   try {
-    const response = await getActivityListApi(starId, status, page, pageSize)
+    const response = await getActivityListApi(starId, page, pageSize)
     if (response.code === 200 && response.data) {
       return {
         activities: response.data.activities || [],
diff --git a/frontend/utils/api.js b/frontend/utils/api.js
index c670b0b..5bf00c8 100644
--- a/frontend/utils/api.js
+++ b/frontend/utils/api.js
@@ -484,7 +484,7 @@ export function getOriginalRankingApi(dimension = 'total', starId = null, page =
 // ==================== 活动相关接口 ====================
 
 // 获取活动列表
-export function getActivityListApi(starId, status = '', page = 1, pageSize = 10) {
+export function getActivityListApi(starId, page = 1, pageSize = 10) {
 	let url = `/api/v1/activities?star_id=${starId}&page=${page}&page_size=${pageSize}`
 	// if (status) {
 	// 	url += `&status=${status}`