From 6a78093d316cb87ede8b7777d09e3aec5493b03c Mon Sep 17 00:00:00 2001 From: zhangyibo95 <690096405@qq.com> Date: Wed, 5 Aug 2026 17:38:34 +0800 Subject: [PATCH] =?UTF-8?q?update:=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apis.js | 17 +- src/components/UserHeader.vue | 29 +- src/pages/member/be-vip.vue | 4 +- src/pages/member/vip-intro.vue | 4 +- src/pages/rank-intro.vue | 449 ++++++++++++++---- src/pages/training/components/ScorePanel2.vue | 2 +- src/pages/user.vue | 47 +- src/store.js | 20 +- src/websocket.js | 2 +- 9 files changed, 434 insertions(+), 140 deletions(-) diff --git a/src/apis.js b/src/apis.js index 89a42e1..264b79e 100644 --- a/src/apis.js +++ b/src/apis.js @@ -8,7 +8,7 @@ try { switch (envVersion) { case "develop": // 开发版 - // BASE_URL = "http://192.168.1.2:8000/api/shoot"; + // BASE_URL = "http://192.168.1.30:8000/api/shoot"; BASE_URL = "https://apitest.shelingxingqiu.com/api/shoot"; break; case "trial": // 体验版 @@ -186,8 +186,19 @@ export const getDailyCountAPI = () => { return request("GET", "/index/dailyCount", {}, ADDONS_BASE_URL); }; -export const getHomeData = (seasonId) => { - return request("GET", `/user/myHome?seasonId=${seasonId}`); +export const getHomeData = async (seasonId) => { + const data = await request("GET", `/user/myHome?seasonId=${seasonId}`); + if (!data?.user) return data; + + // 段位信息由 myHome 接口直接返回,统一并入用户数据供各页面展示。 + return { + ...data, + user: { + ...data.user, + rankIcon: data.rankIcon, + rankName: data.rankName, + }, + }; }; export const getProvinceData = () => { diff --git a/src/components/UserHeader.vue b/src/components/UserHeader.vue index 5b375fe..c382931 100644 --- a/src/components/UserHeader.vue +++ b/src/components/UserHeader.vue @@ -10,6 +10,10 @@ const props = defineProps({ type: Boolean, default: false, }, + fullNickname: { + type: Boolean, + default: false, + }, onSignin: { type: Function, default: () => {}, @@ -61,7 +65,13 @@ watch(