From bb45d79951bfec2655e20693fe4950503b72a310 Mon Sep 17 00:00:00 2001
From: Litrix <wbpstn@163.com>
Date: Fri, 27 Dec 2024 13:10:25 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=83=20docs:=20=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                       |  8 ++++-
 src/api/index.ts                  |  2 +-
 src/components/PagedWrapper.vue   |  6 ++--
 src/components/app/HeaderMenu.vue | 22 +++++++++-----
 src/router/index.ts               |  9 +++++-
 src/views/MainPage.vue            | 49 ++++++++++++++++---------------
 src/views/manage/ManagePage.vue   | 12 ++++++++
 src/views/user/UserEditPage.vue   |  3 --
 src/views/user/UserPage.vue       |  4 ++-
 9 files changed, 76 insertions(+), 39 deletions(-)
 create mode 100644 src/views/manage/ManagePage.vue

diff --git a/src/App.vue b/src/App.vue
index 912f22e..0e96ec8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -9,7 +9,13 @@
           <el-icon size="50" @click="navigate" color="var(--el-color-primary)">
             <icon-cs-club />
           </el-icon>
-          <h3 v-show="showAppTitle" class="app__title" @click="navigate">社团展示系统</h3>
+          <h3
+            v-show="showAppTitle"
+            class="overflow-hidden text-ellipsis whitespace-nowrap"
+            @click="navigate"
+          >
+            社团展示系统
+          </h3>
         </router-link>
         <header-menu v-show="!mdLess" mode="horizontal" />
         <el-dropdown v-if="!mdLess && userStore.logined">
diff --git a/src/api/index.ts b/src/api/index.ts
index fbea4e6..5c6be00 100644
--- a/src/api/index.ts
+++ b/src/api/index.ts
@@ -16,7 +16,7 @@ declare module 'axios' {
 // 自动添加token到请求中.
 axiosInstance.interceptors.request.use((config) => {
   const userStore = useUserStore();
-  if (config.addAuth !== undefined && config.addAuth) {
+  if (config.addAuth === undefined || config.addAuth) {
     config.headers.setAuthorization(userStore.token, false);
   }
   return config;
diff --git a/src/components/PagedWrapper.vue b/src/components/PagedWrapper.vue
index f83f1c1..6999faa 100644
--- a/src/components/PagedWrapper.vue
+++ b/src/components/PagedWrapper.vue
@@ -14,11 +14,13 @@
           :layout="paginationLayout"
           :total="total"
           :page-size="num"
+          1
           :current="page"
+          hide-on-single-page
         />
       </template>
       <template v-else>
-        <slot name="error">
+        <slot name="empty">
           <div class="font-5 font-bold">暂无数据</div>
         </slot>
       </template>
@@ -44,7 +46,7 @@ const { schema, getRequestOptions, num } = defineProps<{
 }>();
 defineSlots<{
   default: (props: { data: DataList }) => unknown;
-  error: () => unknown;
+  empty: () => unknown;
 }>();
 const loading = ref(true);
 const resp = ref<Succeed>();
diff --git a/src/components/app/HeaderMenu.vue b/src/components/app/HeaderMenu.vue
index 34c05ae..fb547de 100644
--- a/src/components/app/HeaderMenu.vue
+++ b/src/components/app/HeaderMenu.vue
@@ -7,7 +7,7 @@
     @select="$emit('select')"
   >
     <el-menu-item index="/">首页</el-menu-item>
-    <el-menu-item v-if="isValid($router.resolve('/club'))" index="/club">社团</el-menu-item>
+    <el-menu-item v-if="isValid('/club')" index="/club">社团</el-menu-item>
     <el-sub-menu class="festival-menu" index="festival">
       <template #title>社团文化节</template>
       <template v-for="{ imgURL, title, to } of festivalMenuItems">
@@ -20,6 +20,7 @@
         />
       </template>
     </el-sub-menu>
+    <el-menu-item v-if="isValid('/manage')" index="/manage">管理</el-menu-item>
   </el-menu>
 </template>
 <style lang="scss" scoped>
@@ -63,12 +64,19 @@ const festivalMenuItems = reactive<MenuItem[]>([
     to: router.resolve('/gobang'),
   },
 ]);
-const isValid = ({
-  meta: { shouldLogin, userPermissionId, clubPermissionId },
-}: RouteLocationGeneric) =>
-  (!shouldLogin || userStore.logined) &&
-  userStore.hasUserPermissions(userPermissionId) &&
-  userStore.hasClubPermissions(clubPermissionId);
+function isValid(to: string | RouteLocationGeneric) {
+  if (typeof to === 'string') {
+    to = router.resolve(to);
+  }
+  const {
+    meta: { shouldLogin, userPermissionId, clubPermissionId },
+  } = to;
+  return (
+    (!shouldLogin || userStore.logined) &&
+    userStore.hasUserPermissions(userPermissionId) &&
+    userStore.hasClubPermissions(clubPermissionId)
+  );
+}
 defineProps<{
   mode: 'horizontal' | 'vertical';
 }>();
diff --git a/src/router/index.ts b/src/router/index.ts
index 50850ef..bd4415a 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -4,7 +4,6 @@ import type { MaybeArray } from '@/utils/types';
 import { PageErrorType, type PageErrorReason } from '@/views/ErrorPage.vue';
 import { createRouter, createWebHistory, type RouteRecordRaw } from 'vue-router';
 import { ClubPermissionId, UserPermissionId } from './permissions';
-
 declare module 'vue-router' {
   interface RouteMeta {
     routeId?: number;
@@ -79,6 +78,14 @@ const routes: RouteRecordRaw[] = [
       shouldLogin: true,
     },
   },
+  {
+    path: '/manage',
+    name: 'Manage',
+    component: () => import('@/views/manage/ManagePage.vue'),
+    meta: {
+      userPermissionId: UserPermissionId.MANAGE_PAGE,
+    },
+  },
   {
     path: '/:path(.*)*',
     name: 'NotFound',
diff --git a/src/views/MainPage.vue b/src/views/MainPage.vue
index 2bda7fc..83ba623 100644
--- a/src/views/MainPage.vue
+++ b/src/views/MainPage.vue
@@ -17,30 +17,33 @@
         <div>
           <div class="title">社团活动</div>
         </div>
-        <paged-wrapper
-          class="grid-col-span-2"
-          pagination-background
-          :schema="clubListRespSchema"
-          :num="10"
-          pagination-class="w-min"
-          pagination-layout="prev, pager, next"
-          :get-request-options="getClubListRequestOptions"
-          v-slot="{ data }"
-        >
-          <div v-show="data">
-            <div class="title m-b-10px">社团列表</div>
-            <div
-              class="grid gap-10px justify-center max-sm-grid-cols-3 sm-grid-cols-5 md-grid-cols-7 lg-grid-cols-9"
-            >
-              <div v-for="club of data" class="flex flex-col items-center">
-                <el-avatar :size="90" :src="getAvatarURL(club.avatar)">
-                  <div class="text-black">暂无图片</div>
-                </el-avatar>
-                <div class="text-5 font-bold">{{ club.name }}</div>
+        <div class="grid-col-span-2">
+          <div class="title m-b-10px">社团列表</div>
+          <paged-wrapper
+            pagination-background
+            :schema="clubListRespSchema"
+            :num="10"
+            pagination-class="w-min"
+            pagination-layout="prev, pager, next"
+            :get-request-options="getClubListRequestOptions"
+          >
+            <template #default="{ data }">
+              <div
+                class="grid gap-10px justify-center max-sm-grid-cols-3 sm-grid-cols-5 md-grid-cols-7 lg-grid-cols-9"
+              >
+                <div v-for="club of data" class="flex flex-col items-center">
+                  <el-avatar :size="90" :src="getAvatarURL(club.avatar)">
+                    <div class="text-black">暂无图片</div>
+                  </el-avatar>
+                  <div class="text-5 font-bold">{{ club.name }}</div>
+                </div>
               </div>
-            </div>
-          </div>
-        </paged-wrapper>
+            </template>
+            <template #empty>
+              <div class="font-bold text-5">暂无社团</div>
+            </template>
+          </paged-wrapper>
+        </div>
       </div>
     </div>
   </el-main>
diff --git a/src/views/manage/ManagePage.vue b/src/views/manage/ManagePage.vue
new file mode 100644
index 0000000..d63d8b7
--- /dev/null
+++ b/src/views/manage/ManagePage.vue
@@ -0,0 +1,12 @@
+<template>
+  <el-main>
+    <el-container>
+      <el-aside class="manage-page-aside">
+        <el-menu></el-menu>
+      </el-aside>
+      <el-main></el-main>
+    </el-container>
+  </el-main>
+</template>
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/user/UserEditPage.vue b/src/views/user/UserEditPage.vue
index 1ce24d6..b3804a4 100644
--- a/src/views/user/UserEditPage.vue
+++ b/src/views/user/UserEditPage.vue
@@ -14,9 +14,6 @@
             </el-link>
           </template>
         </el-upload>
-        <el-link type="danger" :icon="Close" :disabled="uploading" :underline="false">
-          清除头像
-        </el-link>
       </div>
     </div>
     <el-divider />
diff --git a/src/views/user/UserPage.vue b/src/views/user/UserPage.vue
index d2c1649..4d14c52 100644
--- a/src/views/user/UserPage.vue
+++ b/src/views/user/UserPage.vue
@@ -58,7 +58,9 @@
           </div>
         </div>
         <div class="flex-1 flex flex-col overflow-hidden">
-          <div class="user-menu-h-outer w-auto"><user-menu :user-info="userInfo" mobile /></div>
+          <div class="user-menu-h-outer w-auto">
+            <user-menu :user-info="userInfo" mobile />
+          </div>
           <div class="main flex-1 bg-white">
             <router-view v-slot="{ Component }">
               <keep-alive>