diff --git a/common/http.api.js b/common/http.api.js
index aae51fd..c9682b1 100644
--- a/common/http.api.js
+++ b/common/http.api.js
@@ -6,7 +6,7 @@ let apiApp = {
score: '/api/mobile/school/score',
middleSchoolIndicatorList: '/api/mobile/school/middle-school-indicator',
middleSchoolIndicatorDetail: '/api/mobile/school/middle-school-indicator-detail',
-
+ independentRecruitmentsSubmit: '/api/mobile/batch/independent-recruitments-submit'
}
const apiUser = {
appletLogin: '/api/mobile/user/applet-login',
@@ -37,6 +37,7 @@ const install = (Vue, vm) => {
const score = (params = {}) => vm.$u.get(apiApp.score, params)
const middleSchoolIndicatorList = (params = {}) => vm.$u.get(apiApp.middleSchoolIndicatorList, params)
const middleSchoolIndicatorDetail = (params = {}) => vm.$u.get(apiApp.middleSchoolIndicatorDetail, params)
+ const independentRecruitmentsSubmit = (params = {}) => vm.$u.post(apiApp.independentRecruitmentsSubmit, params)
// 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
vm.$u.api = {
// 用户相关
@@ -54,6 +55,7 @@ const install = (Vue, vm) => {
score,
middleSchoolIndicatorList,
middleSchoolIndicatorDetail,
+ independentRecruitmentsSubmit,
};
}
diff --git a/package_sub/pages/FormSuccess/FormSuccess.vue b/package_sub/pages/FormSuccess/FormSuccess.vue
new file mode 100644
index 0000000..6f73c4c
--- /dev/null
+++ b/package_sub/pages/FormSuccess/FormSuccess.vue
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue b/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
index 342846f..6453912 100644
--- a/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
+++ b/package_sub/pages/IndependentRecruitment/IndependentRecruitment.vue
@@ -1,17 +1,641 @@
-
+
+
+
+
+ 报考年份
+
+
+
+ 所在区域
+
+
+ {{ item.name }}
+
+
+
+
+
+ 下一步
+
+
+
+
+ 基本信息
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上一步
+ 下一步
+
+
+
+
+
+ {{ form.year }}年
+ {{ formArea }}
+
+
+
+ 自主招生(含课程基地实验项目)
+
+
+
+ 其他专业是否服从
+
+
+
+ 是
+
+
+ 否
+
+
+
+
+
+
+ 代码
+ 学校名称
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 上一步
+ 下一步
+
+
+
+
+
+ {{ form.year }}年
+ {{ formArea }}
+
+
+
+ 自主招生(含课程基地实验项目)
+
+
+
+
+
+
+
+ 上一步
+ 提交
+
+
+
+
+
+
diff --git a/package_sub/pages/StudentInfo/StudentInfo.vue b/package_sub/pages/StudentInfo/StudentInfo.vue
index 3e0dcd7..64c685f 100644
--- a/package_sub/pages/StudentInfo/StudentInfo.vue
+++ b/package_sub/pages/StudentInfo/StudentInfo.vue
@@ -25,28 +25,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -270,50 +270,34 @@ export default {
regionPick(e) {
if (e.hasOwnProperty('province')) {
- this.form.province = e.province.label
+ this.form.province = e.province?.label
}
if (e.hasOwnProperty('city')) {
- this.form.city = e.city.label
+ this.form.city = e.city?.label
}
if (e.hasOwnProperty('area')) {
- this.form.area = e.area.label
+ this.form.area = e.area?.label
}
},
submit() {
- if (!this.form.grade || !this.form.middle_exam_year || !this.form.city || !this.form.area || !this.form.city) {
- uni.showToast({
- title: '请填写完整信息',
- icon: 'none'
- })
- return
- }
- try {
- this.$u.api.updateUser(this.form).then(async res => {
- console.log(res)
- uni.showToast({
- title: '保存成功',
- icon: 'none'
- })
- const { user } = await this.$u.api.getUserInfo()
- this.$u.vuex('vuex_user', user)
- })
- } catch (err) {
- console.error(err)
- }
- // this.$refs.uForm.validate((valid) => {
- // if (valid) {
- // try {
- // this.$u.api.updateUser(this.form).then(res => {
- // console.log(res)
- // })
- // } catch (err) {
- // console.error(err)
- // }
- // } else {
- // console.log('验证失败');
- // }
- // });
+ this.$refs['uForm'].validate(valid => {
+ if (valid) {
+ try {
+ this.$u.api.updateUser(this.form).then(async res => {
+ console.log(res)
+ uni.showToast({
+ title: '保存成功',
+ icon: 'none'
+ })
+ const { user } = await this.$u.api.getUserInfo()
+ this.$u.vuex('vuex_user', user)
+ })
+ } catch (err) {
+ console.error(err)
+ }
+ }
+ })
}
},
computed: {
diff --git a/package_sub/static/form-success.png b/package_sub/static/form-success.png
new file mode 100644
index 0000000..a6e08dc
Binary files /dev/null and b/package_sub/static/form-success.png differ
diff --git a/pages.json b/pages.json
index d867565..e049d80 100644
--- a/pages.json
+++ b/pages.json
@@ -88,6 +88,13 @@
"navigationBarTitleText": "自主招生志愿填报",
"enablePullDownRefresh": true
}
+ },
+ {
+ "path": "pages/FormSuccess/FormSuccess",
+ "style": {
+ "navigationBarTitleText": "提交成功",
+ "enablePullDownRefresh": true
+ }
}
]
}
diff --git a/uview-ui/components/u-form/u-form.vue b/uview-ui/components/u-form/u-form.vue
index 17f8ad3..69434bc 100644
--- a/uview-ui/components/u-form/u-form.vue
+++ b/uview-ui/components/u-form/u-form.vue
@@ -88,6 +88,7 @@ export default {
},
methods: {
setRules(rules) {
+ this.rules = rules
console.log(this.rules)
},
// 清空所有u-form-item组件的内容，本质上是调用了u-form-item组件中的resetField()方法