xuqiang 4 years ago
parent
commit
819ec30979

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

@@ -285,7 +285,7 @@ export default {
         padding: 0 22px;
         color: #ffffff;
         font-size: 16px;
-        font-weight: 400;
+        font-weight: normal;
         // font-weight: bold;
         &.is-active {
             color: #fdfb60;

+ 9 - 0
src/main/pc-space/src/styles/list.less

@@ -34,6 +34,14 @@
         padding: 60px 0;
         font-family: ZhenyanGB;
     }
+    .title1 {
+        height: 30px;
+        font-size: 30px;
+        line-height: 30px;
+        color: #ffffff;
+        padding: 60px 0 30px;
+        font-family: ZhenyanGB;
+    }
 
     .content {
           &:hover {
@@ -158,6 +166,7 @@
         background-color: transparent;
         color: #949699;
         width: 140px;
+        font-weight: normal;
     }
     .el-radio-button__orig-radio:checked + .el-radio-button__inner {
         background: linear-gradient(46deg, @prim 0%, @warn 100%);

+ 8 - 2
src/main/pc-space/src/views/AssetDetail.vue

@@ -1470,7 +1470,7 @@ export default {
                     height: 46px;
                     text-align: center;
                     margin-right: 30px;
-                    .line();
+                    .line(@bg:#1f2230);
                     .box2 {
                         font-size: @menuFont1;
                         font-weight: 400;
@@ -1627,13 +1627,19 @@ export default {
     height: 48px;
     border-radius: 8px;
     display: block;
-    .line();
+    // .line();
+    .line(@bg:#1f2230);
     border-radius: 8px;
     border-width: 0;
     color: #fff;
     line-height: 48px;
     text-align: center;
     margin-right: 30px;
+    &:hover {
+        &::before {
+            background-color: fade(#1c1e26, 90%);
+        }
+    }
     // &:hover {
     //     background: linear-gradient(135deg, darken(@prim, 10%), darken(@warn, 10%));
     // }

+ 2 - 1
src/main/pc-space/src/views/Collection.vue

@@ -1,6 +1,7 @@
 <template>
     <div class="container">
-        <div class="title" ref="anchor">{{ type === 'BLIND_BOX' ? '欢迎来到藏品盲盒市场' : '欢迎来到藏品市场' }}</div>
+        <div class="title1" v-if="type === 'BLIND_BOX'" ref="anchor">欢迎来到藏品盲盒市场</div>
+        <div class="title" v-if="type !== 'BLIND_BOX'" ref="anchor">欢迎来到藏品市场</div>
         <el-radio-group v-if="type !== 'BLIND_BOX'" class="menu" v-model="select" size="normal">
             <el-radio-button v-for="(item, index) in typeList" :key="index" :label="item.value">
                 <div class="radio-item">

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

@@ -911,7 +911,7 @@ export default {
                     height: 46px;
                     text-align: center;
                     margin-right: 30px;
-                    .line();
+                    .line(@bg:#1f2230);
                     .box2 {
                         font-size: @menuFont1;
                         font-weight: 400;

+ 16 - 6
src/main/pc-space/src/views/user/CollectionOrder.vue

@@ -24,11 +24,11 @@
         <template>
             <el-table
                 class="customer-table"
-                :header-cell-style="{ background: '#1c1e26', fontWeight: 'bold' }"
+                :header-cell-style="{ background: '#1c1e26' }"
                 :data="tableData"
                 :border="false"
                 :highlight-current-row="false"
-                style="width: 100%; background: #1c1e26"
+                style="width: 100%; background: #1c1e26; font-weight: normal"
             >
                 <el-table-column prop="name" label="藏品信息" width="208">
                     <template slot-scope="scope">
@@ -59,8 +59,10 @@
                     <!-- <template slot-scope="scope"> -->
                     <div
                         style="
+                            display: flex;
+                            align-items: center;
                             width: 88px;
-                            height: 24px;
+                            height: 48px;
                             overflow: hidden;
                             text-overflow: ellipsis;
                             white-space: nowrap;
@@ -286,6 +288,9 @@ export default {
 /deep/ .el-table {
     margin-left: -10px;
 }
+.customer-table {
+    font-weight: normal;
+}
 /deep/.menu {
     .el-radio-button__inner {
         border-color: #949699;
@@ -293,7 +298,7 @@ export default {
         color: #949699;
         width: 140px;
         height: 42px;
-
+        font-weight: normal;
         span {
             font-size: 16px !important;
         }
@@ -344,14 +349,19 @@ export default {
         height: 1px;
         background: #494a4d;
         border-radius: 1px;
-        margin: 24px 0 34px;
+        margin: 24px 0 24px;
     }
 }
 </style>
 <style lang="less">
 .customer-table th {
-    // font-weight: bold !important;
+    font-weight: normal !important;
     border: none !important;
+    padding: 0 !important;
+    line-height: 24px;
+}
+.customer-table th > .cell {
+    font-weight: normal !important;
 }
 .customer-table td,
 .customer-table th.is-leaf {

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

@@ -235,13 +235,17 @@ export default {
         height: 1px;
         background: #494a4d;
         border-radius: 1px;
-        margin: 24px 0 34px;
+        margin: 24px 0 24px;
     }
 }
 </style>
 <style lang="less">
 .customer-table th {
     border: none !important;
+    line-height: 24px;
+}
+.customer-table th > .cell {
+    font-weight: normal !important;
 }
 .customer-table td,
 .customer-table th.is-leaf {

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

@@ -276,13 +276,17 @@ export default {
         height: 1px;
         background: #494a4d;
         border-radius: 1px;
-        margin: 24px 0 34px;
+        margin: 24px 0 24px;
     }
 }
 </style>
 <style lang="less">
 .customer-table th {
     border: none !important;
+    line-height: 24px;
+}
+.customer-table th {
+    font-weight: normal !important;
 }
 .customer-table td,
 .customer-table th.is-leaf {

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

@@ -259,13 +259,17 @@ export default {
         height: 1px;
         background: #494a4d;
         border-radius: 1px;
-        margin: 24px 0 34px;
+        margin: 24px 0 24px;
     }
 }
 </style>
 <style lang="less">
 .customer-table th {
     border: none !important;
+    line-height: 24px;
+}
+.customer-table th > .cell {
+    font-weight: normal !important;
 }
 .customer-table td,
 .customer-table th.is-leaf {