From 47bf0977ccb49f6416e0d7200d76975bafeb6991 Mon Sep 17 00:00:00 2001
From: ywyonui <ywyonui@163.com>
Date: Thu, 17 Jul 2025 14:01:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BE=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/server.ts                  |  7 +++
 src/pages/base/class-schedule/index.vue | 58 +++++++++----------------
 2 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/src/api/base/server.ts b/src/api/base/server.ts
index e6d0f9c..741e2c3 100644
--- a/src/api/base/server.ts
+++ b/src/api/base/server.ts
@@ -34,6 +34,13 @@ export const xkqddeleteApi = async (params: any) => {
   return await post("/api/xkqd/delete?ids=" + params.ids);
 };
 
+/**
+ * 获取当前学期和周次
+ */
+export const gzlGetDqXqAndZcApi = async () => {
+  return await get("/api/gzl/getDqXqAndZc");
+};
+
 // 获取配置：家长端是否显示分钟数
 export const getJzdShowFs = async () => {
   return await get("/api/comConfig/getJzdShowFs");
diff --git a/src/pages/base/class-schedule/index.vue b/src/pages/base/class-schedule/index.vue
index 7643844..89b79a8 100644
--- a/src/pages/base/class-schedule/index.vue
+++ b/src/pages/base/class-schedule/index.vue
@@ -63,22 +63,13 @@
 
 <script lang="ts" setup>
 import { ref, reactive, computed, onMounted, nextTick } from "vue";
-import dayjs from "dayjs";
-import "dayjs/locale/zh-cn";
-import weekOfYear from "dayjs/plugin/weekOfYear";
-import isoWeek from "dayjs/plugin/isoWeek";
-import { dqpkApi, drpkkbApi } from "@/api/base/server";
+import { dqpkApi, drpkkbApi, gzlGetDqXqAndZcApi } from "@/api/base/server";
 import { useUserStore } from "@/store/modules/user";
 const { getCurXs } = useUserStore();
 
-dayjs.locale("zh-cn");
-dayjs.extend(weekOfYear);
-dayjs.extend(isoWeek);
-
+let dqZc = 0;
 let xqId = '';
 
-// 记录当前周次编号
-const curZcNum = ref(dayjs().isoWeek());
 // 当前周次
 const curZc = ref<any>({});
 // 当前日期序号
@@ -128,7 +119,7 @@ const popupChange = (e: { show: boolean }) => {
 
 // 选择周
 const selectWeek = (zc: any) => {
-  if (zc.djz === curZc.value.djz) {
+  if (curZc.value && zc && zc.djz === curZc.value.djz) {
     // 如果点击的是当前已选中的周，则只关闭弹窗
     closeWeekPicker();
     return;
@@ -147,7 +138,9 @@ const selectWeek = (zc: any) => {
 // 选择日期
 const selectDay = (index: number) => {
   curRqIndex.value = index;
-
+  if (!rqList.value.length) {
+    return;
+  }
   drpkkbApi({
     bjId: getCurXs.bjId,
     xqId: xqId,
@@ -163,12 +156,10 @@ const selectDay = (index: number) => {
       console.warn("检查报名状态接口返回错误:", res);
     }
   })
-    .catch((error) => {
-      // 接口调用失败
-      console.error("调用检查报名状态接口失败:", error);
-    });
-
-
+  .catch((error) => {
+    // 接口调用失败
+    console.error("调用检查报名状态接口失败:", error);
+  });
 };
 
 // 判断课程颜色
@@ -181,24 +172,17 @@ const getCourseColorClass = (subject: string | undefined): string => {
 };
 
 onMounted(async () => {
-  // Make onMounted async
-  dqpkApi().then(res => {
-    // 根据接口返回的result判断是否已报名
-    if (res && res.resultCode === 1) {
-      xqId = res.result.pksz.xqId;
-      zcList.value = res.result.zcList;
-      sjList.value = res.result.sjList;
-      // 获取当前周次作为默认周次
-      selectWeek(zcList.value.find((zc: any) => zc.djz === curZcNum.value));
-    } else {
-      // 接口调用成功但返回错误
-      console.warn("检查获取当前学期课表周次相关信息接口返回错误:", res);
-    }
-  })
-    .catch((error) => {
-      // 接口调用失败
-      console.error("调用获取当前学期课表周次相关信息接口失败:", error);
-    });
+  const res = await dqpkApi();
+  const result = res.result;
+  dqZc = res.result.dqZc;
+  xqId = res.result.dqXq.id;
+  zcList.value = result.zcList;
+  sjList.value = result.sjList;
+  let zc = zcList.value.find((item:any) => item.djz === dqZc);
+  if (!zc) {
+    zc = zcList.value[0];
+  }
+  selectWeek(zc);
 });
 </script>