From 5bf38c2f1a85191d91e8ddcf254d39d809437314 Mon Sep 17 00:00:00 2001
From: Cxx0822 <1556464090@qq.com>
Date: Tue, 10 Jun 2025 20:01:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/bill.ts                             | 13 +++++++------
 src/apis/session.ts                          |  6 ++++++
 src/components/Home/Login/CommonLogin.vue    | 17 +++++++++++++----
 src/layout/admin/components/SideBar/Logo.vue |  2 +-
 src/layout/home/components/Navbar/index.vue  |  2 +-
 src/store/auth.ts                            |  5 ++++-
 src/types/auth.ts                            |  2 +-
 src/views/home/meta.ts                       |  5 -----
 src/views/home/others/admin.vue              |  7 -------
 src/views/login/index.vue                    |  1 +
 10 files changed, 34 insertions(+), 26 deletions(-)
 delete mode 100644 src/views/home/others/admin.vue

diff --git a/src/apis/bill.ts b/src/apis/bill.ts
index d52bc74..5fa6281 100644
--- a/src/apis/bill.ts
+++ b/src/apis/bill.ts
@@ -7,6 +7,7 @@ import {
   IBillRecord,
   IBillSummaryStats
 } from '@/types/bill'
+import { IStatsChart } from 'vue3-common/dist/types'
 
 export const addBillRecordApi = (billRecord: IBillRecord): Promise<boolean> =>
   cloudService({
@@ -41,7 +42,7 @@ export const queryBillSummaryApi = (query: IBillQuery): Promise<IBillRecord[]> =
     params: query
   })
 
-export const queryBillStatsApi = (type: string, query: IBillQuery): Promise<any> =>
+export const queryBillStatsApi = (type: string, query: IBillQuery): Promise<IStatsChart[]> =>
   cloudService({
     url: `/home-service/bill/stats/${type}`,
     method: 'get',
@@ -73,35 +74,35 @@ export const addBillPayApi = (billPay: IBillPay): Promise<boolean> =>
     data: billPay
   })
 
-export const updateBillPayApi = (id: number, billPay: IBillPay): Promise<any> =>
+export const updateBillPayApi = (id: number, billPay: IBillPay): Promise<boolean> =>
   cloudService({
     url: `/admin-service/bill-manage/pay/${id}`,
     method: 'put',
     data: billPay
   })
 
-export const addBillBookApi = (billBook: IBillBook): Promise<any> =>
+export const addBillBookApi = (billBook: IBillBook): Promise<boolean> =>
   cloudService({
     url: '/admin-service/bill-manage/book',
     method: 'post',
     data: billBook
   })
 
-export const updateBillBookApi = (id: number, billBook: IBillBook): Promise<any> =>
+export const updateBillBookApi = (id: number, billBook: IBillBook): Promise<boolean> =>
   cloudService({
     url: `/admin-service/bill-manage/book/${id}`,
     method: 'put',
     data: billBook
   })
 
-export const addBillCategoryApi = (billCategory: IBillCategory): Promise<any> =>
+export const addBillCategoryApi = (billCategory: IBillCategory): Promise<boolean> =>
   cloudService({
     url: '/admin-service/bill-manage/category',
     method: 'post',
     data: billCategory
   })
 
-export const updateBillCategoryApi = (id: number, billCategory: IBillCategory): Promise<any> =>
+export const updateBillCategoryApi = (id: number, billCategory: IBillCategory): Promise<boolean> =>
   cloudService({
     url: `/admin-service/bill-manage/category/${id}`,
     method: 'put',
diff --git a/src/apis/session.ts b/src/apis/session.ts
index f8ca0d4..f2b6c60 100644
--- a/src/apis/session.ts
+++ b/src/apis/session.ts
@@ -8,3 +8,9 @@ export const loginHomeApi = (name: string, password: string): Promise<ISession>
     params: { name, password }
   })
 
+export const loginAdminApi = (name: string, password: string): Promise<ISession> =>
+  cloudService({
+    url: '/admin-service/session',
+    method: 'post',
+    params: { name, password }
+  })
diff --git a/src/components/Home/Login/CommonLogin.vue b/src/components/Home/Login/CommonLogin.vue
index 0f9b0cf..c5cdaa5 100644
--- a/src/components/Home/Login/CommonLogin.vue
+++ b/src/components/Home/Login/CommonLogin.vue
@@ -43,7 +43,13 @@
     <el-button type="primary" style="width: 100%;"
                :disabled="!authStore.isVerified"
                :loading="authStore.loginLoading"
-               @click.prevent="handleLogin()">登录
+               @click.prevent="handleLogin('common')">登录
+    </el-button>
+    <div />
+    <el-button type="primary" style="width: 100%;"
+               :disabled="!authStore.isVerified"
+               :loading="authStore.loginLoading"
+               @click.prevent="handleLogin('admin')">登录管理系统
     </el-button>
 
     <div class="login-type">
@@ -79,6 +85,7 @@ import { onMounted, reactive, ref } from 'vue'
 import { loginRules } from '@/utils/element/elRules'
 import { isMobile } from 'vue3-common/utils/layoutUtil'
 import { getLocalStorage, setLocalStorage } from 'vue3-common/utils/storageUtil'
+import { ILoginType } from '@/types/auth'
 
 const rules = reactive<FormRules>(loginRules)
 const authStore = useAuthStore()
@@ -94,13 +101,13 @@ onMounted(() => {
   }
 })
 
-const handleLogin = async () => {
+const handleLogin = async (type: ILoginType) => {
   loginFormRef.value.validate(async (valid: any) => {
     if (valid) {
       authStore.loginLoading = true
 
       try {
-        await authStore.handleLogin('common')
+        await authStore.handleLogin(type)
         userStore.handleSession(authStore.homeSession)
 
         // 2. 存储账户密码到localStorage中
@@ -110,8 +117,10 @@ const handleLogin = async () => {
 
         if (isMobile()) {
           await router.push('/mobile-home')
-        } else {
+        } else if (type === 'common') {
           await router.push('/home')
+        } else {
+          await router.push('/admin')
         }
       } finally {
         authStore.loginLoading = false
diff --git a/src/layout/admin/components/SideBar/Logo.vue b/src/layout/admin/components/SideBar/Logo.vue
index 15d16f0..d61dd70 100644
--- a/src/layout/admin/components/SideBar/Logo.vue
+++ b/src/layout/admin/components/SideBar/Logo.vue
@@ -7,7 +7,7 @@
         <!--        <img :src="logoInfo.logo" alt="logo">-->
       </router-link>
       <router-link v-else key="expand" class="logo" to="/admin/dashboard">
-        <img :src="getAssetsImageFile('logo/vue.png')"
+        <img :src="getAssetsImageFile('logo/logo.png')"
              alt="logo">
       </router-link>
     </transition>
diff --git a/src/layout/home/components/Navbar/index.vue b/src/layout/home/components/Navbar/index.vue
index 72d3d37..d09e9c5 100644
--- a/src/layout/home/components/Navbar/index.vue
+++ b/src/layout/home/components/Navbar/index.vue
@@ -37,7 +37,7 @@ const profileClick = () => {
 
 const logoutClick = () => {
   commonElMessageBox('请确认是否退出登录？').then(() => {
-    router.push('/login')
+    router.push('/')
   })
 }
 </script>
diff --git a/src/store/auth.ts b/src/store/auth.ts
index 934633f..c02c331 100644
--- a/src/store/auth.ts
+++ b/src/store/auth.ts
@@ -1,6 +1,6 @@
 import { defineStore } from 'pinia'
 import { ILoginType, ISession } from '@/types/auth'
-import { loginHomeApi } from '@/apis/session'
+import { loginAdminApi, loginHomeApi } from '@/apis/session'
 import { ElMessage } from 'element-plus'
 import { emailPattern, phonePattern } from '@/utils/element/elRules'
 
@@ -90,6 +90,9 @@ export const useAuthStore = defineStore('auth', {
         case 'email':
           this.homeSession = await loginHomeApi(email, emailCode)
           break
+        case 'admin':
+          this.homeSession = await loginAdminApi(username, password)
+          break
         default:
           break
       }
diff --git a/src/types/auth.ts b/src/types/auth.ts
index aae8c55..8f0cd2e 100644
--- a/src/types/auth.ts
+++ b/src/types/auth.ts
@@ -1,4 +1,4 @@
-export type ILoginType = 'common' | 'phone' | 'email'
+export type ILoginType = 'common' | 'phone' | 'email' | 'admin'
 
 export type IAccountType = 'QQ' | 'WeChat' | 'Phone' | 'EMail'
 
diff --git a/src/views/home/meta.ts b/src/views/home/meta.ts
index 58fa431..44d60d1 100644
--- a/src/views/home/meta.ts
+++ b/src/views/home/meta.ts
@@ -55,11 +55,6 @@ export const homeMeta: IRouteMetaConfig = {
     order: 4,
     redirect: '/home/others/admin'
   },
-  '/home/others/admin': {
-    title: '管理系统',
-    icon: '',
-    redirect: '/admin'
-  },
   '/home/others/blog': {
     title: '个人博客',
     icon: '',
diff --git a/src/views/home/others/admin.vue b/src/views/home/others/admin.vue
deleted file mode 100644
index eeb5956..0000000
--- a/src/views/home/others/admin.vue
+++ /dev/null
@@ -1,7 +0,0 @@
-<template>
-  <div>
-  </div>
-</template>
-
-<script setup lang="ts">
-</script>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index db5e988..8e83522 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -31,6 +31,7 @@ const loginInfo = reactive({
 })
 
 onMounted(() => {
+  authStore.isVerified = false
   // authStore.resetLoginForm()
 })