首页代码修改

src/App.vue

@@ -1,42 +1,42 @@
 <script setup lang="ts">
 import { onHide, onLaunch, onShow } from '@dcloudio/uni-app'
 import { navigateToInterceptor } from '@/router/interceptor'
-import { useTokenStore } from '@/store/token'
 import { useAuthStore } from '@/store/auth'
+import { useTokenStore } from '@/store/token'
 
 onLaunch((options) => {
   console.log('App.vue onLaunch', options)
   // 初始化 store
   const tokenStore = useTokenStore()
   const authStore = useAuthStore()
-  
+
   // 钉钉免登录逻辑
   async function handleDingTalkAutoLogin() {
     try {
       // 检查是否已经有有效的token
       if (!tokenStore.isTokenExpired.value) {
-        console.log('已有有效登录状态，无需重新登录');
-        return;
+        console.log('已有有效登录状态，无需重新登录')
+        return
       }
-      
-      console.log('尝试钉钉免登录...');
+
+      console.log('尝试钉钉免登录...')
       // 尝试钉钉免登录
-      await authStore.authDingTalkLogin();
-      console.log('钉钉免登录成功');
+      await authStore.authDingTalkLogin()
+      console.log('钉钉免登录成功')
     }
     catch (error) {
-      console.error('钉钉免登录失败，将跳转到登录页面:', error);
+      console.error('钉钉免登录失败，将跳转到登录页面:', error)
       // 免登录失败，跳转到登录页面
       // 注意：这里不立即跳转，避免影响应用启动性能
       // 路由拦截器会在页面跳转时处理未登录情况
     }
   }
-  
+
   // 执行钉钉免登录
-  handleDingTalkAutoLogin();
+  handleDingTalkAutoLogin()
 })
 onShow((options) => {
-  console.log('App.vue onShow', options)
+  // console.log('App.vue onShow', options)
   // 处理直接进入页面路由的情况：如h5直接输入路由、微信小程序分享后进入等
   // https://github.com/unibest-tech/unibest/issues/192
   if (options?.path) {

src/api/auth.ts

@@ -25,4 +25,4 @@ export function getCaptcha() {
  */
 export function login(loginForm: ILoginForm) {
   return http.post<IAuthLoginRes>('/login', loginForm)
-}
+}

src/api/login.ts

@@ -94,15 +94,15 @@ export function getDingTalkCode() {
   return new Promise<{ code: string }>((resolve, reject) => {
     // #ifdef H5
     // H5环境下，模拟获取code，实际项目中可能需要通过URL参数或其他方式获取
-    console.warn('H5环境下，需要手动传入钉钉code');
-    resolve({ code: 'mock-dingtalk-code' });
+    console.warn('H5环境下，需要手动传入钉钉code')
+    resolve({ code: 'mock-dingtalk-code' })
     // #endif
     // #ifdef APP-PLUS
     // 钉钉小程序环境下，调用钉钉SDK获取code
     plus.dingtalk.getAuthCode({
       success: (res: { code: string }) => resolve(res),
-      fail: (err: any) => reject(new Error(JSON.stringify(err)))
-    });
+      fail: (err: any) => reject(new Error(JSON.stringify(err))),
+    })
     // #endif
   })
 }

src/locale/index.ts

@@ -37,7 +37,7 @@ export function getTemplateByKey(key: string) {
 
   try {
     const keyList = key.split('.')
-    let result = keyList.reduce((pre, cur) => {
+    const result = keyList.reduce((pre, cur) => {
       return pre && typeof pre === 'object' ? pre[cur] : undefined
     }, message)
     // 确保返回的是字符串类型

src/pages-fg/login/login.vue

@@ -220,7 +220,7 @@ function validateForm() {
 
       <!-- 登录按钮 -->
       <view class="login-actions">
-        <wd-button type="primary" block round :loading="authStore.loginLoading" @click="validateForm">
+        <wd-button type="primary" round block :loading="authStore.loginLoading" @click="validateForm">
           {{ authStore.loginLoading ? '登录中...' : '登录' }}
         </wd-button>
       </view>

src/pages/index/index.vue

@@ -30,6 +30,15 @@ interface MenuItem {
   children?: MenuItem[]
   /** 图标颜色 */
   iconColor?: string
+  /** 组件路径 */
+  component?: string
+  /** 元信息 */
+  meta?: {
+    /** 标题 */
+    title?: string
+    /** 图标 */
+    icon?: string
+  }
 }
 
 // 菜单数据
@@ -49,9 +58,12 @@ async function fetchMenuData() {
     const response = await http<MenuItem[]>({
       url: '/getRouters',
       method: 'GET',
+      data: {
+        source: 1,
+      }
     })
     menuData.value = response.data
-    console.log('菜单数据:', response)
+    // console.log('菜单数据:', response)
   }
   catch (err) {
     console.error('获取菜单失败:', err)
@@ -74,12 +86,12 @@ function handleMenuItemClick(menu: MenuItem) {
     return
   }
   // 根据菜单ID执行相应操作
-  if (menu.url) {
+  if (menu.component) {
+    console.log('component:', menu.component) 
     uni.navigateTo({
-      url: menu.url,
+      url:menu.component,
     })
-  }
-  else {
+  } else {
     uni.showToast({
       title: `点击了${menu.meta?.title || menu.name}`,
       icon: 'none',
@@ -92,7 +104,6 @@ onMounted(async () => {
 onLoad(async () => {
   fetchMenuData()
 })
-
 </script>
 
 <template>
@@ -100,20 +111,20 @@ onLoad(async () => {
     <!-- 菜单内容 -->
     <view class="p-2">
       <block v-if="loading">
-        <view class="text-center p-16">
-          <wd-loading size="large" type="ring"></wd-loading>
-          <text class="text-gray-500 text-sm mt-4 inline-block">加载中...</text>
+        <view class="p-16 text-center">
+          <wd-loading size="large" type="ring" />
+          <text class="mt-4 inline-block text-sm text-gray-500">加载中...</text>
         </view>
       </block>
       <block v-else-if="error">
-        <view class="text-center p-16">
-          <wd-icon name="info-circle" size="60" color="#909399"></wd-icon>
-          <text class="text-gray-500 text-sm mt-4 inline-block">{{ error }}</text>
+        <view class="p-16 text-center">
+          <wd-icon name="info-circle" size="60" color="#909399" />
+          <text class="mt-4 inline-block text-sm text-gray-500">{{ error }}</text>
         </view>
       </block>
       <block v-else>
-        <wd-card 
-          v-for="group in menuData" 
+        <wd-card
+          v-for="group in menuData"
           :key="group.id"
           class="mb-3"
           :title="group.meta?.title || group.name"
@@ -121,21 +132,21 @@ onLoad(async () => {
           :shadow="false"
         >
           <wd-grid :column="4" :gutter="10">
-            <wd-grid-item 
-              v-for="item in group.children" 
+            <wd-grid-item
+              v-for="item in group.children"
               :key="item.id"
-              @click="handleMenuItemClick(item)"
               class="menu-item"
+              @click="handleMenuItemClick(item)"
             >
-              <wd-card 
-                size="small" 
+              <wd-card
+                size="small"
                 :border="false"
                 class="menu-card"
-                :style="{ backgroundColor: (item.iconColor || '#4CAF50') + '20' }"
+                :style="{ backgroundColor: `${item.iconColor || '#4CAF50'}20` }"
               >
                 <wd-icon :name="item.meta?.icon || item.icon" color="#0083ff" size="30" />
               </wd-card>
-              <text class="text-xs text-center mt-1">{{ item.meta?.title || item.name }}</text>
+              <text class="mt-1 text-center text-xs">{{ item.meta?.title || item.name }}</text>
             </wd-grid-item>
           </wd-grid>
         </wd-card>

src/pages/me/me.vue

@@ -1,11 +1,9 @@
 <script lang="ts" setup>
 import { storeToRefs } from 'pinia'
-import { ref } from 'vue'
 import { LOGIN_PAGE } from '@/router/config'
 import { useUserStore } from '@/store'
 import { useTokenStore } from '@/store/token'
 
-
 definePage({
   style: {
     navigationBarTitleText: '我的',
@@ -40,7 +38,7 @@ function getIconText(iconName: string): string {
     'data-board': '动',
     'star': '收',
     'customer-service': '客',
-    'setting': '设'
+    'setting': '设',
   }
   return iconMap[iconName] || iconName.charAt(0)
 }
@@ -48,7 +46,7 @@ function getIconText(iconName: string): string {
 function handleFeature(featureName: string) {
   uni.showToast({
     title: `点击了${featureName}`,
-    icon: 'none'
+    icon: 'none',
   })
 }
 
@@ -81,7 +79,7 @@ async function handleLogout() {
         })
         // 使用reLaunch清除所有页面栈并跳转到登录页
         uni.reLaunch({
-          url: LOGIN_PAGE
+          url: LOGIN_PAGE,
         })
       }
     },
@@ -100,7 +98,9 @@ async function handleLogout() {
         </view>
         <!-- 右侧人员信息 -->
         <view class="user-details">
-          <view class="username">{{ userInfo.nickname || '游客' }}</view>
+          <view class="username">
+            {{ userInfo.nickname || '游客' }}
+          </view>
           <view class="user-meta">
             <text class="user-role">{{ userInfo.username || '普通用户' }}</text>
           </view>
@@ -117,13 +117,13 @@ async function handleLogout() {
         </view>
         <view class="feature-right">
           <text v-if="item.badge" class="feature-badge">{{ item.badge }}</text>
-          <text v-if="item.dot" class="notification-dot"></text>
+          <text v-if="item.dot" class="notification-dot" />
           <text class="arrow">></text>
         </view>
       </view>
     </view>
     <!-- 退出登录按钮 -->
-    <view class="logout-section px-4 mb-8">
+    <view class="logout-section mb-8 px-4">
       <button v-if="tokenStore.hasLogin" type="primary" class="w-full" @click="handleLogout">
         退出登录
       </button>

src/store/auth.ts

@@ -67,24 +67,24 @@ export const useAuthStore = defineStore(
      */
     const authDingTalkLogin = async (code?: string) => {
       try {
-        loginLoading.value = true;
-        const res = await tokenStore.dingTalkLogin(code);
+        loginLoading.value = true
+        const res = await tokenStore.dingTalkLogin(code)
         uni.showToast({
           title: '登录成功',
           icon: 'success',
-        });
-        return res;
+        })
+        return res
       }
       catch (error) {
-        console.error('钉钉登录失败:', error);
+        console.error('钉钉登录失败:', error)
         uni.showToast({
           title: '钉钉登录失败，请重试',
           icon: 'error',
-        });
-        throw error;
+        })
+        throw error
       }
       finally {
-        loginLoading.value = false;
+        loginLoading.value = false
       }
     }
 

src/store/token.ts

@@ -5,13 +5,13 @@ import type { IAuthLoginRes } from '@/api/types/login'
 import { defineStore } from 'pinia'
 import { computed, ref } from 'vue' // 修复：导入 computed
 import {
+  dingTalkLogin as _dingTalkLogin,
   login as _login,
   logout as _logout,
   refreshToken as _refreshToken,
   wxLogin as _wxLogin,
-  getWxCode,
-  dingTalkLogin as _dingTalkLogin,
   getDingTalkCode,
+  getWxCode,
 } from '@/api/login'
 import { isDoubleTokenRes, isSingleTokenRes } from '@/api/types/login'
 import { useUserStore } from './user'
@@ -192,24 +192,24 @@ export const useTokenStore = defineStore(
     const dingTalkLogin = async (code?: string) => {
       try {
         // 如果没有传入code，则自动获取
-        const authCode = code || (await getDingTalkCode()).code;
-        console.log('钉钉登录-code: ', authCode);
-        const res = await _dingTalkLogin(authCode);
-        console.log('钉钉登录-res: ', res);
-        await _postLogin(res);
+        const authCode = code || (await getDingTalkCode()).code
+        console.log('钉钉登录-code: ', authCode)
+        const res = await _dingTalkLogin(authCode)
+        console.log('钉钉登录-res: ', res)
+        await _postLogin(res)
         uni.showToast({
           title: '登录成功',
           icon: 'success',
-        });
-        return res;
+        })
+        return res
       }
       catch (error) {
-        console.error('钉钉登录失败:', error);
+        console.error('钉钉登录失败:', error)
         uni.showToast({
           title: '钉钉登录失败，请重试',
           icon: 'error',
-        });
-        throw error;
+        })
+        throw error
       }
     }
 

src/utils/i18n.ts

@@ -5,6 +5,5 @@ export function testI18n() {
   // 下面同样生效
   uni.showModal({
     title: 'i18n 测试',
-    content: t('i18n.title'),
   })
 }