diff --git a/src/api/base/server.ts b/src/api/base/server.ts index 7908ec9..ba3e576 100644 --- a/src/api/base/server.ts +++ b/src/api/base/server.ts @@ -1,67 +1,79 @@ // 参数接口 // 响应接口 -import { get, post } from "@/utils/request"; +import {get, post} from "@/utils/request"; /** * 获取服务器时间 */ export const xqgwFindAllApi = async () => { - return await get("/api/xqgw/findAll"); + return await get("/api/xqgw/findAll"); }; export const xqxjFindAllApi = async () => { - return await get("/api/xqxj/findAll"); + return await get("/api/xqxj/findAll"); }; export const findAllNjBjTreeApi = async () => { - return await get("/api/nj/findAllNjBjTree"); + return await get("/api/nj/findAllNjBjTree"); }; export const kmFindAllApi = async () => { - return await get("/api/km/findAll"); + return await get("/api/km/findAll"); }; export const findAllXxXqNjTree = async () => { - return await get("/api/nj/findAllXxXqNjTree"); + return await get("/api/nj/findAllXxXqNjTree"); }; export const findAllNjBjTree = async () => { - return await get("/api/nj/findAllNjBjTree"); + return await get("/api/nj/findAllNjBjTree"); }; export const jsConfirmJsDataApi = async (params: any) => { - return await post("/api/js/confirmJsData", params); + return await post("/api/js/confirmJsData", params); }; export const jsdFindPageTaskApi = async (params: any) => { - return await get("/api/jsd/findPageTask", params); + return await get("/api/jsd/findPageTask", params); }; +export const rwflFindRwlxsByRwId = async (params: any) => { + return await get("/api/rwlx/findRwlxsByRwId", params); +} +export const rwzxSaveApi = async (params: any) => { + return await post("/api/rwzx/save", params); +}; + + +export const rwFindInfoByRwId = async (params: any) => { + return await get("/api/rw/findInfoByRwId", params); +} + export const fractionRuleApi = async () => { - return await get( - "/api/fractionRule/findAllByItemId?itemId=CDFDED2A704F46E2A4D7E8816968BD23" - ); + return await get( + "/api/fractionRule/findAllByItemId?itemId=CDFDED2A704F46E2A4D7E8816968BD23" + ); }; export const fractionRuleApi1 = async () => { - return await get( - "/api/fractionRule/findAllByItemId?itemId=B96A0FA22C414F71A3E1CDCA7E206B10" - ); + return await get( + "/api/fractionRule/findAllByItemId?itemId=B96A0FA22C414F71A3E1CDCA7E206B10" + ); }; // 查询教师信息 export const jsdfindJsByPhoneApi = async (params: any) => { - return await get("/api/js/findJsByPhone", params); + return await get("/api/js/findJsByPhone", params); }; // 选课列表 export const jsdXkListApi = async (params: any) => { - return await get("/mobile/js/xk/list", params); + return await get("/mobile/js/xk/list", params); }; // 选课列表 export const jsdXkkcSaveApi = async (params: any) => { - return await post("/api/xkkc/save", params); + return await post("/api/xkkc/save", params); }; // 选课学生列表 export const jsdXkXsListApi = async (params: any) => { - return await get("/mobile/js/xkxs/list", params); + return await get("/mobile/js/xkxs/list", params); }; // 提交点名信息 export const jsdXkdmListApi = async (params: any) => { - return await post("/mobile/js/xkdm/add", params); -}; \ No newline at end of file + return await post("/mobile/js/xkdm/add", params); +}; diff --git a/src/components/BasicForm/hooks/useForm.ts b/src/components/BasicForm/hooks/useForm.ts index 9905962..7964be5 100644 --- a/src/components/BasicForm/hooks/useForm.ts +++ b/src/components/BasicForm/hooks/useForm.ts @@ -87,6 +87,7 @@ export function useForm(options: FormOptions): UseForm { function algorithm(schemaItem: FormsSchema) { let upSchemaList: FormsSchema = options.schema.filter(item => item.field === schemaItem.field)[0] for (const key in schemaItem) { + //console.log(11,key,schemaItem[key],typeof schemaItem[key]) // @ts-ignore if (typeof schemaItem[key] === 'object') { // @ts-ignore @@ -154,4 +155,4 @@ export function useForm(options: FormOptions): UseForm { } } ] -} \ No newline at end of file +} diff --git a/src/pages/base/message/detail.vue b/src/pages/base/message/detail.vue index 9b707d4..fc19d97 100644 --- a/src/pages/base/message/detail.vue +++ b/src/pages/base/message/detail.vue @@ -2,32 +2,37 @@ \ No newline at end of file + diff --git a/src/pages/base/message/index.vue b/src/pages/base/message/index.vue index 2a6256a..556030a 100644 --- a/src/pages/base/message/index.vue +++ b/src/pages/base/message/index.vue @@ -113,12 +113,21 @@ onMounted(() => { }); const goToDetail = (data: any) => { + if (currentTab.value != 1) { + return; + } + // if(true){ + // const encodedTitle = encodeURIComponent("教学日志 (待办)"); + // uni.navigateTo({ + // url: `/pages/base/message/detail?id=${encodedTitle}` + // }); + // return; + // } // Ensure data and data.id exist before navigating if (data && data.id) { // Encode the ID in case it contains special characters - const encodedId = encodeURIComponent(data.id); uni.navigateTo({ - url: `/pages/base/message/detail?id=${encodedId}` + url: `/pages/base/message/detail?id=${data.id}` }); } else if (data && data.rwmc) { // Fallback: use title if id is missing (less reliable) diff --git a/src/pages/system/login/login.vue b/src/pages/system/login/login.vue index 838e3e3..200b894 100644 --- a/src/pages/system/login/login.vue +++ b/src/pages/system/login/login.vue @@ -2,34 +2,34 @@ @@ -40,37 +40,46 @@ - *姓名: + + * + 姓名: + - *手机号码: + + * + 手机号码: + - *验证码: + + * + 验证码: + @@ -84,19 +93,20 @@