三级认证修改bug

src/views/attestation/form.vue

@@ -10,7 +10,7 @@
           v-model="form.name"
           name="pattern"
           placeholder="请填写"
-          :rules="[{ pattern, message: '请用英文大写填写资料' }]"
+          :rules="[{ pattern, message: '输入有误，请检查并重新填写' }]"
         />
       </div>
       <div class="item">
@@ -19,7 +19,7 @@
           @click="seleIsShow = true"
           disabled
           class="bor"
-          :value="form.gender == 1 ? '男 man' : '女 woman'"
+          :value="form.gender == 1 ? '男 MALE' : '女 FEMALE'"
           name="pattern"
           placeholder=""
         />
@@ -31,7 +31,7 @@
           v-model="form.birth_place"
           name="pattern"
           placeholder="请填写"
-          :rules="[{ pattern, message: '请用英文大写填写资料' }]"
+          :rules="[{ pattern, message: '输入有误，请检查并重新填写' }]"
         />
       </div>
       <div class="item">
@@ -51,7 +51,7 @@
           v-model="form.nationality"
           name="pattern"
           placeholder="请填写"
-          :rules="[{ pattern, message: '请用英文大写填写资料' }]"
+          :rules="[{ pattern, message: '输入有误，请检查并重新填写' }]"
         />
       </div>
       <div class="item">
@@ -61,7 +61,7 @@
           v-model="form.occupatio"
           name="pattern"
           placeholder="请填写"
-          :rules="[{ pattern, message: '请用英文大写填写资料' }]"
+          :rules="[{ pattern, message: '输入有误，请检查并重新填写' }]"
         />
       </div>
       <div class="item">
@@ -80,7 +80,7 @@
           v-model="form.address"
           name="pattern"
           placeholder="请填写"
-          :rules="[{ pattern, message: '请用英文大写填写资料' }]"
+          :rules="[{ pattern, message: '输入有误，请检查并重新填写' }]"
         />
       </div>
       <div class="item">
@@ -180,7 +180,7 @@ export default {
   data() {
     return {
       seleIsShow: false,
-      columns: ['男 man', '女 woman'],
+      columns: ['男 MALE', '女 FEMALE'],
       form: {
         name: '',
         gender: '1',
@@ -205,7 +205,7 @@ export default {
     }
   },
   created() {
-    if (this.$route.query.edit) {
+    if (this.$route.query.edit || this.$route.query.back) {
       this.getCertificationDetail()
     }
   },
@@ -273,7 +273,7 @@ export default {
       Dialog.confirm({
         message: '你确定要撤回申请吗？撤回后，需要重新填写资料提交申请。'
       }).then(() => {
-        const id = window.sessionStorage.dataId
+        const id = this.$route.query.id
         if (id) {
           api.revoke(id, { status: -2 }).then(response => {
             if (response.success) {

src/views/attestation/index.vue

@@ -26,7 +26,7 @@
             <div class="btn" v-if="item.pay == 0" @click="orderPays">支付</div>
           </template>
         </div>
-        <div class="icon-yes" v-if="item.approve_status"></div>
+        <!-- <div class="icon-yes" v-if="item.approve_status"></div> -->
       </div>
     </template>
     <!-- <div class="btn" @click="orderPays" style="font-size:30px;position: relative;z-index: 999;">支付</div> -->
@@ -68,15 +68,15 @@ export default {
         }
         switch(types) {
           case -1:
-            cont.text = '待审核'
+            cont.text = '待审批'
             cont.class = 'tag'
             break
           case 0:
-            cont.text = '审核驳回'
+            cont.text = '审批驳回'
             cont.class = 'tag stu2'
             break
           case 1:
-            cont.text = '审核通过'
+            cont.text = '审批通过'
             cont.class = 'tag stu3'
             break
         }
@@ -111,7 +111,7 @@ export default {
       Dialog.confirm({
         message: '你确定要撤回申请吗？撤回后，需要重新填写资料提交申请。'
       }).then(() => {
-        const id = window.sessionStorage.dataId
+        // const id = window.sessionStorage.dataId
         if (id) {
           api.revoke(id, { status: -2 }).then(response => {
             if (response.success) {

src/views/attestation/printing.vue

@@ -29,22 +29,23 @@ export default {
   methods: {
     backEdit() {
       // this.$router.go(-1)
-      if (this.$route.query.edit) {
-        this.$router.replace({
-          path: '/attestation/form',
-          query: {
-            id: this.$route.query.id,
-            edit: 1
-          }
-        })
-      } else {
-        this.$router.replace({
-          path: '/attestation/form',
-          query: {
-            id: this.$route.query.id
-          }
-        })
-      }
+      this.$router.replace({
+        path: '/attestation/form',
+        query: {
+          id: this.$route.query.id,
+          edit: 1
+        }
+      })
+      // if (this.$route.query.edit) {
+      // } else {
+      //   this.$router.replace({
+      //     path: '/attestation/form',
+      //     query: {
+      //       id: this.$route.query.id,
+      //       back: 1
+      //     }
+      //   })
+      // }
     },
     goUpload() {
       if (this.$route.query.edit) {

src/views/attestation/upload.vue

@@ -29,7 +29,7 @@
         <div class="form-item">
           <div class="label">1,已签字确认的个人资料页</div>
           <div class="up-box">
-            <img :src="formModel.apply" alt="">
+            <img :src="formModel.apply" alt="" @click="imgViewShow(formModel.apply)">
           </div>
         </div>
       </div>
@@ -37,7 +37,7 @@
         <div class="form-item">
           <div class="label">2,个人护照信息页</div>
           <div class="up-box">
-            <img :src="formModel.passport" alt="">
+            <img :src="formModel.passport" alt="" @click="imgViewShow(formModel.passport)">
           </div>
         </div>
       </div>
@@ -45,7 +45,7 @@
         <div class="form-item">
           <div class="label">3,学位证书页</div>
           <div class="up-box">
-            <img :src="formModel.degree" alt="">
+            <img :src="formModel.degree" alt="" @click="imgViewShow(formModel.degree)">
           </div>
         </div>
       </div>
@@ -70,6 +70,7 @@
       </div>
     </template>
     <h5-pay :productId="productId" ref="h5pay"></h5-pay>
+    <van-image-preview v-model="imagePreview" :images="imgView"></van-image-preview>
   </div>
 </template>
 
@@ -77,7 +78,7 @@
 import h5Pay from './buy/components/h5Pay.vue'
 import Card from '@/components/Card'
 import VForm from '@/components/attestationFormUpload'
-import { Toast, Dialog } from 'vant'
+import { Toast, Dialog, ImagePreview } from 'vant'
 import * as api from '@/api/attestation'
 
 export default {
@@ -87,10 +88,13 @@ export default {
     VForm,
     [Toast.name]: Toast,
     [Dialog.name]: Dialog,
+    [ImagePreview.name]: ImagePreview,
     h5Pay
   },
   data() {
     return {
+      imagePreview: false,
+      imgView: [],
       productId: '6734697826573352960',
       approveRemark: '',
       auditStatus: 2,
@@ -151,13 +155,15 @@ export default {
     }
   },
   mounted() {
-    this.$route.query.look && (this.isLook = true)
-    this.$route.query.edit && (this.isLook = true)
     if (this.$route.query.edit) {
       this.getCertificationDetail()
     }
   },
   methods: {
+    imgViewShow(img) {
+      this.imgView = [img]
+      this.imagePreview = true
+    },
     orderPays() {
       this.$refs.h5pay.pay()
     },
@@ -167,12 +173,17 @@ export default {
     getCertificationDetail() {
       api.getAttestationDetail(this.$route.query.id).then(response => {
         // formModel: { apply: '', passport: '', degree:''}
-        this.formModel.apply = response.apply
-        this.formModel.passport = response.passport
-        this.formModel.degree = response.degree
-        this.auditStatus = response.approve_status
-        this.ispay = response.pay
-        this.approveRemark = response.approve_remark
+        if (response.apply !== '') {
+          this.formModel.apply = response.apply
+          this.formModel.passport = response.passport
+          this.formModel.degree = response.degree
+          this.auditStatus = response.approve_status
+          this.ispay = response.pay
+          this.approveRemark = response.approve_remark
+          if (this.$route.query.look || this.$route.query.edit) {
+            this.isLook = true
+          }
+        }
       })
     },
     revoke() {