From 5be2db430b57e080d629a787027ef9b069ad88c8 Mon Sep 17 00:00:00 2001 From: ywyonui Date: Tue, 2 Sep 2025 21:55:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=91=8A=E7=9F=A5=E4=B9=A6?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 11 +-- src/pages/base/gzs/{xkJlb.vue => index.vue} | 52 ++++++---- src/pages/base/gzs/jc.vue | 63 ------------ src/pages/base/gzs/xkXqk.vue | 101 -------------------- src/pages/base/home/index.vue | 6 +- src/pages/base/xk/pay/index.vue | 5 +- src/pages/base/xk/qk/index.vue | 6 +- src/pages/base/xk/qk/jlb.vue | 4 +- src/pages/base/xk/qk/xqk.vue | 4 +- src/utils/pageUtil.ts | 32 +------ 10 files changed, 52 insertions(+), 232 deletions(-) rename src/pages/base/gzs/{xkJlb.vue => index.vue} (64%) delete mode 100644 src/pages/base/gzs/jc.vue delete mode 100644 src/pages/base/gzs/xkXqk.vue diff --git a/src/pages.json b/src/pages.json index ccd11cc..1b2d63b 100644 --- a/src/pages.json +++ b/src/pages.json @@ -280,16 +280,9 @@ } }, { - "path": "pages/base/gzs/xkXqk", + "path": "pages/base/gzs/index", "style": { - "navigationBarTitleText": "兴趣课告知书", - "enablePullDownRefresh": false - } - }, - { - "path": "pages/base/gzs/xkJlb", - "style": { - "navigationBarTitleText": "俱乐部告知书", + "navigationBarTitleText": "告知书", "enablePullDownRefresh": false } }, diff --git a/src/pages/base/gzs/xkJlb.vue b/src/pages/base/gzs/index.vue similarity index 64% rename from src/pages/base/gzs/xkJlb.vue rename to src/pages/base/gzs/index.vue index 01e563c..37fa932 100644 --- a/src/pages/base/gzs/xkJlb.vue +++ b/src/pages/base/gzs/index.vue @@ -4,7 +4,7 @@ 各位家长： - {{ notice }} + @@ -32,12 +32,31 @@ import { onLoad } from "@dcloudio/uni-app"; const signCompRef = ref(null); const sign_file = ref(null); -const { setData, getGlobal } = useDataStore(); +const { setFile } = useDataStore(); const notice = ref(""); -onLoad(async () => { +const lxId = ref(""); + +onLoad(async (options: any) => { + lxId.value = options.lxId || ''; + let kcLx = ""; + switch (lxId.value) { + case "JC": { + kcLx = "就餐"; + } break; + case "816059832": { + kcLx = "俱乐部"; + } break; + case "962488654": { + kcLx = "兴趣课"; + } break; + default: { + uni.reLaunch({ url: '/pages/base/home/index' }); + return; + } + } showLoading({ title: "加载中..." }); - const res = await xkgzsApi({ kcLx: "俱乐部" }); + const res = await xkgzsApi({ kcLx: kcLx }); notice.value = res.rows?.[0]?.content || ""; uni.hideLoading(); }); @@ -46,22 +65,21 @@ async function submit() { // 显示加载中 const data = await signCompRef.value.getSyncSignature(); sign_file.value = data.base64; - setData({ + setFile({ sign_file: sign_file.value, }); - uni.reLaunch({ - url: "/pages/base/xk/qk/jlb", - }); - /*if (getGlobal.type == 1) { - uni.reLaunch({ - url: "/pages/base/xk/qk/xqk", - }); + switch (lxId.value) { + case "JC": { + uni.reLaunch({ + url: "/pages/base/jc/bm", + }); + } break; + default: { + uni.reLaunch({ + url: "/pages/base/xk/qk/index?xklxId=" + lxId.value, + }); + } } - if (getGlobal.type == 2) { - uni.reLaunch({ - url: "/pages/base/xk/qk/jlb", - }); - }*/ } diff --git a/src/pages/base/gzs/jc.vue b/src/pages/base/gzs/jc.vue deleted file mode 100644 index 613602c..0000000 --- a/src/pages/base/gzs/jc.vue +++ /dev/null @@ -1,63 +0,0 @@ - - - - - diff --git a/src/pages/base/gzs/xkXqk.vue b/src/pages/base/gzs/xkXqk.vue deleted file mode 100644 index 8eeaa1e..0000000 --- a/src/pages/base/gzs/xkXqk.vue +++ /dev/null @@ -1,101 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/pages/base/home/index.vue b/src/pages/base/home/index.vue index 3583f4c..402e133 100644 --- a/src/pages/base/home/index.vue +++ b/src/pages/base/home/index.vue @@ -219,21 +219,21 @@ const menuItems = ref([ { title: "兴趣课选课", icon: "/static/base/home/file-text-line.png", - path: "/pages/base/gzs/xkXqk", + path: "/pages/base/gzs/index", permissionKey: "school-xqkxk", // 兴趣课选课权限编码 lxId: '962488654', }, { title: "俱乐部选课", icon: "/static/base/home/contacts-book-3-line.png", - path: "/pages/base/gzs/xkJlb", + path: "/pages/base/gzs/index", permissionKey: "school-jlbxk", // 俱乐部选课权限编码 lxId: '816059832', }, { title: "就餐缴费", icon: "/static/base/home/contacts-book-3-line.png", - path: "/pages/base/gzs/jc", + path: "/pages/base/gzs/index", permissionKey: "school-jcjf", lxId: 'JC', }, diff --git a/src/pages/base/xk/pay/index.vue b/src/pages/base/xk/pay/index.vue index 1f2266f..ccc8519 100644 --- a/src/pages/base/xk/pay/index.vue +++ b/src/pages/base/xk/pay/index.vue @@ -48,7 +48,7 @@ import { jzXkCancelApi, jzXkFqJfjApi } from "@/api/base/xkApi"; import { useUserStore } from "@/store/modules/user"; import { useDataStore } from "@/store/modules/data"; import { useDebounce } from "@/utils/debounce"; -const { getUser, setWsCallback } = useUserStore(); +const { getUser, initWs, setWsCallback } = useUserStore(); const { getQk } = useDataStore(); // 为支付按钮创建防抖函数和状态 @@ -195,6 +195,7 @@ const cancelRegistration = () => { } } catch (error) { console.log(error); + goBack(); } } }), @@ -256,6 +257,8 @@ onMounted(async() => { console.log(error); goBack(); } + // 这里还是发起一下重连，避免直接跳到支付页面无法监听 + initWs(); // 设置回调处理 setWsCallback((type: string, res: any) => { // 将data从字符串转为对象 diff --git a/src/pages/base/xk/qk/index.vue b/src/pages/base/xk/qk/index.vue index b53b146..c9a8248 100644 --- a/src/pages/base/xk/qk/index.vue +++ b/src/pages/base/xk/qk/index.vue @@ -51,8 +51,8 @@ import { PageUtils } from "@/utils/pageUtil"; import { hideLoading } from "@/utils/uniapp"; const { getCurXs, getUser, initWs, setWsCallback } = useUserStore(); -const { setData, getData } = useDataStore(); -const { sign_file } = getData; +const { setData, getFile } = useDataStore(); +const { sign_file } = getFile; const title = ref(""); const xklxId = ref(""); @@ -151,7 +151,7 @@ const submit = debounce(async () => { xkId: curXk.value.id, xkkcIds: selectedXkkcIds.value, jzId: getUser.jzId, - qmFile: sign_file ? sign_file.value : "", + qmFile: sign_file ? sign_file : "", }; const res = await jzXkQkjApi(params); diff --git a/src/pages/base/xk/qk/jlb.vue b/src/pages/base/xk/qk/jlb.vue index 94ecb7e..4013a3a 100644 --- a/src/pages/base/xk/qk/jlb.vue +++ b/src/pages/base/xk/qk/jlb.vue @@ -42,8 +42,8 @@ import { useDataStore } from "@/store/modules/data"; import dayjs from "dayjs"; const { getCurXs, getUser } = useUserStore(); -const { setData, getData } = useDataStore(); -const { sign_file } = getData; +const { setData, getFile } = useDataStore(); +const { sign_file } = getFile; const curXs = computed(() => getCurXs); const curXk = ref({}); diff --git a/src/pages/base/xk/qk/xqk.vue b/src/pages/base/xk/qk/xqk.vue index 6b5f43a..4d82a2c 100644 --- a/src/pages/base/xk/qk/xqk.vue +++ b/src/pages/base/xk/qk/xqk.vue @@ -42,8 +42,8 @@ import { useDataStore } from "@/store/modules/data"; import dayjs from "dayjs"; const { getCurXs, getUser } = useUserStore(); -const { setData, getData, setParams } = useDataStore(); -const { sign_file } = getData; +const { setData, getFile, setParams } = useDataStore(); +const { sign_file } = getFile; const curXs = computed(() => getCurXs); const curXk = ref({}); diff --git a/src/utils/pageUtil.ts b/src/utils/pageUtil.ts index 6e3ded9..f508f03 100644 --- a/src/utils/pageUtil.ts +++ b/src/utils/pageUtil.ts @@ -80,7 +80,7 @@ export const PageUtils = { switch (result.xsXkStatus) { case 'KQK': { // KQK可抢课 uni.reLaunch({ - url: "/pages/base/xk/qk/index?xklxId=" + xklxId, + url: "/pages/base/gzs/index?lxId=" + xklxId, }); } break; case 'QKZ': { // QKZ抢课中 @@ -105,35 +105,5 @@ export const PageUtils = { } break; } }, - /** - * 跳转到告知书界面 - */ - toGzs(lxId: string) { - let url = ''; - switch (lxId) { - case "JC": { - url = "/pages/base/jc/gzs/jc"; - } break; - case "816059832": { - url = "/pages/base/xk/gzs/xkJlb"; - } break; - case "962488654": { - url = "/pages/base/xk/gzs/xkXqk"; - } break; - } - if (url) { - uni.navigateTo({ - url, - }); - } else { - uni.showToast({ - title: '类型异常，无法跳转到告知书', - icon: 'none' - }); - } - }, - /** - * 跳转到选课列表界面 - */ }