panhui 3 лет назад
Родитель
Сommit
e3f934d538
60 измененных файлов с 283 добавлено и 236 удалено
  1. BIN
      src/main/pc-space/src/assets/detail/icon-dingjia@3x.png
  2. BIN
      src/main/pc-space/src/assets/detail/icon-leixing@3x.png
  3. BIN
      src/main/pc-space/src/assets/detail/icon-qiaoqiaohua@3x.png
  4. BIN
      src/main/pc-space/src/assets/detail/icon-tequan@3x.png
  5. BIN
      src/main/pc-space/src/assets/detail/icon-texing@3x.png
  6. BIN
      src/main/pc-space/src/assets/icon-dingjia@3x.png
  7. BIN
      src/main/pc-space/src/assets/icon-leixing@3x.png
  8. BIN
      src/main/pc-space/src/assets/icon-miaoshu.png
  9. BIN
      src/main/pc-space/src/assets/icon-qiaoqiaohua@3x.png
  10. BIN
      src/main/pc-space/src/assets/icon-tequan@3x.png
  11. BIN
      src/main/pc-space/src/assets/icon-texing@3x.png
  12. BIN
      src/main/pc-space/src/assets/img/fenxiang-icon@3x.png
  13. BIN
      src/main/pc-space/src/assets/img/like.png
  14. BIN
      src/main/pc-space/src/assets/user/fenxiang-icon@3x (1).png
  15. BIN
      src/main/pc-space/src/assets/user/fenxiang-icon@3x (2).png
  16. BIN
      src/main/pc-space/src/assets/user/fenxiang-icon@3x (3).png
  17. BIN
      src/main/pc-space/src/assets/user/icon-jianjie@3x (1).png
  18. BIN
      src/main/pc-space/src/assets/user/icon-renzheng@3x.png
  19. BIN
      src/main/pc-space/src/assets/user/icon_jiage@3x (5).png
  20. BIN
      src/main/pc-space/src/assets/user/icon_jiaoyixinxi@3x.png
  21. BIN
      src/main/pc-space/src/assets/user/icon_mima@3x (1).png
  22. BIN
      src/main/pc-space/src/assets/user/icon_yinhangka@3x.png
  23. BIN
      src/main/pc-space/src/assets/user/icon_yonghuxinxi@3x.png
  24. BIN
      src/main/pc-space/src/assets/user/icon_zhanghao@3x.png
  25. BIN
      src/main/pc-space/src/assets/user/icon_zhuzaoxinxi@3x.png
  26. 3 3
      src/main/pc-space/src/components/AssetInfo.vue
  27. 1 0
      src/main/pc-space/src/components/CollectionInfo.vue
  28. 3 3
      src/main/pc-space/src/components/CouponInfo.vue
  29. 1 1
      src/main/pc-space/src/components/LoginInfo.vue
  30. 2 2
      src/main/pc-space/src/components/SearchInfo.vue
  31. 1 1
      src/main/pc-space/src/components/SecurityPhone.vue
  32. 1 1
      src/main/pc-space/src/components/SingleUpload.vue
  33. 9 2
      src/main/pc-space/src/styles/app.less
  34. 6 4
      src/main/pc-space/src/styles/common.less
  35. 0 0
      src/main/pc-space/src/styles/element/index.css
  36. 7 2
      src/main/pc-space/src/styles/list.less
  37. 59 46
      src/main/pc-space/src/views/AssetDetail.vue
  38. 2 2
      src/main/pc-space/src/views/CastingDetail.vue
  39. 55 45
      src/main/pc-space/src/views/CollectionDetail.vue
  40. 1 0
      src/main/pc-space/src/views/Index.vue
  41. 1 1
      src/main/pc-space/src/views/My.vue
  42. 1 1
      src/main/pc-space/src/views/Send.vue
  43. 1 1
      src/main/pc-space/src/views/Submit.vue
  44. 11 8
      src/main/pc-space/src/views/user/AccountData.vue
  45. 3 3
      src/main/pc-space/src/views/user/Addipc.vue
  46. 5 5
      src/main/pc-space/src/views/user/Address.vue
  47. 1 1
      src/main/pc-space/src/views/user/Authentication.vue
  48. 23 23
      src/main/pc-space/src/views/user/CollectionOrder.vue
  49. 2 2
      src/main/pc-space/src/views/user/EnterpriseAuthentication.vue
  50. 8 8
      src/main/pc-space/src/views/user/Give.vue
  51. 3 3
      src/main/pc-space/src/views/user/Modifypad.vue
  52. 25 20
      src/main/pc-space/src/views/user/OrderValue.vue
  53. 13 13
      src/main/pc-space/src/views/user/PayRecord.vue
  54. 8 8
      src/main/pc-space/src/views/user/Personal.vue
  55. 3 3
      src/main/pc-space/src/views/user/Security.vue
  56. 1 1
      src/main/pc-space/src/views/user/SecuritySuccess.vue
  57. 3 3
      src/main/pc-space/src/views/user/Transaction.vue
  58. 17 17
      src/main/pc-space/src/views/user/TransactionOrdes.vue
  59. 1 1
      src/main/pc-space/src/views/user/TransactionSuccess.vue
  60. 2 2
      src/main/pc-space/src/views/user/UserAuthentication.vue

BIN
src/main/pc-space/src/assets/detail/icon-dingjia@3x.png


BIN
src/main/pc-space/src/assets/detail/icon-leixing@3x.png


BIN
src/main/pc-space/src/assets/detail/icon-qiaoqiaohua@3x.png


BIN
src/main/pc-space/src/assets/detail/icon-tequan@3x.png


BIN
src/main/pc-space/src/assets/detail/icon-texing@3x.png


BIN
src/main/pc-space/src/assets/icon-dingjia@3x.png


BIN
src/main/pc-space/src/assets/icon-leixing@3x.png


BIN
src/main/pc-space/src/assets/icon-miaoshu.png


BIN
src/main/pc-space/src/assets/icon-qiaoqiaohua@3x.png


BIN
src/main/pc-space/src/assets/icon-tequan@3x.png


BIN
src/main/pc-space/src/assets/icon-texing@3x.png


BIN
src/main/pc-space/src/assets/img/fenxiang-icon@3x.png


BIN
src/main/pc-space/src/assets/img/like.png


BIN
src/main/pc-space/src/assets/user/fenxiang-icon@3x (1).png


BIN
src/main/pc-space/src/assets/user/fenxiang-icon@3x (2).png


BIN
src/main/pc-space/src/assets/user/fenxiang-icon@3x (3).png


BIN
src/main/pc-space/src/assets/user/icon-jianjie@3x (1).png


BIN
src/main/pc-space/src/assets/user/icon-renzheng@3x.png


BIN
src/main/pc-space/src/assets/user/icon_jiage@3x (5).png


BIN
src/main/pc-space/src/assets/user/icon_jiaoyixinxi@3x.png


BIN
src/main/pc-space/src/assets/user/icon_mima@3x (1).png


BIN
src/main/pc-space/src/assets/user/icon_yinhangka@3x.png


BIN
src/main/pc-space/src/assets/user/icon_yonghuxinxi@3x.png


BIN
src/main/pc-space/src/assets/user/icon_zhanghao@3x.png


BIN
src/main/pc-space/src/assets/user/icon_zhuzaoxinxi@3x.png


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

@@ -68,7 +68,7 @@ export default {
 </script>
 <style lang="less" scoped>
 .collect {
-    .line();
+    background: #fff;
     width: 276px;
     height: 426px;
     display: inline-block;
@@ -124,7 +124,7 @@ export default {
         padding: 10px 16px 16px;
         font-size: 16px;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 20px;
     }
     .price {
@@ -170,7 +170,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #2b2e3e;
+        background: @border1;
         border-radius: 1px;
         margin: 0 16px;
     }

+ 1 - 0
src/main/pc-space/src/components/CollectionInfo.vue

@@ -156,6 +156,7 @@ export default {
         font-weight: bold;
         color: #26273c;
         line-height: 20px;
+        .ellipsis();
     }
     .con {
         display: flex;

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

@@ -14,7 +14,7 @@
                     </div>
                 </div>
                 <div class="box1">
-                    <div style="width: 100%">
+                    <div style="width: 100%;">
                         <div class="top">
                             <span class="text3 name1"
                                 >兑换券编码<span class="text4"> {{ item.id }}</span></span
@@ -41,7 +41,7 @@
                     </div>
                 </div>
                 <div class="box1">
-                    <div style="width: 100%">
+                    <div style="width: 100%;">
                         <div class="top">
                             <span class="text3 name1"
                                 >兑换券编码<span class="text4"> {{ item.id }}</span></span
@@ -163,7 +163,7 @@ export default {
         }
     }
     .box1 {
-        background: #1f2230;
+        background: @bg2;
         border-radius: 0 8px 8px 0;
         width: 100%;
         display: flex;

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

@@ -312,7 +312,7 @@ export default {
             width: 330px;
             height: 40px;
             line-height: 40px;
-            background: linear-gradient(135deg, @prim 0%, @warn 100%);
+            background: @prim;
             border-radius: 4px;
             font-size: 13px;
             color: #fff;

+ 2 - 2
src/main/pc-space/src/components/SearchInfo.vue

@@ -56,7 +56,7 @@ export default {
         height: 42px;
         color: #fff;
         border-radius: 8px;
-        border: 1px solid #898989;
+        border: 1px solid #EBEFF1;
     }
     /deep/ .el-button {
         background: #1a1a1a;
@@ -64,7 +64,7 @@ export default {
         height: 42px;
         color: #fff;
         border-radius: 8px;
-        border: 1px solid #898989;
+        border: 1px solid #EBEFF1;
     }
     /deep/ .el-dropdown-menu {
         background: #fff;

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

@@ -24,7 +24,7 @@
             </el-form-item>
             <el-form-item label="验证码" prop="code">
                 <el-input style="width: 300px" type="number" v-model="ruleForm.code" placeholder="请输入4位验证码">
-                    <span @click="send" style="color: #fdfb60; cursor: pointer; font-size: 13px" slot="suffix">{{
+                    <span @click="send" style="color: #FF6E91; cursor: pointer; font-size: 13px" slot="suffix">{{
                         time === 0 ? '发送验证码' : `重新发送${time}s`
                     }}</span>
                 </el-input>

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

@@ -110,7 +110,7 @@ export default {
     position: relative;
     overflow: hidden;
     border: 1px solid #494a4d;
-    background: #1c1e26;
+    background: #ffffff;
 
     &:hover {
         border-color: @prim;

+ 9 - 2
src/main/pc-space/src/styles/app.less

@@ -221,6 +221,13 @@ body {
     width: 130px;
 }
 
-.share-popver{
+.share-popver {
     min-width: 120px;
-}
+}
+
+.container {
+    & > div {
+        z-index: 20;
+        position: relative;
+    }
+}

+ 6 - 4
src/main/pc-space/src/styles/common.less

@@ -1,20 +1,22 @@
 @warn: #ff8f3e;
 @success: #07c160;
 @danger: #ea2d2d;
-@prim: #9971EE;
+@prim: #9971ee;
 @info: #939599;
-@text0: #26273C;
-@text1: #26273C;
+@text0: #26273c;
+@text1: #26273c;
 @text2: #606266;
 @text3: #939599;
 @text4: #c6c8cc;
-@border1: #f5f7fa;
+@border1: #ebeff1;
 @border2: #f2f3f5;
 @border3: #dfe1e6;
 @border4: #f2f6fc;
 @bg: #f6f9ff;
 @bg1: #fbfcff;
+@bg2: #fff;
 @red: #fd4d49;
+@price: #ff5daf;
 @menuFont: 16px;
 @menuFont1: 12px;
 @menuFont2: 14px;

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
src/main/pc-space/src/styles/element/index.css


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

@@ -37,7 +37,7 @@
         height: 30px;
         font-size: 30px;
         line-height: 30px;
-        color: #ffffff;
+        color: @text0;
         padding: 60px 0 30px;
         font-family: ZhenyanGB;
     }
@@ -45,6 +45,7 @@
     .content {
         background-color: #fff;
         position: relative;
+        z-index: 20;
         &:hover {
             // .imgBox {
             position: relative;
@@ -203,6 +204,8 @@
     }
     .collect {
         margin: 16px;
+        z-index: 20;
+        position: relative;
     }
 }
 
@@ -246,11 +249,13 @@
 .search-list {
     display: flex;
     justify-content: space-between;
+    z-index: 20;
+    position: relative;
     // align-items: center;
     .select {
         /deep/.el-input__inner {
             background-color: transparent;
-            color: #fff;
+            color: @text0;
         }
     }
 }

+ 59 - 46
src/main/pc-space/src/views/AssetDetail.vue

@@ -9,7 +9,7 @@
                             v-if="isVideo(item)"
                             :src="item.url"
                             :poster="getImg(changeImgs([item]), '', 1800)"
-                            style="width: 100%; height: 520px"
+                            style="width: 100%; height: 520px;"
                             controls="controls"
                         >
                             您的浏览器不支持 video 标签。
@@ -18,7 +18,7 @@
                             v-else
                             :src="getImg(item.url, '', 1800)"
                             :preview-src-list="bannerList"
-                            style="width: 100%; height: 520px"
+                            style="width: 100%; height: 520px;"
                             fit="scale-down"
                         />
                     </swiper-slide>
@@ -27,7 +27,7 @@
                     <img class="works1" src="../assets/img/icon-quanyibaohu@3x.png" alt="" />
                     <div class="works2">该作品已在保存至区块链并进行权益保护</div>
                 </div>
-                <div style="width: 520px" class="content">
+                <div style="width: 520px;" class="content">
                     <el-collapse v-model="activeNames" :accordion="false">
                         <el-collapse-item name="1" v-if="info.tokenId">
                             <template slot="title">
@@ -111,7 +111,7 @@
                             </template>
                             <div class="info5">
                                 <div class="page-detail" v-if="info.detail" v-html="info.detail"></div>
-                                <div style="padding-left: 0" v-else class="del">铸造者未设置描述</div>
+                                <div style="padding-left: 0;" v-else class="del">铸造者未设置描述</div>
                             </div>
                         </el-collapse-item>
                     </el-collapse>
@@ -140,7 +140,7 @@
                     <div class="status" v-else>
                         {{ getLabelName(info.status, assetStatusOptions) }}
                     </div>
-                    <div style="margin-top: 3px" class="price1 num" v-if="info.salable">
+                    <div style="margin-top: 3px;" class="price1 num" v-if="info.salable">
                         <div class="price2 num2">单次限购 1 件</div>
                         <div class="price2 num2">已售 {{ info.sale }} / 剩余 {{ info.stock }}</div>
                     </div>
@@ -180,14 +180,14 @@
                                 <img class="imgs" src="../assets/detail/icon-leixing@3x.png" alt="" />
                                 <span>类型</span>
                                 <img
-                                    style="margin-left: 47px"
+                                    style="margin-left: 47px;"
                                     class="imgs"
                                     src="../assets/detail/icon-qiaoqiaohua@3x.png"
                                     alt=""
                                 />
                                 <span>悄悄话<span class="span-detail">(灰色表示已使用)</span></span>
                                 <img
-                                    style="margin-left: 37px"
+                                    style="margin-left: 37px;"
                                     class="imgs"
                                     src="../assets/detail/icon-tequan@3x.png"
                                     alt=""
@@ -198,13 +198,13 @@
                                 <div class="name-store" v-if="info.category">{{ info.category }}</div>
                                 <div class="Notset" v-else>铸造者未设置</div>
                                 <div class="bor"></div>
-                                <div style="width: 220px">
+                                <div style="width: 220px;">
                                     <div class="box" v-if="init2 != ''">
                                         <div
                                             v-if="init2"
                                             @mouseenter="isShowPopover(init2.name, true)"
                                             @mouseleave="isShowPopover(init2.name, false)"
-                                            style="position: relative; width: 24px; margin-left: 16px"
+                                            style="position: relative; width: 24px; margin-left: 16px;"
                                         >
                                             <img
                                                 @click="Whisper"
@@ -226,7 +226,7 @@
                                     <div class="iconBox" v-if="init.length > 0">
                                         <div v-for="(item, index) in init" :key="index">
                                             <div
-                                                style="position: relative"
+                                                style="position: relative;"
                                                 @mouseenter="isShowPopover(item.name, true)"
                                                 @mouseleave="isShowPopover(item.name, false)"
                                             >
@@ -306,17 +306,17 @@
                             <img class="imgs" src="../assets/info_icon_jiaoyijilu.png" alt="" />
                             <span>交易历史</span>
                         </template>
-                        <el-table :data="tableData" stripe style="width: 100%; background: #1c1e26">
+                        <el-table :data="tableData" stripe style="width: 100%; background: #ffffff;">
                             <el-table-column prop="fromUser" label="卖方" width="355">
                                 <template slot-scope="scope">
-                                    <div style="color: #fdfb60; font-size: 14px">
+                                    <div style="color: #9971EE; font-size: 14px;">
                                         {{ scope.row.fromUser }}
                                     </div>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="operation" label="操作" width="305">
                                 <template slot-scope="scope">
-                                    <div style="font-size: 14px; color: #939599">
+                                    <div style="font-size: 14px; color: #939599;">
                                         {{ scope.row.operation }}
                                         <span v-if="scope.row.price">{{ scope.row.price }}</span>
                                     </div>
@@ -325,14 +325,14 @@
                             <el-table-column prop="nickname" label="持有方" width="305">
                                 <!-- toUser -->
                                 <template slot-scope="scope">
-                                    <div style="color: #fdfb60; font-size: 14px">
+                                    <div style="color: #9971EE; font-size: 14px;">
                                         {{ scope.row.toUser }}
                                     </div>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="createdAt" label="时间">
                                 <template slot-scope="scope">
-                                    <div style="font-size: 14px; color: #939599">
+                                    <div style="font-size: 14px; color: #939599;">
                                         {{ scope.row.createdAt }}
                                     </div>
                                 </template>
@@ -867,7 +867,7 @@ export default {
 <style lang="less">
 .myClass {
     .el-button {
-        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        background: @prim;
         border-radius: 4px;
         border: 0;
     }
@@ -1035,7 +1035,11 @@ export default {
 }
 .container {
     padding: 50px 50px 200px;
-    background: #1a1a1a;
+    background: @bg1;
+    & > div {
+        position: relative;
+        z-index: 20;
+    }
     /deep/.page-detail {
         img {
             display: block;
@@ -1055,7 +1059,7 @@ export default {
             width: 650px;
         }
         .init {
-            background: #1c1e26;
+            background: #ffffff;
             border-radius: 8px 8px 0px 0px;
             display: flex;
             align-items: center;
@@ -1114,12 +1118,12 @@ export default {
             display: flex;
             align-items: center;
             height: 64px;
-            background: #1f2230;
+            background: @bg2;
             border-radius: 0px 0px 8px 8px;
             .name-store {
                 font-size: 14px;
                 font-weight: 400;
-                color: #ffffff;
+                color: @text0;
                 width: 96px;
                 line-height: 24px;
                 padding-left: 16px;
@@ -1127,7 +1131,7 @@ export default {
             .bor {
                 width: 1px;
                 height: 16px;
-                background: #2b2e3e;
+                background: @border1;
                 border-radius: 1px;
             }
             .box {
@@ -1224,7 +1228,7 @@ export default {
             align-items: center;
             height: 44px;
             width: 520px;
-            background: #1c1e26;
+            background: @bg2;
             border-radius: 8px;
             margin: 20px 0;
             .works1 {
@@ -1235,7 +1239,7 @@ export default {
             .works2 {
                 font-size: 16px;
                 font-weight: 400;
-                color: #ffffff;
+                color: @text0;
             }
         }
         .content {
@@ -1244,7 +1248,7 @@ export default {
                 align-items: center;
                 justify-content: space-between;
                 padding: 0 16px;
-                background: #1c1e26;
+                background: #ffffff;
                 &.rad {
                     border-radius: 8px 8px 0px 0px;
                     margin-top: 30px;
@@ -1371,7 +1375,7 @@ export default {
             .name2 {
                 font-size: 14px;
                 font-weight: normal;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
             }
             .name3 {
@@ -1396,7 +1400,7 @@ export default {
             .time1 {
                 font-size: @menuFont;
                 font-weight: normal;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
             }
         }
@@ -1404,7 +1408,7 @@ export default {
             display: flex;
             align-items: center;
             justify-content: space-between;
-            background: #1c1e26;
+            background: @bg;
             border-radius: 8px 8px 0px 0px;
             height: 44px;
             padding: 0 16px;
@@ -1425,7 +1429,7 @@ export default {
         }
         .price {
             padding: 0 16px;
-            background: #1f2230;
+            background: @bg2;
             border-radius: 0px 0px 8px 8px;
             .price1 {
                 display: flex;
@@ -1488,7 +1492,7 @@ export default {
         .card {
             height: 66px;
             border-radius: 0px 0px 8px 8px;
-            background: #1f2230;
+            background: @bg2;
             padding: 0 30px;
             display: flex;
             align-items: center;
@@ -1532,7 +1536,7 @@ export default {
 
     .content {
         /deep/ .el-table {
-            background: #1f2230 !important;
+            background: @bg2 !important;
         }
         /deep/ .el-table__row {
             color: #ffffff;
@@ -1543,11 +1547,11 @@ export default {
         }
         /deep/ .el-table td,
         .el-table th.is-leaf {
-            border-bottom: 1px solid #2b2e3e;
-            background: #1f2230;
+            border-bottom: 1px solid @border1;
+            background: @bg2;
         }
         /deep/ .el-table th.is-leaf {
-            border-bottom: 1px solid #2b2e3e;
+            border-bottom: 1px solid @border1;
         }
         /deep/ .el-collapse-item__content {
             padding-bottom: 1px !important;
@@ -1557,7 +1561,7 @@ export default {
             align-items: center;
             justify-content: space-between;
             padding: 0 16px;
-            background: #1c1e26;
+            background: #ffffff;
             &.rad {
                 border-radius: 8px 8px 0px 0px;
                 margin-top: 30px;
@@ -1620,7 +1624,7 @@ export default {
             .nft3 {
                 font-size: 16px;
                 font-weight: normal;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
             }
             .nft5 {
@@ -1638,7 +1642,7 @@ export default {
         .nft4 {
             font-size: 18px;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 30px;
         }
     }
@@ -1646,7 +1650,6 @@ export default {
 .mySwiper {
     width: 520px;
     display: inline-block;
-    .line();
     /deep/.el-image {
         display: block;
         img {
@@ -1660,16 +1663,21 @@ export default {
     border-radius: 8px;
     display: block;
     // .line();
-    .line(@bg:#1f2230);
     border-radius: 8px;
     border-width: 0;
     color: #fff;
+    background-color: @prim;
     line-height: 48px;
     text-align: center;
     margin-right: 30px;
+    .flex();
+    justify-content: center;
+    img{
+        display: block;
+    }
     &:hover {
         &::before {
-            background-color: fade(#1c1e26, 90%);
+            background-color: fade(#ffffff, 90%);
         }
     }
     // &:hover {
@@ -1712,8 +1720,8 @@ export default {
     .el-collapse {
         border-width: 0;
     }
-    p {
-        max-height: 130px;
+    .page-detail {
+        max-height: 500px;
         overflow-y: auto;
     }
 
@@ -1725,7 +1733,7 @@ export default {
         line-height: 22px;
     }
     .el-collapse-item__header {
-        background-color: #1c1e26;
+        background-color: @bg;
         border-radius: 8px 8px 0 0 !important;
         padding: 0 8px 0 16px;
         height: 44px;
@@ -1737,11 +1745,11 @@ export default {
             margin-right: 10px;
         }
         font-size: 16px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
     }
     .el-collapse-item__content {
-        background-color: #1f2230;
+        background-color: @bg2;
     }
     .el-table {
         background-color: transparent;
@@ -1800,9 +1808,14 @@ export default {
         width: 98px;
         height: 48px;
         padding-top: 4px !important;
-        .line();
+        // .line();
+        background-color: @prim;
         color: #fff;
         text-align: center;
+        border-radius: 8px;
+        box-sizing: border-box;
+        overflow: hidden;
+        cursor: pointer;
         span {
             font-size: @menuFont;
             color: #ffffff;
@@ -1815,7 +1828,7 @@ export default {
         }
         &:hover {
             &::before {
-                background-color: fade(#1c1e26, 90%);
+                background-color: fade(#ffffff, 90%);
             }
         }
     }

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

@@ -271,7 +271,7 @@ export default {
     }
 }
 /deep/.el-input__inner {
-    border: 1px solid #898989;
+    border: 1px solid #EBEFF1;
     background-color: transparent;
     color: #fff;
     border-radius: 8px;
@@ -292,7 +292,7 @@ export default {
     padding: 66px 50px;
 }
 // .select {
-//     border: 1px solid #898989;
+//     border: 1px solid #EBEFF1;
 //     border-radius: 8px;
 // }
 .info {

+ 55 - 45
src/main/pc-space/src/views/CollectionDetail.vue

@@ -9,7 +9,7 @@
                             v-if="isVideo(item)"
                             :src="item.url"
                             :poster="getImg(changeImgs([item]), '', 1800)"
-                            style="width: 100%; height: 520px"
+                            style="width: 100%; height: 520px;"
                             controls="controls"
                         >
                             您的浏览器不支持 video 标签。
@@ -18,7 +18,7 @@
                             v-else
                             :src="getImg(item.url, '', 1800)"
                             :preview-src-list="bannerList"
-                            style="width: 100%; height: 520px"
+                            style="width: 100%; height: 520px;"
                             fit="scale-down"
                         />
                     </swiper-slide>
@@ -119,7 +119,7 @@
                             </template>
                             <div class="info5">
                                 <div class="page-detail" v-if="info.detail" v-html="info.detail"></div>
-                                <div style="padding-left: 0" v-else class="del">铸造者未设置描述</div>
+                                <div style="padding-left: 0;" v-else class="del">铸造者未设置描述</div>
                             </div>
                         </el-collapse-item>
                     </el-collapse>
@@ -134,7 +134,7 @@
                         首发抢购倒计时<span>{{ startTime }}</span>
                     </div>
                 </div>
-                <div style="margin-bottom: 30px" v-if="info.salable == false">
+                <div style="margin-bottom: 30px;" v-if="info.salable == false">
                     <div class="time">
                         <div class="time-icon">
                             <img class="time-img" src="../assets/detail/icon-tequan@3x.png" alt="" />
@@ -143,7 +143,7 @@
                     </div>
                     <div class="card init3">仅展示</div>
                 </div>
-                <div style="padding-bottom: 20px" class="price" v-if="info.salable">
+                <div style="padding-bottom: 20px;" class="price" v-if="info.salable">
                     <div class="top2">
                         <div class="price1">
                             <div class="price2">价格</div>
@@ -179,14 +179,14 @@
                                 <img class="imgs" src="../assets/detail/icon-leixing@3x.png" alt="" />
                                 <span>类型</span>
                                 <img
-                                    style="margin-left: 47px"
+                                    style="margin-left: 47px;"
                                     class="imgs"
                                     src="../assets/detail/icon-qiaoqiaohua@3x.png"
                                     alt=""
                                 />
                                 <span>悄悄话<span class="span-detail">(灰色表示已使用)</span></span>
                                 <img
-                                    style="margin-left: 37px"
+                                    style="margin-left: 37px;"
                                     class="imgs"
                                     src="../assets/detail/icon-tequan@3x.png"
                                     alt=""
@@ -197,14 +197,14 @@
                                 <div class="name-store" v-if="info.category">{{ info.category }}</div>
                                 <div class="Notset" v-else>铸造者未设置</div>
                                 <div class="bor"></div>
-                                <div style="width: 228px">
+                                <div style="width: 228px;">
                                     <div class="box" v-if="init2.length > 0">
                                         <div v-for="item in init2" :key="item.id">
                                             <div
                                                 v-if="item"
                                                 @mouseenter="isShowPopover(item.name, true)"
                                                 @mouseleave="isShowPopover(item.name, false)"
-                                                style="position: relative; width: 24px; margin-left: 16px"
+                                                style="position: relative; width: 24px; margin-left: 16px;"
                                             >
                                                 <img v-if="item.opened" class="img" :src="item.icon[2]" alt="" />
                                                 <img v-else class="img" :src="item.icon[0]" alt="" />
@@ -221,7 +221,7 @@
                                     <div class="iconBox" v-if="init.length > 0">
                                         <div v-for="(item, index) in init" :key="index">
                                             <div
-                                                style="position: relative"
+                                                style="position: relative;"
                                                 @mouseenter="isShowPopover(item.name, true)"
                                                 @mouseleave="isShowPopover(item.name, false)"
                                             >
@@ -284,17 +284,17 @@
                             <img class="imgs" src="../assets/info_icon_jiaoyijilu.png" alt="" />
                             <span>交易历史</span>
                         </template>
-                        <el-table :data="tableData" stripe style="width: 100%; background: #1c1e26">
+                        <el-table :data="tableData" stripe style="width: 100%; background: #ffffff;">
                             <el-table-column prop="fromUser" label="卖方" width="355">
                                 <template slot-scope="scope">
-                                    <div style="color: #fdfb60; font-size: 14px">
+                                    <div style="color: #FF6E91; font-size: 14px;">
                                         {{ scope.row.fromUser }}
                                     </div>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="operation" label="操作" width="305">
                                 <template slot-scope="scope">
-                                    <div style="font-size: 14px; color: #939599">
+                                    <div style="font-size: 14px; color: #939599;">
                                         {{ scope.row.operation }}
                                         <span v-if="scope.row.price">{{ scope.row.price }}</span>
                                     </div>
@@ -302,14 +302,14 @@
                             </el-table-column>
                             <el-table-column prop="nickname" label="持有方" width="305">
                                 <template slot-scope="scope">
-                                    <div style="color: #fdfb60; font-size: 14px">
+                                    <div style="color: #FF6E91; font-size: 14px;">
                                         {{ scope.row.toUser }}
                                     </div>
                                 </template>
                             </el-table-column>
                             <el-table-column prop="createdAt" label="时间">
                                 <template slot-scope="scope">
-                                    <div style="font-size: 14px; color: #939599">
+                                    <div style="font-size: 14px; color: #939599;">
                                         {{ scope.row.createdAt }}
                                     </div>
                                 </template>
@@ -555,6 +555,10 @@ export default {
 </script>
 <style lang="less" scoped>
 .container {
+    & > div {
+        position: relative;
+        z-index: 20;
+    }
     /deep/.page-detail {
         img {
             display: block;
@@ -564,7 +568,7 @@ export default {
         }
     }
     padding: 50px 50px 200px;
-    background: #1a1a1a;
+    background: @bg1;
     .top {
         display: flex;
         justify-content: space-between;
@@ -583,7 +587,7 @@ export default {
             display: flex;
             align-items: center;
             height: 44px;
-            background: #1c1e26;
+            background: @bg2;
             border-radius: 8px;
             margin: 20px 0;
             .works1 {
@@ -594,7 +598,7 @@ export default {
             .works2 {
                 font-size: 16px;
                 font-weight: normal;
-                color: #ffffff;
+                color: @text3;
             }
         }
         .title {
@@ -603,7 +607,7 @@ export default {
             .title1 {
                 font-size: 26px;
                 font-weight: bold;
-                color: #ffffff;
+                color: @text0;
                 .ellipsis();
             }
             .text {
@@ -650,7 +654,7 @@ export default {
             .name2 {
                 font-size: 14px;
                 font-weight: normal;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
             }
             .name3 {
@@ -675,7 +679,7 @@ export default {
             .time1 {
                 font-size: @menuFont;
                 font-weight: normal;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
             }
         }
@@ -683,7 +687,7 @@ export default {
             display: flex;
             align-items: center;
             justify-content: space-between;
-            background: #1c1e26;
+            background: @bg;
             border-radius: 8px 8px 0px 0px;
             height: 44px;
             padding: 0 16px;
@@ -705,14 +709,14 @@ export default {
         }
         .price {
             padding: 0 23px 0 18px;
-            background: #1f2230;
+            background: @bg2;
             border-radius: 0px 0px 8px 8px;
             margin-bottom: 20px;
             .top2 {
                 display: flex;
                 align-items: center;
                 justify-content: space-between;
-                border-bottom: 1px solid #2b2e3e;
+                border-bottom: 1px solid @border1;
             }
             .price1 {
                 display: flex;
@@ -748,7 +752,7 @@ export default {
                     font-size: 40px;
                     font-family: OSP-DIN, OSP;
                     font-weight: normal;
-                    color: @prim;
+                    color: @price;
                     line-height: 36px;
                     margin-right: 5px;
                 }
@@ -786,7 +790,7 @@ export default {
             display: flex;
             align-items: center;
             height: 64px;
-            background: #1f2230;
+            background: @bg2;
             border-radius: 0px 0px 8px 8px;
             .Notset {
                 font-size: 14px;
@@ -800,7 +804,7 @@ export default {
             .name-store {
                 font-size: 14px;
                 font-weight: normal;
-                color: #ffffff;
+                color: @text0;
                 width: 96px;
                 line-height: 24px;
                 padding-left: 16px;
@@ -808,7 +812,7 @@ export default {
             .bor {
                 width: 1px;
                 height: 16px;
-                background: #2b2e3e;
+                background: #ebeff1;
                 border-radius: 1px;
             }
             .box {
@@ -901,7 +905,7 @@ export default {
         .card {
             height: 66px;
             border-radius: 0px 0px 8px 8px;
-            background: #1f2230;
+            background: @bg2;
             padding: 0 30px;
             display: flex;
             align-items: center;
@@ -915,7 +919,8 @@ export default {
                     height: 46px;
                     text-align: center;
                     margin-right: 30px;
-                    .line(@bg:#1f2230);
+                    border: 1px solid #ebeff1;
+                    border-radius: 4px;
                     .box2 {
                         font-size: @menuFont1;
                         font-weight: normal;
@@ -926,7 +931,7 @@ export default {
                     .box3 {
                         font-size: @menuFont1;
                         font-weight: normal;
-                        color: #ffffff;
+                        color: @text0;
                         line-height: 17px;
                     }
                 }
@@ -975,7 +980,7 @@ export default {
             align-items: center;
             justify-content: space-between;
             padding: 0 16px;
-            background: #1c1e26;
+            background: #ffffff;
             &.rad {
                 border-radius: 8px 8px 0px 0px;
                 margin-top: 30px;
@@ -1051,7 +1056,6 @@ export default {
         .info5 {
             padding: 10px 16px;
             font-size: 14px;
-            font-family: PingFangSC-Regular, PingFang SC;
             font-weight: normal;
             color: #939599;
             line-height: 24px;
@@ -1074,7 +1078,7 @@ export default {
             .nft3 {
                 font-size: 16px;
                 font-weight: normal;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
             }
             .nft5 {
@@ -1092,7 +1096,7 @@ export default {
         .nft4 {
             font-size: 18px;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 30px;
         }
     }
@@ -1100,9 +1104,10 @@ export default {
 .mySwiper {
     width: 520px;
     display: inline-block;
-    .line();
+    // .line();
     /deep/.el-image {
         display: block;
+        border-radius: 8px;
         img {
             display: block;
         }
@@ -1114,17 +1119,17 @@ export default {
     height: 48px;
     display: block;
     font-size: 16px;
-    background: linear-gradient(135deg, @prim 0%, @warn 100%);
+    background: @prim;
     border-radius: 8px;
     border-width: 0;
-    color: #000;
+    color: @bg2;
     font-weight: bold;
     &:hover {
-        background: linear-gradient(135deg, darken(@prim, 10%), darken(@warn, 10%));
+        background: darken(@prim, 10%);
     }
 
     &.used {
-        background: linear-gradient(135deg, darken(@prim, 50%), darken(@warn, 50%));
+        background: darken(@prim, 20%);
         color: #939599;
     }
 }
@@ -1144,7 +1149,7 @@ export default {
     }
 
     .el-collapse-item__header {
-        background-color: #1c1e26;
+        background-color: @bg;
         border-radius: 8px 8px 0 0 !important;
         padding: 0 8px 0 16px;
         height: 44px;
@@ -1156,8 +1161,12 @@ export default {
             margin-right: 10px;
         }
         font-size: 16px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
+        .el-icon-arrow-right {
+            color: #939599;
+            font-size: 9px;
+        }
     }
     .span-detail {
         font-size: 12px;
@@ -1167,7 +1176,7 @@ export default {
         line-height: 22px;
     }
     .el-collapse-item__content {
-        background-color: #1f2230;
+        background-color: @bg2;
     }
     .el-table {
         background-color: transparent;
@@ -1182,10 +1191,11 @@ export default {
             content: none;
         }
     }
-    p {
-        max-height: 130px;
+    .page-detail {
+        max-height: 500px;
         overflow-y: auto;
     }
+
     .el-collapse-item {
         &:last-child {
             .el-collapse-item__wrap {

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

@@ -90,6 +90,7 @@ export default {
     padding: 0;
     min-height: calc(100vh - 270px);
     position: relative;
+    overflow: initial;
     .bg1 {
         width: 693px;
         height: 575px;

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

@@ -1,4 +1,4 @@
-<template>
+el-table__row<template>
     <div class="container center-content">
         <div class="title">我的藏品</div>
         <el-radio-group class="menu" v-model="select" size="normal">

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

@@ -347,7 +347,7 @@ export default {
 .myClass {
     width: 340px;
     .el-button {
-        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        background: @prim;
         border-radius: 4px;
         border: 0;
     }

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

@@ -425,7 +425,7 @@ export default {
 .myClass {
     width: 340px;
     .el-button {
-        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        background: @prim;
         border-radius: 4px;
         border: 0;
     }

+ 11 - 8
src/main/pc-space/src/views/user/AccountData.vue

@@ -6,7 +6,7 @@
                     class="top"
                     :src="getImg(userInfo.bg, '', 1300) || require('../../assets/background/bg-03@3x.png')"
                     alt=""
-                    style="object-fit: cover"
+                    style="object-fit: cover;"
                 />
                 <i class="el-icon-plus avatar-uploader-icon"></i>
                 <el-button class="btn" size="small" type="primary">更换背景</el-button>
@@ -69,7 +69,7 @@
                                     </div>
                                     <div class="btnFollow">
                                         <el-button
-                                            style="color: #939599"
+                                            style="color: #939599;"
                                             plain
                                             round
                                             :class="{ prim: !item.follow }"
@@ -447,8 +447,7 @@ export default {
                 confirmButtonText: '确定',
                 cancelButtonText: '取消',
                 customClass: 'myClass',
-                inputPattern:
-                    /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/,
+                inputPattern: /[\w!#$%&'*+/=?^_`{|}~-]+(?:\.[\w!#$%&'*+/=?^_`{|}~-]+)*@(?:[\w](?:[\w-]*[\w])?\.)+[\w](?:[\w-]*[\w])?/,
                 inputErrorMessage: '邮箱格式不正确'
             })
                 .then(({ value }) => {
@@ -476,7 +475,7 @@ export default {
 <style lang="less">
 .myClass {
     .el-button {
-        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        background: @prim;
         border-radius: 4px;
         border: 0;
     }
@@ -489,6 +488,10 @@ export default {
 </style>
 <style lang="less" scoped>
 .containers {
+    & > div {
+        position: relative;
+        z-index: 20;
+    }
     .border2 {
         height: 1px;
         background: #494a4d;
@@ -730,7 +733,7 @@ export default {
         .name {
             font-size: @menuFont;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             margin: 20px 0 10px 0;
         }
@@ -739,7 +742,7 @@ export default {
             justify-content: space-between;
             padding: 17px 0;
             .myClass {
-                background: linear-gradient(133deg, @prim 0%, @warn 100%) !important;
+                background: @prim !important;
                 border-radius: 4px;
                 color: #ffffff;
             }
@@ -816,7 +819,7 @@ export default {
         }
         .border {
             height: 1px;
-            background: #494a4d;
+            background: @border1;
             border-radius: 1px;
             margin-top: 10px;
         }

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

@@ -62,7 +62,7 @@
                             <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入短信验证码">
                                 <span
                                     @click="send"
-                                    style="color: #fdfb60; cursor: pointer; font-size: 13px"
+                                    style="color: #FF6E91; cursor: pointer; font-size: 13px"
                                     slot="suffix"
                                     >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
                                 >
@@ -194,7 +194,7 @@ input::-webkit-inner-spin-button {
     }
     /deep/ .el-input__inner {
         border: 1px solid #494a4d;
-        background: #1c1e26;
+        background: #ffffff;
         color: #ffffff;
     }
     .title {
@@ -208,7 +208,7 @@ input::-webkit-inner-spin-button {
     }
     .box {
         height: 539px;
-        background: #1c1e26;
+        background: #ffffff;
     }
     .name {
         .flex();

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

@@ -8,11 +8,11 @@
         <template>
             <el-table
                 class="customer-table"
-                :header-cell-style="{ background: '#1c1e26' }"
+                :header-cell-style="{ background: '#fff' }"
                 :data="tableData"
                 :border="false"
                 :highlight-current-row="false"
-                style="width: 100%; background: #1c1e26"
+                style="width: 100%; background: #ffffff"
             >
                 <el-table-column prop="name" label="收货人" width="200"> </el-table-column>
                 <el-table-column prop="phone" label="联系电话" width="200"> </el-table-column>
@@ -85,12 +85,12 @@ export default {
 
 <style lang="less" scoped>
 /deep/ .el-table__header {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
 }
 /deep/ .el-table__row {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
     .cell {
-        color: #ffffff;
+        color: @text0;
     }
 }
 /deep/ .el-table__empty-text {

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

@@ -72,7 +72,7 @@ export default {
         .box1 {
             width: 400px;
             height: 484px;
-            background: #1c1e26;
+            background: #ffffff;
             border-radius: 8px;
             margin-right: 52px;
             text-align: center;

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

@@ -24,17 +24,17 @@
         <template>
             <el-table
                 class="customer-table"
-                :header-cell-style="{ background: '#1c1e26' }"
+                :header-cell-style="{ background: '#fff' }"
                 :data="tableData"
                 :border="false"
                 :highlight-current-row="false"
-                style="width: 100%; background: #1c1e26; font-weight: normal"
+                style="width: 100%; background: #fff; font-weight: normal;"
             >
                 <el-table-column prop="name" label="藏品信息" width="208">
                     <template slot-scope="scope">
-                        <div style="display: flex; align-items: center">
+                        <div style="display: flex; align-items: center;">
                             <img
-                                style="width: 60px; height: 60px; border-radius: 4px"
+                                style="width: 60px; height: 60px; border-radius: 4px;"
                                 :src="getImg(scope.row.pic[0].url, '', 300)"
                                 alt=""
                             />
@@ -74,14 +74,14 @@
                 </el-table-column>
                 <el-table-column prop="price" label="金额" width="90">
                     <template slot-scope="scope">
-                        <div style="display: flex">
+                        <div style="display: flex;">
                             <img
-                                style="width: 8px; height: 8px; margin-top: 10px"
+                                style="width: 8px; height: 8px; margin-top: 10px;"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 alt=""
                             />
                             <div
-                                style="color: #fdfb60; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
+                                style="color: #FF6E91; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal;"
                             >
                                 {{ scope.row.price }}
                             </div>
@@ -92,14 +92,14 @@
                 <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">
-                        <div :style="{ color: '#fdfb60' }" v-if="scope.row.status === 'FINISH'">已完成</div>
-                        <div :style="{ color: '#fdfb60' }" v-if="scope.row.status === 'PROCESSING'">交易中</div>
+                        <div :style="{ color: '#9971EE' }" v-if="scope.row.status === 'FINISH'">已完成</div>
+                        <div :style="{ color: '#9971EE' }" v-if="scope.row.status === 'PROCESSING'">交易中</div>
                     </template>
                 </el-table-column>
                 <el-table-column fixed="right" label="操作">
                     <template slot-scope="scope">
                         <img
-                            style="width: 24px; height: 24px; cursor: pointer"
+                            style="width: 24px; height: 24px; cursor: pointer;"
                             @click="handleClick(scope.row)"
                             src="../../assets/user/icon_shanchu@3x.png"
                             alt=""
@@ -234,7 +234,7 @@ export default {
 <style lang="less">
 .myClass {
     .el-button {
-        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        background: @prim;
         border-radius: 4px;
         border: 0;
     }
@@ -247,19 +247,19 @@ export default {
 </style>
 <style lang="less" scoped>
 /deep/ .el-table__header {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
 }
 /deep/ .el-table__row {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
     .cell {
-        color: #ffffff;
+        color: @text0;
     }
 }
 /deep/ .el-table__empty-text {
     padding-top: 150px;
 }
 /deep/ .el-table__empty-block {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
 }
 .pagination-wrapper {
     .pagination();
@@ -270,12 +270,12 @@ export default {
     border-radius: 8px;
 
     /deep/.el-input__inner {
-        border: 1px solid #898989;
+        border: 1px solid #ebeff1;
         background-color: transparent;
-        color: #fff;
+        color: @text0;
         border-radius: 8px;
         &:focus {
-            border-color: #fff;
+            border-color: @prim;
         }
     }
 }
@@ -287,7 +287,7 @@ export default {
 }
 /deep/.menu {
     .el-radio-button__inner {
-        border-color: #949699;
+        border-color: #ebeff1;
         background-color: transparent;
         color: #949699;
         width: 140px;
@@ -298,9 +298,9 @@ export default {
         }
     }
     .el-radio-button__orig-radio:checked + .el-radio-button__inner {
-        background: linear-gradient(46deg, @prim 0%, @warn 100%);
-        color: #000;
-        border-color: #fff;
+        background: @prim;
+        color: #fff;
+        border-color: @prim;
         font-weight: bold;
     }
     .el-radio-button {
@@ -342,7 +342,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         border-radius: 1px;
         margin: 24px 0 24px;
     }

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

@@ -274,7 +274,7 @@ export default {
     }
     /deep/ .el-input__inner {
         border: 1px solid #494a4d;
-        background: #1c1e26;
+        background: #ffffff;
         color: #ffffff;
     }
     /deep/ .el-form-item__error {
@@ -336,7 +336,7 @@ export default {
         margin: -7px 0 2px 294px;
     }
     .box {
-        background: #1c1e26;
+        background: #ffffff;
         padding: 17px 16px;
         padding-bottom: 120px;
         .border {

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

@@ -20,7 +20,7 @@
                 </el-input>
             </div> -->
         </div>
-        <div class="border" style="margin: 30px 0"></div>
+        <div class="border" style="margin: 30px 0;"></div>
 
         <div class="list" v-loading="fetchingData">
             <collection-info
@@ -130,7 +130,7 @@ export default {
     border-radius: 8px;
 
     /deep/.el-input__inner {
-        border: 1px solid #898989;
+        border: 1px solid #EBEFF1;
         background-color: transparent;
         color: #fff;
         border-radius: 8px;
@@ -145,7 +145,7 @@ export default {
 }
 .border {
     height: 1px;
-    background: #494a4d;
+    background: @border1;
     border-radius: 1px;
 }
 .container {
@@ -255,16 +255,16 @@ export default {
 
 /deep/.menu {
     .el-radio-button__inner {
-        border-color: #949699;
+        border-color: #ebeff1;
         background-color: transparent;
-        color: #949699;
+        color: #939599;
         width: 140px;
     }
     .el-radio-button__orig-radio:checked + .el-radio-button__inner {
-        background: linear-gradient(46deg, @prim 0%, @warn 100%);
-        color: #000;
+        background: @prim;
+        color: #fff;
         font-weight: bold;
-        border-color: #fff;
+        border-color: @prim;
     }
     .el-radio-button {
         &:last-child {

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

@@ -36,7 +36,7 @@
                             <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入短信验证码">
                                 <span
                                     @click="send"
-                                    style="color: #fdfb60; cursor: pointer; font-size: 13px"
+                                    style="color: #FF6E91; cursor: pointer; font-size: 13px"
                                     slot="suffix"
                                     >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
                                 >
@@ -196,7 +196,7 @@ export default {
     }
     /deep/ .el-input__inner {
         border: 1px solid #494a4d;
-        background: #1c1e26;
+        background: #ffffff;
         color: #ffffff;
         height: 36px;
     }
@@ -211,7 +211,7 @@ export default {
     }
     .box {
         height: 539px;
-        background: #1c1e26;
+        background: #ffffff;
     }
     .name {
         .flex();

+ 25 - 20
src/main/pc-space/src/views/user/OrderValue.vue

@@ -18,11 +18,10 @@
         <template>
             <el-table
                 class="customer-table"
-                :header-cell-style="{ background: '#1c1e26' }"
+                :header-cell-style="{ background: '#fff' }"
                 :data="tableData"
                 :border="false"
-                :highlight-current-row="false"
-                style="width: 100%; background: #1c1e26"
+                style="width: 100%; background: #fff;"
             >
                 <el-table-column prop="name" label="商品信息" width="228">
                     <template slot-scope="scope">
@@ -41,17 +40,17 @@
                     </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 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">
+                        <div style="display: flex;">
                             <img
-                                style="width: 8px; height: 8px; margin-top: 10px"
+                                style="width: 8px; height: 8px; margin-top: 10px;"
                                 src="../../assets/user/icon_jiage@3x (5).png"
                                 alt=""
                             />
                             <div
-                                style="color: #ffffff; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
+                                style="color: #26273c; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal;"
                             >
                                 {{ scope.row.totalPrice }}
                             </div>
@@ -62,14 +61,14 @@
                 </el-table-column>
                 <el-table-column prop="price" label="收益金额">
                     <template slot-scope="scope">
-                        <div style="display: flex">
+                        <div style="display: flex;">
                             <img
-                                style="width: 8px; height: 8px; margin-top: 10px"
+                                style="width: 8px; height: 8px; margin-top: 10px;"
                                 src="../../assets/img/icon_jiage@3x.png"
                                 alt=""
                             />
                             <div
-                                style="color: #fdfb60; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
+                                style="color: #ff6e91; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal;"
                             >
                                 {{ scope.row.price }}
                             </div>
@@ -144,16 +143,22 @@ export default {
 
 <style lang="less" scoped>
 /deep/ .el-table__header {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
 }
 /deep/ .el-table__row {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
     .cell {
-        color: #ffffff;
+        color: @text0;
+    }
+    &:hover {
+        background: fade(@prim, 10%);
+    }
+    &:active {
+        background: fade(@prim, 10%);
     }
 }
 /deep/ .el-table__empty-block {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
 }
 /deep/ .el-table__empty-text {
     padding-top: 150px !important;
@@ -170,12 +175,12 @@ export default {
     border-radius: 8px;
 
     /deep/.el-input__inner {
-        border: 1px solid #898989;
+        border: 1px solid #ebeff1;
         background-color: transparent;
-        color: #fff;
+        color: @text0;
         border-radius: 8px;
         &:focus {
-            border-color: #fff;
+            border-color: @prim;
         }
     }
 }
@@ -203,13 +208,13 @@ export default {
         .pay {
             font-size: @menuFont;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 28px;
         }
         .text1 {
             font-size: 14px;
             font-weight: 400;
-            color: #ffffff;
+            color: @text0;
             line-height: 25px;
         }
         .text2 {
@@ -232,7 +237,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         border-radius: 1px;
         margin: 24px 0 24px;
     }

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

@@ -18,16 +18,16 @@
         <template>
             <el-table
                 class="customer-table"
-                :header-cell-style="{ background: '#1c1e26' }"
+                :header-cell-style="{ background: '#fff' }"
                 :data="tableData"
                 :border="false"
                 :highlight-current-row="false"
-                style="width: 100%; background: #1c1e26"
+                style="width: 100%; background: #ffffff"
             >
                 <el-table-column prop="payMethod" label="支付类型" width="108" :formatter="statusFormatter">
                     <template slot-scope="scope">
-                        <div :style="{ color: '#fdfb60' }" v-if="scope.row.payMethod === 'WEIXIN'">微信</div>
-                        <div :style="{ color: '#fdfb60' }" v-if="scope.row.payMethod === 'ALIPAY'">支付宝</div>
+                        <div :style="{ color: '#9971EE' }" v-if="scope.row.payMethod === 'WEIXIN'">微信</div>
+                        <div :style="{ color: '#9971EE' }" v-if="scope.row.payMethod === 'ALIPAY'">支付宝</div>
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="藏品信息" width="208">
@@ -63,7 +63,7 @@
                                 alt=""
                             />
                             <div
-                                style="color: #fdfb60; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
+                                style="color: #FF6E91; font-size: 20px; font-family: OSP-DIN, OSP; font-weight: normal"
                             >
                                 {{ scope.row.price }}
                             </div>
@@ -172,7 +172,7 @@ export default {
 <style lang="less">
 .myClass {
     .el-button {
-        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        background: @prim;
         border-radius: 4px;
         border: 0;
     }
@@ -185,16 +185,16 @@ export default {
 </style>
 <style lang="less" scoped>
 /deep/ .el-table__header {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
 }
 /deep/ .el-table__row {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
     .cell {
-        color: #ffffff;
+        color: @text0;
     }
 }
 /deep/ .el-table__empty-block {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
 }
 /deep/ .el-table__empty-text {
     padding-top: 150px !important;
@@ -211,7 +211,7 @@ export default {
     border-radius: 8px;
 
     /deep/.el-input__inner {
-        border: 1px solid #898989;
+        border: 1px solid #EBEFF1;
         background-color: transparent;
         color: #fff;
         border-radius: 8px;
@@ -244,7 +244,7 @@ export default {
         .pay {
             font-size: @menuFont;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 28px;
         }
         .text1 {
@@ -273,7 +273,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         border-radius: 1px;
         margin: 24px 0 24px;
     }

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

@@ -9,7 +9,7 @@
                 router
                 class="aside-menu"
                 text-color="#939599"
-                active-text-color="#fdfb60"
+                active-text-color="#9971EE"
             >
                 <el-submenu index="1">
                     <template slot="title">
@@ -74,11 +74,11 @@ export default {
 
     /deep/ .el-menu {
         width: 200px;
-        background: #1c1e26 !important;
+        background: @bg2 !important;
         margin-right: 30px;
         .el-submenu__title {
-            background: #1c1e26 !important;
-            color: #ffffff !important;
+            background: @bg2 !important;
+            color: @text0 !important;
             font-size: 18px !important;
             margin-left: 4px !important;
             .el-submenu__icon-arrow {
@@ -91,11 +91,11 @@ export default {
             height: 60px !important;
             line-height: 60px !important;
             margin-bottom: 10px !important;
-            background: #1c1e26 !important;
+            background: @bg2 !important;
             font-size: 16px;
             padding-left: 56px !important;
             span {
-                color: #ffffff !important;
+                color: @text0 !important;
                 font-size: 18px !important;
             }
         }
@@ -104,7 +104,7 @@ export default {
         &::before {
             width: 3px;
             height: 36px;
-            background: linear-gradient(90deg, #fdfb60 0%, #fdfb60 0%, #ff8f3e 100%);
+            background: @prim;
             border-radius: 2px;
             content: '';
             position: absolute;
@@ -131,7 +131,7 @@ export default {
         margin-top: 50px;
         .main {
             .flex-col();
-            background: #1c1e26 !important;
+            background: @bg2 !important;
             flex-grow: 1;
             min-height: 1100px;
         }

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

@@ -27,7 +27,7 @@
                         <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入4位验证码">
                             <span
                                 @click="send"
-                                style="color: #fdfb60; cursor: pointer; font-size: 13px"
+                                style="color: #FF6E91; cursor: pointer; font-size: 13px"
                                 slot="suffix"
                                 >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
                             >
@@ -188,7 +188,7 @@ export default {
     }
     /deep/ .el-input__inner {
         border: 1px solid #494a4d;
-        background: #1c1e26;
+        background: #ffffff;
         color: #ffffff;
         height: 36px;
     }
@@ -203,7 +203,7 @@ export default {
     }
     .box {
         height: 539px;
-        background: #1c1e26;
+        background: #ffffff;
     }
     .name {
         .flex();

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

@@ -113,7 +113,7 @@ export default {
     }
     .box {
         height: 539px;
-        background: #1c1e26;
+        background: #ffffff;
     }
     .name {
         .flex();

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

@@ -27,7 +27,7 @@
                         <el-input style="width: 300px" v-model="ruleForm.code" placeholder="请输入4位验证码">
                             <span
                                 @click="send"
-                                style="color: #fdfb60; cursor: pointer; font-size: 13px"
+                                style="color: #FF6E91; cursor: pointer; font-size: 13px"
                                 slot="suffix"
                                 >{{ time === 0 ? '发送验证码' : `重新发送${time}s` }}</span
                             >
@@ -190,7 +190,7 @@ export default {
     }
     /deep/ .el-input__inner {
         border: 1px solid #494a4d;
-        background: #1c1e26;
+        background: #ffffff;
         color: #ffffff;
         height: 36px;
     }
@@ -205,7 +205,7 @@ export default {
     }
     .box {
         height: 539px;
-        background: #1c1e26;
+        background: #ffffff;
     }
     .name {
         .flex();

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

@@ -18,23 +18,23 @@
         <template>
             <el-table
                 class="customer-table"
-                :header-cell-style="{ background: '#1c1e26' }"
+                :header-cell-style="{ background: '#fff' }"
                 :data="tableData"
                 :border="false"
                 :highlight-current-row="false"
-                style="width: 100%; background: #1c1e26"
+                style="width: 100%; background: #ffffff;"
             >
                 <el-table-column prop="payMethod" label="支付类型" width="148" :formatter="statusFormatter">
                     <template slot-scope="scope">
-                        <div :style="{ color: '#fdfb60' }" v-if="scope.row.payMethod === 'WEIXIN'">微信</div>
-                        <div :style="{ color: '#fdfb60' }" v-if="scope.row.payMethod === 'ALIPAY'">支付宝</div>
+                        <div :style="{ color: '#9971EE' }" v-if="scope.row.payMethod === 'WEIXIN'">微信</div>
+                        <div :style="{ color: '#9971EE' }" v-if="scope.row.payMethod === 'ALIPAY'">支付宝</div>
                     </template>
                 </el-table-column>
                 <el-table-column prop="name" label="藏品信息" width="248">
                     <template slot-scope="scope">
-                        <div style="display: flex; align-items: center">
+                        <div style="display: flex; align-items: center;">
                             <img
-                                style="width: 60px; height: 60px; border-radius: 4px"
+                                style="width: 60px; height: 60px; border-radius: 4px;"
                                 :src="getImg(scope.row.pic[0].url, '', 300)"
                                 alt=""
                             />
@@ -54,13 +54,13 @@
                         </div>
                     </template>
                 </el-table-column>
-                <el-table-column style="color: #fdfb60" prop="minter" label="来源" width="140"> </el-table-column>
+                <el-table-column style="color: #fdfb60;" prop="minter" label="来源" width="140"> </el-table-column>
                 <!-- <el-table-column prop="username" label="去向" width="190"> </el-table-column> -->
                 <el-table-column prop="payTime" label="交易时间" width="278"> </el-table-column>
                 <el-table-column fixed="right" label="操作">
                     <template slot-scope="scope">
                         <img
-                            style="width: 24px; height: 24px; cursor: pointer"
+                            style="width: 24px; height: 24px; cursor: pointer;"
                             @click="handleClick(scope.row)"
                             src="../../assets/user/icon_shanchu@3x.png"
                             alt=""
@@ -155,7 +155,7 @@ export default {
 <style lang="less">
 .myClass {
     .el-button {
-        background: linear-gradient(133deg, @prim 0%, @warn 100%);
+        background: @prim;
         border-radius: 4px;
         border: 0;
     }
@@ -168,16 +168,16 @@ export default {
 </style>
 <style lang="less" scoped>
 /deep/ .el-table__header {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
 }
 /deep/ .el-table__row {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
     .cell {
-        color: #ffffff;
+        color: @text0;
     }
 }
 /deep/ .el-table__empty-block {
-    background: #1c1e26 !important;
+    background: @bg2 !important;
 }
 /deep/ .el-table__empty-text {
     padding-top: 150px;
@@ -194,7 +194,7 @@ export default {
     border-radius: 8px;
 
     /deep/.el-input__inner {
-        border: 1px solid #898989;
+        border: 1px solid #ebeff1;
         background-color: transparent;
         color: #fff;
         border-radius: 8px;
@@ -227,13 +227,13 @@ export default {
         .pay {
             font-size: @menuFont;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 28px;
         }
         .text1 {
             font-size: 14px;
             font-weight: 400;
-            color: #ffffff;
+            color: @text0;
             line-height: 25px;
         }
         .text2 {
@@ -256,7 +256,7 @@ export default {
     }
     .border {
         height: 1px;
-        background: #494a4d;
+        background: @border1;
         border-radius: 1px;
         margin: 24px 0 24px;
     }

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

@@ -116,7 +116,7 @@ export default {
     }
     .box {
         height: 539px;
-        background: #1c1e26;
+        background: #ffffff;
     }
     .name {
         .flex();

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

@@ -211,7 +211,7 @@ export default {
     }
     /deep/ .el-input__inner {
         border: 1px solid #494a4d;
-        background: #1c1e26;
+        background: #ffffff;
         color: #ffffff;
     }
     /deep/ .el-form-item__error {
@@ -260,7 +260,7 @@ export default {
         margin: -7px 0 2px 94px;
     }
     .box {
-        background: #1c1e26;
+        background: #ffffff;
         padding: 17px 16px;
         padding-bottom: 120px;
         .border {

Некоторые файлы не были показаны из-за большого количества измененных файлов