bug fixes

687c6753 · 王鹏飞 · 32fbd88c · 687c6753 · 687c6753 · 687c6753
--- a/src/pages/letter/index.vue
+++ b/src/pages/letter/index.vue
@@ -9,7 +9,7 @@
        </div>
      </div>
    </header>
-    <nav class="nav"><h1 class="title">康博斯威尔大学蒙台梭利硕士项目推荐信</h1></nav>
+    <nav class="nav"><h1 class="title">加州整合大学应用心理学硕士项目推荐信</h1></nav>
    <section class="content">
      <el-form
        :model="ruleForm"

--- a/src/pages/my/application/complete.vue
+++ b/src/pages/my/application/complete.vue
@@ -48,12 +48,12 @@ export default {
            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: '无犯罪证明',
+          //   code: 'applicationWfzzm',
+          //   view: { to: { path: '/my/application', query: { active: 'application_wfzzm' } } }
+          // }
        ],
        [
          {

--- a/src/pages/my/application/form/declare.js
+++ b/src/pages/my/application/form/declare.js
@@ -33,7 +33,7 @@ export default function(_this) {
      }
    },
    form: {
-      prev: { to: { query: { active: 'application_wfzzm' } } },
+      prev: { to: { query: { active: 'application_tjx' } } },
      submitText: '提交报名申请',
      model: { isAgree: [] },
      options: {},
@@ -44,7 +44,7 @@ export default function(_this) {
          model: 'isAgree',
          rules: [{ required: true, message: '请阅读协议', trigger: 'change' }],
          prepend:
-            '<p>本人自愿申请紫荆-康博斯威尔大学蒙台梭利方向教育硕士项目，所有申请表格内填写的内容属实，本科学士学位证书属实，没有弄虚作假的行为。如有虚假，愿承担一切法 律责任。</p>'
+            '<p>本人自愿申请紫荆-加州整合大学应用心理学硕士项目，所有申请表格内填写的内容属实，本科学士学位证书属实，没有弄虚作假的行为。如有虚假，愿承担一切法 律责任。</p>'
        }
      ]
    }

--- a/src/pages/my/application/form/index.js
+++ b/src/pages/my/application/form/index.js
 import info from './info'
 import tjx from './tjx'
-import wfzsm from './wfzzm'
+// import wfzsm from './wfzzm'
 import declare from './declare'

 export default function(_this) {
@@ -10,7 +10,7 @@ export default function(_this) {
    children: [
      info(_this),
      tjx(_this),
-      wfzsm(_this),
+      // wfzsm(_this),
      declare(_this),
      {
        id: 'application_pay',

--- a/src/pages/my/application/form/info/answer.js
+++ b/src/pages/my/application/form/info/answer.js
@@ -16,16 +16,21 @@ export default function(_this) {
        const { answers = [], submission_stage: submissionStage = 'FILLING' } = data.data.material
        this.form.options.disabled = submissionStage !== 'FILLING'

-        const [first = {}, second = {}] = answers
+        const [first = {}, second = {}, third = {}, fourth = {}] = answers
        return {
          qid1: first.qid || '1',
-          question1: first.question || '个人描述（60-1000字）中文或者英文',
+          question1: first.question || '自我介绍',
          answer1: first.answer,
          qid2: second.qid || '2',
-          question2:
-            second.question ||
-            '申请紫荆教育康博斯威尔大学教育硕士的原因？以及您的职业或个人发展的预期目标（60-1000字）中文或者英文',
-          answer2: second.answer
+          question2: second.question || '这个MAP计划对你个人将来有什么好处？你在这个项目中的个人发展目标是什么？',
+          answer2: second.answer,
+          qid3: third.qid || '3',
+          question3: third.question || '这个MAP计划对你将来的职业发展有什么好处？你的职业发展目标是什么？',
+          answer3: third.answer,
+          qid4: fourth.qid || '4',
+          question4:
+            fourth.question || '你参加过心理学的工作坊或培训班吗？请把它列出来。你是如何从这些学习经验中获益的？',
+          answer4: fourth.answer
        }
      }
    },
@@ -35,7 +40,9 @@ export default function(_this) {
        return {
          answers: [
            { qid: data.qid1, question: data.question1, answer: data.answer1 },
-            { qid: data.qid2, question: data.question2, answer: data.answer2 }
+            { qid: data.qid2, question: data.question2, answer: data.answer2 },
+            { qid: data.qid3, question: data.question3, answer: data.answer3 },
+            { qid: data.qid4, question: data.question4, answer: data.answer4 }
          ]
        }
      }
@@ -47,7 +54,7 @@ export default function(_this) {
      items: [
        {
          type: 'v-input',
-          label: '个人描述（60-1000字）中文或者英文',
+          label: '自我介绍',
          model: 'answer1',
          attrs: { type: 'textarea', rows: '8', maxlength: '1000', style: 'width:100%' },
          rules: [
@@ -57,13 +64,33 @@ export default function(_this) {
        },
        {
          type: 'v-input',
-          label: '申请紫荆教育康博斯威尔大学教育硕士的原因？以及您的职业或个人发展的预期目标（60-1000字）中文或者英文',
+          label: '这个MAP计划对你个人将来有什么好处？你在这个项目中的个人发展目标是什么？',
          model: 'answer2',
          attrs: { type: 'textarea', rows: '8', maxlength: '1000', style: 'width:100%' },
          rules: [
            { required: true, message: '请输入', trigger: 'blur' },
            { min: 60, max: 1000, message: '长度在 60 到 1000 个字符', trigger: 'blur' }
          ]
+        },
+        {
+          type: 'v-input',
+          label: '这个MAP计划对你将来的职业发展有什么好处？你的职业发展目标是什么？',
+          model: 'answer3',
+          attrs: { type: 'textarea', rows: '8', maxlength: '1000', style: 'width:100%' },
+          rules: [
+            { required: true, message: '请输入', trigger: 'blur' },
+            { min: 60, max: 1000, message: '长度在 60 到 1000 个字符', trigger: 'blur' }
+          ]
+        },
+        {
+          type: 'v-input',
+          label: '你参加过心理学的工作坊或培训班吗？请把它列出来。你是如何从这些学习经验中获益的？',
+          model: 'answer4',
+          attrs: { type: 'textarea', rows: '8', maxlength: '1000', style: 'width:100%' },
+          rules: [
+            { required: true, message: '请输入', trigger: 'blur' },
+            { min: 60, max: 1000, message: '长度在 60 到 1000 个字符', trigger: 'blur' }
+          ]
        }
      ]
    }

--- a/src/pages/my/application/form/tjx.js
+++ b/src/pages/my/application/form/tjx.js
@@ -25,7 +25,7 @@ export default function(_this) {
        ]
        this.form.options.disabled = stageList.findIndex(item => item === submissionStage) > 3
        const list = data.data.material.reco_letters || []
-        return list.length ? list : [{}, {}, {}]
+        return list.length ? list : [{}, {}]
      }
    },
    update: {
@@ -44,9 +44,9 @@ export default function(_this) {
      }
    },
    form: {
-      minlength: 3,
+      minlength: 2,
      prev: { to: { query: { active: 'application_info', tab: 'application_info_honor' } }, isSubmit: true },
-      next: { to: { query: { active: 'application_wfzzm' } }, isSubmit: true },
+      next: { to: { query: { active: 'application_declare' } }, isSubmit: true },
      hasAdd: true,
      disabled(data) {
        return !!data.letter_content

--- a/src/pages/my/application/pay.vue
+++ b/src/pages/my/application/pay.vue
@@ -6,10 +6,10 @@
    <div class="pay-hd">
      <h1>欢迎您</h1>
      <p class="t1">
-        申请紫荆-康博斯威尔大学蒙台梭利方向教育学硕士项目，本项目的注册费、申请费共计<span>700</span>元，请扫描二维码缴费以完成报名。
+        申请紫荆-加州整合大学应用心理学硕士项目，本项目的注册费、申请费共计<span>600</span>元，请扫描二维码缴费以完成报名。
      </p>
      <p class="t1" v-if="isPass">
-        因面试未通过需重新申请紫荆-康博斯威尔大学蒙台梭利方向教育学硕士项目，本项目的注册费、申请费共计<span>700</span>元，请扫描二维码缴费以完成报名。
+        因面试未通过需重新申请紫荆-加州整合大学应用心理学硕士项目，本项目的注册费、申请费共计<span>600</span>元，请扫描二维码缴费以完成报名。
      </p>
    </div>
    <div class="qrcode-error" v-if="qrcodeError">
@@ -20,8 +20,8 @@
      <span @click="refreshQrcode">刷新</span>
    </div>
    <div class="pay-ft">
-      <p class="t2">注释：再提交700元申请费后，申请人还需上传并提交如下文件。</p>
-      <p class="t2">①本科学位证书、②本科中、英文成绩单各一份、③个人证件照（2寸、免冠、白底）</p>
+      <p class="t2">注释：再提交600元申请费后，申请人还需上传并提交如下文件。</p>
+      <p class="t2">①学历/学位证书、②本科中、英文成绩单各一份、③个人证件照（2寸、免冠、白底）</p>
      <p class="t2">该申请费不退，请慎重缴费！</p>
    </div>
    <el-dialog

--- a/src/pages/my/application/preview.vue
+++ b/src/pages/my/application/preview.vue
@@ -272,16 +272,16 @@ export default {
              }
            }
          ]
-        },
-        {
-          title: '无犯罪证明',
-          code: 'attachments',
-          edit: { to: { path: '/my/application', query: { active: 'application_wfzzm' } } },
-          computed(data) {
-            const found = data.find(item => item.file_type_id === 'NO_CRIMINAL_CERT')
-            return found ? `<img src="${found.oss_sign_url}" style="max-width:300px;margin:10px 0;">` : ''
-          }
        }
+        // {
+        //   title: '无犯罪证明',
+        //   code: 'attachments',
+        //   edit: { to: { path: '/my/application', query: { active: 'application_wfzzm' } } },
+        //   computed(data) {
+        //     const found = data.find(item => item.file_type_id === 'NO_CRIMINAL_CERT')
+        //     return found ? `<img src="${found.oss_sign_url}" style="max-width:300px;margin:10px 0;">` : ''
+        //   }
+        // }
      ]
    }
  },

--- a/src/pages/my/interview/form/byz.js
+++ b/src/pages/my/interview/form/byz.js
 export default {
  id: 'interview_byz',
-  title: '学位证书',
+  title: '学历/学位证书',
  get: {
    action: `/api/enrollment/v1.0/application-materials/${webConf.others.projectId}`,
    callback(data) {

--- a/src/pages/my/interview/index.vue
+++ b/src/pages/my/interview/index.vue
@@ -20,7 +20,7 @@
      width="348px"
    >
      <div class="dialog-tips">
-        <p>请注意接听康博斯威尔大学招办老师的邀约电话</p>
+        <p>请注意接听加州整合大学招办老师的邀约电话</p>
        <div class="icon"><img src="../../../assets/images/icon_success.png" /></div>
      </div>
      <template #footer>