Merge branch 'dev-majunjie' into dev

pages/frontend/name_cert/index.vue

@@ -299,13 +299,14 @@ export default {
             //         certifyId: "123123"
             //     }
             // }
-            let res = await this.$axios.$post("/uapi/zfb/certify", {
+            let res = await this.$axios.$post("/uapi/user/realName/create", {
                 cert_name,
                 cert_no,
                 cert_type,
                 z_file:this.z_file,
                 f_file:this.f_file,
-                from_type: 3
+                is_face_check:0,
+                from_type: 1
             });
 
             if (Number(res.status) !== 1) {
@@ -314,9 +315,11 @@ export default {
             }
 
             const {
-                url,
+                kezhan_url,
                 certifyId,
-                cert_status
+                cert_status,
+                zfb_url,
+                certify_type
             } = res.data;
 
             if(cert_status==3)
@@ -324,11 +327,15 @@ export default {
               this.toSuccess();
               return ;
             }
-            this.url = url;
-            //this.certifyId = certifyId;
-            //this.centerDialogVisible = true;
-            //this.createQrCode();
-            this.startTimer();
+
+            if(certify_type==2)
+            {
+              this.url = kezhan_url;
+              this.certifyId = certifyId;
+              this.centerDialogVisible = true;
+              this.createQrCode();
+              this.startTimer();
+            }
         },
         createQrCode() {
             this.$nextTick(() => {
@@ -354,7 +361,7 @@ export default {
             }
 
             this.timer = setInterval(async () => {
-                let res = await this.$axios.$post("/uapi/zfb/return", {});
+                let res = await this.$axios.$post("/uapi/user/realName/check", {});
                 if (Number(res.status) !== 1) {
                     this.$message.error(res.info);
                     return;