diff --git a/src/api/base/xkApi.ts b/src/api/base/xkApi.ts index ee2a680..55a9360 100644 --- a/src/api/base/xkApi.ts +++ b/src/api/base/xkApi.ts @@ -86,4 +86,36 @@ export const xkkclxFindAllApi = async () => { */ export const getXkkcDetailByIdApi = async (id: string) => { return await get("/api/xkkc/getXkkcDetailById?id=" + id); -}; \ No newline at end of file +}; + +/** + * 校验学生选课退费(用于退费时使用) + */ +export const checkXkTfApi = async (params: any) => { + return await get("/mobile/jz/checkXkTf", params); +}; + +/** + * 获取选课退费分页查询 + * @param params + * @returns + */ +export const findPageXkTfApi = async (params: any) => { + return await get("/api/xkTf/findPage", params); +}; + +/** + * 获取选课退费详情 + * @param params + * @returns + */ +export const getXkTfDetailByIdApi = async (id: string) => { + return await get("/api/xkTf/getDetailById?id=" + id); +}; + +/** + * 家长申请退费 + */ +export const xkTfSqApi = async (params: any) => { + return await post("/api/xkTf/sq", params); +}; diff --git a/src/components/BasicForm/components/BasicDateTimes.vue b/src/components/BasicForm/components/BasicDateTimes.vue index ad8ad73..25a1c72 100644 --- a/src/components/BasicForm/components/BasicDateTimes.vue +++ b/src/components/BasicForm/components/BasicDateTimes.vue @@ -43,4 +43,4 @@ function change(e: string) { } } - + diff --git a/src/components/BasicUpload/CustomUpload.vue b/src/components/BasicUpload/CustomUpload.vue index d9c5b9e..d2f6b73 100644 --- a/src/components/BasicUpload/CustomUpload.vue +++ b/src/components/BasicUpload/CustomUpload.vue @@ -21,7 +21,7 @@ const attrs = useAttrs() const blob = ref(null) -const popup = ref<{ open: (v: string) => void } | null>(null) +const popup = ref<{ open: (v: string) => void, close: () => void }>({ open: () => { }, close: () => { }}) const emits = defineEmits(['select', 'close']) diff --git a/src/components/BasicUpload/Upload.vue b/src/components/BasicUpload/Upload.vue index b610cf1..86a9715 100644 --- a/src/components/BasicUpload/Upload.vue +++ b/src/components/BasicUpload/Upload.vue @@ -1,25 +1,20 @@ \ No newline at end of file diff --git a/src/components/PreviewImage/index.vue b/src/components/PreviewImage/index.vue new file mode 100644 index 0000000..247b174 --- /dev/null +++ b/src/components/PreviewImage/index.vue @@ -0,0 +1,134 @@ + + + + + \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 1b2d63b..a66dc14 100644 --- a/src/pages.json +++ b/src/pages.json @@ -227,6 +227,20 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/base/xk/tf/sq", + "style": { + "navigationBarTitleText": "选课退费申请", + "enablePullDownRefresh": false + } + }, + { + "path": "pages/base/xk/tf/detail", + "style": { + "navigationBarTitleText": "选课退费详情", + "enablePullDownRefresh": false + } + }, { "path": "pages/base/xk/qk/wks", "style": { @@ -286,6 +300,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/base/gzs/tf", + "style": { + "navigationBarTitleText": "退费告知书", + "enablePullDownRefresh": false + } + }, { "path": "pages/base/jc/index", "style": { diff --git a/src/pages/base/gzs/index.vue b/src/pages/base/gzs/index.vue index a6d38f1..4092afa 100644 --- a/src/pages/base/gzs/index.vue +++ b/src/pages/base/gzs/index.vue @@ -63,6 +63,10 @@ onLoad(async (options: any) => { async function submit() { // 显示加载中 const data = await signCompRef.value.getSyncSignature(); + if (!data) { + console.log("请签名"); + return; + } sign_file.value = data.base64; setFile({ sign_file: sign_file.value, diff --git a/src/pages/base/gzs/tf.vue b/src/pages/base/gzs/tf.vue new file mode 100644 index 0000000..4b0980c --- /dev/null +++ b/src/pages/base/gzs/tf.vue @@ -0,0 +1,127 @@ + + + + + diff --git a/src/pages/base/home/index.vue b/src/pages/base/home/index.vue index b8c78da..af2e379 100644 --- a/src/pages/base/home/index.vue +++ b/src/pages/base/home/index.vue @@ -223,6 +223,7 @@ const menuItems = ref([ icon: "/static/base/home/file-text-line.png", path: "/pages/base/gzs/index", permissionKey: "school-xqkxk", // 兴趣课选课权限编码 + action: 'jf', lxId: '962488654', }, { @@ -230,6 +231,7 @@ const menuItems = ref([ icon: "/static/base/home/contacts-book-3-line.png", path: "/pages/base/gzs/index", permissionKey: "school-jlbxk", // 俱乐部选课权限编码 + action: 'jf', lxId: '816059832', }, { @@ -237,13 +239,24 @@ const menuItems = ref([ icon: "/static/base/home/contacts-book-3-line.png", path: "/pages/base/gzs/index", permissionKey: "school-jcjf", + action: 'jf', lxId: 'JC', }, { - title: "退费申请", + title: "兴趣课退费", icon: "/static/base/home/contacts-book-3-line.png", - path: "/pages/base/tf/index", - permissionKey: "school-jlb", + path: "/pages/base/gzs/tf", + permissionKey: "school-xqk-tf", + action: "tf", + lxId: "962488654", + }, + { + title: "俱乐部退费", + icon: "/static/base/home/contacts-book-3-line.png", + path: "/pages/base/gzs/tf", + permissionKey: "school-jlb-tf", + action: "tf", + lxId: "816059832", }, ]); @@ -268,13 +281,13 @@ const goToGlxs = () => { // 处理菜单点击 const handleMenuClick = debounce(async (item: any) => { if (item.path) { - if (!item.lxId) { + if (item.lxId) { + setGlobal({ lxId: item.lxId, action: item.action, from: 'home' }); + PageUtils.toHome(item.lxId, item.action); + } else { uni.navigateTo({ url: item.path, }); - } else { - setGlobal({ lxId: item.lxId, from: 'home' }); - PageUtils.toHome(item.lxId); } } }); diff --git a/src/pages/base/home/xsXz.vue b/src/pages/base/home/xsXz.vue index df1d058..a728208 100644 --- a/src/pages/base/home/xsXz.vue +++ b/src/pages/base/home/xsXz.vue @@ -23,7 +23,7 @@ const switchXs = (xs: any) => { // 设置学生选择器已初始化标记 setXsPickerInitialized(true); // 检查逻辑页面 - PageUtils.checkLogicPage(xs.lxId); + PageUtils.checkLogicPage(getGlobal.lxId, getGlobal.action); } diff --git a/src/pages/base/tf/indexvue b/src/pages/base/tf/indexvue deleted file mode 100644 index e69de29..0000000 diff --git a/src/pages/base/xk/components/XkPaySuccessXkkc/index.vue b/src/pages/base/xk/components/XkPaySuccessXkkc/index.vue index 1b40b81..24f4f17 100644 --- a/src/pages/base/xk/components/XkPaySuccessXkkc/index.vue +++ b/src/pages/base/xk/components/XkPaySuccessXkkc/index.vue @@ -1,8 +1,20 @@