Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

src/main/java/com/izouma/nineth/service/AssetService.java

@@ -166,7 +166,7 @@ public class AssetService {
         } catch (Exception e) {
             e.printStackTrace();
         }
-        applicationContext.publishEvent(new CreateAssetEvent(this, false, asset));
+        applicationContext.publishEvent(new CreateAssetEvent(this, true, asset));
     }
 
     public String ipfsUpload(String url) {

src/main/nine-space/src/plugins/http.js

@@ -5,9 +5,9 @@ import qs from 'qs';
 let baseUrl = 'http://localhost:8080';
 switch (process.env.NODE_ENV) {
     case 'development':
-        baseUrl = 'https://nfttest.9space.vip/';
+        // baseUrl = 'https://nfttest.9space.vip/';
         // baseUrl = 'http://192.168.50.190:8080';
-        // baseUrl = 'http://localhost:8080';
+        baseUrl = 'http://localhost:8080';
         // baseUrl = 'http://192.168.50.190:8080';
         break;
     case 'test':

src/main/nine-space/src/router/index.js

@@ -161,6 +161,11 @@ const routes = [
         name: 'verifiedSucs',
         component: () => import('../views/account/VerifiedSucs.vue')
     },
+    {
+        path: '/EnterpriseAuthentication',
+        name: 'EnterpriseAuthentication',
+        component: () => import('../views/account/EnterpriseAuthentication.vue')
+    },
     {
         path: '/Authentication',
         name: 'Authentication',

src/main/nine-space/src/styles/common/common.less

@@ -6,7 +6,52 @@
     display: flex;
     flex-direction: column;
 }
+.line(@bg: #1c1e26, @radius: 6px, @color1: @prim, @color2: @warn) {
+    background-image: linear-gradient(135deg, @color1, @color2);
+    position: relative;
+    padding: 1px;
+    border-radius: @radius;
+    overflow: hidden;
+    cursor: pointer;
+    box-sizing: border-box;
+
+    &::before {
+        position: absolute;
+        z-index: 1;
+        content: '';
+        left: 1px;
+        right: 1px;
+        bottom: 1px;
+        top: 1px;
+        background-color: @bg;
+        border-radius: @radius;
+    }
+
+    &::after {
+        position: absolute;
+        z-index: 0;
+        content: '';
+        left: 0;
+        right: 0;
+        bottom: 0;
+        top: 0;
+        background-image: linear-gradient(135deg, @color1, @color2);
+        transform-origin: center center;
+        animation: spin ease-in-out 3s;
+        animation-iteration-count: 0;
+    }
 
+    * {
+        z-index: 3;
+        position: relative;
+    }
+
+    &:hover {
+        &::after {
+            animation-iteration-count: infinite;
+        }
+    }
+}
 .setTopLine(@c: @divider) {
     content: ' ';
     position: absolute;

src/main/nine-space/src/views/Mine.vue

@@ -43,8 +43,20 @@
                         size="mini"
                         :icon="require('../assets/renzheng_icon_pre.png')"
                         round
-                        @click="$router.push('/Authentication')"
-                        v-if="authStatus === '已认证'"
+                        @click="$router.push('/verifiedSuc')"
+                        v-if="authStatus === '已认证' && org == false"
+                        class="verid"
+                    >
+                        {{ authStatus }}
+                    </van-button>
+                    <van-button
+                        plain
+                        color="#939599"
+                        size="mini"
+                        :icon="require('../assets/renzheng_icon_pre.png')"
+                        round
+                        @click="$router.push('/EnterpriseAuthentication')"
+                        v-if="authStatus === '已认证' && org == true"
                         class="verid"
                     >
                         {{ authStatus }}
@@ -171,11 +183,33 @@
 <script>
 import { mapState } from 'vuex';
 export default {
+    data() {
+        return {
+            org: false
+        };
+    },
     computed: {
         ...mapState(['userInfo'])
     },
     mounted() {
         this.$store.dispatch('getUserInfo');
+        this.$http
+            .post(
+                '/identityAuth/all',
+                {
+                    query: {
+                        userId: this.$store.state.userInfo.id
+                    }
+                },
+                { body: 'json' }
+            )
+            .then(res => {
+                if (!res.empty) {
+                    this.form = res.content[0];
+                    this.org = this.form.org;
+                    console.log(this.org);
+                }
+            });
     },
     methods: {
         copy() {

src/main/nine-space/src/views/account/Authentication.vue

@@ -11,7 +11,7 @@
             <div class="text">个人认证</div>
             <div class="btn">下一步</div>
         </div>
-        <!-- <div class="box box1" @click="$router.push('/verifiedSucs')">
+        <div class="box box1" @click="$router.push('/verifiedSucs')">
             <img
                 class="img"
                 src="https://ticket-exchange.oss-cn-hangzhou.aliyuncs.com/image/2021-11-11-10-16-35hyCazZgd.png"
@@ -19,7 +19,7 @@
             />
             <div class="text">企业认证</div>
             <div class="btn">下一步</div>
-        </div> -->
+        </div>
     </div>
 </template>
 
@@ -68,11 +68,9 @@ export default {
         display: flex;
         align-items: center;
         width: 303px;
+        .line();
         height: 88px;
         background: #1f2021;
-        border: 1px solid;
-        border-image: linear-gradient(135deg, rgba(253, 251, 96, 1), rgba(255, 143, 62, 1)) 1 1;
-        border-radius: 10px;
         .img {
             width: 38px;
             height: 38px;

src/main/nine-space/src/views/account/EnterpriseAuthentication.vue

@@ -0,0 +1,138 @@
+<template>
+    <div class="page">
+        <div class="tabs">
+            <div class="text1">企业认证已完成</div>
+            <div class="text2">
+                <span>账户实名认证后不能修改</span>
+            </div>
+        </div>
+        <div class="info">
+            <div class="text1">法人姓名</div>
+            <div class="text2">{{ form.realName }}</div>
+        </div>
+        <div class="info">
+            <div class="text1">身份证照片</div>
+            <div class="text2">已上传</div>
+        </div>
+        <div class="info">
+            <div class="text1">企业名称</div>
+            <div class="text2">{{ form.orgName }}</div>
+        </div>
+        <div class="info">
+            <div class="text1">身份证号</div>
+            <div class="text2" v-if="form.idNo">{{ idNo }}</div>
+        </div>
+        <div class="info">
+            <div class="text1">身份证照片</div>
+            <div class="text2">已上传</div>
+        </div>
+        <div class="info">
+            <div class="text1">工商营业执照注册号/统一社会信用代码</div>
+        </div>
+        <div class="text4">{{ form.orgNo }}</div>
+
+        <div class="info">
+            <div class="text1">工商营业执照有效日期截止时间</div>
+            <div class="text2" v-if="form.orgLicenseExpire">{{ form.orgLicenseExpire }}</div>
+            <div class="text2 text3" v-else>长期</div>
+        </div>
+        <div class="info">
+            <div class="text1">营业执照</div>
+            <div class="text2">已上传</div>
+        </div>
+    </div>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+            form: {}
+        };
+    },
+    computed: {
+        idNo() {
+            // return this.form.idNo.slice(0, 4) + ' **** ' + this.form.idNo.slice(7, 18);
+            return this.form.idNo.slice(0, 4) + ' ********** ' + this.form.idNo.slice(14, 18);
+        }
+    },
+    mounted() {
+        this.$http
+            .post(
+                '/identityAuth/all',
+                {
+                    query: {
+                        userId: this.$store.state.userInfo.id
+                    }
+                },
+                { body: 'json' }
+            )
+            .then(res => {
+                if (!res.empty) {
+                    this.form = res.content[0];
+                }
+            });
+    }
+};
+</script>
+<style lang="less" scoped>
+.page {
+    padding: 10px 16px 150px;
+}
+.tabs {
+    padding-bottom: 12px;
+    .text1 {
+        font-size: 20px;
+        font-weight: bold;
+        color: #ffffff;
+        line-height: 30px;
+    }
+    .text2 {
+        font-size: 12px;
+        color: #939599;
+        line-height: 22px;
+        margin-top: 4px;
+    }
+}
+
+.info {
+    display: flex;
+    align-items: center;
+    height: 70px;
+    position: relative;
+    .text1 {
+        font-size: 14px;
+        font-weight: bold;
+        color: #939599;
+        line-height: 24px;
+        min-width: 90px;
+    }
+
+    .text2 {
+        font-size: 16px;
+        color: #939599;
+        line-height: 24px;
+        &.text3 {
+            margin-left: 20px;
+        }
+    }
+
+    &:not(:last-child) {
+        &::after {
+            content: '';
+            position: absolute;
+            left: 90px;
+            right: 0px;
+            bottom: 0;
+            height: 1px;
+            background-color: #202122;
+        }
+    }
+}
+.text4 {
+    font-size: 16px;
+    color: #939599;
+    line-height: 24px;
+    margin-bottom: 10px;
+}
+</style>

src/main/nine-space/src/views/account/VerifiedSuc.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="page">
         <div class="tabs">
-            <div class="text1">实名认证已完成</div>
+            <div class="text1">个人认证已完成</div>
             <div class="text2">
                 <span>账户实名认证后不能修改</span>
             </div>

src/main/nine-space/src/views/account/Waiting.vue

@@ -7,7 +7,9 @@
         </div>
 
         <div class="btn" v-if="authStatus === '认证失败'">
-            <van-button type="primary" block plain round @click="$router.replace('/verified')"> 重新申请 </van-button>
+            <van-button type="primary" block plain round @click="$router.replace('/Authentication')">
+                重新申请
+            </van-button>
         </div>
     </div>
 </template>