diff --git a/src/api/base/jcApi.ts b/src/api/base/jcApi.ts index ebcd67c..3f135f7 100644 --- a/src/api/base/jcApi.ts +++ b/src/api/base/jcApi.ts @@ -3,29 +3,15 @@ import { get, post } from "@/utils/request"; /** * 校验学生就餐标准情况 */ -export const checkXsJcApi = async (params: any) => { - return await get("/mobile/jz/jc/checkXsJc", params); -}; - -/** - * 获取就餐标准列表 - */ -export const jcGetJcBzListApi = async (params: any) => { - return await get("/mobile/jz/jc/getJcBzList", params); -}; - -/** - * 获取就餐标准详情 - */ -export const jcGetJcBzDetailApi = async (params: any) => { - return await get("/mobile/jz/jc/getJcBzDetail", params); +export const checkXsJcBmApi = async (params: any) => { + return await get("/mobile/jz/jc/checkXsJcBm", params); }; /** * 学生报名就餐标准 */ -export const jcBmJcBzApi = async (params: any) => { - return await post("/mobile/jz/jc/bmJcBz", params); +export const jcXsBmJcApi = async (params: any) => { + return await post("/mobile/jz/jc/xsBmJc", params); }; /** diff --git a/src/pages.json b/src/pages.json index a66dc14..69df9c9 100644 --- a/src/pages.json +++ b/src/pages.json @@ -358,6 +358,13 @@ "navigationBarTitleText": "支付失败", "enablePullDownRefresh": false } + }, + { + "path": "pages/base/jc/pay/qrcode", + "style": { + "navigationBarTitleText": "收款码", + "enablePullDownRefresh": false + } } ], "globalStyle": { diff --git a/src/pages/base/components/JcBzList/index.vue b/src/pages/base/components/JcBzList/index.vue index 8e1e13d..c99a75f 100644 --- a/src/pages/base/components/JcBzList/index.vue +++ b/src/pages/base/components/JcBzList/index.vue @@ -49,8 +49,7 @@ + + \ No newline at end of file diff --git a/src/store/modules/data.ts b/src/store/modules/data.ts index d8f56bb..d3811eb 100644 --- a/src/store/modules/data.ts +++ b/src/store/modules/data.ts @@ -5,13 +5,14 @@ export const useDataStore = defineStore({ state: () => ({ data: {}, kcData: {}, - jcBzData: {}, global: {}, file: {}, params: {}, appCode: "JZ", qk: {}, tf: {}, + jc: {}, // 学生就餐校验信息 + jcBz: {}, // 查看标准详情信息 lcgl: {} }), getters: { @@ -27,9 +28,6 @@ export const useDataStore = defineStore({ getKcData(): any { return this.kcData; }, - getJcBzData(): any { - return this.jcBzData; - }, getParams(): any { return this.params; }, @@ -42,6 +40,12 @@ export const useDataStore = defineStore({ getTf(): any { return this.tf; }, + getJc(): any { + return this.jc; + }, + getJcBz(): any { + return this.jcBz; + }, getLcgl(): any { return this.lcgl; }, @@ -50,12 +54,14 @@ export const useDataStore = defineStore({ cleanData() { this.data = {}; this.kcData = {}; - this.jcBzData = {}; this.global = {}; this.file = {}; this.params = {}; this.qk = {}; this.tf = {}; + this.jc = {}; + this.jcBz = {}; + this.lcgl = {}; }, setData(data: any) { this.data = data; @@ -69,9 +75,6 @@ export const useDataStore = defineStore({ setKcData(data: any) { this.kcData = data; }, - setJcBzData(data: any) { - this.jcBzData = data; - }, setParams(data: any) { this.params = data; }, @@ -81,6 +84,12 @@ export const useDataStore = defineStore({ setTf(data: any) { this.tf = data; }, + setJc(data: any) { + this.jc = data; + }, + setJcBz(data: any) { + this.jcBz = data; + }, setLcgl(data: any) { this.lcgl = data; }, diff --git a/src/utils/pageUtil.ts b/src/utils/pageUtil.ts index f0be1cb..9ace9fc 100644 --- a/src/utils/pageUtil.ts +++ b/src/utils/pageUtil.ts @@ -1,5 +1,4 @@ import { checkXsXkApi, checkXkTfApi } from "@/api/base/xkApi"; -import { checkXsJcApi } from "@/api/base/jcApi"; import { useUserStore } from "@/store/modules/user"; import { useDataStore } from "@/store/modules/data"; const userStore = useUserStore(); @@ -55,7 +54,11 @@ export const PageUtils = { switch (lxId) { // 就餐逻辑单独处理 case "JC": { - + if (action === "jf") { + await this.checkJcLogic(); + } else if (action === "tf") { + await this.checkJcTfLogic(); + } } break; // 默认当作 选课的选课类型ID(xkLxId)处理 default: { @@ -163,5 +166,17 @@ export const PageUtils = { } }, + // 判断就餐逻辑 + async checkJcLogic() { + uni.reLaunch({ + url: "/pages/base/jc/bm", + }); + }, + + // 判断就餐退费逻辑 + async checkJcTfLogic() { + + }, + }