修改报名申请表单配置

.config.dev.js

 module.exports = {
   domain: 'dev.ezijing.com',
-  url: 'https://chinafflg.ezijing.com/api',
+  url: 'https://sofia2.ezijing.com/api',
   isEnableToIphoneDebugger: false,
   apiBaseURL: '/api',
   webpack: {

src/pages/my/admission/form/cjd.js

+export default function(_this) {
+  return {
+    id: 'interview_cjd',
+    title: '成绩单（中+英）',
+    get: {
+      action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
+      callback(data) {
+        const { attachments = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
+        const stageList = [
+          'FILLING',
+          'PREPAYMENT',
+          'INTERVIEW_APPLICATION',
+          'AUDITION',
+          'INTERVIEW',
+          'PAYMENT',
+          'REGISTRATION',
+          'CLOSED'
+        ]
+        this.form.options.disabled = stageList.findIndex(item => item === submissionStage) > 2
+        return attachments.reduce(
+          (result, item) => {
+            if (item.file_type_id === 'REPORT_CARD_CN') {
+              result.REPORT_CARD_CN.push(item)
+            }
+            if (item.file_type_id === 'REPORT_CARD_EN') {
+              result.REPORT_CARD_EN.push(item)
+            }
+            return result
+          },
+          { REPORT_CARD_CN: [], REPORT_CARD_EN: [] }
+        )
+      }
+    },
+    form: {
+      next: { to: { query: { active: 'admission_xy' } } },
+      hasButton: false,
+      options: { 'label-position': 'top' },
+      hint: `
+      <p>请将中英文成绩单原件扫描或者拍照后提交。</p>
+      <p>获取途径:联系大学时就读学校相关部门(档案馆/教务处)获取成绩单。</p>
+    `,
+      items: [
+        {
+          type: 'v-upload',
+          label: '中文成绩单',
+          model: 'REPORT_CARD_CN',
+          attrs: {
+            action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
+            deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            data: { file_type: 'REPORT_CARD_CN' }
+          }
+        },
+        {
+          type: 'v-upload',
+          label: '英文成绩单',
+          model: 'REPORT_CARD_EN',
+          attrs: {
+            action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
+            deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
+            data: { file_type: 'REPORT_CARD_EN' }
+          }
+        }
+      ]
+    }
+  }
+}

src/pages/my/admission/form/index.js

+import cjd from './cjd'
 import xy from './xy'
 import xfjn from './xfjn'
 
@@ -5,6 +6,6 @@ export default function(_this) {
   return {
     id: 'admission',
     title: '入学办理',
-    children: [xy(_this), xfjn(_this)]
+    children: [cjd(_this), xy(_this), xfjn(_this)]
   }
 }

src/pages/my/admission/form/xy.js

@@ -24,6 +24,7 @@ export default function(_this) {
       }
     },
     form: {
+      prev: { to: { query: { active: 'interview_cjd' } } },
       next: { to: { query: { active: 'admission_xfjn' } } },
       hasButton: false,
       options: {},
@@ -38,7 +39,7 @@ export default function(_this) {
             data: { file_type: 'ADMISSION_AGREEMENT' }
           },
           prepend: `
-            <p><a href="https://zws-imgs-pub.ezijing.com/static/public/41b2a4ae91c6826dc5f9daa3ebf345eb.docx" target="_blank" download="入学协议">下载入学协议</p>
+            <p><a href="https://zws-imgs-pub.ezijing.com/static/public/c66b72430dce73ad7d56bfda426843f5.pdf" target="_blank" download="入学协议">下载入学协议</p>
             <p>申请者可将签字后的入学协议原件扫描或拍照后提交。</p>
             <p>学员应仔细阅读《入学协议》以及课程介绍，如对入学协议或课程有异议，请第一时间与课程顾问咨询确认。请用A4纸打印后，在入学协议上签上姓名和日期，内容需显示完整、格式整齐、字迹清晰可辨。上传文件仅限“jpg,jpeg,pdf,png”格式，文件小于10Mb。</p>
           `

src/pages/my/admission/index.vue

@@ -45,7 +45,7 @@ export default {
     const menus = getMenu(this)
     return {
       menus: [menus],
-      currentActive: 'admission_xy',
+      currentActive: 'interview_cjd',
       dialogVisible: false,
       detail: null
     }
@@ -55,7 +55,7 @@ export default {
       immediate: true,
       handler(route) {
         const { query = {} } = route
-        this.currentActive = query.active || 'admission_xy'
+        this.currentActive = query.active || 'interview_cjd'
       }
     },
     showSubmitedDialog(value) {

src/pages/my/application/complete.vue

@@ -43,24 +43,19 @@ export default {
             title: '个人资料',
             code: 'applicaitonInfo',
             view: { to: { path: '/my/application', query: { active: 'application_info' } } }
-          },
-          {
-            title: '推荐信',
-            code: 'applicationTjx',
-            view: { to: { path: '/my/application', query: { active: 'application_tjx' } } }
           }
           // {
+          //   title: '推荐信',
+          //   code: 'applicationTjx',
+          //   view: { to: { path: '/my/application', query: { active: 'application_tjx' } } }
+          // }
+          // {
           //   title: '无犯罪证明',
           //   code: 'applicationWfzzm',
           //   view: { to: { path: '/my/application', query: { active: 'application_wfzzm' } } }
           // }
         ],
         [
-          {
-            title: '2寸照片',
-            code: 'interviewZp',
-            view: { to: { path: '/my/interview', query: { active: 'interview_zp' } } }
-          },
           {
             title: '毕业证书',
             code: 'interviewByzs',
@@ -71,26 +66,32 @@ export default {
             code: 'interviewXwzs',
             view: { to: { path: '/my/interview', query: { active: 'interview_xwzs' } } }
           },
-          {
-            title: '学位证书英文证明',
-            code: 'interviewXwzsEnglish',
-            view: { to: { path: '/my/interview', query: { active: 'interview_xwzsywzm' } } }
-          },
+          // {
+          //   title: '学位证书英文证明',
+          //   code: 'interviewXwzsEnglish',
+          //   view: { to: { path: '/my/interview', query: { active: 'interview_xwzsywzm' } } }
+          // },
           {
             title: '英文简历',
             code: 'interviewYwjl',
             view: { to: { path: '/my/interview', query: { active: 'interview_ywjl' } } }
           },
+          // {
+          //   title: '成绩单',
+          //   code: 'interviewCjd',
+          //   view: { to: { path: '/my/interview', query: { active: 'interview_cjd' } } }
+          // },
           {
-            title: '成绩单',
-            code: 'interviewCjd',
-            view: { to: { path: '/my/interview', query: { active: 'interview_cjd' } } }
-          },
-          {
-            title: '推荐信',
-            code: 'interviewTjx',
-            view: { to: { path: '/my/application', query: { active: 'application_tjx' } } }
+            title: '2寸照片',
+            code: 'interviewZp',
+            view: { to: { path: '/my/interview', query: { active: 'interview_zp' } } }
           }
+
+          // {
+          //   title: '推荐信',
+          //   code: 'interviewTjx',
+          //   view: { to: { path: '/my/application', query: { active: 'application_tjx' } } }
+          // }
         ]
       ]
     }

src/pages/my/application/form/declare.js

@@ -44,8 +44,8 @@ export default function(_this) {
           values: [{ label: '同意', value: 1 }],
           model: 'isAgree',
           rules: [{ required: true, message: '请阅读协议', trigger: 'change' }],
-          prepend:
-            '<p>我提供的所有报名材料信息皆准确和完整。我同意在需要的情况下提交原件以确认我的报名资格。由于报名材料中的虚假、错误信息或重大遗漏导致不录取或取消学籍的后果由我个人承担。我理解并同意所有报名材料归紫荆教育所有，无论考生录取与否均不退回。我授权紫荆教育使用报名表中的信息查询本人学习和工作记录。</p>'
+          prepend: `<p>1、本人知晓此申请表及所附文件将作为申请紫荆-索菲亚大学MBA面试和背景评估的参考依据，一旦成功录取，有关资料将作为学生信息存档。</p>
+            <p>2、本人声明所填资料正确无误，知晓任何不真实的信息或不诚信的行为，均会影响申请结果，已取得的成绩和资格会被取消。我理解并同意所有报名材料归紫荆教育所有，无论考生录取与否均不退回。我授权紫荆教育使用报名表中的信息查询本人学习和工作记录。</p>`
         }
       ]
     }

src/pages/my/application/form/index.js

 import info from './info'
-import tjx from './tjx'
-import wfzsm from './wfzzm'
+// import tjx from './tjx'
+// import wfzsm from './wfzzm'
 import declare from './declare'
 
 export default function(_this) {
@@ -9,7 +9,7 @@ export default function(_this) {
     title: '报名申请',
     children: [
       info(_this),
-      tjx(_this),
+      // tjx(_this),
       // wfzsm(_this),
       declare(_this)
       // {

src/pages/my/application/form/info/answer.js

@@ -19,10 +19,10 @@ export default function(_this) {
         const [first = {}, second = {}] = answers
         return {
           qid1: first.qid || '1',
-          question1: '您为什么申请中国产业金融菁英计划项目? (200字以上，1000字以内)',
+          question1: '您为什么要申请索菲亚大学金融方向工商管理硕士项目?(60字以上，1000字以内)',
           answer1: first.answer,
           qid2: second.qid || '2',
-          question2: '您的短期和长期职业发展目标是什么?您打 算如何达成此愿景?(200字以上，1000字以内)',
+          question2: '您的短期和长期职业发展目标是什么?您打算如何达成此愿景?(60字以上，1000字以内)',
           answer2: second.answer
         }
       }
@@ -45,22 +45,22 @@ export default function(_this) {
       items: [
         {
           type: 'v-input',
-          label: '您为什么申请中国产业金融菁英计划项目? (200字以上，1000字以内)',
+          label: '您为什么要申请索菲亚大学金融方向工商管理硕士项目?(60字以上，1000字以内)',
           model: 'answer1',
           attrs: { type: 'textarea', rows: '8', maxlength: '1000', style: 'width:100%' },
           rules: [
             { required: true, message: '请输入', trigger: 'blur' },
-            { min: 200, max: 1000, message: '长度在 200 到 1000 个字符', trigger: 'blur' }
+            { min: 60, max: 1000, message: '长度在 60 到 1000 个字符', trigger: 'blur' }
           ]
         },
         {
           type: 'v-input',
-          label: '您的短期和长期职业发展目标是什么?您打 算如何达成此愿景?(200字以上，1000字以内)',
+          label: '您的短期和长期职业发展目标是什么?您打算如何达成此愿景?(60字以上，1000字以内)',
           model: 'answer2',
           attrs: { type: 'textarea', rows: '8', maxlength: '1000', style: 'width:100%' },
           rules: [
             { required: true, message: '请输入', trigger: 'blur' },
-            { min: 200, max: 1000, message: '长度在 200 到 1000 个字符', trigger: 'blur' }
+            { min: 60, max: 1000, message: '长度在 60 到 1000 个字符', trigger: 'blur' }
           ]
         }
       ]

src/pages/my/application/pay.vue

@@ -6,10 +6,10 @@
     <div class="pay-hd">
       <h1>欢迎您</h1>
       <p class="t1">
-        申请紫荆-索菲亚大学金融方向工商管理硕士项目项目，本项目的注册费、申请费共计<span>800</span>元，请扫描二维码缴费以完成报名。
+        申请紫荆-索菲亚大学金融方向工商管理硕士项目项目，本项目的注册费、申请费共计<span>700</span>元，请扫描二维码缴费以完成报名。
       </p>
       <p class="t1" v-if="isPass">
-        因面试未通过需重新申请紫荆-索菲亚大学金融方向工商管理硕士项目项目，本项目的注册费、申请费共计<span>800</span>元，请扫描二维码缴费以完成报名。
+        因面试未通过需重新申请紫荆-索菲亚大学金融方向工商管理硕士项目项目，本项目的注册费、申请费共计<span>700</span>元，请扫描二维码缴费以完成报名。
       </p>
     </div>
     <div class="qrcode-error" v-if="qrcodeError">
@@ -20,7 +20,7 @@
       <span @click="refreshQrcode">刷新</span>
     </div>
     <div class="pay-ft">
-      <p class="t2">注释：再提交800元申请费后，申请人还需上传并提交如下文件。</p>
+      <p class="t2">注释：再提交700元申请费后，申请人还需上传并提交如下文件。</p>
       <p class="t2">①本科学位证书、②本科中、英文成绩单各一份、③个人证件照（2寸、免冠、白底）</p>
       <p class="t2">该申请费不退，请慎重缴费！</p>
     </div>

src/pages/my/application/preview.vue

@@ -275,23 +275,23 @@ export default {
             { label: '荣誉奖励', code: 'title' },
             { label: '证书颁发机构', code: 'institution_cn' }
           ]
-        },
-        {
-          title: '推荐信',
-          code: 'reco_letters',
-          edit: { to: { path: '/my/application', query: { active: 'application_tjx' } } },
-          isMultiple: true,
-          items: [
-            { label: '推荐人姓名', code: 'provider_name' },
-            { label: '推荐人电话', code: 'provider_phone_number' },
-            { label: '推荐人邮箱', code: 'provider_email' },
-            { label: '与推荐人关系', code: 'provider_relationship' },
-            { label: '推荐人工作单位', code: 'provider_company_name', visible: () => this.isManager },
-            { label: '推荐人职务', code: 'provider_job_title', visible: () => this.isManager },
-            { label: '推荐信内容', code: 'letter_content', visible: () => this.isManager }
-          ]
         }
         // {
+        //   title: '推荐信',
+        //   code: 'reco_letters',
+        //   edit: { to: { path: '/my/application', query: { active: 'application_tjx' } } },
+        //   isMultiple: true,
+        //   items: [
+        //     { label: '推荐人姓名', code: 'provider_name' },
+        //     { label: '推荐人电话', code: 'provider_phone_number' },
+        //     { label: '推荐人邮箱', code: 'provider_email' },
+        //     { label: '与推荐人关系', code: 'provider_relationship' },
+        //     { label: '推荐人工作单位', code: 'provider_company_name', visible: () => this.isManager },
+        //     { label: '推荐人职务', code: 'provider_job_title', visible: () => this.isManager },
+        //     { label: '推荐信内容', code: 'letter_content', visible: () => this.isManager }
+        //   ]
+        // }
+        // {
         //   title: '无犯罪证明',
         //   code: 'attachments',
         //   edit: { to: { path: '/my/application', query: { active: 'application_wfzzm' } } },

src/pages/my/interview/form/cjd.js

@@ -31,24 +31,9 @@ export default function(_this) {
         )
       }
     },
-    update: {
-      action: `/api/enrollment/v1.0/application-materials/submit/${webConf.others.projectId}`,
-      beforeRequest(data) {
-        return { submission_stage: 'INTERVIEW_APPLICATION' }
-      },
-      callback() {
-        this.form.options.disabled = true
-        _this.dialogVisible = true
-        _this.getApplication()
-      },
-      errorCallback() {
-        _this.completeVisible = true
-      }
-    },
     form: {
-      prev: { to: { query: { active: 'interview_ywjl' } } },
-      submitText: '申请面试',
-      model: { submission_stage: 'INTERVIEW_APPLICATION' },
+      next: { to: { query: { active: 'interview_ywjl' } } },
+      hasButton: false,
       options: { 'label-position': 'top' },
       hint: `
       <p>请将中英文成绩单原件扫描或者拍照后提交。</p>

src/pages/my/interview/form/index.js

-import zp from './zp'
 import byzs from './byzs'
 import xwzs from './xwzs'
-import xwzszm from './xwzszm'
 import ywjl from './ywjl'
-import cjd from './cjd'
+import zp from './zp'
 
 export default function(_this) {
   return {
     id: 'interview',
     title: '申请面试',
-    children: [zp(_this), byzs, xwzs, xwzszm, ywjl, cjd(_this)]
+    children: [byzs, xwzs, ywjl, zp(_this)]
   }
 }

src/pages/my/interview/form/xwzs.js

@@ -24,7 +24,7 @@ export default {
   },
   form: {
     prev: { to: { query: { active: 'interview_byzs' } } },
-    next: { to: { query: { active: 'interview_xwzsywzm' } } },
+    next: { to: { query: { active: 'interview_ywjl' } } },
     hasButton: false,
     options: {},
     items: [

src/pages/my/interview/form/ywjl.js

@@ -23,8 +23,8 @@ export default {
     }
   },
   form: {
-    prev: { to: { query: { active: 'interview_xwzsywzm' } } },
-    next: { to: { query: { active: 'interview_cjd' } } },
+    prev: { to: { query: { active: 'interview_xwzs' } } },
+    next: { to: { query: { active: 'interview_zp' } } },
     hasButton: false,
     options: {},
     items: [

src/pages/my/interview/form/zp.js

@@ -23,9 +23,24 @@ export default function(_this) {
         return { PERSONAL_PHOTO_FOR_ID }
       }
     },
+    update: {
+      action: `/api/enrollment/v1.0/application-materials/submit/${webConf.others.projectId}`,
+      beforeRequest(data) {
+        return { submission_stage: 'INTERVIEW_APPLICATION' }
+      },
+      callback() {
+        this.form.options.disabled = true
+        _this.dialogVisible = true
+        _this.getApplication()
+      },
+      errorCallback() {
+        _this.completeVisible = true
+      }
+    },
     form: {
-      next: { to: { query: { active: 'interview_byzs' } } },
-      hasButton: false,
+      prev: { to: { query: { active: 'interview_ywjl' } } },
+      submitText: '申请面试',
+      model: { submission_stage: 'INTERVIEW_APPLICATION' },
       options: {},
       items: [
         {

src/pages/my/interview/index.vue

@@ -45,7 +45,7 @@ export default {
     const menus = getMenu(this)
     return {
       menus: [menus],
-      currentActive: 'interview_zp',
+      currentActive: 'interview_byzs',
       completeVisible: false,
       dialogVisible: false,
       detail: null
@@ -56,7 +56,7 @@ export default {
       immediate: true,
       handler(route) {
         const { query = {} } = route
-        this.currentActive = query.active || 'interview_zp'
+        this.currentActive = query.active || 'interview_byzs'
       }
     },
     showSubmitedDialog(value) {
@@ -81,7 +81,7 @@ export default {
       return false
     },
     showSubmitedDialog() {
-      return this.isSubmited && this.currentActive === 'interview_zp'
+      return this.isSubmited && this.currentActive === 'interview_byzs'
     }
   },
   methods: {

src/pages/my/welcome/indexPay.vue

@@ -14,8 +14,10 @@
       <span @click="refreshQrcode">刷新</span>
     </div>
     <div class="pay-ft">
-      <p class="t2">注释：在提交800元申请费后，申请人需上传并提交如下文件。</p>
-      <p class="t2">①填写报名表、②完成推荐信3封、③无犯罪声明、④本科学历学位证书、⑤中英文成绩单、⑥个人证件照</p>
+      <p class="t2">注释：在提交700元申请费后，申请人需上传并提交如下文件。</p>
+      <p class="t2">
+        ①填写报名表、②毕业证书、③2寸照片、④入学协议、⑤缴费凭证、⑥英文简历、⑦毕业证书注册备案表、⑧成绩单（中+英）
+      </p>
       <p class="t2">该申请费不退，请慎重缴费！</p>
     </div>
     <el-dialog

src/pages/my/welcome/indexWelcome.vue

@@ -7,7 +7,7 @@
       <h1>欢迎您</h1>
       <p class="t1">
         申请紫荆-索菲亚大学金融方向工商管理硕士项目项目，请在填写以下内容并<br />
-        提交报名申请后，扫码支付本项目的注册费、申请费共计<span>800</span>元。
+        提交报名申请后，扫码支付本项目的注册费、申请费共计<span>700</span>元。
       </p>
     </div>
     <div class="form">