From 12ed5557d8b6c876cb64cea3cbe0ee96fefb3457 Mon Sep 17 00:00:00 2001
From: wangzeyan <258785420@qq.com>
Date: Fri, 6 Jun 2025 13:57:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E6=B6=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/package.json                            |  2 +-
 .../layout/default/components/aside/index.vue |  3 +++
 .../default/components/aside/menu-item.vue    | 19 ++++++++++++++++---
 .../default/components/header/index.vue       | 14 +++-----------
 admin/src/stores/modules/system.ts            |  4 +++-
 .../adminapi/route/person_course_schedule.php |  2 ++
 .../PersonCourseScheduleService.php           |  3 ++-
 7 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/admin/package.json b/admin/package.json
index d811eff0..727f9980 100644
--- a/admin/package.json
+++ b/admin/package.json
@@ -5,7 +5,7 @@
     "type": "module",
     "scripts": {
         "dev": "vite",
-        "build": "vite build && node publish.cjs",
+        "build": "vite build",
         "preview": "vite preview",
         "lint": "eslint .",
         "lint:fix": "eslint . --ext .ts --ext .vue --ext .js --fix",
diff --git a/admin/src/layout/default/components/aside/index.vue b/admin/src/layout/default/components/aside/index.vue
index 084a9a3c..25014fb7 100644
--- a/admin/src/layout/default/components/aside/index.vue
+++ b/admin/src/layout/default/components/aside/index.vue
@@ -9,6 +9,9 @@
     :with-header="false"
     custom-class="aside-drawer"
     size="210px"
+    :show-close="true"
+    :close-on-click-modal="true"
+    :close-on-press-escape="true"
   >
     <template #default>
       <side />
diff --git a/admin/src/layout/default/components/aside/menu-item.vue b/admin/src/layout/default/components/aside/menu-item.vue
index f953feff..50b1b509 100644
--- a/admin/src/layout/default/components/aside/menu-item.vue
+++ b/admin/src/layout/default/components/aside/menu-item.vue
@@ -20,7 +20,7 @@
         <template v-if="addonsMenus">
           <menu-item
             :routes="addonsMenus"
-            :key="index"
+            :key="'addon'"
             :level="props.level + 1"
           />
         </template>
@@ -29,7 +29,7 @@
     <template v-else>
       <el-menu-item
         :index="String(routes.name)"
-        @click="router.push({ name: routes.name })"
+        @click="handleMenuClick(routes.name)"
         v-if="meta.addon && meta.parent_route && meta.parent_route.addon == ''"
       >
         <template #title>
@@ -53,7 +53,7 @@
       </el-menu-item>
       <el-menu-item
         :index="String(routes.name)"
-        @click="router.push({ name: routes.name })"
+        @click="handleMenuClick(routes.name)"
         v-else
       >
         <template #title>
@@ -99,6 +99,19 @@ const props = defineProps({
 const systemStore = useSystemStore()
 const meta = computed(() => props.routes.meta)
 
+// 处理菜单点击事件
+const handleMenuClick = (name: string | number) => {
+  // 导航到目标路由
+  router.push({ name: name.toString() })
+  
+  // 在移动设备上关闭抽屉
+  if (window.innerWidth < 768) {
+    systemStore.$patch((state) => {
+      state.menuDrawer = false
+    })
+  }
+}
+
 const addons = computed(() => {
   const addons: Record<string, any> = {}
   systemStore?.apps.forEach((item: any) => {
diff --git a/admin/src/layout/default/components/header/index.vue b/admin/src/layout/default/components/header/index.vue
index 42a2761a..c4a64ccd 100644
--- a/admin/src/layout/default/components/header/index.vue
+++ b/admin/src/layout/default/components/header/index.vue
@@ -37,16 +37,6 @@
       </el-col>
       <el-col :span="12">
         <div class="right-panel h-full flex items-center justify-end">
-          <!-- 预览 只有站点时展示-->
-          <i
-            class="iconfont iconicon_huojian1 cursor-pointer px-[8px]"
-            :title="t('visitWap')"
-            @click="toPreview"
-          ></i>
-          <!-- 切换语言 -->
-          <div class="navbar-item flex items-center h-full cursor-pointer">
-            <switch-lang />
-          </div>
           <!-- 切换全屏 -->
           <!-- <div class="navbar-item flex items-center h-full cursor-pointer" @click="toggleFullscreen">
                         <icon name="iconfont icontuichuquanping" v-if="isFullscreen" />
@@ -158,8 +148,10 @@ onMounted(() => {
 // 菜单栏展开折叠
 const toggleMenuCollapse = () => {
   systemStore.$patch((state) => {
+    console.log('toggleMenuCollapse',screenWidth.value)
     if (screenWidth.value < 768) {
-      state.menuDrawer = true
+      // 直接切换抽屉状态，确保每次点击都有反应
+      state.menuDrawer = !state.menuDrawer
       state.menuIsCollapse = false
     } else {
       systemStore.toggleMenuCollapse(!systemStore.menuIsCollapse)
diff --git a/admin/src/stores/modules/system.ts b/admin/src/stores/modules/system.ts
index 653a815c..e9b4b8a8 100644
--- a/admin/src/stores/modules/system.ts
+++ b/admin/src/stores/modules/system.ts
@@ -6,6 +6,7 @@ import { getInstalledAddonList } from '@/app/api/addon'
 
 interface System {
   menuIsCollapse: boolean
+  menuDrawer: boolean
   dark: boolean
   theme: string
   lang: string
@@ -19,6 +20,7 @@ const useSystemStore = defineStore('system', {
   state: (): System => {
     return {
       menuIsCollapse: false,
+      menuDrawer: false,
       dark: theme.dark ?? false,
       theme: theme.theme ?? '#273de3',
       lang: storage.get('lang') ?? 'zh-cn',
@@ -27,7 +29,7 @@ const useSystemStore = defineStore('system', {
     }
   },
   actions: {
-    setTheme(state: string, value: any) {
+    setTheme(state: keyof Pick<System, 'dark' | 'theme'>, value: any) {
       this[state] = value
       theme[state] = value
       storage.set({ key: 'theme', data: theme })
diff --git a/niucloud/app/adminapi/route/person_course_schedule.php b/niucloud/app/adminapi/route/person_course_schedule.php
index e7057540..d91a08c5 100644
--- a/niucloud/app/adminapi/route/person_course_schedule.php
+++ b/niucloud/app/adminapi/route/person_course_schedule.php
@@ -34,6 +34,8 @@ Route::group('person_course_schedule', function () {
 
     Route::get('customer_resources_all','person_course_schedule.PersonCourseSchedule/getCustomerResourcesAll');
 
+    //获取试课人员
+    Route::get('get_try_course_person/:schedule_id', 'person_course_schedule.PersonCourseSchedule/getTryCoursePerson');
 })->middleware([
     AdminCheckToken::class,
     AdminCheckRole::class,
diff --git a/niucloud/app/service/admin/person_course_schedule/PersonCourseScheduleService.php b/niucloud/app/service/admin/person_course_schedule/PersonCourseScheduleService.php
index b5e3be43..eabea7ee 100644
--- a/niucloud/app/service/admin/person_course_schedule/PersonCourseScheduleService.php
+++ b/niucloud/app/service/admin/person_course_schedule/PersonCourseScheduleService.php
@@ -169,7 +169,8 @@ class PersonCourseScheduleService extends BaseAdminService
                     'student_id' => $student_id,
                     'person_type' => $student_id ? 'student' : 'customer_resource',
                     'course_date' => $schedule->course_date,
-                    'time_slot' => $schedule->time_slot
+                    'time_slot' => $schedule->time_slot,
+                    'status' => 0,
                 ]);
             }