Auto stash before rebase of "refs/heads/sbu-plus"

modules/my/application/form/info/education.js

@@ -28,7 +28,8 @@ export default function(_this) {
             return result
           }, {})
         })
-        return { educations }
+        const base_Info = { education_status: data[0].education_status }
+        return { base_Info, educations }
       }
     },
     form: {
@@ -37,14 +38,6 @@ export default function(_this) {
       hasAdd: true,
       options: { labelWidth: '140px' },
       items: [
-        {
-          type: 'v-input',
-          label: '当前教育状态',
-          model: 'education_status',
-          attrs: { placeholder: '请填写当前教育状态' },
-          rules: [{ required: true, message: '请填写当前教育状态', trigger: 'blur' }],
-          append: '<p style="color:#606266">当前教育状态(填写示例：本科在读/大四)</p>'
-        },
         {
           type: 'v-datepicker',
           label: '开始时间',

modules/my/interview/form/cjd.js

@@ -32,16 +32,26 @@ export default function(_this) {
         )
       }
     },
+    update: {
+      action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/${process.env.projectId}/put`,
+      beforeRequest(data) {
+        // const basicInfo = ['gpa_score'].reduce((result, key) => {
+        //   result[key] = data[key]
+        //   return result
+        // }, {})
+        return { basic_info: data.gpa_score }
+      }
+    },
     form: {
       prev: { to: { query: { active: 'interview_ywjl' } } },
-      next: { to: { query: { active: 'interview_yynl' } } },
+      next: { to: { query: { active: 'interview_yynl' } }, isSubmit: true },
       hasButton: false,
       options: { 'label-position': 'top' },
       items: [
         {
           type: 'v-input',
           label: 'GPA成绩 (填写示例：3.9 / 5.0)',
-          model: 'id_number',
+          model: 'gpa_score',
           attrs: { placeholder: '请填写您的GPA成绩' },
           rules: [{ required: true, message: '请填写您的GPA成绩', trigger: 'blur' }]
         },

modules/my/interview/form/yynl.js

@@ -32,7 +32,7 @@ export default function(_this) {
     update: {
       action: `${process.env.baseURL}/api/enrollment/v1.0/application-materials/submit/${process.env.projectId}`,
       beforeRequest(data) {
-        return { submission_stage: 'INTERVIEW_APPLICATION' }
+        return { language_score: 'language_score', submission_stage: 'INTERVIEW_APPLICATION' }
       },
       callback() {
         this.form.options.disabled = true
@@ -52,7 +52,7 @@ export default function(_this) {
         {
           type: 'v-input',
           label: '语言成绩(填写示例：大学英语六级/550)',
-          model: 'id_number',
+          model: 'language_score',
           attrs: { placeholder: '请填写您的语言成绩' },
           rules: [{ required: true, message: '请填写您的语言成绩', trigger: 'blur' }]
         },