diff --git a/uniapp/src/pages/index/index.vue b/uniapp/src/pages/index/index.vue index ff8c7704..b0c7bb89 100644 --- a/uniapp/src/pages/index/index.vue +++ b/uniapp/src/pages/index/index.vue @@ -192,9 +192,9 @@ const getStats = async () => { teacherId = userInfo.value.teacherId } else if (userInfo.value?.account) { try { - const teacherRes = await getTeacherInfo({ teacher_code: userInfo.value.account }) + const teacherRes = await getTeacherInfo({ teacherCode: userInfo.value.account }) if (teacherRes && teacherRes.code === 1 && teacherRes.data) { - teacherId = teacherRes.data.teacher_id + teacherId = teacherRes.data.teacherId userInfo.value.teacherId = teacherId } } catch (error) { @@ -205,11 +205,11 @@ const getStats = async () => { if (teacherId) { console.log('首页获取招生统计,teacherId:', teacherId) const res = await getEnrollmentStatistical(teacherId) - if (res && res.total_enroll_count !== undefined) { + if (res && res.totalEnrollCount !== undefined) { stats.value = { - total: res.total_enroll_count, - today: res.today_enroll_count, - week: res.week_enroll_count + total: res.totalEnrollCount, + today: res.todayEnrollCount, + week: res.weekEnrollCount } } } else { diff --git a/uniapp/src/pages/login/login.vue b/uniapp/src/pages/login/login.vue index 50b76c30..ebd7759b 100644 --- a/uniapp/src/pages/login/login.vue +++ b/uniapp/src/pages/login/login.vue @@ -377,8 +377,8 @@ const loginHandle = async (data: any) => { return } console.log('登录返回数据:', data) - console.log('登录返回userType:', data.user_type) - userStore.login(data.token, data.user_type) + console.log('登录返回userType:', data.userType) + userStore.login(data.token, data.userType) console.log('登录后token:', userStore.token) console.log('登录后userType:', userStore.userType) console.log('登录后isTeacher:', userStore.isTeacher) @@ -453,7 +453,7 @@ const wxLogin = async () => { code: code }) loginData.value = data - if (data.is_new_user) { + if (data.isNewUser) { uni.hideLoading() userStore.temToken = data.token showLoginPopup.value = true diff --git a/uniapp/src/pages/my_recruitment/my_recruitment.vue b/uniapp/src/pages/my_recruitment/my_recruitment.vue index fbccba9c..2d32b6a1 100644 --- a/uniapp/src/pages/my_recruitment/my_recruitment.vue +++ b/uniapp/src/pages/my_recruitment/my_recruitment.vue @@ -50,7 +50,7 @@ {{ item.name }} {{ item.gender === 1 ? '男' : item.gender === 2 ? '女' : '-' }} {{ item.highSchoolScore || '-' }} - {{ item.major_name || '-' }} + {{ item.majorName || '-' }} {{ item.studentStatus === 1 ? '已报名' : '预报名' }} diff --git a/uniapp/src/pages/payment/payment.vue b/uniapp/src/pages/payment/payment.vue index ec9fe93f..8731b858 100644 --- a/uniapp/src/pages/payment/payment.vue +++ b/uniapp/src/pages/payment/payment.vue @@ -567,7 +567,7 @@ onMounted(() => { }) onLoad((options: any) => { - const sid = Number(options?.studentId || options?.student_id || 0) + const sid = Number(options?.studentId || 0) if (sid > 0) { studentId.value = sid } diff --git a/uniapp/src/pages/pre_registration/pre_registration.vue b/uniapp/src/pages/pre_registration/pre_registration.vue index 8200e3ad..29ef0576 100644 --- a/uniapp/src/pages/pre_registration/pre_registration.vue +++ b/uniapp/src/pages/pre_registration/pre_registration.vue @@ -150,7 +150,7 @@ class="dropdown-option" @click="selectMajor(index)" > - {{ item.major_name }} + {{ item.majorName }} @@ -238,15 +238,15 @@ const getTeacherData = async (teacherId: string) => { console.log('teacherId:', teacherId) try { console.log('开始调用 getTeacherInfo...') - const res = await getTeacherInfo({ teacher_id: Number(teacherId) }) + const res = await getTeacherInfo({ teacherId: Number(teacherId) }) console.log('getTeacherInfo 完整返回:', JSON.stringify(res)) console.log('getTeacherInfo res.code:', res.code) console.log('getTeacherInfo res.data:', res.data) if (res.code === 1 && res.data) { - console.log('res.data.teacher_name:', res.data.teacher_name) - console.log('res.data.teacher_id:', res.data.teacher_id) - formData.teacher = res.data.teacher_name - formData.recruitmentTeacherId = res.data.teacher_id + console.log('res.data.teacherName:', res.data.teacherName) + console.log('res.data.teacherId:', res.data.teacherId) + formData.teacher = res.data.teacherName + formData.recruitmentTeacherId = res.data.teacherId console.log('赋值后 formData.teacher:', formData.teacher) console.log('赋值后 formData.recruitmentTeacherId:', formData.recruitmentTeacherId) } else { @@ -262,15 +262,15 @@ const getTeacherDataByInvitationCode = async (invitationCode: string) => { console.log('invitationCode:', invitationCode) try { console.log('开始调用 getTeacherInfo...') - const res = await getTeacherInfo({ invitation_code: invitationCode }) + const res = await getTeacherInfo({ invitationCode: invitationCode }) console.log('getTeacherInfo 完整返回:', JSON.stringify(res)) console.log('getTeacherInfo res.code:', res.code) console.log('getTeacherInfo res.data:', res.data) if (res.code === 1 && res.data) { - console.log('res.data.teacher_name:', res.data.teacher_name) - console.log('res.data.teacher_id:', res.data.teacher_id) - formData.teacher = res.data.teacher_name - formData.recruitmentTeacherId = res.data.teacher_id + console.log('res.data.teacherName:', res.data.teacherName) + console.log('res.data.teacherId:', res.data.teacherId) + formData.teacher = res.data.teacherName + formData.recruitmentTeacherId = res.data.teacherId console.log('赋值后 formData.teacher:', formData.teacher) console.log('赋值后 formData.recruitmentTeacherId:', formData.recruitmentTeacherId) } else { @@ -295,7 +295,7 @@ const getMajors = async () => { const onMajorChange = (e: any) => { console.log('选择了专业:', e) - formData.major = majorList.value[e.detail.value].major_name + formData.major = majorList.value[e.detail.value].majorName majorIndex.value = e.detail.value } @@ -312,7 +312,7 @@ const clearMajor = () => { const selectMajor = (index: number) => { console.log('选择了专业索引:', index) - formData.major = majorList.value[index].major_name + formData.major = majorList.value[index].majorName formData.majorId = majorList.value[index].id majorIndex.value = index showDropdown.value = false diff --git a/uniapp/src/pages/user/user.vue b/uniapp/src/pages/user/user.vue index 134124d6..b840288e 100644 --- a/uniapp/src/pages/user/user.vue +++ b/uniapp/src/pages/user/user.vue @@ -314,16 +314,16 @@ const getStats = async (teacherId?: number) => { const res = await getEnrollmentStatistical(teacherId) console.log('接口返回结果:', res) // 接口直接返回数据对象,没有 code 包装 - if (res && res.total_enroll_count !== undefined) { - console.log('total_enroll_count:', res.total_enroll_count) - console.log('today_enroll_count:', res.today_enroll_count) - console.log('week_enroll_count:', res.week_enroll_count) - console.log('month_enroll_count:', res.month_enroll_count) + if (res && res.totalEnrollCount !== undefined) { + console.log('totalEnrollCount:', res.totalEnrollCount) + console.log('todayEnrollCount:', res.todayEnrollCount) + console.log('weekEnrollCount:', res.weekEnrollCount) + console.log('monthEnrollCount:', res.monthEnrollCount) recruitmentStats.value = { - total: res.total_enroll_count, - today: res.today_enroll_count, - week: res.week_enroll_count, - month: res.month_enroll_count + total: res.totalEnrollCount, + today: res.todayEnrollCount, + week: res.weekEnrollCount, + month: res.monthEnrollCount } console.log('更新后的 recruitmentStats:', recruitmentStats.value) } else { @@ -469,8 +469,8 @@ onShow(async () => { // 获取教师信息 let teacherIdForQrcode: number | undefined = undefined try { - console.log('准备调用 getTeacherInfo, 参数:', { teacher_code: userInfo.value.account }) - const teacherRes = await getTeacherInfo({ teacher_code: userInfo.value.account }) + console.log('准备调用 getTeacherInfo, 参数:', { teacherCode: userInfo.value.account }) + const teacherRes = await getTeacherInfo({ teacherCode: userInfo.value.account }) console.log('getTeacherInfo 返回:', teacherRes) console.log('teacherRes 类型:', typeof teacherRes) console.log('teacherRes.code:', teacherRes?.code) @@ -478,14 +478,14 @@ onShow(async () => { if (teacherRes && teacherRes.code === 1 && teacherRes.data) { const teacherData = teacherRes.data console.log('teacherData:', teacherData) - console.log('teacherData.teacher_id:', teacherData.teacher_id) - userInfo.value.teacherId = teacherData.teacher_id - teacherIdForQrcode = teacherData.teacher_id - currentTeacherId.value = teacherData.teacher_id - console.log('设置 teacherId:', teacherData.teacher_id) - console.log('教师姓名:', teacherData.teacher_name) - console.log('学院:', teacherData.college_name) - console.log('二维码URL:', teacherData.qrcode_url) + console.log('teacherData.teacherId:', teacherData.teacherId) + userInfo.value.teacherId = teacherData.teacherId + teacherIdForQrcode = teacherData.teacherId + currentTeacherId.value = teacherData.teacherId + console.log('设置 teacherId:', teacherData.teacherId) + console.log('教师姓名:', teacherData.teacherName) + console.log('学院:', teacherData.collegeName) + console.log('二维码URL:', teacherData.qrcodeUrl) } else { console.log('获取教师信息失败或返回格式异常:', teacherRes) } diff --git a/uniapp/src/stores/user.ts b/uniapp/src/stores/user.ts index dc8190f4..03f7f7d9 100644 --- a/uniapp/src/stores/user.ts +++ b/uniapp/src/stores/user.ts @@ -35,8 +35,8 @@ export const useUserStore = defineStore({ try { const data = await getUserCenter() this.userInfo = data - if (data.user_type !== undefined && data.user_type !== null) { - this.userType = data.user_type + if (data.userType !== undefined && data.userType !== null) { + this.userType = data.userType } resetSession() } catch (error) {