将参数改成驼峰格式
This commit is contained in:
parent
717e9a9dd8
commit
b112065efe
|
|
@ -192,9 +192,9 @@ const getStats = async () => {
|
||||||
teacherId = userInfo.value.teacherId
|
teacherId = userInfo.value.teacherId
|
||||||
} else if (userInfo.value?.account) {
|
} else if (userInfo.value?.account) {
|
||||||
try {
|
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) {
|
if (teacherRes && teacherRes.code === 1 && teacherRes.data) {
|
||||||
teacherId = teacherRes.data.teacher_id
|
teacherId = teacherRes.data.teacherId
|
||||||
userInfo.value.teacherId = teacherId
|
userInfo.value.teacherId = teacherId
|
||||||
}
|
}
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|
@ -205,11 +205,11 @@ const getStats = async () => {
|
||||||
if (teacherId) {
|
if (teacherId) {
|
||||||
console.log('首页获取招生统计,teacherId:', teacherId)
|
console.log('首页获取招生统计,teacherId:', teacherId)
|
||||||
const res = await getEnrollmentStatistical(teacherId)
|
const res = await getEnrollmentStatistical(teacherId)
|
||||||
if (res && res.total_enroll_count !== undefined) {
|
if (res && res.totalEnrollCount !== undefined) {
|
||||||
stats.value = {
|
stats.value = {
|
||||||
total: res.total_enroll_count,
|
total: res.totalEnrollCount,
|
||||||
today: res.today_enroll_count,
|
today: res.todayEnrollCount,
|
||||||
week: res.week_enroll_count
|
week: res.weekEnrollCount
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -377,8 +377,8 @@ const loginHandle = async (data: any) => {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
console.log('登录返回数据:', data)
|
console.log('登录返回数据:', data)
|
||||||
console.log('登录返回userType:', data.user_type)
|
console.log('登录返回userType:', data.userType)
|
||||||
userStore.login(data.token, data.user_type)
|
userStore.login(data.token, data.userType)
|
||||||
console.log('登录后token:', userStore.token)
|
console.log('登录后token:', userStore.token)
|
||||||
console.log('登录后userType:', userStore.userType)
|
console.log('登录后userType:', userStore.userType)
|
||||||
console.log('登录后isTeacher:', userStore.isTeacher)
|
console.log('登录后isTeacher:', userStore.isTeacher)
|
||||||
|
|
@ -453,7 +453,7 @@ const wxLogin = async () => {
|
||||||
code: code
|
code: code
|
||||||
})
|
})
|
||||||
loginData.value = data
|
loginData.value = data
|
||||||
if (data.is_new_user) {
|
if (data.isNewUser) {
|
||||||
uni.hideLoading()
|
uni.hideLoading()
|
||||||
userStore.temToken = data.token
|
userStore.temToken = data.token
|
||||||
showLoginPopup.value = true
|
showLoginPopup.value = true
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@
|
||||||
<view class="td td-name">{{ item.name }}</view>
|
<view class="td td-name">{{ item.name }}</view>
|
||||||
<view class="td td-gender">{{ item.gender === 1 ? '男' : item.gender === 2 ? '女' : '-' }}</view>
|
<view class="td td-gender">{{ item.gender === 1 ? '男' : item.gender === 2 ? '女' : '-' }}</view>
|
||||||
<view class="td td-score">{{ item.highSchoolScore || '-' }}</view>
|
<view class="td td-score">{{ item.highSchoolScore || '-' }}</view>
|
||||||
<view class="td td-major">{{ item.major_name || '-' }}</view>
|
<view class="td td-major">{{ item.majorName || '-' }}</view>
|
||||||
<view class="td td-status">
|
<view class="td td-status">
|
||||||
<text :class="item.studentStatus === 1 ? 'status-enrolled' : 'status-pre'">
|
<text :class="item.studentStatus === 1 ? 'status-enrolled' : 'status-pre'">
|
||||||
{{ item.studentStatus === 1 ? '已报名' : '预报名' }}
|
{{ item.studentStatus === 1 ? '已报名' : '预报名' }}
|
||||||
|
|
|
||||||
|
|
@ -567,7 +567,7 @@ onMounted(() => {
|
||||||
})
|
})
|
||||||
|
|
||||||
onLoad((options: any) => {
|
onLoad((options: any) => {
|
||||||
const sid = Number(options?.studentId || options?.student_id || 0)
|
const sid = Number(options?.studentId || 0)
|
||||||
if (sid > 0) {
|
if (sid > 0) {
|
||||||
studentId.value = sid
|
studentId.value = sid
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -150,7 +150,7 @@
|
||||||
class="dropdown-option"
|
class="dropdown-option"
|
||||||
@click="selectMajor(index)"
|
@click="selectMajor(index)"
|
||||||
>
|
>
|
||||||
{{ item.major_name }}
|
{{ item.majorName }}
|
||||||
</view>
|
</view>
|
||||||
</scroll-view>
|
</scroll-view>
|
||||||
</view>
|
</view>
|
||||||
|
|
@ -238,15 +238,15 @@ const getTeacherData = async (teacherId: string) => {
|
||||||
console.log('teacherId:', teacherId)
|
console.log('teacherId:', teacherId)
|
||||||
try {
|
try {
|
||||||
console.log('开始调用 getTeacherInfo...')
|
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 完整返回:', JSON.stringify(res))
|
||||||
console.log('getTeacherInfo res.code:', res.code)
|
console.log('getTeacherInfo res.code:', res.code)
|
||||||
console.log('getTeacherInfo res.data:', res.data)
|
console.log('getTeacherInfo res.data:', res.data)
|
||||||
if (res.code === 1 && res.data) {
|
if (res.code === 1 && res.data) {
|
||||||
console.log('res.data.teacher_name:', res.data.teacher_name)
|
console.log('res.data.teacherName:', res.data.teacherName)
|
||||||
console.log('res.data.teacher_id:', res.data.teacher_id)
|
console.log('res.data.teacherId:', res.data.teacherId)
|
||||||
formData.teacher = res.data.teacher_name
|
formData.teacher = res.data.teacherName
|
||||||
formData.recruitmentTeacherId = res.data.teacher_id
|
formData.recruitmentTeacherId = res.data.teacherId
|
||||||
console.log('赋值后 formData.teacher:', formData.teacher)
|
console.log('赋值后 formData.teacher:', formData.teacher)
|
||||||
console.log('赋值后 formData.recruitmentTeacherId:', formData.recruitmentTeacherId)
|
console.log('赋值后 formData.recruitmentTeacherId:', formData.recruitmentTeacherId)
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -262,15 +262,15 @@ const getTeacherDataByInvitationCode = async (invitationCode: string) => {
|
||||||
console.log('invitationCode:', invitationCode)
|
console.log('invitationCode:', invitationCode)
|
||||||
try {
|
try {
|
||||||
console.log('开始调用 getTeacherInfo...')
|
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 完整返回:', JSON.stringify(res))
|
||||||
console.log('getTeacherInfo res.code:', res.code)
|
console.log('getTeacherInfo res.code:', res.code)
|
||||||
console.log('getTeacherInfo res.data:', res.data)
|
console.log('getTeacherInfo res.data:', res.data)
|
||||||
if (res.code === 1 && res.data) {
|
if (res.code === 1 && res.data) {
|
||||||
console.log('res.data.teacher_name:', res.data.teacher_name)
|
console.log('res.data.teacherName:', res.data.teacherName)
|
||||||
console.log('res.data.teacher_id:', res.data.teacher_id)
|
console.log('res.data.teacherId:', res.data.teacherId)
|
||||||
formData.teacher = res.data.teacher_name
|
formData.teacher = res.data.teacherName
|
||||||
formData.recruitmentTeacherId = res.data.teacher_id
|
formData.recruitmentTeacherId = res.data.teacherId
|
||||||
console.log('赋值后 formData.teacher:', formData.teacher)
|
console.log('赋值后 formData.teacher:', formData.teacher)
|
||||||
console.log('赋值后 formData.recruitmentTeacherId:', formData.recruitmentTeacherId)
|
console.log('赋值后 formData.recruitmentTeacherId:', formData.recruitmentTeacherId)
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -295,7 +295,7 @@ const getMajors = async () => {
|
||||||
|
|
||||||
const onMajorChange = (e: any) => {
|
const onMajorChange = (e: any) => {
|
||||||
console.log('选择了专业:', e)
|
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
|
majorIndex.value = e.detail.value
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -312,7 +312,7 @@ const clearMajor = () => {
|
||||||
|
|
||||||
const selectMajor = (index: number) => {
|
const selectMajor = (index: number) => {
|
||||||
console.log('选择了专业索引:', index)
|
console.log('选择了专业索引:', index)
|
||||||
formData.major = majorList.value[index].major_name
|
formData.major = majorList.value[index].majorName
|
||||||
formData.majorId = majorList.value[index].id
|
formData.majorId = majorList.value[index].id
|
||||||
majorIndex.value = index
|
majorIndex.value = index
|
||||||
showDropdown.value = false
|
showDropdown.value = false
|
||||||
|
|
|
||||||
|
|
@ -314,16 +314,16 @@ const getStats = async (teacherId?: number) => {
|
||||||
const res = await getEnrollmentStatistical(teacherId)
|
const res = await getEnrollmentStatistical(teacherId)
|
||||||
console.log('接口返回结果:', res)
|
console.log('接口返回结果:', res)
|
||||||
// 接口直接返回数据对象,没有 code 包装
|
// 接口直接返回数据对象,没有 code 包装
|
||||||
if (res && res.total_enroll_count !== undefined) {
|
if (res && res.totalEnrollCount !== undefined) {
|
||||||
console.log('total_enroll_count:', res.total_enroll_count)
|
console.log('totalEnrollCount:', res.totalEnrollCount)
|
||||||
console.log('today_enroll_count:', res.today_enroll_count)
|
console.log('todayEnrollCount:', res.todayEnrollCount)
|
||||||
console.log('week_enroll_count:', res.week_enroll_count)
|
console.log('weekEnrollCount:', res.weekEnrollCount)
|
||||||
console.log('month_enroll_count:', res.month_enroll_count)
|
console.log('monthEnrollCount:', res.monthEnrollCount)
|
||||||
recruitmentStats.value = {
|
recruitmentStats.value = {
|
||||||
total: res.total_enroll_count,
|
total: res.totalEnrollCount,
|
||||||
today: res.today_enroll_count,
|
today: res.todayEnrollCount,
|
||||||
week: res.week_enroll_count,
|
week: res.weekEnrollCount,
|
||||||
month: res.month_enroll_count
|
month: res.monthEnrollCount
|
||||||
}
|
}
|
||||||
console.log('更新后的 recruitmentStats:', recruitmentStats.value)
|
console.log('更新后的 recruitmentStats:', recruitmentStats.value)
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -469,8 +469,8 @@ onShow(async () => {
|
||||||
// 获取教师信息
|
// 获取教师信息
|
||||||
let teacherIdForQrcode: number | undefined = undefined
|
let teacherIdForQrcode: number | undefined = undefined
|
||||||
try {
|
try {
|
||||||
console.log('准备调用 getTeacherInfo, 参数:', { teacher_code: userInfo.value.account })
|
console.log('准备调用 getTeacherInfo, 参数:', { teacherCode: userInfo.value.account })
|
||||||
const teacherRes = await getTeacherInfo({ teacher_code: userInfo.value.account })
|
const teacherRes = await getTeacherInfo({ teacherCode: userInfo.value.account })
|
||||||
console.log('getTeacherInfo 返回:', teacherRes)
|
console.log('getTeacherInfo 返回:', teacherRes)
|
||||||
console.log('teacherRes 类型:', typeof teacherRes)
|
console.log('teacherRes 类型:', typeof teacherRes)
|
||||||
console.log('teacherRes.code:', teacherRes?.code)
|
console.log('teacherRes.code:', teacherRes?.code)
|
||||||
|
|
@ -478,14 +478,14 @@ onShow(async () => {
|
||||||
if (teacherRes && teacherRes.code === 1 && teacherRes.data) {
|
if (teacherRes && teacherRes.code === 1 && teacherRes.data) {
|
||||||
const teacherData = teacherRes.data
|
const teacherData = teacherRes.data
|
||||||
console.log('teacherData:', teacherData)
|
console.log('teacherData:', teacherData)
|
||||||
console.log('teacherData.teacher_id:', teacherData.teacher_id)
|
console.log('teacherData.teacherId:', teacherData.teacherId)
|
||||||
userInfo.value.teacherId = teacherData.teacher_id
|
userInfo.value.teacherId = teacherData.teacherId
|
||||||
teacherIdForQrcode = teacherData.teacher_id
|
teacherIdForQrcode = teacherData.teacherId
|
||||||
currentTeacherId.value = teacherData.teacher_id
|
currentTeacherId.value = teacherData.teacherId
|
||||||
console.log('设置 teacherId:', teacherData.teacher_id)
|
console.log('设置 teacherId:', teacherData.teacherId)
|
||||||
console.log('教师姓名:', teacherData.teacher_name)
|
console.log('教师姓名:', teacherData.teacherName)
|
||||||
console.log('学院:', teacherData.college_name)
|
console.log('学院:', teacherData.collegeName)
|
||||||
console.log('二维码URL:', teacherData.qrcode_url)
|
console.log('二维码URL:', teacherData.qrcodeUrl)
|
||||||
} else {
|
} else {
|
||||||
console.log('获取教师信息失败或返回格式异常:', teacherRes)
|
console.log('获取教师信息失败或返回格式异常:', teacherRes)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -35,8 +35,8 @@ export const useUserStore = defineStore({
|
||||||
try {
|
try {
|
||||||
const data = await getUserCenter()
|
const data = await getUserCenter()
|
||||||
this.userInfo = data
|
this.userInfo = data
|
||||||
if (data.user_type !== undefined && data.user_type !== null) {
|
if (data.userType !== undefined && data.userType !== null) {
|
||||||
this.userType = data.user_type
|
this.userType = data.userType
|
||||||
}
|
}
|
||||||
resetSession()
|
resetSession()
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue