diff --git a/src/router/config.ts b/src/router/config.ts
index 3da5e68..8be41b1 100644
--- a/src/router/config.ts
+++ b/src/router/config.ts
@@ -35,6 +35,7 @@ export const LOGIN_PAGE_LIST = [
export const EXCLUDE_LOGIN_PATH_LIST = [
'/pages/xxx/index', // 示例值
'/pages-sub/xxx/index', // 示例值
+ '/pages-core/splash/index', // Splash 启动页
// 注释 by 芋艿：在 mp 环境下，getAllPages 函数还没初始化好，所以不能直接调用。统一优化到 judgeIsExcludePath 函数里面去获取
// ...excludeLoginPathList, // 都是以 / 开头的 path
]
diff --git a/src/static/logo-white.svg b/src/static/logo-white.svg
new file mode 100644
index 0000000..185dc97
--- /dev/null
+++ b/src/static/logo-white.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/src/static/logo-白线.svg b/src/static/logo-白线.svg
new file mode 100644
index 0000000..185dc97
--- /dev/null
+++ b/src/static/logo-白线.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/src/static/logo.svg b/src/static/logo.svg
index 94aea0e..24f167b 100644
--- a/src/static/logo.svg
+++ b/src/static/logo.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/store/user.ts b/src/store/user.ts
index 213a536..9fd337e 100644
--- a/src/store/user.ts
+++ b/src/store/user.ts
@@ -26,9 +26,8 @@ export const useUserStore = defineStore(
/** 设置用户信息 */
const setUserInfo = (val: AuthPermissionInfo) => {
- // console.log('设置用户信息', val)
// 若头像为空 则使用默认头像
- if (!val.user) {
+ if (val.user && !val.user.avatar) {
val.user.avatar = userInfoState.avatar
}
userInfo.value = val.user
diff --git a/src/utils/index.ts b/src/utils/index.ts
index df08cbe..4719b17 100644
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -123,9 +123,9 @@ export function getEnvBaseUrl() {
// # 有些同学可能需要在微信小程序里面根据 develop、trial、release 分别设置上传地址，参考代码如下。
// TODO @芋艿：这个后续也要调整。
- const VITE_SERVER_BASEURL__WEIXIN_DEVELOP = 'http://localhost:48080/admin-api'
- const VITE_SERVER_BASEURL__WEIXIN_TRIAL = 'http://localhost:48080/admin-api'
- const VITE_SERVER_BASEURL__WEIXIN_RELEASE = 'http://localhost:48080/admin-api'
+ const VITE_SERVER_BASEURL__WEIXIN_DEVELOP = 'http://192.168.0.104:48080/admin-api'
+ const VITE_SERVER_BASEURL__WEIXIN_TRIAL = 'http://192.168.0.104:48080/admin-api'
+ const VITE_SERVER_BASEURL__WEIXIN_RELEASE = 'http://192.168.0.104:48080/admin-api'
// 微信小程序端环境区分
if (isMpWeixin) {
diff --git a/src/utils/systemInfo.ts b/src/utils/systemInfo.ts
index a60f82e..85db020 100644
--- a/src/utils/systemInfo.ts
+++ b/src/utils/systemInfo.ts
@@ -35,4 +35,39 @@ console.log('systemInfo', systemInfo)
// windowHeight: 753
// windowTop: 0
// windowWidth: 390
-export { safeAreaInsets, systemInfo }
+// 小程序自定义导航栏高度计算（胶囊按钮适配）
+// 公式：导航栏高度 = (胶囊top - 状态栏高度) * 2 + 胶囊高度
+// 总高度 = 状态栏高度 + 导航栏高度
+let statusBarHeight = 0
+let customNavBarHeight = 0
+let customNavBarTotalHeight = 0 // 状态栏 + 导航栏
+// 胶囊按钮完整信息（px）：top/height/bottom/right/left/width
+let menuButtonInfo = { top: 0, height: 0, bottom: 0, right: 0, left: 0, width: 0 }
+
+// #ifdef MP-WEIXIN
+try {
+ const menuButton = uni.getMenuButtonBoundingClientRect()
+ statusBarHeight = systemInfo.statusBarHeight || systemInfo.safeArea?.top || 0
+ const navBarHeight = (menuButton.top - statusBarHeight) * 2 + menuButton.height
+ customNavBarHeight = navBarHeight
+ customNavBarTotalHeight = statusBarHeight + navBarHeight
+ menuButtonInfo = {
+ top: menuButton.top,
+ height: menuButton.height,
+ bottom: menuButton.bottom,
+ right: menuButton.right,
+ left: menuButton.left,
+ width: menuButton.width,
+ }
+} catch {
+ statusBarHeight = 44
+ customNavBarHeight = 44
+ customNavBarTotalHeight = 88
+}
+// #endif
+
+// #ifndef MP-WEIXIN
+statusBarHeight = systemInfo.statusBarHeight || 0
+// #endif
+
+export { customNavBarHeight, customNavBarTotalHeight, menuButtonInfo, safeAreaInsets, statusBarHeight, systemInfo }