|
|
@@ -10,13 +10,19 @@
|
|
|
</uv-form-item>
|
|
|
<uv-form-item label="所在省份" prop="location" borderBottom required>
|
|
|
<ie-picker ref="pickerRef" v-model="examTypeForm.location" :list="provinceList" placeholder="选择省份"
|
|
|
- :custom-style="customStyle" key-label="dictLabel" key-value="dictValue" :disabled="isProvinceDisabled"
|
|
|
- :show-arrow="!isProvinceDisabled" @change="handleProvinceChange"></ie-picker>
|
|
|
+ :custom-style="customStyle" key-label="dictLabel" key-value="dictValue" :disabled="isProvinceDisabled">
|
|
|
+ <template v-if="isProvinceDisabled" #right>
|
|
|
+ <ie-image src="/pagesSystem/static/image/icon/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
|
|
|
+ </template>
|
|
|
+ </ie-picker>
|
|
|
</uv-form-item>
|
|
|
<uv-form-item label="考生类别" prop="examType" borderBottom required>
|
|
|
<ie-picker ref="pickerRef" v-model="examTypeForm.examType" :list="examTypeList" :disabled="isExamTypeDisabled"
|
|
|
- placeholder="选择考生类别" :custom-style="customStyle" key-label="dictLabel" key-value="dictValue"
|
|
|
- :show-arrow="!isExamTypeDisabled"></ie-picker>
|
|
|
+ placeholder="选择考生类别" :custom-style="customStyle" key-label="dictLabel" key-value="dictValue">
|
|
|
+ <template v-if="isExamTypeDisabled" #right>
|
|
|
+ <ie-image src="/pagesSystem/static/image/icon/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
|
|
|
+ </template>
|
|
|
+ </ie-picker>
|
|
|
</uv-form-item>
|
|
|
<uv-form-item v-if="examTypeForm.examType === 'VHS'" label="专业类别" prop="majorType" borderBottom required>
|
|
|
<ie-picker ref="pickerRef" v-model="examTypeForm.majorType" :list="examMajorList"
|
|
|
@@ -38,39 +44,42 @@
|
|
|
</uv-form-item>
|
|
|
</content-card>
|
|
|
<content-card v-if="showCulture" title="文化素质">
|
|
|
- <uv-form-item label="语文" prop="form.scores.chinese" borderBottom :required="isImproveMode">
|
|
|
- <uv-input v-model="scoresForm.chinese" border="none" type="number" placeholder="请输入" font-size="30rpx"
|
|
|
+ <uv-form-item label="语文" prop="form.scores.chinese" borderBottom :required="isBindMode">
|
|
|
+ <uv-input v-model.number="scoresForm.chinese" border="none" type="number" placeholder="请输入" font-size="30rpx"
|
|
|
:custom-style="customStyle">
|
|
|
</uv-input>
|
|
|
</uv-form-item>
|
|
|
- <uv-form-item label="数学" prop="form.score.mathematics" borderBottom :required="isImproveMode">
|
|
|
- <uv-input v-model="scoresForm.mathematics" border="none" type="number" placeholder="请输入" font-size="30rpx"
|
|
|
- :custom-style="customStyle">
|
|
|
+ <uv-form-item label="数学" prop="form.score.mathematics" borderBottom :required="isBindMode">
|
|
|
+ <uv-input v-model.number="scoresForm.mathematics" border="none" type="number" placeholder="请输入"
|
|
|
+ font-size="30rpx" :custom-style="customStyle">
|
|
|
</uv-input>
|
|
|
</uv-form-item>
|
|
|
- <uv-form-item label="外语" prop="form.scores.foreign" borderBottom :required="isImproveMode">
|
|
|
- <uv-input v-model="scoresForm.foreign" border="none" type="number" placeholder="请输入" font-size="30rpx"
|
|
|
+ <uv-form-item label="外语" prop="form.scores.foreign" borderBottom :required="isBindMode">
|
|
|
+ <uv-input v-model.number="scoresForm.foreign" border="none" type="number" placeholder="请输入" font-size="30rpx"
|
|
|
:custom-style="customStyle">
|
|
|
</uv-input>
|
|
|
</uv-form-item>
|
|
|
- <uv-form-item label="物理" prop="form.scores.physics" borderBottom :required="isImproveMode">
|
|
|
- <uv-input v-model="scoresForm.physics" border="none" type="number" placeholder="请输入" font-size="30rpx"
|
|
|
+ <uv-form-item label="物理" prop="form.scores.physics" borderBottom :required="isBindMode">
|
|
|
+ <uv-input v-model.number="scoresForm.physics" border="none" type="number" placeholder="请输入" font-size="30rpx"
|
|
|
:custom-style="customStyle">
|
|
|
</uv-input>
|
|
|
</uv-form-item>
|
|
|
- <uv-form-item label="政治" prop="form.scores.political" :required="isImproveMode">
|
|
|
- <uv-input v-model="scoresForm.political" border="none" type="number" placeholder="请输入" font-size="30rpx"
|
|
|
- :custom-style="customStyle">
|
|
|
+ <uv-form-item label="政治" prop="form.scores.political" :required="isBindMode">
|
|
|
+ <uv-input v-model.number="scoresForm.political" border="none" type="number" placeholder="请输入"
|
|
|
+ font-size="30rpx" :custom-style="customStyle">
|
|
|
</uv-input>
|
|
|
</uv-form-item>
|
|
|
</content-card>
|
|
|
- <content-card v-if="isImproveMode" title="学校信息">
|
|
|
- <uv-form-item label="学校名称" prop="form.name" borderBottom :required="isImproveMode">
|
|
|
+ <content-card v-if="isBindMode" title="学校信息">
|
|
|
+ <uv-form-item label="学校名称" prop="form.name" borderBottom :required="isBindMode">
|
|
|
<ie-picker ref="pickerRef" v-model="form.schoolName" disabled placeholder="请选择就读学校"
|
|
|
- :custom-style="customStyle" :custom-label="form.schoolName" @click="handleSchoolSelect"
|
|
|
- :show-arrow="!isSchoolDisabled"></ie-picker>
|
|
|
+ :custom-style="customStyle" :custom-label="form.schoolName" @click="handleSchoolSelect">
|
|
|
+ <template v-if="isSchoolDisabled" #right>
|
|
|
+ <ie-image src="/pagesSystem/static/image/icon/icon-lock.png" custom-class="w-24 h-30" mode="aspectFill" />
|
|
|
+ </template>
|
|
|
+ </ie-picker>
|
|
|
</uv-form-item>
|
|
|
- <uv-form-item label="所在班级" prop="form.name" :required="isImproveMode">
|
|
|
+ <uv-form-item label="所在班级" prop="form.name" :required="isBindMode">
|
|
|
<ie-picker ref="pickerRef" v-model="form.classId" :list="classList" :disabled="!form.schoolId" title="选择班级"
|
|
|
placeholder="请选择所在班级" :custom-style="customStyle" key-label="name" key-value="classId"></ie-picker>
|
|
|
</uv-form-item>
|
|
|
@@ -87,16 +96,24 @@
|
|
|
<script lang="ts" setup>
|
|
|
import ContentCard from '../../components/content-card.vue';
|
|
|
import { useUserStore } from '@/store/userStore';
|
|
|
-import { registry, improve } from '@/api/modules/login';
|
|
|
+import { registry, improve, improveWithToken } from '@/api/modules/login';
|
|
|
import { useTransferPage } from '@/hooks/useTransferPage';
|
|
|
import { useExamType } from '@/composables/useExamType';
|
|
|
import { useAppStore } from '@/store/appStore';
|
|
|
-import { BindCardInfo, ClassItem, SchoolItem, Scores } from '@/types/user';
|
|
|
+import { BindCardInfo, CardInfo, ClassItem, LoginInfo, RegisterInfo, SchoolItem, Scores, UserInfo } from '@/types/user';
|
|
|
|
|
|
import { getClassList } from '@/api/modules/user';
|
|
|
+import { EnumBindScene, EnumExamRecordType, EnumExamType } from '@/common/enum';
|
|
|
+type PrevDataInfo = {
|
|
|
+ cardInfo: CardInfo;
|
|
|
+ userInfo: UserInfo;
|
|
|
+ registerInfo: RegisterInfo;
|
|
|
+ scene: EnumBindScene;
|
|
|
+ token: string; // 绑定已有账号时需要 token
|
|
|
+}
|
|
|
+
|
|
|
const { form: examTypeForm, examTypeList, examMajorList, provinceList, endYearList } = useExamType();
|
|
|
const userStore = useUserStore();
|
|
|
-const appStore = useAppStore();
|
|
|
const { prevData, transferTo, transferBack } = useTransferPage();
|
|
|
|
|
|
const form = ref<Partial<BindCardInfo>>({});
|
|
|
@@ -106,21 +123,15 @@ const customStyle = {
|
|
|
paddingLeft: '26px'
|
|
|
};
|
|
|
|
|
|
-const isImproveMode = computed(() => prevData.value.scene === 'phone_improve' || prevData.value.scene === 'card_improve');
|
|
|
-const isSchoolDisabled = computed(() => prevData.value.scene === 'card_improve' && prevData.value.card.assignSchoolId);
|
|
|
-const isProvinceDisabled = computed(() => prevData.value.scene === 'card_improve' && prevData.value.card.assignLocation);
|
|
|
-const isExamTypeDisabled = computed(() => (prevData.value.scene === 'card_improve' && prevData.value.card.assignExamType) || !examTypeForm.value.location);
|
|
|
-const handleProvinceChange = (val: string) => {
|
|
|
- if (isProvinceDisabled.value) {
|
|
|
- return;
|
|
|
- }
|
|
|
- form.value.examType = '';
|
|
|
- form.value.majorType = '';
|
|
|
-}
|
|
|
+const isBindMode = computed(() => [EnumBindScene.LOGIN_BIND, EnumBindScene.REGISTER_BIND].includes(prevData.value.scene));
|
|
|
+const isSchoolDisabled = computed(() => isBindMode.value && prevData.value.cardInfo.assignSchoolId);
|
|
|
+const isProvinceDisabled = computed(() => isBindMode.value && prevData.value.cardInfo.assignLocation);
|
|
|
+const isExamTypeDisabled = computed(() => (isBindMode.value && prevData.value.cardInfo.assignExamType) || !examTypeForm.value.location);
|
|
|
+
|
|
|
|
|
|
const classList = ref<ClassItem[]>([]);
|
|
|
const showCulture = computed(() => {
|
|
|
- return examTypeForm.value.examType === 'OHS';
|
|
|
+ return examTypeForm.value.examType === EnumExamType.OHS;
|
|
|
});
|
|
|
const handleSchoolSelect = () => {
|
|
|
if (isSchoolDisabled.value) {
|
|
|
@@ -178,44 +189,44 @@ const loginValidate = () => {
|
|
|
return false;
|
|
|
}
|
|
|
if (showCulture.value) {
|
|
|
- if (isImproveMode.value) {
|
|
|
+ if (isBindMode.value) {
|
|
|
if (!scoresForm.value.chinese || scoresForm.value.chinese < 0 || scoresForm.value.chinese > 100) {
|
|
|
uni.$ie.showToast('请输入正确的语文成绩');
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
- if (isImproveMode.value) {
|
|
|
+ if (isBindMode.value) {
|
|
|
if (!scoresForm.value.mathematics || scoresForm.value.mathematics < 0 || scoresForm.value.mathematics > 100) {
|
|
|
uni.$ie.showToast('请输入正确的数学成绩');
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
- if (isImproveMode.value) {
|
|
|
+ if (isBindMode.value) {
|
|
|
if (!scoresForm.value.foreign || scoresForm.value.foreign < 0 || scoresForm.value.foreign > 100) {
|
|
|
uni.$ie.showToast('请输入正确的外语成绩');
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
- if (isImproveMode.value) {
|
|
|
+ if (isBindMode.value) {
|
|
|
if (!scoresForm.value.physics || scoresForm.value.physics < 0 || scoresForm.value.physics > 100) {
|
|
|
uni.$ie.showToast('请输入正确的物理成绩');
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
- if (isImproveMode.value) {
|
|
|
+ if (isBindMode.value) {
|
|
|
if (!scoresForm.value.political || scoresForm.value.political < 0 || scoresForm.value.political > 100) {
|
|
|
uni.$ie.showToast('请输入正确的政治成绩');
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (isImproveMode.value) {
|
|
|
+ if (isBindMode.value) {
|
|
|
if (!form.value.schoolId) {
|
|
|
uni.$ie.showToast('请选择学校');
|
|
|
return false;
|
|
|
}
|
|
|
}
|
|
|
- if (isImproveMode.value) {
|
|
|
+ if (isBindMode.value) {
|
|
|
if (!form.value.classId) {
|
|
|
uni.$ie.showToast('请选择班级');
|
|
|
return false;
|
|
|
@@ -228,49 +239,82 @@ const handleSubmit = async () => {
|
|
|
if (valid) {
|
|
|
let params = {
|
|
|
...form.value,
|
|
|
+ ...examTypeForm.value,
|
|
|
scores: scoresForm.value,
|
|
|
};
|
|
|
+
|
|
|
+ // 接下来补充注册登录信息
|
|
|
try {
|
|
|
- if (isImproveMode.value) {
|
|
|
- const { cardNo, password } = prevData.value;
|
|
|
- params = {
|
|
|
- ...params,
|
|
|
- username: cardNo,
|
|
|
- password,
|
|
|
- }
|
|
|
- console.log('params', params)
|
|
|
- if (prevData.value.scene === 'card_improve') {
|
|
|
- startLogin(params as BindCardInfo);
|
|
|
- } else {
|
|
|
- startBind(params as BindCardInfo)
|
|
|
- }
|
|
|
+ if (prevData.value.scene === EnumBindScene.REGISTER) {
|
|
|
+ startRegister(params as BindCardInfo);
|
|
|
} else {
|
|
|
- const { mobile, password, code, uuid } = prevData.value;
|
|
|
- params = {
|
|
|
- ...params,
|
|
|
- mobile,
|
|
|
- password,
|
|
|
- code,
|
|
|
- uuid,
|
|
|
+ // startRegisterBind(params as BindCardInfo);
|
|
|
+ // params = {
|
|
|
+ // ...params,
|
|
|
+ // username: prevData.value.registerInfo.username,
|
|
|
+ // password: prevData.value.registerInfo.password,
|
|
|
+ // };
|
|
|
+ console.log('初步提交信息:', params);
|
|
|
+ if (prevData.value.scene === EnumBindScene.LOGIN_BIND) {
|
|
|
+ startLoginBind(params as BindCardInfo);
|
|
|
+ } else {
|
|
|
+ startRegister(params as BindCardInfo);
|
|
|
}
|
|
|
- startLogin(params as BindCardInfo);
|
|
|
}
|
|
|
+ // if (isBindMode.value) {
|
|
|
+ // const { cardNo, password } = prevData.value;
|
|
|
+ // params = {
|
|
|
+ // ...params,
|
|
|
+ // username: cardNo,
|
|
|
+ // password,
|
|
|
+ // }
|
|
|
+ // console.log('params', params)
|
|
|
+ // if (prevData.value.scene === 'card_improve') {
|
|
|
+ // startRegister(params as BindCardInfo);
|
|
|
+ // } else {
|
|
|
+ // startRegisterBind(params as BindCardInfo)
|
|
|
+ // }
|
|
|
+ // } else {
|
|
|
+ // const { mobile, password, code, uuid } = prevData.value;
|
|
|
+ // params = {
|
|
|
+ // ...params,
|
|
|
+ // mobile,
|
|
|
+ // password,
|
|
|
+ // code,
|
|
|
+ // uuid,
|
|
|
+ // }
|
|
|
+ // startRegister(params as BindCardInfo);
|
|
|
+ // }
|
|
|
} catch (error) {
|
|
|
console.error(error)
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-const startBind = async (params: BindCardInfo) => {
|
|
|
+const startLoginBind = async (params: BindCardInfo) => {
|
|
|
uni.$ie.showLoading();
|
|
|
- await improve(params);
|
|
|
+ const token = prevData.value.token;
|
|
|
+ await improveWithToken(params, token);
|
|
|
uni.$ie.hideLoading();
|
|
|
uni.$ie.showSuccess('绑定成功');
|
|
|
- userStore.getUserInfo();
|
|
|
- goHome();
|
|
|
+ const userStore = useUserStore();
|
|
|
+ userStore.setToken(token);
|
|
|
+ setTimeout(() => {
|
|
|
+ userStore.getUserInfo();
|
|
|
+ goHome();
|
|
|
+ }, 50);
|
|
|
}
|
|
|
|
|
|
-const startLogin = async (params: BindCardInfo) => {
|
|
|
+// const startRegisterBind = async (params: BindCardInfo) => {
|
|
|
+// uni.$ie.showLoading();
|
|
|
+// await improve(params);
|
|
|
+// uni.$ie.hideLoading();
|
|
|
+// uni.$ie.showSuccess('绑定成功');
|
|
|
+// userStore.getUserInfo();
|
|
|
+// goHome();
|
|
|
+// }
|
|
|
+
|
|
|
+const startRegister = async (params: BindCardInfo) => {
|
|
|
uni.$ie.showLoading();
|
|
|
const { token } = await registry(params);
|
|
|
if (token) {
|
|
|
@@ -288,43 +332,92 @@ const goHome = () => {
|
|
|
transferTo('/pagesMain/pages/index/index', {
|
|
|
type: 'reLaunch'
|
|
|
});
|
|
|
- }, 600);
|
|
|
+ }, 800);
|
|
|
}
|
|
|
|
|
|
const gatherInfo = () => {
|
|
|
- const { scene, card, phone, code, uuid } = prevData.value;
|
|
|
- console.log('prevData.value', prevData.value)
|
|
|
- if (userStore.tempInfo?.location) {
|
|
|
+ console.log('数据预览：', prevData.value)
|
|
|
+ // const { scene, card, phone, code, uuid } = prevData.value;
|
|
|
+ let { cardInfo = {} as CardInfo, userInfo = {} as UserInfo, registerInfo = {} as RegisterInfo, scene, token } = prevData.value as PrevDataInfo;
|
|
|
+ form.value = {
|
|
|
+ code: registerInfo.code,
|
|
|
+ uuid: registerInfo.uuid,
|
|
|
+ mobile: registerInfo.mobile,
|
|
|
+ username: registerInfo.username,
|
|
|
+ password: registerInfo.password,
|
|
|
+ }
|
|
|
+ // 注册时，如果以游客身份使用过，则从临时信息中获取省份和考试类型
|
|
|
+ if (scene === EnumBindScene.REGISTER) {
|
|
|
+ console.log('自动填写临时信息：', userStore.tempInfo)
|
|
|
examTypeForm.value.location = userStore.tempInfo?.location;
|
|
|
setTimeout(() => {
|
|
|
examTypeForm.value.examType = userStore.tempInfo!.examType;
|
|
|
- }, 0)
|
|
|
- }
|
|
|
- console.log('examTypeForm', examTypeForm)
|
|
|
- if (scene === 'card_improve') {
|
|
|
+ }, 0);
|
|
|
+ } else if ([EnumBindScene.LOGIN_BIND, EnumBindScene.REGISTER_BIND].includes(scene)) {
|
|
|
+ // 已有卡信息，补充信息
|
|
|
+ if (scene === EnumBindScene.LOGIN_BIND) {
|
|
|
+ form.value = {
|
|
|
+ ...form.value,
|
|
|
+ ...userInfo,
|
|
|
+ };
|
|
|
+ }
|
|
|
form.value = {
|
|
|
- location: card.assignLocation,
|
|
|
- examType: card.assignExamType,
|
|
|
- endYear: card.endYear,
|
|
|
- majorType: card.majorType,
|
|
|
- schoolId: card.assignSchoolId,
|
|
|
- schoolName: card.assignSchoolName,
|
|
|
- classId: card.classId,
|
|
|
- mobile: phone
|
|
|
- // code
|
|
|
+ ...form.value,
|
|
|
+ schoolName: cardInfo.assignSchoolName,
|
|
|
+ schoolId: cardInfo.assignSchoolId,
|
|
|
+ classId: cardInfo.classId,
|
|
|
+ //
|
|
|
+ // code: registerInfo.code,
|
|
|
+ // uuid: registerInfo.uuid,
|
|
|
+ // mobile: registerInfo.mobile,
|
|
|
+ // username: registerInfo.username,
|
|
|
+ // password: registerInfo.password,
|
|
|
};
|
|
|
+ // 考生相关信息
|
|
|
+ examTypeForm.value.location = cardInfo.assignLocation || userInfo.location || '';
|
|
|
+ setTimeout(() => {
|
|
|
+ examTypeForm.value.examType = cardInfo.assignExamType || userInfo.examType || '';
|
|
|
+ examTypeForm.value.endYear = cardInfo.endYear || userInfo.endYear;
|
|
|
+ }, 0);
|
|
|
+ examTypeForm.value.majorType = userInfo.majorType || '';
|
|
|
+ //
|
|
|
+ scoresForm.value = userInfo.scores || {};
|
|
|
handleGetClassList();
|
|
|
- } else if (scene === 'phone_improve') {
|
|
|
- const { nickName, location, examType, endYear, scores } = userStore.userInfo;
|
|
|
- form.value = {
|
|
|
- nickName,
|
|
|
- location,
|
|
|
- examType,
|
|
|
- endYear,
|
|
|
- scores
|
|
|
- };
|
|
|
- scoresForm.value = scores;
|
|
|
}
|
|
|
+ console.log('初始化整理的信息:')
|
|
|
+ console.log('form.value:', form.value)
|
|
|
+ console.log('examTypeForm.value:', examTypeForm.value)
|
|
|
+ console.log('scoresForm.value:', scoresForm.value)
|
|
|
+ // if (scene === EnumBindScene.LOGIN_BIND) {
|
|
|
+ // 未登录用户卡注册登录
|
|
|
+ // form.value = {
|
|
|
+ // nickName,
|
|
|
+ // scores,
|
|
|
+ // 下面 3 个属性卡的优先级更高
|
|
|
+ // location: assignLocation || location,
|
|
|
+ // examType: assignExamType || examType,
|
|
|
+ // endYear: cardEndYear || userEndYear,
|
|
|
+ // majorType: majorType || userMajorType,
|
|
|
+ // schoolId: assignSchoolId,
|
|
|
+ // schoolName: assignSchoolName,
|
|
|
+ // classId: classId,
|
|
|
+ // mobile: phone
|
|
|
+ // code
|
|
|
+ // };
|
|
|
+ // handleGetClassList();
|
|
|
+ // } else if (scene === 'phone_improve') {
|
|
|
+ // 已登录用户绑卡
|
|
|
+ // const { nickName, location, examType, endYear, scores } = userStore.userInfo;
|
|
|
+ // const { nickName, location, examType, endYear, scores } = prevData.value.userInfo;
|
|
|
+ // form.value = {
|
|
|
+ // nickName,
|
|
|
+ // location,
|
|
|
+ // examType,
|
|
|
+ // // endYear,
|
|
|
+ // scores
|
|
|
+ // };
|
|
|
+ // scoresForm.value = scores;
|
|
|
+ // }
|
|
|
}
|
|
|
|
|
|
onLoad(() => {
|
