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>
@@ -28,7 +30,7 @@
           <img src="https://webapp-pub.ezijing.com/project/application/images/welcome.png" width="350" />
           <div class="welcome-content">
             <h1>欢迎您报考</h1>
-            <h2>美国帕克大学</h2>
+            <h2>美国帕克大学硕士项目</h2>
             <div class="welcome-button" @click="handleStart">马上开始</div>
           </div>
         </div>
@@ -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,7 @@ export default {
     // 申请面试
     toInterview() {
       if (this.activeProgress < 1) {
-        this.$message.warning('请完成报名申请并缴报名费')
+        this.$message.warning('请完成报名申请')
         return
       }
       this.$router.push('/my/interview')
@@ -135,8 +139,8 @@ export default {
     },
     // 办理入学
     toAdmission() {
-      if (this.activeProgress < 3) {
-        this.$message.warning('请完成综合评审')
+      if (this.activeProgress < 2) {
+        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) {
@@ -6,8 +6,8 @@ export default function (_this) {
     id: 'admission',
     title: '入学办理',
     children: [
-      xfjn(_this)
-      //  xy(_this)
+      xfjn(_this),
+      xy(_this)
     ]
   }
 }

modules/my/application/components/qrcodePay.vue

@@ -5,7 +5,7 @@
         <img src="https://webapp-pub.ezijing.com/project/application/images/my_pay_01.png" />
       </div>
       <h1>欢迎您</h1>
-      <p class="t1">申请美国帕克大学硕士项目，本项目的申请费为<span>700</span>元，请扫描二维码以完成报名。</p>
+      <p class="t1">申请美国帕克大学硕士项目，本项目的申请费为<span>10000</span>元，请扫描二维码以完成报名。</p>
     </div>
     <div class="qrcode-error" v-if="qrcodeError">
       生成二维码失败请刷新<i class="el-icon-refresh-left" @click="getOrder" title="刷新"></i>

modules/my/application/form/index.js

@@ -14,7 +14,7 @@ export default function (_this) {
       declare(_this),
       {
         id: 'application_pay',
-        title: '缴报名费',
+        title: '缴纳申请费',
         visible() {
           return _this.visible && _this.hasPay
         }

modules/my/interview/components/qrcodePay.vue

@@ -5,7 +5,7 @@
         <img src="https://webapp-pub.ezijing.com/project/application/images/my_pay_01.png" />
       </div>
       <h1>欢迎您</h1>
-      <p class="t1">申请美国帕克大学硕士项目，本项目的申请费为<span>700</span>元，请扫描二维码以完成报名。</p>
+      <p class="t1">申请美国帕克大学硕士项目，本项目的申请费为<span>10000</span>元，请扫描二维码以完成报名。</p>
     </div>
     <div class="qrcode-error" v-if="qrcodeError">
       生成二维码失败请刷新<i class="el-icon-refresh-left" @click="getOrder" title="刷新"></i>

modules/my/interview/form/index.js

@@ -26,7 +26,7 @@ export default function (_this) {
       {
         required: true,
         id: 'application_pay',
-        title: '缴报名费'
+        title: '缴纳申请费'
       }
       //  ywcjd(_this), tjx(_this), grcs(_this), byzs(_this), form(_this)
     ]

modules/my/interview/pay.vue

@@ -4,7 +4,7 @@
       <h5-pay @update="handleUpdateOrder" v-if="isWechat"></h5-pay>
       <qrcode-pay @update="handleUpdateOrder" v-else></qrcode-pay>
       <div class="pay-ft">
-        <p class="t2">注释：<br />此处为微信二维码<br />申请费不退还</p>
+        <p class="t2">注释：<br />此处为微信二维码。<br />如果收到帕克大学有条件录取通知书，申请费10000元将当作学费抵消，如果收到帕克大学拒信，申请费10000元将原路退回。</p>
       </div>
       <!-- <el-dialog title="报名费缴费成功" :visible.sync="dialogVisible" :center="true" :close-on-click-modal="false" width="348px">
         <div class="dialog-pay">