bug fixes

modules/my/application/form/index.js

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

modules/my/application/index.vue

 <template>
   <app-layout>
     <vue-form
+      :class="{ 'pay-disabled': !canPay }"
       :menus="menus"
       :default-active="currentActive"
       :tab-active="tabActive"
+      :before-page-change="beforePageChange"
       @page-change="handlePageChange"
       @tab-change="handleTabChange"
       @success="handleSuccess"
@@ -68,6 +70,13 @@ export default {
     },
     hasEdit() {
       return this.detail ? this.detail.material.submission_stage === 'FILLING' : true
+    },
+    // 是否可以查看缴报名费
+    canPay() {
+      if (!this.detail) return false
+      const { material = {}, progress = {} } = this.detail
+      const { submission_stage: submissionStage = 'FILLING' } = material
+      return submissionStage !== 'FILLING' || progress.PREPAYMENT?.total_progress === 1
     }
   },
   methods: {
@@ -77,26 +86,31 @@ export default {
         const { data, error, message } = response
         if (error.toString() === '0') {
           this.detail = data
-          if (
-            !data.progress.FILLING.attachments ||
-            data.progress.FILLING.attachments.missed_required_list.ID_CARD_PHOTO
-          ) {
+          if (!data.progress.FILLING.attachments || data.progress.FILLING.attachments.missed_required_list.ID_CARD_PHOTO) {
             this.tabActive = 'application_info_first'
           }
-          const { submission_stage: submissionStage = 'FILLING' } = data.material
-          if (submissionStage !== 'FILLING') {
-            this.menus[0].children.forEach(item => {
-              if (item.id === 'application_pay') {
-                item.show = true
-              }
-            })
-          }
+          // const { submission_stage: submissionStage = 'FILLING' } = data.material
+          // if (submissionStage !== 'FILLING') {
+          //   this.menus[0].children.forEach(item => {
+          //     if (item.id === 'application_pay') {
+          //       item.show = true
+          //     }
+          //   })
+          // }
         } else {
           this.$message.error(message)
         }
       })
     },
+    beforePageChange(value) {
+      if (value === 'application_pay' && !this.canPay) {
+        this.$message.error('请先提交个人资料')
+        return false
+      }
+      return true
+    },
     handlePageChange(value) {
+      console.log(value)
       this.currentActive = value
       this.$router.push({ path: this.$route.path, query: { active: value } })
     },
@@ -166,4 +180,9 @@ export default {
     padding: 0;
   }
 }
+.pay-disabled {
+  ::v-deep .v-submenu__item:last-child {
+    color: #999;
+  }
+}
 </style>

package-lock.json

@@ -8,7 +8,7 @@
       "name": "project-pc",
       "version": "1.0.0",
       "dependencies": {
-        "@ezijing/vue-form": "^2.2.2",
+        "@ezijing/vue-form": "^2.2.3",
         "axios": "^0.21.1",
         "cookie-universal-nuxt": "^2.1.4",
         "core-js": "^3.9.1",
@@ -1010,9 +1010,9 @@
       }
     },
     "node_modules/@ezijing/vue-form": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@ezijing/vue-form/-/vue-form-2.2.2.tgz",
-      "integrity": "sha512-kfFnnpYxW+mW96Ba/+FxKKGmhOpPOAPmhUC71EVqOk49gFaqwpmjnUMLLHmC3jFXkfyGSwQNqSWLILrf+ii3bQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@ezijing/vue-form/-/vue-form-2.2.3.tgz",
+      "integrity": "sha512-hosUuiJBz1t2uLljXzZ6bsDz5Fv8q8vAabzD9GMxEX2YNWYTE2M/SBXvByPdHa+yih9XWROXH7kmsLE2fE6H1Q==",
       "dependencies": {
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "@vue/babel-preset-jsx": "^1.1.2",
@@ -13723,9 +13723,9 @@
       "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw=="
     },
     "@ezijing/vue-form": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/@ezijing/vue-form/-/vue-form-2.2.2.tgz",
-      "integrity": "sha512-kfFnnpYxW+mW96Ba/+FxKKGmhOpPOAPmhUC71EVqOk49gFaqwpmjnUMLLHmC3jFXkfyGSwQNqSWLILrf+ii3bQ==",
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/@ezijing/vue-form/-/vue-form-2.2.3.tgz",
+      "integrity": "sha512-hosUuiJBz1t2uLljXzZ6bsDz5Fv8q8vAabzD9GMxEX2YNWYTE2M/SBXvByPdHa+yih9XWROXH7kmsLE2fE6H1Q==",
       "requires": {
         "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
         "@vue/babel-preset-jsx": "^1.1.2",

package.json

@@ -10,7 +10,7 @@
     "generate": "nuxt generate"
   },
   "dependencies": {
-    "@ezijing/vue-form": "^2.2.2",
+    "@ezijing/vue-form": "^2.2.3",
     "axios": "^0.21.1",
     "cookie-universal-nuxt": "^2.1.4",
     "core-js": "^3.9.1",