调整选课调课支付

src/pages.json

@@ -221,6 +221,13 @@
         "enablePullDownRefresh": false
       }
     },
+    {
+      "path": "pages/base/xk/qk/pre",
+      "style": {
+        "navigationBarTitleText": "抢课",
+        "enablePullDownRefresh": false
+      }
+    },
     {
       "path": "pages/base/xk/qk/xqk",
       "style": {

src/pages/base/xk/qk/pre.vue

@@ -0,0 +1,72 @@
+<template>
+  <view class="wh-full">
+    <BasicLoading
+      :isShow="isShow"
+      bgColor="#fff"
+      isShowTitle
+      textColor="#000"
+      title="加载中..."
+      :type="1"
+    />
+  </view>
+</template>
+
+<script setup lang="ts">
+import { onLoad } from '@dcloudio/uni-app';
+import { useDataStore } from "@/store/modules/data";
+import { useUserStore } from "@/store/modules/user";
+import { PageUtils } from "@/utils/pageUtil";
+import { xxtsFindByIdApi } from "@/api/base/xxtsApi";
+const { loginByOpenId, getUser, setCurXs } = useUserStore();
+const { setXxts } = useDataStore();
+
+const isShow = ref(true);
+
+// 从待办加载
+const loadByDb = async (data: any) => { 
+	// 检查登录状态
+	const isLoggedIn = await loginByOpenId(data.openId);
+	if (!isLoggedIn) {
+		console.log("用户未登录，跳过处理");
+		return;
+	}
+	try {
+		// 优先从后端根据url中的id去查询Xxts
+		const xxtsRes = await xxtsFindByIdApi({ id: data.id });
+		if (xxtsRes && xxtsRes.result) {
+			const xxts = xxtsRes.result;
+      setXxts(xxts);
+		}
+    const xsList = getUser.xsList || [];
+    if (xsList && xsList.length > 0) {
+      // 获取当前学生信息
+      const curXs = xsList.find((xs: any) => xs.id == data.xsId);
+      if (curXs) {
+        setCurXs(curXs);
+        // 检查抢课逻辑
+        PageUtils.checkQkLogic(data.xklxId);
+      }
+    }
+	} catch (error) {
+		console.error("获取待办信息失败", error);
+	}
+};
+
+onLoad((data:any) => {
+  // 从待办过来的，需要从后端获取数据
+  if (data && data.from && data.from == "db") {
+    loadByDb(data);
+	}
+});
+</script>
+
+<style lang="scss" scoped>
+.pre-page {
+  min-height: 100%;
+  background-color: #f5f7fa;
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  overflow: hidden;
+}
+</style>

src/pages/base/xk/tf/detail.vue

@@ -61,7 +61,6 @@ import { useDataStore } from "@/store/modules/data";
 import { useUserStore } from "@/store/modules/user";
 import XkPayXs from "@/pages/base/xk/components/XkPayXs/index.vue"
 import XkPaySuccessXkkc from "@/pages/base/xk/components/XkPaySuccessXkkc/index.vue"
-import LcglSp from "@/components/LcglSp/index.vue";
 import PreviewImage from "@/components/PreviewImage/index.vue";
 import { getXkTfDetailByIdApi } from "@/api/base/xkApi";
 import { xxtsFindByIdApi } from "@/api/base/xxtsApi";

src/store/modules/common.ts

@@ -1,6 +1,7 @@
 import { defineStore } from "pinia";
 import { jsFindByIdApi } from "@/api/base/jsApi";
 import { xkkclxFindAllApi, getXkkcDetailByIdApi } from "@/api/base/xkApi";
+import { clear } from "console";
 
 /**
  * 
@@ -56,6 +57,9 @@ export const useCommonStore = defineStore({
     }
   },
   actions: {
+    cleanData() {
+      this.data = {};
+    },
     setData(key: string, data: any) {
       this.data[key] = data;
     },

src/store/modules/data.ts

@@ -1,3 +1,4 @@
+import { get } from "lodash";
 import { defineStore } from "pinia";
 
 export const useDataStore = defineStore({
@@ -13,7 +14,8 @@ export const useDataStore = defineStore({
     tf: {},
     jc: {}, // 学生就餐校验信息
     jcBz: {}, // 查看标准详情信息
-    lcgl: {}
+    lcgl: {},
+    xxts: {}, // 消息推送
   }),
   getters: {
     getData(): any {
@@ -49,6 +51,9 @@ export const useDataStore = defineStore({
     getLcgl(): any {
       return this.lcgl;
     },
+    getXxts(): any {
+      return this.xxts;
+    },
   },
   actions: {
     cleanData() {
@@ -62,6 +67,7 @@ export const useDataStore = defineStore({
       this.jc = {};
       this.jcBz = {};
       this.lcgl = {};
+      this.xxts = {};
     },
     setData(data: any) {
       this.data = data;
@@ -93,6 +99,9 @@ export const useDataStore = defineStore({
     setLcgl(data: any) {
       this.lcgl = data;
     },
+    setXxts(data: any) {
+      this.xxts = data;
+    },
   },
   persist: {
     enabled: true,

src/store/modules/dic.ts

@@ -17,6 +17,9 @@ export const useDicStore = defineStore({
     }
   },
   actions: {
+    cleanData() {
+      this.data = {};
+    },
     setData(data: any) {
       this.data = data;
     },

src/store/modules/user.ts

@@ -192,8 +192,8 @@ export const useUserStore = defineStore({
      */
     afterLoginAction(value: any) {
       // 为了避免数据加载异常。这里清理一下缓存
-      useDicStore().setData({});
+      useDicStore().cleanData()
-      useCommonStore().setData({});
+      useCommonStore().cleanData();
       useDataStore().cleanData();
       // 设置用户数据
       this.setUser(value)
@@ -228,8 +228,8 @@ export const useUserStore = defineStore({
       this.setXsPickerInitialized(false); // 注销时重置学生选择器状态
       this.exitWs();
       this.wsCallback = defWsCallback;
-      useDicStore().setData({});
+      useDicStore().cleanData()
-      useCommonStore().setData({});
+      useCommonStore().cleanData();
       useDataStore().cleanData();
     },
   },