diff --git a/src/pages.json b/src/pages.json index c4df1f9..a93bed9 100644 --- a/src/pages.json +++ b/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": { diff --git a/src/pages/base/xk/qk/pre.vue b/src/pages/base/xk/qk/pre.vue new file mode 100644 index 0000000..599dca0 --- /dev/null +++ b/src/pages/base/xk/qk/pre.vue @@ -0,0 +1,72 @@ + + + + + diff --git a/src/pages/base/xk/tf/detail.vue b/src/pages/base/xk/tf/detail.vue index 0b62a71..4fb8ebe 100644 --- a/src/pages/base/xk/tf/detail.vue +++ b/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"; diff --git a/src/store/modules/common.ts b/src/store/modules/common.ts index a45ba55..b5c0598 100644 --- a/src/store/modules/common.ts +++ b/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; }, diff --git a/src/store/modules/data.ts b/src/store/modules/data.ts index d3811eb..c9c9f47 100644 --- a/src/store/modules/data.ts +++ b/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, diff --git a/src/store/modules/dic.ts b/src/store/modules/dic.ts index e66fae8..66414b0 100644 --- a/src/store/modules/dic.ts +++ b/src/store/modules/dic.ts @@ -17,6 +17,9 @@ export const useDicStore = defineStore({ } }, actions: { + cleanData() { + this.data = {}; + }, setData(data: any) { this.data = data; }, diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index 218aa93..028dfdb 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -192,8 +192,8 @@ export const useUserStore = defineStore({ */ afterLoginAction(value: any) { // 为了避免数据加载异常。这里清理一下缓存 - useDicStore().setData({}); - useCommonStore().setData({}); + useDicStore().cleanData() + 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({}); - useCommonStore().setData({}); + useDicStore().cleanData() + useCommonStore().cleanData(); useDataStore().cleanData(); }, },