update

modules/my/account/home.vue

@@ -2,7 +2,9 @@
   <div class="my">
     <div class="card">
       <div class="result">
-        <div class="result-left"><img src="https://webapp-pub.ezijing.com/project/application/images/my_icon.png" />招生办反馈</div>
+        <div class="result-left">
+          <img src="https://webapp-pub.ezijing.com/project/application/images/my_icon.png" />招生办反馈
+        </div>
         <!-- <div class="result-right">{{ result.submit_status_desc || '未收到报名信息' }}</div> -->
       </div>
     </div>
@@ -10,12 +12,12 @@
       <ul class="nav">
         <li class="nav-application" @click="toApplication"></li>
         <li class="nav-interview" @click="toInterview"></li>
-        <li class="nav-review" @click="toReview"></li>
+        <!-- <li class="nav-review" @click="toReview"></li> -->
         <li class="nav-admission" @click="toAdmission"></li>
       </ul>
       <div class="progress">
         <el-steps :active="activeProgress" finish-status="success" align-center>
-          <el-step v-for="(item, index) in 4" :key="index">
+          <el-step v-for="(item, index) in 3" :key="index">
             <template #title>{{ getProgressStatusText(index) }}</template>
           </el-step>
         </el-steps>
@@ -51,8 +53,8 @@ export default {
         0: ['FILLING'],
         1: ['INTERVIEW_APPLICATION', 'AUDITION', 'INTERVIEW', 'PREPAYMENT'],
         2: ['REGISTRATION', 'PAYMENT'],
-        3: ['CLOSED'],
-        4: ['FINISHED']
+        3: ['CLOSED', 'FINISHED']
+        // 4: ['']
       },
       result: {},
       welcomeShow: false
@@ -65,10 +67,12 @@ export default {
     activeProgress() {
       for (const key in this.submissionStage) {
         const list = this.submissionStage[key]
+        console.log(this.material.submission_stage, 'this.material.submission_stage')
         if (list.includes(this.material.submission_stage)) {
           // if (key === '3' && !this.isPay) {
           //   return 2
           // }
+          console.log(parseInt(key), 'parseInt(key)parseInt(key)')
           return parseInt(key)
         }
       }
@@ -121,7 +125,8 @@ export default {
     // 申请面试
     toInterview() {
       if (this.activeProgress < 1) {
-        this.$message.warning('请完成报名申请并缴报名费')
+        // this.$message.warning('请完成报名申请并缴报名费')
+        this.$message.warning('请完成报名申请')
         return
       }
       this.$router.push('/my/interview')
@@ -136,7 +141,7 @@ export default {
     // 办理入学
     toAdmission() {
       if (this.activeProgress < 3) {
-        this.$message.warning('请完成综合评审')
+        this.$message.warning('请等待面试结果')
         return
       }
       this.$router.push('/my/admission')

modules/my/admission/form/index.js

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

modules/my/interview/index.vue

@@ -56,7 +56,7 @@ export default {
       immediate: true,
       handler(route) {
         const { query = {} } = route
-        this.currentActive = query.active || 'interview_ywjl'
+        this.currentActive = query.active || 'interview_zwjl'
       }
     },
     showSubmittedDialog(value) {