diff --git a/pages.json b/pages.json
index 39d8333..2b97e0d 100644
--- a/pages.json
+++ b/pages.json
@@ -139,20 +139,20 @@
{
"text": "PK站",
"pagePath": "pages/pk/index",
- "iconPath": "static/images/tabBar/creation.png",
- "selectedIconPath": "static/images/tabBar/creation_s.png"
+ "iconPath": "static/images/tabBar/pk.png",
+ "selectedIconPath": "static/images/tabBar/pk_s.png"
},
{
"text": "发布",
"pagePath": "pages/release/index",
- "iconPath": "static/images/tabBar/creation.png",
- "selectedIconPath": "static/images/tabBar/creation_s.png"
+ "iconPath": "static/images/tabBar/publish.png",
+ "selectedIconPath": "static/images/tabBar/publish_s.png"
},
{
"text": "消息",
"pagePath": "pages/message/index",
- "iconPath": "static/images/tabBar/me.png",
- "selectedIconPath": "static/images/tabBar/me_s.png"
+ "iconPath": "static/images/tabBar/message.png",
+ "selectedIconPath": "static/images/tabBar/message_s.png"
},
{
"text": "我的",
diff --git a/pages/message/index.vue b/pages/message/index.vue
index 40e4385..469a831 100644
--- a/pages/message/index.vue
+++ b/pages/message/index.vue
@@ -132,6 +132,9 @@ import {
import LoginPopup from "@/components/LoginPopup/LoginPopup.vue";
const DEFAULT_AVATAR = "/static/images/icon/robot.png";
+const APPROVED_AVATAR = "/static/images/icon/approved.png";
+const REJECTED_AVATAR = "/static/images/icon/rejected.png";
+const PENDING_AVATAR = "/static/images/icon/pending.png";
const userStore = useUserStore();
const loginPopupRef = ref(null);
@@ -266,7 +269,17 @@ const formatDayLabel = (day) => {
const resolveAvatar = (item) => {
const avatar = item?.fromUser?.avatar;
- if (!avatar) return DEFAULT_AVATAR;
+ if (!avatar) {
+ if(item.title.includes("已通过")) {
+ return APPROVED_AVATAR;
+ } else if(item.title.includes("未通过")) {
+ return REJECTED_AVATAR;
+ } else if(item.title.includes("已提交审核")) {
+ return PENDING_AVATAR;
+ } else {
+ return DEFAULT_AVATAR;
+ }
+ }
return String(avatar).startsWith("http") ? avatar : `${FILE_BASE_URL}${avatar}`;
};
@@ -281,6 +294,8 @@ const resolveActionText = (item) => {
};
const resolveJumpText = (item) => {
+ if(item.title.includes("已提交审核") || item.title.includes("未通过")) return "";
+
if (item.itemId) return "查看评分详情";
if (item.topicId) return "查看话题";
return "查看消息";
@@ -423,6 +438,7 @@ const markSingleAsRead = async (item) => {
const handleItemTap = async (item) => {
await markSingleAsRead(item);
+ if(item.title.includes("未通过") || item.title.includes("已提交审核")) return
handleNavigate(item);
};
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index c94f780..e2dd0f5 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -26,8 +26,8 @@
{{ userInfo.nickName }}
- ✨
- {{ userStats.label.join(' | ') }}
+
点击登录解锁更多功能
diff --git a/pages/mine/topics.vue b/pages/mine/topics.vue
index 0f827b0..63ccd3d 100644
--- a/pages/mine/topics.vue
+++ b/pages/mine/topics.vue
@@ -75,7 +75,7 @@ const loadData = async (page = 1) => {
try {
loading.value = true;
const res = await fetchUserTopics(page);
- const list = res?.data?.records || res?.records || res?.list || [];
+ const list = res?.list || [];
// 如果是第一页,先清空原有数据
if (page === 1) {
diff --git a/pages/rating/index.vue b/pages/rating/index.vue
index 8b2c645..014c8f5 100644
--- a/pages/rating/index.vue
+++ b/pages/rating/index.vue
@@ -295,7 +295,13 @@ const confirmAddItem = async () => {
});
uni.hideLoading();
- uni.showToast({ title: '添加成功', icon: 'success' });
+ // uni.showToast({ title: '添加成功', icon: 'success' });
+ if (successPopupRef.value) {
+ successPopupRef.value.show({
+ emoji: '🎉',
+ label: '请耐心等待管理员审核'
+ }, 'release');
+ }
// 重置表单并关闭弹窗
newItem.value = { name: '', avatar: '' };
diff --git a/static/images/icon/approved.png b/static/images/icon/approved.png
new file mode 100644
index 0000000..a286c5f
Binary files /dev/null and b/static/images/icon/approved.png differ
diff --git a/static/images/icon/pending.png b/static/images/icon/pending.png
new file mode 100644
index 0000000..d957a98
Binary files /dev/null and b/static/images/icon/pending.png differ
diff --git a/static/images/icon/rejected.png b/static/images/icon/rejected.png
new file mode 100644
index 0000000..ce9e53a
Binary files /dev/null and b/static/images/icon/rejected.png differ
diff --git a/static/images/tabBar/creation.png b/static/images/tabBar/creation.png
deleted file mode 100644
index e2203fc..0000000
Binary files a/static/images/tabBar/creation.png and /dev/null differ
diff --git a/static/images/tabBar/creation_s.png b/static/images/tabBar/creation_s.png
deleted file mode 100644
index 42dc189..0000000
Binary files a/static/images/tabBar/creation_s.png and /dev/null differ
diff --git a/static/images/tabBar/home.png b/static/images/tabBar/home.png
index 36e857b..4799adc 100644
Binary files a/static/images/tabBar/home.png and b/static/images/tabBar/home.png differ
diff --git a/static/images/tabBar/home_s.png b/static/images/tabBar/home_s.png
index 68e9952..8e80953 100644
Binary files a/static/images/tabBar/home_s.png and b/static/images/tabBar/home_s.png differ
diff --git a/static/images/tabBar/message.png b/static/images/tabBar/message.png
new file mode 100644
index 0000000..b28da8b
Binary files /dev/null and b/static/images/tabBar/message.png differ
diff --git a/static/images/tabBar/message_s.png b/static/images/tabBar/message_s.png
new file mode 100644
index 0000000..1a30f51
Binary files /dev/null and b/static/images/tabBar/message_s.png differ
diff --git a/static/images/tabBar/pk.png b/static/images/tabBar/pk.png
new file mode 100644
index 0000000..9fefb97
Binary files /dev/null and b/static/images/tabBar/pk.png differ
diff --git a/static/images/tabBar/pk_s.png b/static/images/tabBar/pk_s.png
new file mode 100644
index 0000000..068b39f
Binary files /dev/null and b/static/images/tabBar/pk_s.png differ
diff --git a/static/images/tabBar/publish.png b/static/images/tabBar/publish.png
new file mode 100644
index 0000000..acf72fd
Binary files /dev/null and b/static/images/tabBar/publish.png differ
diff --git a/static/images/tabBar/publish_s.png b/static/images/tabBar/publish_s.png
new file mode 100644
index 0000000..4753d32
Binary files /dev/null and b/static/images/tabBar/publish_s.png differ