xuqiang 4 years ago
parent
commit
c3b5d6911f

BIN
src/main/pc-space/src/assets/bg-moren备份 2@3x.png


+ 3 - 3
src/main/pc-space/src/components/AssetInfo.vue

@@ -120,7 +120,7 @@ export default {
         padding: 10px 16px 6px;
         font-size: 14px;
         font-weight: 400;
-        color: #939599;
+        color: #ffffff;
         line-height: 20px;
     }
     .price {
@@ -131,7 +131,7 @@ export default {
         .img1 {
             width: 10px;
             height: 11px;
-            margin-top: 10px;
+            margin-top: 8px;
         }
         .num {
             font-size: 30px;
@@ -166,7 +166,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: #2b2e3e;
         border-radius: 1px;
         margin: 0 16px;
     }

+ 3 - 3
src/main/pc-space/src/components/CollectionInfo.vue

@@ -140,7 +140,7 @@ export default {
         padding: 10px 16px 10px;
         font-size: 14px;
         font-weight: 400;
-        color: #939599;
+        color: #ffffff;
         line-height: 20px;
     }
     .init {
@@ -159,7 +159,7 @@ export default {
         .img1 {
             width: 10px;
             height: 11px;
-            margin-top: 10px;
+            margin-top: 8px;
         }
         .num {
             font-size: 30px;
@@ -188,7 +188,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: #2b2e3e;
         border-radius: 1px;
         margin: 0 16px;
     }

+ 2 - 1
src/main/pc-space/src/styles/list.less

@@ -17,8 +17,9 @@
 }
 .border {
     height: 1px;
-    background: #494a4d;
+    background: #2B2E3E;
     border-radius: 1px;
+    margin: 0 16px;
 }
 .container {
     background: #1a1a1a;

+ 7 - 4
src/main/pc-space/src/views/AssetDetail.vue

@@ -201,7 +201,7 @@
                             <img class="imgs" src="../assets/info_icon_jiaoyijilu.png" alt="" />
                             <span>交易历史</span>
                         </template>
-                        <el-table :data="tableData" stripe style="width: 100%">
+                        <el-table class="elTable" :data="tableData" stripe style="width: 100%">
                             <el-table-column prop="fromUser" label="用户" width="555"> </el-table-column>
                             <el-table-column prop="operation" label="操作" width="455"> </el-table-column>
                             <el-table-column prop="createdAt" label="时间"> </el-table-column>
@@ -856,7 +856,7 @@ export default {
             .bor {
                 width: 1px;
                 height: 62px;
-                background: #494a4d;
+                background: #2b2e3e;
                 border-radius: 1px;
             }
             .box {
@@ -1000,7 +1000,7 @@ export default {
             }
             .border {
                 height: 1px;
-                background: #494a4d;
+                background: #2b2e3e;
                 border-radius: 1px;
                 margin: 0 16px;
             }
@@ -1241,6 +1241,9 @@ export default {
                 height: 24px;
             }
         }
+        .elTable {
+            border: 1px solid red;
+        }
         .border {
             height: 1px;
             background: #494a4d;
@@ -1456,7 +1459,7 @@ export default {
 }
 .btn-content {
     padding: 20px 0;
-    border-top: 1px solid #494a4d;
+    border-top: 1px solid #2b2e3e;
 }
 
 .btn-list {

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

@@ -29,7 +29,7 @@
             >
                 <el-image
                     class="imgBox"
-                    :src="item.bg || require('../assets/img/bg-moren@3x.png')"
+                    :src="item.bg || require('../assets/bg-moren备份 2@3x.png')"
                     fit="cover"
                     :lazy="true"
                 ></el-image>

+ 3 - 5
src/main/pc-space/src/views/CollectionDetail.vue

@@ -400,7 +400,7 @@ export default {
             width: 460px;
             flex-shrink: 0;
         }
-       
+
         .top-info {
             flex-grow: 1;
             margin-left: 30px;
@@ -527,8 +527,6 @@ export default {
             }
         }
         .price {
-            // width: 678px;
-            // height: 220px;
             padding: 0 16px;
             background: #1f2230;
             border-radius: 0px 0px 8px 8px;
@@ -536,7 +534,7 @@ export default {
             .price1 {
                 display: flex;
                 padding: 18px 0 24px 0;
-                border-bottom: 1px solid #494a4d;
+                border-bottom: 1px solid #2b2e3e;
                 &.num {
                     justify-content: space-between;
                     border-bottom: 0;
@@ -640,7 +638,7 @@ export default {
             .bor {
                 width: 1px;
                 height: 62px;
-                background: #494a4d;
+                background: #2b2e3e;
                 border-radius: 1px;
             }
             .box {

+ 4 - 2
src/main/pc-space/src/views/user/CollectionOrder.vue

@@ -70,11 +70,13 @@
                     <template slot-scope="scope">
                         <div style="display: flex">
                             <img
-                                style="width: 10px; height: 11px; margin-top: 8px"
+                                style="width: 10px; height: 11px; margin-top: 9px"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 alt=""
                             />
-                            <div style="color: #fdfb60; font-size: 26px">
+                            <div
+                                style="color: #fdfb60; font-size: 30px; font-family: OSP-DIN, OSP; font-weight: normal"
+                            >
                                 {{ scope.row.price }}
                             </div>
                         </div>

+ 0 - 2
src/main/pc-space/src/views/user/EnterpriseAuthentication.vue

@@ -24,8 +24,6 @@
                 <div class="botn" v-if="userInfo.authStatus !== 'FAIL'" @click="all('accountdata')">返回</div>
                 <div class="botn" v-if="userInfo.authStatus === 'FAIL'" @click="Jump2">重新认证</div>
             </div>
-            <!-- v-loading="loading"
-    element-loading-text="拼命加载中" -->
             <div>
                 <div v-if="userInfo.authStatus === 'NOT_AUTH'">
                     <el-form ref="form" :label-position="labelPosition" :model="sizeForm" :rules="registerRule">

+ 8 - 4
src/main/pc-space/src/views/user/OrderValue.vue

@@ -31,11 +31,13 @@
                     <template slot-scope="scope">
                         <div style="display: flex">
                             <img
-                                style="width: 10px; height: 11px; margin-top: 7px"
+                                style="width: 10px; height: 11px; margin-top: 9px"
                                 src="../../assets/user/icon_jiage@3x (5).png"
                                 alt=""
                             />
-                            <div style="color: #ffffff; font-size: 24px">
+                            <div
+                                style="color: #ffffff; font-size: 30px; font-family: OSP-DIN, OSP; font-weight: normal"
+                            >
                                 {{ scope.row.totalPrice }}
                             </div>
                         </div>
@@ -47,11 +49,13 @@
                     <template slot-scope="scope">
                         <div style="display: flex">
                             <img
-                                style="width: 10px; height: 11px; margin-top: 7px"
+                                style="width: 10px; height: 11px; margin-top: 9px"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 alt=""
                             />
-                            <div style="color: #fdfb60; font-size: 24px">
+                            <div
+                                style="color: #fdfb60; font-size: 30px; font-family: OSP-DIN, OSP; font-weight: normal"
+                            >
                                 {{ scope.row.price }}
                             </div>
                         </div>

+ 4 - 2
src/main/pc-space/src/views/user/PayRecord.vue

@@ -54,11 +54,13 @@
                     <template slot-scope="scope">
                         <div style="display: flex">
                             <img
-                                style="width: 10px; height: 11px; margin-top: 8px"
+                                style="width: 10px; height: 11px; margin-top: 9px"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 alt=""
                             />
-                            <div style="color: #fdfb60; font-size: 26px">
+                            <div
+                                style="color: #fdfb60; font-size: 30px; font-family: OSP-DIN, OSP; font-weight: normal"
+                            >
                                 {{ scope.row.price }}
                             </div>
                         </div>

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

@@ -26,7 +26,7 @@
             </div>
             <div v-if="userInfo.authStatus === 'NOT_AUTH'">
                 <el-form ref="form" :label-position="labelPosition" :model="sizeForm" :rules="registerRule">
-                    <el-form-item label="姓名" prop="nickname">
+                    <el-form-item label="姓名" prop="realName">
                         <el-input
                             style="width: 300px"
                             placeholder="请输入您的真实姓名"