bug fixes

modules/my/account/home.vue

@@ -50,8 +50,8 @@ export default {
       progress: {},
       submissionStage: {
         0: ['FILLING', 'PREPAYMENT'],
-        1: ['INTERVIEW_APPLICATION', 'AUDITION', 'INTERVIEW', 'PAYMENT'],
-        2: ['REGISTRATION'],
+        1: ['INTERVIEW_APPLICATION', 'AUDITION', 'INTERVIEW'],
+        2: ['REGISTRATION', 'PAYMENT'],
         3: ['CLOSED']
       },
       result: {},

modules/my/admission/form/byzs.js

@@ -17,7 +17,7 @@ export default function(_this) {
           'PAYMENT',
           'CLOSED'
         ]
-        this.form.options.disabled = stageList.findIndex(item => item === submissionStage) > 6
+        this.form.options.disabled = stageList.findIndex(item => item === submissionStage) >= 6
         return attachments.reduce(
           (result, item) => {
             if (item.file_type_id === 'DIPLOMA_CN') {

modules/my/admission/form/cjd.js

@@ -17,7 +17,7 @@ export default function(_this) {
           'PAYMENT',
           'CLOSED'
         ]
-        this.form.options.disabled = stageList.findIndex(item => item === submissionStage) > 6
+        this.form.options.disabled = stageList.findIndex(item => item === submissionStage) >= 6
         return attachments.reduce(
           (result, item) => {
             if (item.file_type_id === 'REPORT_CARD_CN') {

modules/my/admission/form/grcs.js

@@ -17,7 +17,7 @@ export default function(_this) {
           'PAYMENT',
           'CLOSED'
         ]
-        this.form.options.disabled = stageList.findIndex(item => item === submissionStage) > 6
+        this.form.options.disabled = stageList.findIndex(item => item === submissionStage) >= 6
         const PERSONAL_STATEMENT = attachments.filter(item => {
           return item.file_type_id === 'PERSONAL_STATEMENT'
         })

modules/my/admission/form/tjx.js

@@ -17,7 +17,7 @@ export default function(_this) {
           'PAYMENT',
           'CLOSED'
         ]
-        this.form.options.disabled = stageList.findIndex(item => item === submissionStage) > 6
+        this.form.options.disabled = stageList.findIndex(item => item === submissionStage) >= 6
         return attachments.reduce(
           (result, item) => {
             item.disabled = item.upload_operator_user_id !== _this.user?.id

modules/my/admission/index.vue

@@ -29,11 +29,11 @@
       width="348px"
     >
       <div class="dialog-tips">
-        <p>请确认是否已缴费，如未缴费点击下方缴费按钮 <br />（已缴费，请忽略）</p>
+        <!-- <p>请确认是否已缴费，如未缴费点击下方缴费按钮 <br />（已缴费，请忽略）</p> -->
         <div class="icon"><img src="https://webapp-pub.ezijing.com/project/application/images/icon_success.png" /></div>
       </div>
       <template #footer>
-        <el-button type="primary" @click="toPay">立即缴费</el-button>
+        <!-- <el-button type="primary" @click="toPay">立即缴费</el-button> -->
         <el-button type="primary" @click="dialogVisible = false">忽略</el-button>
       </template>
     </el-dialog>
@@ -75,7 +75,7 @@ export default {
   computed: {
     isSubmited() {
       if (this.detail) {
-        return !!this.detail.material.attachments.find(item => item.file_type_id === 'ADMISSION_AGREEMENT')
+        return this.detail.material.submission_stage === 'PAYMENT'
       }
       return false
     },