fix: 替换 APP 打包 logo、引导页跳转逻辑错误等问题

.env.development

 # API 接口地址
-# VITE_GLOB_API_URL=http://111.22.182.169:49600
-VITE_GLOB_API_URL=http://36.133.16.81:42111
+VITE_GLOB_API_URL=http://111.22.182.169:49600
+# VITE_GLOB_API_URL=http://36.133.16.81:42111
 
 # API 接口地址前缀
-# VITE_GLOB_API_URL_PREFIX=/jeecgboot
-VITE_GLOB_API_URL_PREFIX=/jeecg-boot
+VITE_GLOB_API_URL_PREFIX=/jeecgboot
+# VITE_GLOB_API_URL_PREFIX=/jeecg-boot

src/App.vue

@@ -44,7 +44,7 @@
     })
 
     onError((err) => {
-        Message.toast(`App Error: ${err}`)
+        // Message.toast(`App Error: ${err}`)
         console.error('App Error:', err)
     })
 

src/api/model/userInfo.ts

@@ -6,8 +6,8 @@ enum Api {
     sysLogin = '/sys/mLogin', // 登陆
     /* phoneLogin = '/sys/phoneLogin',
     sms = '/sys/sms', */
-	phoneLogin = '/sys/phoneLogin',
-	sms = '/sys/getLoginVerifyCode',
+    phoneLogin = '/sys/phoneLogin',
+    sms = '/sys/getLoginVerifyCode',
     dictList = '/sys/dict/queryAllDictItems', // 获取字典数据
     location = '/tianditu/geocode', // 根据经纬度获取地址
     sysRegister = '/app/user/register', // 注册
@@ -20,6 +20,8 @@ export function getUserInfo(params = {}) {
     return otherHttp.get({
         url: Api.getUserInfo,
         data: params,
+    }, {
+        errorMessageMode: null
     })
 }
 

src/pages/login/login.vue

 <script setup lang="ts">
     // import { PUSH_CLIENT_KEY } from '/@/enums/cacheEnum'
     import { useUserStore } from '@/store/modules/user'
-    import { closeSplashscreenAndChechUpgrade } from '@/utils/upgrade'
+    import { checkUpgrade } from '@/utils/upgrade'
     import { isDevMode } from '@/utils/env'
     import Link from '@/utils/const/link'
     import * as API from '/@/api/model/userInfo'
@@ -9,25 +9,9 @@
     const userStore = useUserStore()
 
     onShow(async () => {
-        // 获取推送标识并设置 PushClientId 缓存
-        // uni.getPushClientId({
-        //     success: (res) => {
-        //         uni.setStorageSync(PUSH_CLIENT_KEY, res.cid)
-        //     },
-        // })
-
         // 检查是否有 token
         const token = userStore.getToken
         if (token) {
-            // // 检查登录状态
-            // try {
-            //     const valid = await Auth.valid.request()
-            //     if (valid && userStore.getUserInfo) {
-            //         model.isLogin = true
-            //     }
-            // } catch (error) {
-            //     console.log('error', error)
-            // }
             model.isLogin = true
         }
 
@@ -41,7 +25,7 @@
         } else {
             // 关闭启动页并检查更新
             try {
-                await closeSplashscreenAndChechUpgrade()
+                await checkUpgrade()
             } catch (error) {
                 console.log('error', error)
             } finally {
@@ -319,14 +303,14 @@
 		                        @change="(e) => (model.form.data.read = e.checked)"
 		                        style="margin-right: 10rpx; width: 32rpx; height: 32rpx; margin-top: 2rpx"
 		                    />
-		                    <text style="color: #999999;;font-size:28rpx;">已阅读并同意</text>
+		                    <text style="color: #999;;font-size:28rpx;">已阅读并同意</text>
 		                </fui-label>
 		                <fui-text
 		                    @tap="Link.to(Link.services, '服务协议')"
 		                    size="28rpx"
 		                    text="《服务协议》"
 		                    color="#4da25b"
-		                /><text style="color: #999999;;font-size:28rpx;">与</text>
+		                /><text style="color: #999;;font-size:28rpx;">与</text>
 		                <fui-text
 		                    @tap="Link.to(Link.privacy, '隐私政策')"
 		                    size="28rpx"
@@ -381,6 +365,7 @@
         height: calc(100vh);
         block-size: 100% 100%;
         background-color: #fafefc;
+
 		.login_top_bg{
 			width:750rpx;
 			height:1324rpx;
@@ -388,23 +373,28 @@
 			left:0rpx;
 			top:0rpx;
 		}
+
 		.login_top_warp{
 			width:750rpx;
 			height:482rpx;
 			position: relative;
+
 			.login_hello{
 				position: absolute;
 				left: 50rpx;
 				top: 226rpx;
-				color: rgba(51, 51, 51, 1);
+				color: rgb(51 51 51 / 100%);
+
 				.text_hello{
 					font-size: 32rpx;
 					font-weight: 400;
 					letter-spacing: 0rpx;
 					line-height: 40rpx;
 				}
+
 				.login_server_name{
 					margin-top:32rpx;
+
 					.text_server_name{
 						font-size: 40rpx;
 						font-weight: 500;
@@ -420,36 +410,43 @@
 			justify-content: center;
 			flex-wrap:wrap;
 			position: relative;
+
 			.login-input-area{
 				width: 650rpx;
 				// border:1rpx red solid;
 				.user_phone{
 					display:flex;
 					align-items: center;
+
 					.user_phone_img{
 						width: 40rpx;
 						height: 40rpx;
 					}
 				}
+
 				.user_text_view{
 					margin-left:12rpx;
 					height: 40rpx;
 					line-height: 40rpx;
+
 					.view_text{
 						font-size: 30rpx;
 						font-weight: 500;
 						letter-spacing: 0rpx;
-						color: rgba(51, 51, 51, 1);
+						color: rgb(51 51 51 / 100%);
 					}
 				}
+
 				.input-bottom-border{
-					border-bottom: 2rpx #eeeeee solid;
+					border-bottom: 2rpx #eee solid;
 				}
+
 				.mt50{
 					margin-top:50rpx;
 				}
 			}
 		}
+
 		.submit_btn_view{
 			margin-top:120rpx;
 			width:650rpx;

src/pages/splash/splash.vue

 <script setup lang="ts">
     // import { onMounted, onUnmounted, ref } from 'vue'
     import { getQueryByType } from '/@/api/model/dict'
+    import { useUserStore } from '@/store/modules/user'
 
     const mediaUrl = ref('')
     const seconds = ref(4)
     let timer = null
-    onLoad(() => {
-        getServiceItems()
+
+    const userStore = useUserStore()
+    const model = reactive({
+        isLogin: false,
+        show: false,
     })
+
+    onLoad(async () => {
+        try {
+            await getServiceItems()
+        } finally {
+            // #ifdef APP-PLUS
+            plus.navigator.closeSplashscreen()
+            // #endif
+        }
+    })
+    async function navigateToLogin() {
+        // 检查是否有 token
+        const token = userStore.getToken
+        if (token) {
+            model.isLogin = true
+        }
+
+        try {
+            if (model.isLogin) {
+                // 刷新用户信息
+                await userStore.refreshUserInfo()
+
+                // 跳转到登录页
+                goHome()
+                Message.toast(`欢迎回来~`)
+            } else {
+                // 跳转到登录页
+                toLogin()
+            }
+        } catch (error) {
+            // 跳转到登录页
+            toLogin()
+        }
+    }
+
+    /**
+     * 跳转到门户页
+     */
+    function goHome() {
+        uni.reLaunch({
+            url: '/pages/shouye/shouye',
+        })
+    }
+
+    /**
+     * 跳转到登录页
+     */
+    function toLogin() {
+        uni.reLaunch({
+            url: '/pages/login/login',
+        })
+    }
+
     onMounted(() => {
         countdown()
     })
+
     onUnmounted(() => {
         clearTimerInterval()
     })
+
     function clearTimerInterval() {
         clearInterval(timer)
     }
     function getServiceItems() {
-        getQueryByType({ type: 2 }).then((res) => {
+        return getQueryByType({ type: 2 }).then((res) => {
             mediaUrl.value = res[0].mediaUrl
         })
     }
@@ -32,11 +91,6 @@
             }
         }, 1000)
     }
-    function navigateToLogin() {
-        uni.redirectTo({
-            url: '/pages/login/login',
-        })
-    }
 </script>
 
 <template>
@@ -76,10 +130,12 @@
         height: 100vh;
         width: 750rpx;
         position: relative;
+
         .splash_bg {
             width: 100%;
             height: 100vh;
         }
+
         .middle_logo_content {
             position: absolute;
             top: 250rpx;
@@ -88,6 +144,7 @@
             display: flex;
             flex-direction: column;
             align-items: center;
+
             .logo_view {
                 width: 136rpx;
                 height: 136rpx;
@@ -96,36 +153,43 @@
                 display: flex;
                 justify-content: center;
                 align-items: center;
+
                 .splash_logo {
                     width: 110rpx;
                     height: 110rpx;
                 }
             }
+
             .logo_text_bg {
                 margin-top: 32rpx;
                 width: 192rpx;
                 height: 64rpx;
             }
+
             .server_text_bg {
                 width: 528rpx;
                 height: 116rpx;
             }
+
             .outline_bg {
                 margin-top: -36rpx;
                 width: 464rpx;
                 height: 54rpx;
             }
         }
+
         .countdown_view {
             position: absolute;
             left: 612rpx;
             top: 118rpx;
             width: 108rpx;
             height: 52rpx;
+
             .shadow_img {
                 width: 108rpx;
                 height: 52rpx;
             }
+
             .countdown_val {
                 width: 108rpx;
                 height: 52rpx;