xuqiang 4 سال پیش
والد
کامیت
6c8496ae35

+ 47 - 3
src/main/pc-space/src/views/AssetDetail.vue

@@ -297,7 +297,8 @@ export default {
             init: [],
             init: [],
             init2: [],
             init2: [],
             list2: [],
             list2: [],
-            opened: ''
+            opened: '',
+            lists: ''
         };
         };
     },
     },
     computed: {
     computed: {
@@ -530,9 +531,52 @@ export default {
                     });
                     });
             }
             }
         },
         },
+        add() {
+            this.$http
+                .post(
+                    '/identityAuth/all',
+                    {
+                        query: {
+                            userId: this.userInfo.id
+                        },
+                        sort: 'createdAt,desc',
+                        size: 1,
+                        page: 0
+                    },
+                    {
+                        body: 'json'
+                    }
+                )
+                .then(res => {
+                    this.lists = res.content[0].org;
+                    console.log(this.lists);
+                });
+        },
         send() {
         send() {
-            this.checkAuth().then(() => {
-                this.$refs.send.show = true;
+            this.$confirm('未认证不能转增,是否认证', '认证', {
+                confirmButtonText: '确定',
+                cancelButtonText: '取消',
+                customClass: 'myClass',
+                center: true
+            }).then(() => {
+                this.add();
+                this.$nextTick(() => {
+                    console.log(this.lists);
+                    setTimeout(() => {
+                        if (this.userInfo.authStatus !== 'NOT_AUTH' && this.lists == false) {
+                            this.add();
+                            this.$router.push('/userauthentication');
+                            this.$refs.send.show = true;
+                        }
+                    }, 1000);
+                    setTimeout(() => {
+                        if (this.userInfo.authStatus !== 'NOT_AUTH' && this.lists == true) {
+                            this.add();
+                            this.$router.push('/enterpriseauthentication');
+                            this.$refs.send.show = true;
+                        }
+                    }, 1000);
+                });
             });
             });
         }
         }
     }
     }

+ 4 - 0
src/main/pc-space/src/views/Home.vue

@@ -241,6 +241,7 @@ export default {
             font-weight: 400;
             font-weight: 400;
             color: #ffffff;
             color: #ffffff;
             line-height: 42px;
             line-height: 42px;
+            font-family: ZhenyanGB-Regular, ZhenyanGB;
             padding: 130px 0 24px 10px;
             padding: 130px 0 24px 10px;
         }
         }
         .title2 {
         .title2 {
@@ -330,6 +331,7 @@ export default {
         font-weight: 400;
         font-weight: 400;
         color: #ffffff;
         color: #ffffff;
         line-height: 34px;
         line-height: 34px;
+        font-family: ZhenyanGB-Regular, ZhenyanGB;
         padding: 100px 0 50px;
         padding: 100px 0 50px;
     }
     }
     .all {
     .all {
@@ -368,6 +370,7 @@ export default {
         color: #ffffff;
         color: #ffffff;
         line-height: 34px;
         line-height: 34px;
         padding: 60px 0 50px;
         padding: 60px 0 50px;
+        font-family: ZhenyanGB-Regular, ZhenyanGB;
     }
     }
     .imgBox {
     .imgBox {
         display: flex;
         display: flex;
@@ -435,6 +438,7 @@ export default {
         margin: 100px 0 8px;
         margin: 100px 0 8px;
         font-weight: 400;
         font-weight: 400;
         color: #ffffff;
         color: #ffffff;
+        font-family: ZhenyanGB-Regular, ZhenyanGB;
         line-height: 34px;
         line-height: 34px;
     }
     }
     .space2 {
     .space2 {

+ 1 - 1
src/main/pc-space/src/views/Send.vue

@@ -90,7 +90,7 @@
             </div> -->
             </div> -->
         </div>
         </div>
 
 
-        <span slot="footer" class="dialog-footer">
+        <span v-if="status != 'NOT_PAID'" slot="footer" class="dialog-footer">
             <el-button :disabled="btn" type="primary" class="pay" @click="submit">立即支付</el-button>
             <el-button :disabled="btn" type="primary" class="pay" @click="submit">立即支付</el-button>
         </span>
         </span>
     </el-dialog>
     </el-dialog>

+ 3 - 1
src/main/pc-space/src/views/Submit.vue

@@ -214,10 +214,12 @@ export default {
                 .post(url)
                 .post(url)
                 .then(res => {
                 .then(res => {
                     if (this.money) {
                     if (this.money) {
+                        // console.log(111);
                         this.status = res.status;
                         this.status = res.status;
                         this.id = res.id;
                         this.id = res.id;
-                        this.show = false;
+                        // this.show = false;
                     } else {
                     } else {
+                        console.log(222);
                         this.$message.success('支付成功');
                         this.$message.success('支付成功');
                         setTimeout(() => {
                         setTimeout(() => {
                             this.$router.replace('/collectionorder');
                             this.$router.replace('/collectionorder');

+ 1 - 0
src/main/pc-space/src/views/user/Personal.vue

@@ -82,6 +82,7 @@ export default {
         font-weight: 400;
         font-weight: 400;
         color: #ffffff;
         color: #ffffff;
         line-height: 42px;
         line-height: 42px;
+        font-family: ZhenyanGB-Regular, ZhenyanGB;
         padding: 60px 0;
         padding: 60px 0;
     }
     }
     .content {
     .content {