From fb4e90c518b5401b75372857b2a42165774c82e3 Mon Sep 17 00:00:00 2001
From: ywyonui <ywyonui@163.com>
Date: Wed, 3 Sep 2025 15:02:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/base/home/index.vue                   |  3 ++-
 src/pages/base/xk/components/XkkcList/index.vue |  2 --
 src/pages/base/xk/qk/index.vue                  | 10 ++--------
 src/pages/system/launchPage/launchPage.vue      |  1 +
 src/utils/pageUtil.ts                           |  3 ++-
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/pages/base/home/index.vue b/src/pages/base/home/index.vue
index 9afa299..0143bad 100644
--- a/src/pages/base/home/index.vue
+++ b/src/pages/base/home/index.vue
@@ -265,7 +265,7 @@ function handleMenuClick(item: any) {
         url: item.path,
       });
     } else {
-      setGlobal({ lxId: item.lxId });
+      setGlobal({ lxId: item.lxId, from: 'home' });
       PageUtils.toHome(item.lxId);
     }
   }
@@ -306,6 +306,7 @@ const getArticleList = async () => {
 };
 
 onMounted(async () => {
+  setGlobal({ from: 'home' });
   // 确保有学生年级信息才获取通知公告
   if (curXs.value && curXs.value.njmcId) {
     getArticleList();
diff --git a/src/pages/base/xk/components/XkkcList/index.vue b/src/pages/base/xk/components/XkkcList/index.vue
index d424c3e..12e8cd7 100644
--- a/src/pages/base/xk/components/XkkcList/index.vue
+++ b/src/pages/base/xk/components/XkkcList/index.vue
@@ -145,8 +145,6 @@ const goToDetail = (xkkc: any) => {
 
 const switchXk = (xk: any) => {
   xkkcList.value = xk.xkkcs || xk.xkkcList || [];
-  console.log('switchXk', xk)
-  
   // 对课程列表进行排序：先按课程名称，再按课程名称中的序号，最后按上课时间
   xkkcList.value.sort((a: any, b: any) => {
     // 提取课程名称（去掉序号部分）
diff --git a/src/pages/base/xk/qk/index.vue b/src/pages/base/xk/qk/index.vue
index 6267af0..72c0424 100644
--- a/src/pages/base/xk/qk/index.vue
+++ b/src/pages/base/xk/qk/index.vue
@@ -173,6 +173,7 @@ const submit = debounce(async () => {
         title: res.message,
         icon: "none",
       });
+      PageUtils.toHome(xklxId.value);
     }
   } catch (error: any) {
     hideLoading();
@@ -203,14 +204,7 @@ onLoad((options:any) => {
     if (dataObj.action === 'qk') {
       uni.hideLoading();
       if (dataObj.code === 1 && dataObj.data === "qk") {
-        if (curXk.value.sfjf === 1) {
-          PageUtils.toHome(xklxId.value);
-        } else {
-          // 不需要支付，直接跳转到支付成功页面
-          uni.navigateTo({
-            url: "/pages/base/xk/pay/success?xklxId=" + xklxId.value,
-          });
-        }
+        PageUtils.toHome(xklxId.value);
       } else {
         uni.showToast({
           title: dataObj.message,
diff --git a/src/pages/system/launchPage/launchPage.vue b/src/pages/system/launchPage/launchPage.vue
index 3de752c..0c4fbc9 100644
--- a/src/pages/system/launchPage/launchPage.vue
+++ b/src/pages/system/launchPage/launchPage.vue
@@ -48,6 +48,7 @@ const initGlobalData = (data: any) => {
     }
   }
   gData.lxId = lxId;
+  gData.from = "launch";
   setGlobal(gData);
   return gData;
 }
diff --git a/src/utils/pageUtil.ts b/src/utils/pageUtil.ts
index f508f03..2b9dde6 100644
--- a/src/utils/pageUtil.ts
+++ b/src/utils/pageUtil.ts
@@ -27,7 +27,8 @@ export const PageUtils = {
     if (devFlag) {
       userStore.setCurXs(xsList[0]);
     } else {
-      if (xsList && xsList.length > 1) {
+      if (xsList && xsList.length > 1 
+        && (dataStore.getGlobal && dataStore.getGlobal.from == 'launch')) {
         uni.reLaunch({
           url: "/pages/base/home/xsXz",
         });