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

src/main/pc-space/src/components/PageHeader.vue

@@ -16,7 +16,7 @@
                 <div class="btn-list" v-if="isLogin">
                     <el-dropdown @command="onCommand" style="margin-left: 20px">
                         <span class="el-dropdown-link">
-                            <img class="img" :src="avatarBox" />
+                            <img class="img" :src="avatarBox || require('../assets/png-touxiang@.png')" />
                         </span>
                         <el-dropdown-menu slot="dropdown">
                             <el-dropdown-item command="nickname" style="word-break: keep-all"

src/main/pc-space/src/components/SecurityPhone.vue

@@ -3,7 +3,7 @@
         <el-steps :space="180" :active="2" align-center>
             <el-step title="验证当前手机号"></el-step>
             <el-step title="绑定新手机号"></el-step>
-            <el-step title="完成"></el-step>
+            <el-step title="修改完成"></el-step>
         </el-steps>
         <el-form :label-position="labelPosition" ref="form2" label-width="290px" :model="ruleForm" :rules="rules">
             <el-form-item
@@ -149,7 +149,7 @@ input::-webkit-inner-spin-button {
         .btn2 {
             display: flex;
             justify-content: center;
-            margin-top: 80px;
+            margin-top: 87px;
             .btn3 {
                 width: 130px;
                 height: 36px;
@@ -159,7 +159,7 @@ input::-webkit-inner-spin-button {
                 color: #ffffff;
                 font-size: 13px;
                 text-align: center;
-                line-height: 38px;
+                line-height: 36px;
                 margin-left: 20px;
             }
         }

src/main/pc-space/src/components/TransactionPhone.vue

@@ -3,7 +3,7 @@
         <el-steps :space="180" :active="2" align-center>
             <el-step title="验证当前手机号"></el-step>
             <el-step title="修改交易密码"></el-step>
-            <el-step title="完成"></el-step>
+            <el-step title="修改完成"></el-step>
         </el-steps>
         <el-form :label-position="labelPosition" ref="form2" label-width="290px" :model="ruleForm" :rules="rules">
             <el-form-item label="新交易密码" prop="password">
@@ -136,6 +136,9 @@ input::-webkit-inner-spin-button {
         border: 0;
     }
 }
+/deep/ .el-form-item__label {
+    font-size: 13px !important;
+}
 /deep/ .el-step__title.is-process {
     font-weight: 400;
     color: #939599;
@@ -153,7 +156,7 @@ input::-webkit-inner-spin-button {
         .btn2 {
             display: flex;
             justify-content: center;
-            margin-top: 80px;
+            margin-top: 87px;
             .btn3 {
                 width: 130px;
                 height: 36px;

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

@@ -198,6 +198,15 @@ const routes = [
                     checkLogin: true
                 }
             },
+            {
+                path: '/addipc',
+                name: 'addipc',
+                component: () => import('../views/user/Addipc.vue'),
+                meta: {
+                    title: '添加银行卡',
+                    checkLogin: true
+                }
+            },
             {
                 path: '/authentication',
                 name: 'authentication',

src/main/pc-space/src/styles/list.less

@@ -3,7 +3,7 @@
     width: 280px;
     height: 42px;
     border-radius: 8px;
-    margin: 30px 0 50px;
+    margin: 30px 0;
 
     /deep/.el-input__inner {
         border: 1px solid #898989;
@@ -27,10 +27,10 @@
     .center-content();
 
     .title {
-        height: 42px;
-        font-size: 32px;
+        height: 30px;
+        font-size: 30px;
+        line-height: 30px;
         color: #ffffff;
-        line-height: 42px;
         padding: 60px 0;
         font-family: ZhenyanGB;
     }
@@ -108,7 +108,7 @@
             display: flex;
             align-items: center;
             justify-content: space-between;
-            padding: 10px 16px 20px;
+            padding: 11px 16px 20px;
             .followers {
                 display: flex;
                 flex-direction: column;

src/main/pc-space/src/views/AssetDetail.vue

@@ -130,7 +130,7 @@
                         <img class="price3" src="../assets/img/icon_jiage@3x.png" alt="" />
                         <div class="price4">{{ info.sellPrice || 0 }}</div>
                         <div class="price2" v-if="info.royalties">
-                            含<span>{{ info.royalties }}%</span>版税
+                            含 <span>{{ info.royalties }}%</span> 版税
                         </div>
                     </div>
                     <div class="status" v-else-if="info.status === 'NORMAL'">
@@ -155,7 +155,7 @@
                                 <div class="btn-list">
                                     <div class="buy" @click="changeShow">
                                         <i class="font_family icon-icon-gongkaizhanshi"></i>
-                                        <span>{{ info.publicShow ? '改为仅展示' : '公开展示' }}</span>
+                                        <span>{{ info.publicShow ? '改为未展示' : '公开展示' }}</span>
                                     </div>
 
                                     <el-button @click="Consignment" class="buy" type="primary" size="default"
@@ -315,7 +315,7 @@
                             </el-table-column>
                             <el-table-column prop="operation" label="操作" width="305">
                                 <template slot-scope="scope">
-                                    <div style="font-size: 14px">
+                                    <div style="font-size: 14px; color: #939599">
                                         {{ scope.row.operation }}
                                         <span v-if="scope.row.price">{{ scope.row.price }}</span>
                                     </div>
@@ -331,7 +331,7 @@
                             </el-table-column>
                             <el-table-column prop="createdAt" label="时间">
                                 <template slot-scope="scope">
-                                    <div style="font-size: 14px">
+                                    <div style="font-size: 14px; color: #939599">
                                         {{ scope.row.createdAt }}
                                     </div>
                                 </template>
@@ -1506,6 +1506,7 @@ export default {
         }
         /deep/ .cell {
             font-size: 12px;
+            color: #939599;
         }
         /deep/ .el-table td,
         .el-table th.is-leaf {

src/main/pc-space/src/views/Casting.vue

@@ -58,6 +58,7 @@
                         @click.prevent="like(item)"
                     >
                         {{ item.follow ? '已关注' : '关注' }}
+                        <!-- {{ item.follow ? (isFollow ? '互相关注' : '已关注') : '关注' }} -->
                     </el-button>
                 </div>
             </router-link>

src/main/pc-space/src/views/CastingDetail.vue

@@ -31,6 +31,7 @@
                         @click="like(info)"
                     >
                         {{ info.follow ? '已关注' : '关注' }}
+                        <!-- {{ info.follow ? (isFollow ? '互相关注' : '已关注') : '关注' }} -->
                     </el-button>
                     <el-popover popper-class="share-popver" placement="bottom" trigger="hover">
                         <el-button style="margin-left: 20px; color: #939599" slot="reference" plain round size="mini"
@@ -47,7 +48,7 @@
 
             <div class="anchor" style="height: 50px" ref="anchor"></div>
 
-            <el-radio-group class="menu" v-model="isOwner" size="normal">
+            <el-radio-group @change="change" class="menu" v-model="isOwner" size="normal">
                 <el-radio-button v-for="(item, index) in typeList" :key="index" :label="item.value">
                     <div class="radio-item">
                         <span>{{ item.label }}</span>
@@ -66,14 +67,32 @@
                     @change="onSearch"
                 >
                 </el-input>
-                <!-- <el-select class="select" v-model="value" @change="getList" placeholder="请选择">
-                    <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                </el-select> -->
-                <el-select class="select" style="margin-top: 30px" v-model="sortStr" placeholder="请选择">
-                    <el-option v-for="item in sortList" :key="item.value" :label="item.label" :value="item.value">
-                    </el-option>
-                </el-select>
+                <div style="display: flex">
+                    <el-select
+                        style="margin: 30px 20px 0 0; width: 120px"
+                        class="select"
+                        v-model="value"
+                        @change="getList"
+                        placeholder="请选择"
+                    >
+                        <el-option
+                            v-for="item in typeOptions"
+                            :key="item.value"
+                            :label="item.label"
+                            :value="item.value"
+                        >
+                        </el-option>
+                    </el-select>
+                    <el-select
+                        class="select"
+                        style="margin-top: 30px; width: 120px"
+                        v-model="sortStr"
+                        placeholder="请选择"
+                    >
+                        <el-option v-for="item in sortList" :key="item.value" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </div>
             </div>
 
             <div class="list" v-loading="fetchingData">
@@ -184,32 +203,53 @@ export default {
         setList(list) {
             this.list = list;
         },
+        change(e) {
+            let status = e ? '' : true;
+            let form = {
+                page: 0,
+                size: 20,
+                query: {
+                    minterId: this.info.id,
+                    del: false,
+                    type: 'DEFAULT',
+                    salable: status
+                }
+            };
+            this.$http.post('/collection/all', form, { body: 'json' }).then(res => {
+                this.list = res.content;
+            });
+        },
         getList() {
             let form = {
-                page: this.page,
+                page: 0,
                 size: 20,
                 query: {
-                    userId: this.info.id
-                    // status: 'NORMAL,TRADING,GIFTING'
-                },
-                sort: 'createdAt,desc'
+                    minterId: this.info.id,
+                    del: false,
+                    type: 'DEFAULT'
+                }
             };
-            if (this.value === 'NORMAL') {
+            if (this.value === '') {
                 form.query = {
                     ...form.query,
-                    salable: false
-                    // consignment: false
+                    del: false,
+                    salable: ''
                 };
             }
             if (this.value === 'ON_SALE') {
                 form.query = {
                     ...form.query,
-                    consignment: true
+                    salable: true
+                };
+            }
+            if (this.value === 'NORMAL') {
+                form.query = {
+                    ...form.query,
+                    salable: false
                 };
             }
-            this.$http.post('/asset/all', form, { body: 'json' }).then(res => {
-                this.list = [...this.list, ...res.content];
-                console.log(this.list);
+            this.$http.post('/collection/all', form, { body: 'json' }).then(res => {
+                this.list = res.content;
             });
         }
     }

src/main/pc-space/src/views/CollectionDetail.vue

@@ -149,7 +149,7 @@
                             <img class="price3" src="../assets/img/icon_jiage@3x.png" alt="" />
                             <div class="price4">{{ info.price }}</div>
                             <div class="price2" v-if="info.royalties">
-                                含<span>{{ info.royalties }}%</span>版税
+                                含 <span>{{ info.royalties }}%</span> 版税
                             </div>
                         </div>
                         <el-button
@@ -293,7 +293,7 @@
                             </el-table-column>
                             <el-table-column prop="operation" label="操作" width="305">
                                 <template slot-scope="scope">
-                                    <div style="font-size: 14px">
+                                    <div style="font-size: 14px; color: #939599">
                                         {{ scope.row.operation }}
                                         <span v-if="scope.row.price">{{ scope.row.price }}</span>
                                     </div>
@@ -308,7 +308,7 @@
                             </el-table-column>
                             <el-table-column prop="createdAt" label="时间">
                                 <template slot-scope="scope">
-                                    <div style="font-size: 14px">
+                                    <div style="font-size: 14px; color: #939599">
                                         {{ scope.row.createdAt }}
                                     </div>
                                 </template>
@@ -629,7 +629,7 @@ export default {
         }
         .name-list {
             display: flex;
-            margin: 20px 0 10px;
+            margin: 5px 0 10px;
         }
         .name {
             display: flex;

src/main/pc-space/src/views/Index.vue

@@ -13,6 +13,7 @@
                     this.$route.name !== 'enterpriseauthentication' &&
                     this.$route.name !== 'transactionsuccess' &&
                     this.$route.name !== 'transaction' &&
+                    this.$route.name !== 'addipc' &&
                     this.$route.name !== 'securitysuccess' &&
                     this.$route.name !== 'modifypad'
                 "

src/main/pc-space/src/views/Submit.vue

@@ -610,8 +610,11 @@ export default {
         }
     }
     &.is-checked {
-        .line(@bg:#E0FFF8,@radius:4px);
-        border-width: 0;
+        background: rgba(253, 251, 96, 0.12);
+        border-radius: 4px;
+        border: 1px solid #ff4f50;
+        // .line(@bg:#E0FFF8,@radius:4px);
+        // border-width: 0;
         .el-radio__label {
             color: #000;
         }

src/main/pc-space/src/views/user/AccountData.vue

@@ -2,7 +2,11 @@
     <div class="containers">
         <div class="top">
             <el-upload :action="uploadUrl" :show-file-list="false" :before-upload="beforeAvatarUpload2">
-                <img class="top" :src="userInfo.bg || require('../../assets/img/bg-moren@3x.png')" alt="" />
+                <img
+                    class="top"
+                    :src="getImg(userInfo.bg, '', 1300) || require('../../assets/img/bg-moren@3x.png')"
+                    alt=""
+                />
                 <i class="el-icon-plus avatar-uploader-icon"></i>
                 <el-button class="btn" size="small" type="primary">更换背景</el-button>
             </el-upload>
@@ -17,15 +21,25 @@
                         :key="index"
                         :class="{ active: active === item }"
                     >
-                        <div v-if="item === '粉丝'" class="text3">{{ userInfo.followers }}</div>
-                        <div v-if="item === '关注'" class="text3">{{ userInfo.follows }}</div>
+                        <div :class="{ active: active === item }" v-if="item === '粉丝'" class="text3">
+                            {{ userInfo.followers }}
+                        </div>
+                        <div :class="{ active: active === item }" v-if="item === '关注'" class="text3">
+                            {{ userInfo.follows }}
+                        </div>
                         {{ item }}
                     </div>
                 </div>
             </div>
             <el-upload :action="uploadUrl" :show-file-list="false" :before-upload="beforeAvatarUpload">
-                <img v-if="userInfo.avatar" class="img2" :src="userInfo.avatar" alt="" />
+                <img
+                    v-if="userInfo.avatar"
+                    class="img2"
+                    :src="getImg(userInfo.avatar, '', 400) || require('../../assets/png-touxiang@.png')"
+                    alt=""
+                />
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+                <img class="avatar" src="../../assets/png-genhuantouxiang@3x.png" alt="" />
             </el-upload>
         </div>
         <div class="userContent" v-if="active === '关注' || active === '粉丝'">
@@ -61,6 +75,7 @@
                                             @click.prevent="like(item)"
                                         >
                                             {{ item.follow ? '已关注' : '关注' }}
+                                            <!-- {{ item.follow ? (isFollow ? '互相关注' : '已关注') : '关注' }} -->
                                         </el-button>
                                     </div>
                                 </div>
@@ -122,7 +137,7 @@
                     <div class="text1">
                         <img class="icon" src="../../assets/user/icon_zhanghao@3x.png" alt="" />
                     </div>
-                    <div class="text6">登录账号</div>
+                    <div class="text2">登录账号</div>
                     <div class="text3">{{ Phone }}</div>
                 </div>
                 <div class="text4" @click="all('security')">修改</div>
@@ -132,7 +147,7 @@
                     <div class="text1">
                         <img class="icon" src="../../assets/user/icon_mima@3x (1).png" alt="" />
                     </div>
-                    <div class="text6">登录密码</div>
+                    <div class="text2">登录密码</div>
                     <div class="text3">********</div>
                 </div>
                 <div class="text4" @click="all('modifypad')">修改</div>
@@ -142,7 +157,7 @@
                     <div class="text1">
                         <img class="icon" src="../../assets/user/icon_mima@3x (1).png" alt="" />
                     </div>
-                    <div class="text6">交易密码</div>
+                    <div class="text2">交易密码</div>
                     <div class="text3">付款时用来认证身份信息</div>
                 </div>
                 <div class="text4" @click="all('/transaction')">修改</div>
@@ -159,6 +174,16 @@
                 </div>
                 <div class="text4" @click="Auths">{{ Status }}</div>
             </div>
+            <!-- <div class="box">
+                <div class="text">
+                    <div class="text1">
+                        <img class="icon" src="../../assets/user/icon-renzheng@3x.png" alt="" />
+                    </div>
+                    <div class="text2">银行卡</div>
+                    <div class="text3">已添加银行卡信息</div>
+                </div>
+                <div class="text4" @click="ipcFn">查看</div>
+            </div> -->
         </div>
     </div>
 </template>
@@ -212,6 +237,9 @@ export default {
         }, 1000);
     },
     methods: {
+        ipcFn() {
+            this.$router.push('/Addipc');
+        },
         add() {
             this.$http
                 .post(
@@ -252,6 +280,7 @@ export default {
             if (e === '关注') {
                 this.$http.get('/user/myFollows').then(res => {
                     this.list = res;
+                    console.log(res);
                     this.$store.dispatch('getUserInfo');
                     if (this.list.length === 0) {
                         this.empty = true;
@@ -437,6 +466,9 @@ export default {
                 font-weight: normal;
                 color: #ffffff;
                 line-height: 24px;
+                &.active {
+                    color: @prim;
+                }
             }
             .text {
                 display: flex;
@@ -463,6 +495,14 @@ export default {
             top: -50px;
             left: 431px;
         }
+        .avatar {
+            position: absolute;
+            top: 28px;
+            width: 100px;
+            height: 24px;
+            border: 0;
+            left: 44.8%;
+        }
     }
     .userContent {
         padding: 0 16px;
@@ -481,14 +521,13 @@ export default {
                     margin-right: 12px;
                 }
                 .box2 {
-                    width: 288px;
+                    width: 398px;
                     margin-right: 50px;
                     .nickname {
                         .flex();
                         // margin-top: 5px;
                         .name1 {
-                            font-size: 16px;
-                            font-weight: bold;
+                            font-size: @menuFont2;
                             color: #ffffff;
                             line-height: 24px;
                             margin-right: 6px;
@@ -499,13 +538,14 @@ export default {
                         }
                     }
                     .detail {
+                        // width: 350px;
+                        width: 100%;
                         font-size: 14px;
                         font-weight: 400;
                         color: #939599;
                         line-height: 24px;
                         margin-bottom: 8px;
-                        overflow: hidden;
-                        text-overflow: ellipsis;
+                        .ellipsis();
                     }
                     .box3 {
                         display: flex;
@@ -514,10 +554,10 @@ export default {
                         .box4 {
                             display: flex;
                             .text4 {
-                                font-size: 14px;
+                                font-size: @menuFont1;
                                 font-weight: 400;
                                 color: #939599;
-                                line-height: 24px;
+                                line-height: 26px;
                                 margin-right: 20px;
                             }
                             span {
@@ -560,16 +600,16 @@ export default {
     .content {
         padding: 0 16px;
         .name {
-            font-size: 16px;
+            font-size: @menuFont;
             font-weight: bold;
             color: #ffffff;
             line-height: 24px;
-            margin: 30px 0 10px 0;
+            margin: 20px 0 10px 0;
         }
         .box {
             display: flex;
             justify-content: space-between;
-            padding: 16px 0;
+            padding: 17px 0;
             .myClass {
                 background: linear-gradient(133deg, @prim 0%, @warn 100%) !important;
                 border-radius: 4px;
@@ -587,26 +627,19 @@ export default {
                     }
                 }
                 .text2 {
-                    font-size: 17px;
+                    font-size: @menuFont2;
                     font-weight: 400;
                     color: #ffffff;
                     line-height: 24px;
                     width: 94px;
-                    margin: -1px 0 0 10px;
-                }
-                .text6 {
-                    font-size: 17px;
-                    font-weight: 400;
-                    color: #ffffff;
-                    line-height: 24px;
-                    width: 94px;
-                    margin: 1px 0 0 10px;
+                    margin-left: 10px;
                 }
+
                 .text3 {
-                    font-size: 16px;
+                    font-size: @menuFont2;
                     font-weight: 400;
                     color: #949699;
-                    line-height: 26px;
+                    line-height: 24px;
                     &.text5 {
                         width: 745px;
                         min-height: 60px;
@@ -625,7 +658,7 @@ export default {
             height: 1px;
             background: #494a4d;
             border-radius: 1px;
-            margin-top: 30px;
+            margin-top: 10px;
         }
     }
 }

src/main/pc-space/src/views/user/Addipc.vue

@@ -0,0 +1,229 @@
+<template>
+    <div class="container center-content">
+        <div class="title">添加银行卡</div>
+        <div class="box">
+            <div class="name">
+                <div class="name1">添加银行卡</div>
+                <div class="name2">成功绑定银行卡后<span style="color: #fdfb60">不能修改</span></div>
+            </div>
+            <div class="border"></div>
+            <div class="content">
+                <el-form
+                    :label-position="labelPosition"
+                    label-width="287px"
+                    :model="ruleForm"
+                    ref="form"
+                    :rules="rules"
+                >
+                    <el-form-item label="开户行" prop="password">
+                        <el-input
+                            style="width: 300px"
+                            type="password"
+                            v-model="ruleForm.password"
+                            placeholder="请输入新密码，8-16位字母数字组合"
+                            autocomplete="off"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="卡号" prop="ipc">
+                        <el-input
+                            style="width: 300px"
+                            type="number"
+                            v-model="ruleForm.ipc"
+                            placeholder="请输入银行预留手机号"
+                            autocomplete="off"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item
+                        prop="phone"
+                        label="银行预留手机号"
+                        :rules="{
+                            pattern: /^1[3-9]\d{9}$/,
+                            message: '请输入正确的手机号',
+                            trigger: 'blur'
+                        }"
+                    >
+                        <el-input
+                            style="width: 300px"
+                            :disabled="true"
+                            v-model="ruleForm.phone"
+                            placeholder="请输入手机号"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item prop="code" label="验证码">
+                        <el-form-item prop="code" :rules="{ required: true, message: '请输入', trigger: 'blur' }">
+                            <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入短信验证码">
+                                <span
+                                    @click="send"
+                                    style="color: #fdfb60; cursor: pointer; font-size: 13px"
+                                    slot="suffix"
+                                    >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
+                                >
+                            </el-input>
+                        </el-form-item>
+                    </el-form-item>
+                </el-form>
+                <div class="btn">
+                    <el-button type="primary" @click="ipcSend">确认</el-button>
+                    <div class="btn2" @click="all('/accountdata')">返回</div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import eventBus from '../../eventBus';
+import phone from '../../mixins/phone';
+import { mapState, mapMutations } from 'vuex';
+export default {
+    mixins: [phone],
+    data() {
+        return {
+            labelPosition: 'right',
+            ruleForm: {
+                password: '',
+                phone: ''
+            },
+            time: 0,
+            rules: {
+                checkPass: [
+                    {
+                        validator: (rule, value, callback) => {
+                            if (value !== this.ruleForm.password) {
+                                callback(new Error('两次密码输入不一致'));
+                            } else {
+                                callback();
+                            }
+                        },
+                        trigger: 'blur'
+                    },
+                    { required: true, message: '请再次输入密码', trigger: 'blur' }
+                ]
+            }
+        };
+    },
+    computed: {
+        ...mapState(['userInfo'])
+    },
+    created() {
+        this.ruleForm.phone = this.userInfo.phone;
+    },
+    methods: {
+        ...mapMutations(['updateUserInfo']),
+        // 验证码
+        send() {
+            if (this.time === 0) {
+                this.sendMsg(this.userInfo.phone);
+            }
+        },
+        ipcSend() {
+            this.$refs.form.validate(valid => {
+                if (valid) {
+                    console.log('银行卡');
+                }
+            });
+        }
+    }
+};
+</script>
+<style>
+input[type='number'] {
+    -moz-appearance: textfield;
+}
+input[type='number']::-webkit-inner-spin-button,
+input[type='number']::-webkit-outer-spin-button {
+    -webkit-appearance: none;
+    margin: 0;
+}
+input::-webkit-outer-spin-button,
+input::-webkit-inner-spin-button {
+    -webkit-appearance: none !important;
+    margin: 0;
+}
+</style>
+<style lang="less" scoped>
+.container {
+    .btn {
+        display: flex;
+        justify-content: center;
+        margin-top: 80px;
+        .btn2 {
+            width: 130px;
+            height: 36px;
+            background: #c4c7cc;
+            border-radius: 4px;
+            cursor: pointer;
+            color: #ffffff;
+            font-size: 13px;
+            text-align: center;
+            line-height: 38px;
+            margin-left: 20px;
+        }
+    }
+    /deep/ .el-button {
+        width: 130px;
+        height: 36px;
+        color: #1a1a1a;
+        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        border-radius: 4px;
+        line-height: 6px;
+        border: 0;
+    }
+    /deep/ .el-form-item__error {
+        margin-left: 174px;
+    }
+    /deep/ .el-step__title {
+        font-size: 13px;
+    }
+    /deep/ .el-form-item__label {
+        color: #ffffff;
+        margin-left: 175px;
+    }
+    /deep/ .el-form {
+        margin-top: 66px;
+    }
+    /deep/ .el-input__inner {
+        border: 1px solid #494a4d;
+        background: #1c1e26;
+        color: #ffffff;
+    }
+    .title {
+        height: 30px;
+        font-size: 30px;
+        font-weight: 400;
+        font-family: ZhenyanGB-Regular, ZhenyanGB;
+        color: #ffffff;
+        line-height: 30px;
+        padding: 60px 0;
+    }
+    .box {
+        height: 539px;
+        background: #1c1e26;
+    }
+    .name {
+        .flex();
+        padding: 17px 16px;
+        .name1 {
+            font-size: 16px;
+            font-weight: bold;
+            color: #ffffff;
+            line-height: 26px;
+        }
+        .name2 {
+            font-size: 12px;
+            font-weight: 400;
+            color: #939599;
+            margin-left: 10px;
+        }
+    }
+    .phone {
+        color: #ffffff;
+        font-size: 18px;
+    }
+    .border {
+        height: 1px;
+        background: #494a4d;
+        margin: 0 16px 40px;
+    }
+}
+</style>

src/main/pc-space/src/views/user/Authentication.vue

@@ -48,12 +48,12 @@ export default {
         }
     }
     .title {
-        height: 42px;
-        font-size: 32px;
+        height: 30px;
+        font-size: 30px;
         font-family: ZhenyanGB-Regular, ZhenyanGB;
         font-weight: 400;
         color: #ffffff;
-        line-height: 42px;
+        line-height: 30px;
         padding-top: 60px;
     }
     .name {
@@ -89,7 +89,7 @@ export default {
                 margin: 20px 0 10px;
             }
             .text2 {
-                width: 192px;
+                width: 228px;
                 height: 66px;
                 font-size: 12px;
                 text-align: center;
@@ -104,8 +104,7 @@ export default {
                 background: linear-gradient(133deg, @prim 0%, @warn 100%);
                 border-radius: 4px;
                 margin-top: 60px;
-                line-height: 6px;
-                color: #ffffff;
+                color: #1a1a1a;
                 border: 0;
             }
         }

src/main/pc-space/src/views/user/CollectionOrder.vue

@@ -30,28 +30,32 @@
                 :highlight-current-row="false"
                 style="width: 100%; background: #1c1e26"
             >
-                <el-table-column prop="name" label="藏品信息" width="158">
+                <el-table-column prop="name" label="藏品信息" width="208">
                     <template slot-scope="scope">
-                        <img
-                            style="width: 60px; height: 60px; border-radius: 4px; margin-left: 4px"
-                            :src="scope.row.minterAvatar"
-                            alt=""
-                        />
-                        <div
-                            style="
-                                width: 88px;
-                                height: 24px;
-                                overflow: hidden;
-                                text-overflow: ellipsis;
-                                white-space: nowrap;
-                            "
-                        >
-                            {{ scope.row.name }}
+                        <div style="display: flex; align-items: center">
+                            <img
+                                style="width: 60px; height: 60px; border-radius: 4px"
+                                :src="scope.row.minterAvatar"
+                                alt=""
+                            />
+                            <div
+                                style="
+                                    margin-left: 10px;
+                                    width: 113px;
+                                    display: flex;
+                                    align-items: center;
+                                    height: 48px;
+                                    overflow: hidden;
+                                    text-overflow: ellipsis;
+                                "
+                            >
+                                {{ scope.row.name }}
+                            </div>
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="minter" label="卖家" width="104"> </el-table-column>
-                <el-table-column prop="nickname" label="买方" width="104">
+                <el-table-column prop="minter" label="卖家" width="94"> </el-table-column>
+                <el-table-column prop="nickname" label="买方" width="94">
                     <!-- <template slot-scope="scope"> -->
                     <div
                         style="
@@ -66,23 +70,23 @@
                     </div>
                     <!-- </template> -->
                 </el-table-column>
-                <el-table-column prop="price" label="金额" width="100">
+                <el-table-column prop="price" label="金额" width="90">
                     <template slot-scope="scope">
                         <div style="display: flex">
                             <img
-                                style="width: 10px; height: 11px; margin-top: 9px"
+                                style="width: 8px; height: 8px; margin-top: 10px"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 alt=""
                             />
                             <div
-                                style="color: #fdfb60; font-size: 30px; font-family: OSP-DIN, OSP; font-weight: normal"
+                                style="color: #fdfb60; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
                             >
                                 {{ scope.row.price }}
                             </div>
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="id" label="订单编号" width="120"> </el-table-column>
+                <el-table-column prop="id" label="订单编号" width="100"> </el-table-column>
                 <el-table-column prop="createdAt" label="成交时间" width="158"> </el-table-column>
                 <el-table-column prop="status" label="状态" width="108" :formatter="statusFormatter">
                     <template slot-scope="scope">
@@ -279,6 +283,9 @@ export default {
         }
     }
 }
+/deep/ .el-table {
+    margin-left: -10px;
+}
 /deep/.menu {
     .el-radio-button__inner {
         border-color: #949699;
@@ -293,8 +300,9 @@ export default {
     }
     .el-radio-button__orig-radio:checked + .el-radio-button__inner {
         background: linear-gradient(46deg, @prim 0%, @warn 100%);
-        color: #fff;
+        color: #000;
         border-color: #fff;
+        font-weight: bold;
     }
     .el-radio-button {
         font-size: 16px !important;
@@ -348,7 +356,7 @@ export default {
 .customer-table td,
 .customer-table th.is-leaf {
     border: none;
-    // font-weight: bold !important;
+    padding: 16px 0;
 }
 //表格最外边框
 .el-table--border,

src/main/pc-space/src/views/user/EnterpriseAuthentication.vue

@@ -290,9 +290,9 @@ export default {
     /deep/ .el-button {
         width: 130px;
         height: 36px;
+        color: #1a1a1a;
         background: linear-gradient(133deg, @prim 0%, @warn 100%);
         border-radius: 4px;
-        line-height: 6px;
         border: 0;
         margin: 0 !important;
     }
@@ -309,7 +309,7 @@ export default {
             color: #ffffff;
             font-size: 13px;
             text-align: center;
-            line-height: 38px;
+            line-height: 36px;
             margin-left: 20px;
         }
     }
@@ -319,12 +319,12 @@ export default {
         justify-content: space-between;
     }
     .title {
-        height: 42px;
-        font-size: 32px;
+        height: 30px;
+        font-size: 30px;
         font-weight: 400;
         font-family: ZhenyanGB-Regular, ZhenyanGB;
         color: #ffffff;
-        line-height: 42px;
+        line-height: 30px;
         padding: 60px 0;
     }
     .description {
@@ -337,11 +337,11 @@ export default {
     .box {
         background: #1c1e26;
         padding: 17px 16px;
-        padding-bottom: 200px;
+        padding-bottom: 120px;
         .border {
             height: 1px;
             background: #494a4d;
-            margin: 17px 0 60px;
+            margin: 17px 0 80px;
         }
         .fail {
             text-align: center;
@@ -366,13 +366,13 @@ export default {
                 width: 130px;
                 height: 36px;
                 font-size: 13px;
-                color: #ffffff;
+                color: #1a1a1a;
                 cursor: pointer;
                 line-height: 36px;
                 text-align: center;
                 background: linear-gradient(133deg, @prim 0%, @warn 100%);
                 border-radius: 4px;
-                margin: 87px 0 0 518px;
+                margin: 80px 0 0 518px;
             }
         }
         .name {
@@ -393,7 +393,8 @@ export default {
             background: linear-gradient(133deg, @prim 0%, @warn 100%);
             border-radius: 4px;
             margin-top: 60px;
-            color: #ffffff;
+            color: #1a1a1a;
+            border: 0;
         }
     }
 }

src/main/pc-space/src/views/user/Give.vue

@@ -262,7 +262,8 @@ export default {
     }
     .el-radio-button__orig-radio:checked + .el-radio-button__inner {
         background: linear-gradient(46deg, @prim 0%, @warn 100%);
-        color: #fff;
+        color: #000;
+        font-weight: bold;
         border-color: #fff;
     }
     .el-radio-button {

src/main/pc-space/src/views/user/Modifypad.vue

@@ -167,7 +167,7 @@ export default {
             color: #ffffff;
             font-size: 13px;
             text-align: center;
-            line-height: 38px;
+            line-height: 36px;
             margin-left: 20px;
         }
     }
@@ -176,7 +176,8 @@ export default {
         height: 36px;
         background: linear-gradient(133deg, @prim 0%, @warn 100%);
         border-radius: 4px;
-        line-height: 6px;
+        color: #1a1a1a;
+        font-size: 13px;
         border: 0;
     }
     /deep/ .el-form-item__error {
@@ -188,6 +189,7 @@ export default {
     /deep/ .el-form-item__label {
         color: #ffffff;
         margin-left: 175px;
+        font-size: 13px;
     }
     /deep/ .el-form {
         margin-top: 66px;
@@ -196,14 +198,15 @@ export default {
         border: 1px solid #494a4d;
         background: #1c1e26;
         color: #ffffff;
+        height: 36px;
     }
     .title {
-        height: 42px;
-        font-size: 32px;
+        height: 30px;
+        font-size: 30px;
         font-weight: 400;
         font-family: ZhenyanGB-Regular, ZhenyanGB;
         color: #ffffff;
-        line-height: 42px;
+        line-height: 30px;
         padding: 60px 0;
     }
     .box {

src/main/pc-space/src/views/user/OrderValue.vue

@@ -24,19 +24,34 @@
                 :highlight-current-row="false"
                 style="width: 100%; background: #1c1e26"
             >
-                <el-table-column prop="name" label="商品信息" width="228"> </el-table-column>
+                <el-table-column prop="name" label="商品信息" width="228">
+                    <template slot-scope="scope">
+                        <div
+                            style="
+                                width: 113px;
+                                height: 48px;
+                                display: flex;
+                                align-items: center;
+                                overflow: hidden;
+                                text-overflow: ellipsis;
+                            "
+                        >
+                            {{ scope.row.name }}
+                        </div>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="id" label="订单编号" width="134"> </el-table-column>
                 <el-table-column style="color: #fdfb60" prop="payTime" label="交易时间" width="190"> </el-table-column>
                 <el-table-column prop="totalPrice" label="实际金额" width="140">
                     <template slot-scope="scope">
                         <div style="display: flex">
                             <img
-                                style="width: 10px; height: 11px; margin-top: 9px"
+                                style="width: 8px; height: 8px; margin-top: 10px"
                                 src="../../assets/user/icon_jiage@3x (5).png"
                                 alt=""
                             />
                             <div
-                                style="color: #ffffff; font-size: 30px; font-family: OSP-DIN, OSP; font-weight: normal"
+                                style="color: #ffffff; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
                             >
                                 {{ scope.row.totalPrice }}
                             </div>
@@ -49,12 +64,12 @@
                     <template slot-scope="scope">
                         <div style="display: flex">
                             <img
-                                style="width: 10px; height: 11px; margin-top: 9px"
+                                style="width: 8px; height: 8px; margin-top: 10px"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 alt=""
                             />
                             <div
-                                style="color: #fdfb60; font-size: 30px; font-family: OSP-DIN, OSP; font-weight: normal"
+                                style="color: #fdfb60; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
                             >
                                 {{ scope.row.price }}
                             </div>
@@ -146,6 +161,9 @@ export default {
 .pagination-wrapper {
     .pagination();
 }
+/deep/ .el-table {
+    margin-left: -10px;
+}
 .search {
     background: #1a1a1a;
     width: 280px;
@@ -178,13 +196,13 @@ export default {
     }
 }
 .container {
-    padding: 45px 16px 0;
+    padding: 40px 16px 0;
     width: 938px;
     .top {
         .flex();
         justify-content: space-between;
         .pay {
-            font-size: 18px;
+            font-size: @menuFont;
             font-weight: bold;
             color: #ffffff;
             line-height: 28px;
@@ -233,6 +251,7 @@ export default {
 .el-table--border,
 .el-table--group {
     border: none;
+    padding: 16px 0;
 }
 // 头部边框
 .customer-table thead tr th.is-leaf {

src/main/pc-space/src/views/user/PayRecord.vue

@@ -30,23 +30,27 @@
                         <div :style="{ color: '#fdfb60' }" v-if="scope.row.payMethod === 'ALIPAY'">支付宝</div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="藏品信息" width="158">
+                <el-table-column prop="name" label="藏品信息" width="208">
                     <template slot-scope="scope">
-                        <img
-                            style="width: 60px; height: 60px; border-radius: 4px; margin-left: 4px"
-                            :src="scope.row.minterAvatar"
-                            alt=""
-                        />
-                        <div
-                            style="
-                                width: 88px;
-                                height: 24px;
-                                overflow: hidden;
-                                text-overflow: ellipsis;
-                                white-space: nowrap;
-                            "
-                        >
-                            {{ scope.row.name }}
+                        <div style="display: flex; align-items: center">
+                            <img
+                                style="width: 60px; height: 60px; border-radius: 4px"
+                                :src="scope.row.minterAvatar"
+                                alt=""
+                            />
+                            <div
+                                style="
+                                    margin-left: 10px;
+                                    width: 113px;
+                                    height: 48px;
+                                    display: flex;
+                                    align-items: center;
+                                    overflow: hidden;
+                                    text-overflow: ellipsis;
+                                "
+                            >
+                                {{ scope.row.name }}
+                            </div>
                         </div>
                     </template>
                 </el-table-column>
@@ -54,19 +58,19 @@
                     <template slot-scope="scope">
                         <div style="display: flex">
                             <img
-                                style="width: 10px; height: 11px; margin-top: 9px"
+                                style="width: 8px; height: 8px; margin-top: 10px"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 alt=""
                             />
                             <div
-                                style="color: #fdfb60; font-size: 30px; font-family: OSP-DIN, OSP; font-weight: normal"
+                                style="color: #fdfb60; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
                             >
                                 {{ scope.row.price }}
                             </div>
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="id" label="订单编号" width="160"> </el-table-column>
+                <el-table-column prop="id" label="订单编号" width="130"> </el-table-column>
                 <el-table-column prop="payTime" label="支付时间" width="248"> </el-table-column>
                 <el-table-column fixed="right" label="操作">
                     <template slot-scope="scope">
@@ -198,6 +202,9 @@ export default {
 .pagination-wrapper {
     .pagination();
 }
+/deep/ .el-table {
+    margin-left: -10px;
+}
 .search {
     background: #1a1a1a;
     width: 280px;
@@ -230,13 +237,13 @@ export default {
     }
 }
 .container {
-    padding: 45px 16px 0;
+    padding: 40px 16px 0;
     width: 938px;
     .top {
         .flex();
         justify-content: space-between;
         .pay {
-            font-size: 18px;
+            font-size: @menuFont;
             font-weight: bold;
             color: #ffffff;
             line-height: 28px;
@@ -280,6 +287,7 @@ export default {
 .customer-table td,
 .customer-table th.is-leaf {
     border: none;
+    padding: 16px 0;
 }
 //表格最外边框
 .el-table--border,

src/main/pc-space/src/views/user/Personal.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="container center-content">
-        <div class="title">个人中心</div>
+        <!-- <div class="title">个人中心</div> -->
         <div class="content">
             <el-menu
                 :default-openeds="openeds"
@@ -114,6 +114,7 @@ export default {
     }
     .content {
         display: flex;
+        margin-top: 50px;
         .main {
             .flex-col();
             background: #1c1e26 !important;

src/main/pc-space/src/views/user/Security.vue

@@ -11,7 +11,7 @@
                 <el-steps :space="180" :active="1" align-center>
                     <el-step title="验证当前手机号"></el-step>
                     <el-step title="绑定新手机号"></el-step>
-                    <el-step title="完成"></el-step>
+                    <el-step title="修改完成"></el-step>
                 </el-steps>
                 <el-form
                     :label-position="labelPosition"
@@ -115,6 +115,9 @@ export default {
         border: 0;
     }
 }
+/deep/ .el-step__title {
+    font-size: 12px !important;
+}
 /deep/.el-step:nth-child(2) {
     .el-step__icon {
         background: #c8c9cc;
@@ -148,7 +151,7 @@ export default {
         .btn2 {
             display: flex;
             justify-content: center;
-            margin-top: 80px;
+            margin-top: 87px;
             .btn3 {
                 width: 130px;
                 height: 36px;
@@ -158,7 +161,7 @@ export default {
                 color: #ffffff;
                 font-size: 13px;
                 text-align: center;
-                line-height: 38px;
+                line-height: 36px;
                 margin-left: 20px;
             }
         }
@@ -168,7 +171,8 @@ export default {
         height: 36px;
         background: linear-gradient(133deg, @prim 0%, @warn 100%);
         border-radius: 4px;
-        line-height: 6px;
+        color: #1a1a1a;
+        font-size: 13px;
         border: 0;
     }
     /deep/ .el-step__title {
@@ -177,6 +181,7 @@ export default {
     /deep/ .el-form-item__label {
         color: #ffffff;
         margin-left: 175px;
+        font-size: 13px;
     }
     /deep/ .el-form {
         margin-top: 66px;
@@ -185,14 +190,15 @@ export default {
         border: 1px solid #494a4d;
         background: #1c1e26;
         color: #ffffff;
+        height: 36px;
     }
     .title {
-        height: 42px;
-        font-size: 32px;
+        height: 30px;
+        font-size: 30px;
         font-weight: 400;
         color: #ffffff;
         font-family: ZhenyanGB-Regular, ZhenyanGB;
-        line-height: 42px;
+        line-height: 30px;
         padding: 60px 0;
     }
     .box {

src/main/pc-space/src/views/user/SecuritySuccess.vue

@@ -11,7 +11,7 @@
                 <el-steps :space="180" :active="3" align-center>
                     <el-step title="验证当前手机号"></el-step>
                     <el-step title="绑定新手机号"></el-step>
-                    <el-step title="完成"></el-step>
+                    <el-step title="修改完成"></el-step>
                 </el-steps>
                 <div class="fail">
                     <img class="text1" src="../../assets/user/icon-xiugaichengg@3x (1).png" alt="" />
@@ -90,7 +90,7 @@ export default {
             width: 130px;
             height: 36px;
             font-size: 13px;
-            color: #ffffff;
+            color: #1a1a1a;
             cursor: pointer;
             line-height: 36px;
             text-align: center;
@@ -103,11 +103,12 @@ export default {
         font-size: 13px;
     }
     .title {
-        height: 42px;
-        font-size: 32px;
+        height: 30px;
+        font-size: 30px;
         font-weight: 400;
         color: #ffffff;
-        line-height: 42px;
+        line-height: 30px;
+        font-family: ZhenyanGB-Regular, ZhenyanGB;
         padding: 60px 0;
     }
     .box {

src/main/pc-space/src/views/user/Transaction.vue

@@ -11,7 +11,7 @@
                 <el-steps :space="180" :active="1" align-center>
                     <el-step title="验证当前手机号"></el-step>
                     <el-step title="修改交易密码"></el-step>
-                    <el-step title="完成"></el-step>
+                    <el-step title="修改完成"></el-step>
                 </el-steps>
                 <el-form
                     :label-position="labelPosition"
@@ -141,6 +141,9 @@ export default {
 /deep/ .el-step__title.is-finish {
     color: #fdfb60;
 }
+/deep/ .el-step__title {
+    font-size: 12px !important;
+}
 /deep/ .el-step__head.is-finish {
     border-color: #fdfb60;
 }
@@ -150,7 +153,7 @@ export default {
         .btn2 {
             display: flex;
             justify-content: center;
-            margin-top: 80px;
+            margin-top: 87px;
             .btn3 {
                 width: 130px;
                 height: 36px;
@@ -160,7 +163,7 @@ export default {
                 color: #ffffff;
                 font-size: 13px;
                 text-align: center;
-                line-height: 38px;
+                line-height: 36px;
                 margin-left: 20px;
             }
         }
@@ -170,7 +173,8 @@ export default {
         height: 36px;
         background: linear-gradient(133deg, @prim 0%, @warn 100%);
         border-radius: 4px;
-        line-height: 6px;
+        color: #1a1a1a;
+        font-size: 13px;
         border: 0;
     }
     /deep/ .el-step__title {
@@ -179,6 +183,7 @@ export default {
     /deep/ .el-form-item__label {
         color: #ffffff;
         margin-left: 175px;
+        font-size: 13px;
     }
     /deep/ .el-form {
         margin-top: 66px;
@@ -187,13 +192,14 @@ export default {
         border: 1px solid #494a4d;
         background: #1c1e26;
         color: #ffffff;
+        height: 36px;
     }
     .title {
-        height: 42px;
-        font-size: 32px;
+        height: 30px;
+        font-size: 30px;
         font-weight: 400;
         color: #ffffff;
-        line-height: 42px;
+        line-height: 30px;
         font-family: ZhenyanGB-Regular, ZhenyanGB;
         padding: 60px 0;
     }

src/main/pc-space/src/views/user/TransactionOrdes.vue

@@ -30,23 +30,27 @@
                         <div :style="{ color: '#fdfb60' }" v-if="scope.row.payMethod === 'ALIPAY'">支付宝</div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="name" label="藏品信息" width="178">
+                <el-table-column prop="name" label="藏品信息" width="248">
                     <template slot-scope="scope">
-                        <img
-                            style="width: 60px; height: 60px; border-radius: 4px; margin-left: 4px"
-                            :src="scope.row.minterAvatar"
-                            alt=""
-                        />
-                        <div
-                            style="
-                                width: 88px;
-                                height: 24px;
-                                overflow: hidden;
-                                text-overflow: ellipsis;
-                                white-space: nowrap;
-                            "
-                        >
-                            {{ scope.row.name }}
+                        <div style="display: flex; align-items: center">
+                            <img
+                                style="width: 60px; height: 60px; border-radius: 4px"
+                                :src="scope.row.minterAvatar"
+                                alt=""
+                            />
+                            <div
+                                style="
+                                    margin-left: 10px;
+                                    width: 113px;
+                                    height: 48px;
+                                    display: flex;
+                                    align-items: center;
+                                    overflow: hidden;
+                                    text-overflow: ellipsis;
+                                "
+                            >
+                                {{ scope.row.name }}
+                            </div>
                         </div>
                     </template>
                 </el-table-column>
@@ -181,6 +185,9 @@ export default {
 .pagination-wrapper {
     .pagination();
 }
+/deep/ .el-table {
+    margin-left: -10px;
+}
 .search {
     background: #1a1a1a;
     width: 280px;
@@ -213,13 +220,13 @@ export default {
     }
 }
 .container {
-    padding: 45px 16px 0;
+    padding: 40px 16px 0;
     width: 938px;
     .top {
         .flex();
         justify-content: space-between;
         .pay {
-            font-size: 18px;
+            font-size: @menuFont;
             font-weight: bold;
             color: #ffffff;
             line-height: 28px;
@@ -263,6 +270,7 @@ export default {
 .customer-table td,
 .customer-table th.is-leaf {
     border: none;
+    padding: 16px 0;
 }
 //表格最外边框
 .el-table--border,

src/main/pc-space/src/views/user/TransactionSuccess.vue

@@ -11,7 +11,7 @@
                 <el-steps :space="180" :active="3" align-center>
                     <el-step title="验证当前手机号"></el-step>
                     <el-step title="绑定新手机号"></el-step>
-                    <el-step title="完成"></el-step>
+                    <el-step title="修改完成"></el-step>
                 </el-steps>
                 <div class="fail">
                     <img class="text1" src="../../assets/user/icon-xiugaichengg@3x (1).png" alt="" />
@@ -50,6 +50,9 @@ export default {
 /deep/ .el-step__head.is-finish {
     border-color: #fdfb60;
 }
+/deep/ .el-step__title {
+    font-size: 12px !important;
+}
 /deep/.el-step:nth-child(1) {
     .el-step__icon {
         background: linear-gradient(143deg, @prim 0%, @warn 100%, @warn 100%);
@@ -90,7 +93,7 @@ export default {
             width: 130px;
             height: 36px;
             font-size: 13px;
-            color: #ffffff;
+            color: #1a1a1a;
             cursor: pointer;
             line-height: 36px;
             text-align: center;
@@ -103,11 +106,12 @@ export default {
         font-size: 13px;
     }
     .title {
-        height: 42px;
-        font-size: 32px;
+        height: 30px;
+        font-size: 30px;
         font-weight: 400;
         color: #ffffff;
-        line-height: 42px;
+        font-family: ZhenyanGB-Regular, ZhenyanGB;
+        line-height: 30px;
         padding: 60px 0;
     }
     .box {

src/main/pc-space/src/views/user/UserAuthentication.vue

@@ -218,6 +218,7 @@ export default {
     }
     /deep/ .el-button {
         width: 130px;
+        color: #1a1a1a;
         height: 36px;
         background: linear-gradient(133deg, @prim 0%, @warn 100%);
         border-radius: 4px;
@@ -236,17 +237,17 @@ export default {
             cursor: pointer;
             font-size: 13px;
             text-align: center;
-            line-height: 38px;
+            line-height: 36px;
             margin-left: 20px;
         }
     }
     .title {
-        height: 42px;
-        font-size: 32px;
+        height: 30px;
+        font-size: 30px;
         font-weight: 400;
         font-family: ZhenyanGB-Regular, ZhenyanGB;
         color: #ffffff;
-        line-height: 42px;
+        line-height: 30px;
         padding: 60px 0;
     }
     .description {
@@ -259,11 +260,11 @@ export default {
     .box {
         background: #1c1e26;
         padding: 17px 16px;
-        padding-bottom: 200px;
+        padding-bottom: 120px;
         .border {
             height: 1px;
             background: #494a4d;
-            margin: 17px 0 60px;
+            margin: 17px 0 80px;
         }
         .fail {
             text-align: center;
@@ -283,14 +284,14 @@ export default {
                 font-weight: 400;
                 color: #ffffff;
                 line-height: 24px;
-                margin-bottom: 30px;
+                margin-bottom: 80px;
             }
             .botn {
                 width: 130px;
                 height: 36px;
                 font-size: 13px;
                 cursor: pointer;
-                color: #ffffff;
+                color: #1a1a1a;
                 line-height: 36px;
                 text-align: center;
                 background: linear-gradient(133deg, @prim 0%, @warn 100%);
@@ -316,8 +317,7 @@ export default {
             background: linear-gradient(133deg, @prim 0%, @warn 100%);
             border-radius: 4px;
             margin-top: 60px;
-            line-height: 6px;
-            color: #ffffff;
+            color: #1a1a1a;
             border: 0;
         }
     }