|
@@ -461,7 +461,7 @@ export default defineComponent({
|
|
forms.submitLoading = false;
|
|
forms.submitLoading = false;
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- const { extra, loginType, autoRegister, password, ...res } =
|
|
|
|
|
|
+ const { extra, loginType, autoRegister, password, multiUser, ...res } =
|
|
studentInfo;
|
|
studentInfo;
|
|
if (
|
|
if (
|
|
forms.studentItem.nickname !== extra.nickname &&
|
|
forms.studentItem.nickname !== extra.nickname &&
|
|
@@ -519,38 +519,26 @@ export default defineComponent({
|
|
otherParams.messageAlign = 'left';
|
|
otherParams.messageAlign = 'left';
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
- // if (!isRegister) {
|
|
|
|
- // const checkSchool = await request.get(
|
|
|
|
- // `/edu-app/open/student/studentSchool?mobile=${studentInfo.username}&code=${studentInfo.password}&type=REGISTER`
|
|
|
|
- // );
|
|
|
|
- // if (checkSchool.data?.schoolId !== forms.schoolId) {
|
|
|
|
- // forms.showOtherSchool = true;
|
|
|
|
- // forms.showOtherMessage = `您已绑定【${
|
|
|
|
- // forms.registerDetails.schoolName || ''
|
|
|
|
- // }】,提交后将更换到【${
|
|
|
|
- // checkSchool.data?.schoolName
|
|
|
|
- // }】,是否确认提交?`;
|
|
|
|
- // return;
|
|
|
|
- // }
|
|
|
|
- // }
|
|
|
|
|
|
|
|
/*
|
|
/*
|
|
- 新用户:
|
|
|
|
- autoRegister: true
|
|
|
|
- loginType: 'SMS'
|
|
|
|
-
|
|
|
|
- 已存在用户:
|
|
|
|
- autoRegister: false
|
|
|
|
- loginType: 'TOKEN'
|
|
|
|
- password: xxx
|
|
|
|
- */
|
|
|
|
|
|
+ 新用户:
|
|
|
|
+ autoRegister: true
|
|
|
|
+ loginType: 'SMS'
|
|
|
|
+
|
|
|
|
+ 已存在用户:
|
|
|
|
+ autoRegister: false
|
|
|
|
+ loginType: 'TOKEN'
|
|
|
|
+ password: xxx
|
|
|
|
+ */
|
|
let tLoginType = loginType,
|
|
let tLoginType = loginType,
|
|
tAutoRegister = autoRegister,
|
|
tAutoRegister = autoRegister,
|
|
- tPassword = password;
|
|
|
|
|
|
+ tPassword = password,
|
|
|
|
+ tMultiUser = multiUser;
|
|
if (forms.isRegister === 'update') {
|
|
if (forms.isRegister === 'update') {
|
|
tLoginType = 'TOKEN';
|
|
tLoginType = 'TOKEN';
|
|
tAutoRegister = false;
|
|
tAutoRegister = false;
|
|
tPassword = forms.studentItem.token;
|
|
tPassword = forms.studentItem.token;
|
|
|
|
+ tMultiUser = false;
|
|
}
|
|
}
|
|
const result = await request.post('/edu-app/userlogin', {
|
|
const result = await request.post('/edu-app/userlogin', {
|
|
requestType: 'form',
|
|
requestType: 'form',
|
|
@@ -558,14 +546,13 @@ export default defineComponent({
|
|
loginType: tLoginType,
|
|
loginType: tLoginType,
|
|
autoRegister: tAutoRegister,
|
|
autoRegister: tAutoRegister,
|
|
password: tPassword,
|
|
password: tPassword,
|
|
|
|
+ multiUser: tMultiUser,
|
|
...res,
|
|
...res,
|
|
extra: JSON.stringify({
|
|
extra: JSON.stringify({
|
|
...extra,
|
|
...extra,
|
|
giftVipDay:
|
|
giftVipDay:
|
|
forms.detailVip.membershipDays || 0 + forms.giftVipDay || 0,
|
|
forms.detailVip.membershipDays || 0 + forms.giftVipDay || 0,
|
|
- schoolId: forms.isChangeSchool
|
|
|
|
- ? forms.studentItem.schoolId
|
|
|
|
- : forms.schoolId
|
|
|
|
|
|
+ schoolId: forms.schoolId
|
|
})
|
|
})
|
|
}
|
|
}
|
|
});
|
|
});
|
|
@@ -614,7 +601,7 @@ export default defineComponent({
|
|
});
|
|
});
|
|
setLogin(res.data);
|
|
setLogin(res.data);
|
|
|
|
|
|
- // await onRegisterSubmit();
|
|
|
|
|
|
+ await onRegisterSubmit();
|
|
}
|
|
}
|
|
} catch {
|
|
} catch {
|
|
// 重置信息
|
|
// 重置信息
|
|
@@ -678,7 +665,6 @@ export default defineComponent({
|
|
const { data } = await request.get(
|
|
const { data } = await request.get(
|
|
`/edu-app/open/student/studentInfo?mobile=${studentInfo.username}&code=${studentInfo.password}&type=REGISTER`
|
|
`/edu-app/open/student/studentInfo?mobile=${studentInfo.username}&code=${studentInfo.password}&type=REGISTER`
|
|
);
|
|
);
|
|
- console.log(data, 'studentInfo');
|
|
|
|
forms.studentList = data || [];
|
|
forms.studentList = data || [];
|
|
|
|
|
|
if (forms.studentList.length > 0) {
|
|
if (forms.studentList.length > 0) {
|
|
@@ -703,6 +689,17 @@ export default defineComponent({
|
|
}
|
|
}
|
|
});
|
|
});
|
|
studentInfo.extra.gender = firstStudent.gender;
|
|
studentInfo.extra.gender = firstStudent.gender;
|
|
|
|
+
|
|
|
|
+ forms.isRegister = 'update';
|
|
|
|
+ } else {
|
|
|
|
+ forms.isRegister = 'create';
|
|
|
|
+ forms.isChangeSchool = false;
|
|
|
|
+ studentInfo.extra.nickname = '';
|
|
|
|
+ studentInfo.extra.currentGradeNum = '';
|
|
|
|
+ studentInfo.extra.currentClass = '';
|
|
|
|
+ studentInfo.extra.gender = 1;
|
|
|
|
+ forms.currentClassText = '';
|
|
|
|
+ forms.gradeNumText = '';
|
|
}
|
|
}
|
|
} catch {
|
|
} catch {
|
|
//
|
|
//
|
|
@@ -1885,6 +1882,7 @@ export default defineComponent({
|
|
}
|
|
}
|
|
});
|
|
});
|
|
studentInfo.extra.gender = firstStudent.gender;
|
|
studentInfo.extra.gender = firstStudent.gender;
|
|
|
|
+ forms.isRegister = 'update';
|
|
} else {
|
|
} else {
|
|
forms.isRegister = 'create';
|
|
forms.isRegister = 'create';
|
|
forms.isChangeSchool = false;
|
|
forms.isChangeSchool = false;
|
|
@@ -1892,6 +1890,8 @@ export default defineComponent({
|
|
studentInfo.extra.currentGradeNum = '';
|
|
studentInfo.extra.currentGradeNum = '';
|
|
studentInfo.extra.currentClass = '';
|
|
studentInfo.extra.currentClass = '';
|
|
studentInfo.extra.gender = 1;
|
|
studentInfo.extra.gender = 1;
|
|
|
|
+ forms.currentClassText = '';
|
|
|
|
+ forms.gradeNumText = '';
|
|
}
|
|
}
|
|
}}
|
|
}}
|
|
/>
|
|
/>
|