报名费放到申请声明之前

.env.dev

@@ -2,6 +2,6 @@ projectId=1001
 
 newProjectId=6800243768751554560
 
-baseURL=https://project-api.ezijing.com
+baseURL=https://project-api2.ezijing.com
 
-loginURL=https://login.ezijing.com/auth
\ No newline at end of file
+loginURL=https://login2.ezijing.com/auth
\ No newline at end of file

modules/my/application/complete.vue

@@ -43,6 +43,11 @@ export default {
             title: '个人资料',
             code: 'applicaitonInfo',
             view: { to: { path: '/my/application', query: { active: 'application_info' } } }
+          },
+          {
+            title: '缴报名费',
+            code: 'applicationPay',
+            view: { to: { path: '/my/application', query: { active: 'application_pay' } } }
           }
           // {
           //   title: '推荐信',
@@ -120,7 +125,7 @@ export default {
           const fillingMissedRequiredList = progress.FILLING.attachments.missed_required_list
           // 个人资料
           const applicaitonInfo = { progress: 0 }
-          const infoRequriedList = ['basic_info', 'educations', 'careers', 'answers']
+          const infoRequriedList = ['basic_info', 'educations', 'careers', 'answers', 'attachments']
           for (const key of infoRequriedList) {
             if (progress.FILLING[key].progress < 1) {
               applicaitonInfo.progress = 0
@@ -133,6 +138,11 @@ export default {
           } else {
             applicaitonInfo.progress = 0
           }
+
+          // 缴报名费
+          const applicationPay = { progress: 0 }
+          applicationPay.progress = progress.FILLING.payment_records ? progress.FILLING.payment_records.progress : 0
+
           // 推荐信
           const applicationTjx = { progress: 0 }
           applicationTjx.progress = progress.FILLING.reco_letters ? progress.FILLING.reco_letters.progress : 0
@@ -167,6 +177,7 @@ export default {
 
           this.progress = {
             applicaitonInfo,
+            applicationPay,
             applicationTjx,
             applicationWfzzm,
             interviewZp,

modules/my/application/form/declare.js

@@ -34,7 +34,7 @@ export default function(_this) {
       }
     },
     form: {
-      prev: { to: { query: { active: 'application_info', tab: 'application_info_attachment' } } },
+      prev: { to: { query: { active: 'application_pay' } } },
       submitText: '提交报名申请',
       model: { isAgree: [] },
       options: {},

modules/my/application/form/index.js

@@ -11,15 +11,15 @@ export default function(_this) {
       info(_this),
       // tjx(_this),
       // wfzsm(_this),
-      declare(_this),
       {
         id: 'application_pay',
-        title: '缴报名费',
-        show: false,
-        visible() {
-          return _this.visible
-        }
-      }
+        title: '缴报名费'
+        // show: false,
+        // visible() {
+        //   return _this.visible
+        // }
+      },
+      declare(_this)
     ]
   }
 }

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

@@ -46,7 +46,7 @@ export default function(_this) {
     },
     form: {
       prev: { to: { query: { active: 'application_info', tab: 'application_info_honor' } } },
-      next: { to: { query: { active: 'application_declare' } } },
+      next: { to: { query: { active: 'application_pay' } } },
       hasButton: false,
       options: { labelWidth: '140px' },
       items: [