bug fixes

src/pages/my/admission/index.vue

@@ -87,7 +87,7 @@ export default {
     },
     handlePageChange(value) {
       this.currentActive = value
-      this.$router.push({ path: this.$route.path, query: { active: value } })
+      this.$router.push({ path: this.$route.path, query: { active: value } }).catch(() => {})
       console.log('页面切换了', value)
     },
     handleSuccess(data) {

src/pages/my/application/form/info/first.js

@@ -32,6 +32,7 @@ export default function(_this) {
           },
           { ID_CARD_FRONT: [], ID_CARD_BACK: [], HK_ID_CARD: [], PASSPORT: [], OTHER_ID_CARD_PHOTO: [] }
         )
+        basicInfo.id_type = basicInfo.id_type === '护照' ? '中国护照' : basicInfo.id_type
         return Object.assign({}, basicInfo, attachment)
       }
     },
@@ -125,10 +126,10 @@ export default function(_this) {
             return data.id_type === '港澳台身份证'
           }
         },
-        // 护照
+        // 中国护照
         {
           type: 'v-upload',
-          label: '护照',
+          label: '中国护照',
           model: 'PASSPORT',
           attrs: {
             action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
@@ -137,9 +138,9 @@ export default function(_this) {
             limit: 1,
             accept: 'image/*'
           },
-          rules: [{ type: 'array', required: true, message: '请上传护照', trigger: 'change' }],
+          rules: [{ type: 'array', required: true, message: '请上传中国护照', trigger: 'change' }],
           isShow(data) {
-            return data.id_type === '护照'
+            return data.id_type === '中国护照'
           }
         },
         // 其他证件

src/pages/my/application/form/info/profile.js

@@ -34,6 +34,7 @@ export default function(_this) {
           },
           { ID_CARD_FRONT: [], ID_CARD_BACK: [], HK_ID_CARD: [], PASSPORT: [], OTHER_ID_CARD_PHOTO: [] }
         )
+        basicInfo.id_type = basicInfo.id_type === '护照' ? '中国护照' : basicInfo.id_type
         return Object.assign({}, basicInfo, attachment)
       }
     },
@@ -104,6 +105,7 @@ export default function(_this) {
             deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
             data: { file_type: 'ID_CARD_BACK' },
             limit: 1,
+            accept: 'image/*',
             image: 'https://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/pc/cu/id_card_back.png'
           },
           rules: [{ type: 'array', required: true, message: '请上传身份证照片人像面', trigger: 'change' }],
@@ -121,6 +123,7 @@ export default function(_this) {
             deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
             data: { file_type: 'ID_CARD_FRONT' },
             limit: 1,
+            accept: 'image/*',
             image: 'https://zws-imgs-pub.oss-cn-beijing.aliyuncs.com/pc/cu/id_card_front.png'
           },
           rules: [{ type: 'array', required: true, message: '请上传身份证照片国徽面', trigger: 'change' }],
@@ -137,27 +140,29 @@ export default function(_this) {
             action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
             deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
             data: { file_type: 'HK_ID_CARD' },
-            limit: 1
+            limit: 1,
+            accept: 'image/*'
           },
           rules: [{ type: 'array', required: true, message: '请上传港澳台身份证', trigger: 'change' }],
           isShow(data) {
             return data.id_type === '港澳台身份证'
           }
         },
-        // 护照
+        // 中国护照
         {
           type: 'v-upload',
-          label: '护照',
+          label: '中国护照',
           model: 'PASSPORT',
           attrs: {
             action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
             deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
             data: { file_type: 'PASSPORT' },
-            limit: 1
+            limit: 1,
+            accept: 'image/*'
           },
-          rules: [{ type: 'array', required: true, message: '请上传护照', trigger: 'change' }],
+          rules: [{ type: 'array', required: true, message: '请上传中国护照', trigger: 'change' }],
           isShow(data) {
-            return data.id_type === '护照'
+            return data.id_type === '中国护照'
           }
         },
         // 其他证件
@@ -169,7 +174,8 @@ export default function(_this) {
             action: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/put`,
             deleteAction: `/api/enrollment/v1.0/application-materials/attachments/${webConf.others.projectId}/delete`,
             data: { file_type: 'OTHER_ID_CARD_PHOTO' },
-            limit: 1
+            limit: 1,
+            accept: 'image/*'
           },
           rules: [{ type: 'array', required: true, message: '请上传其他证件', trigger: 'change' }],
           isShow(data) {

src/pages/my/application/index.vue

@@ -94,7 +94,7 @@ export default {
     },
     handlePageChange(value) {
       this.currentActive = value
-      this.$router.push({ path: this.$route.path, query: { active: value } })
+      this.$router.push({ path: this.$route.path, query: { active: value } }).catch(() => {})
     },
     handleTabChange(value) {
       this.tabActive = value

src/pages/my/interview/index.vue

@@ -98,7 +98,7 @@ export default {
     },
     handlePageChange(value) {
       this.currentActive = value
-      this.$router.push({ path: this.$route.path, query: { active: value } })
+      this.$router.push({ path: this.$route.path, query: { active: value } }).catch(() => {})
       console.log('页面切换了', value)
     },
     handleSuccess(data) {