xiongzhu %!s(int64=4) %!d(string=hai) anos
pai
achega
2975dd43b9
Modificáronse 100 ficheiros con 577 adicións e 352 borrados
  1. BIN=BIN
      src/assets/dislike.png
  2. BIN=BIN
      src/assets/icon-anquan.png
  3. BIN=BIN
      src/assets/icon-dianzan.png
  4. BIN=BIN
      src/assets/icon-dianzan1.png
  5. BIN=BIN
      src/assets/icon-guanyuwomen.png
  6. BIN=BIN
      src/assets/icon-jifen.png
  7. BIN=BIN
      src/assets/icon_dizhi.png
  8. BIN=BIN
      src/assets/icon_gouxuan.png
  9. BIN=BIN
      src/assets/icon_gouxuan_pre.png
  10. BIN=BIN
      src/assets/icon_jiage.png
  11. BIN=BIN
      src/assets/icon_liaojiegengduo.png
  12. BIN=BIN
      src/assets/icon_yinhangka.png
  13. BIN=BIN
      src/assets/info_icon_ershoushichang.png
  14. BIN=BIN
      src/assets/info_icon_jiaoyijilu.png
  15. BIN=BIN
      src/assets/info_icon_jingxuanxilie.png
  16. BIN=BIN
      src/assets/info_icon_paimaixilie.png
  17. BIN=BIN
      src/assets/info_icon_shangpindingdan.png
  18. BIN=BIN
      src/assets/info_icon_xiliehuodong.png
  19. BIN=BIN
      src/assets/info_icon_zhuzaozhe.png
  20. BIN=BIN
      src/assets/jiage_huang.png
  21. BIN=BIN
      src/assets/kong_png_dianzan.png
  22. BIN=BIN
      src/assets/kong_png_duihuanquan.png
  23. BIN=BIN
      src/assets/kong_png_fensi.png
  24. BIN=BIN
      src/assets/kong_png_gaunzhu.png
  25. BIN=BIN
      src/assets/kong_png_maichude.png
  26. BIN=BIN
      src/assets/kong_png_wudingdan.png
  27. BIN=BIN
      src/assets/kong_png_wusousuo.png
  28. BIN=BIN
      src/assets/kong_png_yongyoude (1).png
  29. BIN=BIN
      src/assets/kong_png_yongyoude (2).png
  30. BIN=BIN
      src/assets/kong_png_yongyoude .png
  31. BIN=BIN
      src/assets/like.png
  32. BIN=BIN
      src/assets/nav_logo.png
  33. BIN=BIN
      src/assets/png-biaokuag-01.png
  34. BIN=BIN
      src/assets/png-biaokuag-02.png
  35. BIN=BIN
      src/assets/png-diwen.png
  36. BIN=BIN
      src/assets/png-tianjia.png
  37. BIN=BIN
      src/assets/renzheng-icon-geren-pre.png
  38. BIN=BIN
      src/assets/renzheng-icon-qiye-pre.png
  39. BIN=BIN
      src/assets/shenqing_shenhezhong.png
  40. 1 1
      src/assets/svgs/bg-png.svg
  41. 1 1
      src/assets/svgs/login_icon_code.svg
  42. 2 2
      src/assets/svgs/login_icon_mima.svg
  43. 5 5
      src/assets/svgs/login_icon_zhanghao.svg
  44. BIN=BIN
      src/assets/tabbar_icon_01_pre.png
  45. BIN=BIN
      src/assets/tabbar_icon_02_pre.png
  46. BIN=BIN
      src/assets/tabbar_icon_03_pre.png
  47. BIN=BIN
      src/assets/tabbar_icon_04_pre.png
  48. 24 3
      src/components/AppBar.vue
  49. 4 4
      src/components/CouponInfo.vue
  50. 1 1
      src/components/Driver.vue
  51. 3 3
      src/components/LikeButton.vue
  52. 1 0
      src/components/PageTitle.vue
  53. 1 1
      src/components/asset/assetInfo.vue
  54. 5 5
      src/components/creator/CreatorInfo.vue
  55. 4 5
      src/components/order/OrderInfo.vue
  56. 10 0
      src/components/product/HashCode.vue
  57. 2 2
      src/components/product/productInfo.vue
  58. 5 5
      src/components/product/productLarge.vue
  59. 9 3
      src/plugins/colors.js
  60. 4 2
      src/router/index.js
  61. 10 10
      src/styles/app.less
  62. 16 11
      src/styles/common/theme.less
  63. 8 7
      src/views/Discover.vue
  64. 28 19
      src/views/Givesubmit.vue
  65. 10 2
      src/views/Index.vue
  66. 14 12
      src/views/Mine.vue
  67. 25 5
      src/views/Store.vue
  68. 47 41
      src/views/Submit.vue
  69. 4 4
      src/views/account/About.vue
  70. 2 2
      src/views/account/Agreement.vue
  71. 7 6
      src/views/account/Authentication.vue
  72. 2 2
      src/views/account/ChangePhone.vue
  73. 4 4
      src/views/account/Connect.vue
  74. 2 2
      src/views/account/Forget.vue
  75. 2 2
      src/views/account/Login.vue
  76. 2 2
      src/views/account/Register.vue
  77. 7 4
      src/views/account/Security.vue
  78. 3 3
      src/views/account/Setting.vue
  79. 3 3
      src/views/account/TradingPassword.vue
  80. 6 6
      src/views/account/Verified.vue
  81. 2 2
      src/views/account/VerifiedSuc.vue
  82. 8 7
      src/views/account/VerifiedSucs.vue
  83. 3 1
      src/views/account/Waiting.vue
  84. 1 1
      src/views/activity/Detail.vue
  85. 1 1
      src/views/activity/List.vue
  86. 39 32
      src/views/asset/Consignment.vue
  87. 19 7
      src/views/asset/Detail.vue
  88. 8 8
      src/views/asset/GiveSearch.vue
  89. 26 2
      src/views/asset/Search.vue
  90. 14 6
      src/views/creator/Detail.vue
  91. 16 2
      src/views/creator/List.vue
  92. 23 5
      src/views/creator/Search.vue
  93. 9 0
      src/views/order/CouponList.vue
  94. 76 69
      src/views/order/Detail.vue
  95. 3 0
      src/views/order/Orders.vue
  96. 23 8
      src/views/product/Detail.vue
  97. 7 3
      src/views/product/List.vue
  98. 13 6
      src/views/product/Search.vue
  99. 1 1
      src/views/user/Address.vue
  100. 1 1
      src/views/user/Banks.vue

BIN=BIN
src/assets/dislike.png


BIN=BIN
src/assets/icon-anquan.png


BIN=BIN
src/assets/icon-dianzan.png


BIN=BIN
src/assets/icon-dianzan1.png


BIN=BIN
src/assets/icon-guanyuwomen.png


BIN=BIN
src/assets/icon-jifen.png


BIN=BIN
src/assets/icon_dizhi.png


BIN=BIN
src/assets/icon_gouxuan.png


BIN=BIN
src/assets/icon_gouxuan_pre.png


BIN=BIN
src/assets/icon_jiage.png


BIN=BIN
src/assets/icon_liaojiegengduo.png


BIN=BIN
src/assets/icon_yinhangka.png


BIN=BIN
src/assets/info_icon_ershoushichang.png


BIN=BIN
src/assets/info_icon_jiaoyijilu.png


BIN=BIN
src/assets/info_icon_jingxuanxilie.png


BIN=BIN
src/assets/info_icon_paimaixilie.png


BIN=BIN
src/assets/info_icon_shangpindingdan.png


BIN=BIN
src/assets/info_icon_xiliehuodong.png


BIN=BIN
src/assets/info_icon_zhuzaozhe.png


BIN=BIN
src/assets/jiage_huang.png


BIN=BIN
src/assets/kong_png_dianzan.png


BIN=BIN
src/assets/kong_png_duihuanquan.png


BIN=BIN
src/assets/kong_png_fensi.png


BIN=BIN
src/assets/kong_png_gaunzhu.png


BIN=BIN
src/assets/kong_png_maichude.png


BIN=BIN
src/assets/kong_png_wudingdan.png


BIN=BIN
src/assets/kong_png_wusousuo.png


BIN=BIN
src/assets/kong_png_yongyoude (1).png


BIN=BIN
src/assets/kong_png_yongyoude (2).png


BIN=BIN
src/assets/kong_png_yongyoude .png


BIN=BIN
src/assets/like.png


BIN=BIN
src/assets/nav_logo.png


BIN=BIN
src/assets/png-biaokuag-01.png


BIN=BIN
src/assets/png-biaokuag-02.png


BIN=BIN
src/assets/png-diwen.png


BIN=BIN
src/assets/png-tianjia.png


BIN=BIN
src/assets/renzheng-icon-geren-pre.png


BIN=BIN
src/assets/renzheng-icon-qiye-pre.png


BIN=BIN
src/assets/shenqing_shenhezhong.png


+ 1 - 1
src/assets/svgs/bg-png.svg

@@ -6,7 +6,7 @@
             <g id="编组-4" transform="translate(0.000000, 166.000000)">
             <g id="编组-4" transform="translate(0.000000, 166.000000)">
                 <g id="编组-3" transform="translate(0.000000, 284.000000)">
                 <g id="编组-3" transform="translate(0.000000, 284.000000)">
                     <g id="bg-png" transform="translate(106.000000, 20.000000)">
                     <g id="bg-png" transform="translate(106.000000, 20.000000)">
-                        <rect id="Rectangle-12" fill="#1F2021" transform="translate(80.000000, 80.000000) scale(1, -1) translate(-80.000000, -80.000000) " x="0" y="0" width="160" height="160" rx="12"></rect>
+                        <rect id="Rectangle-12" fill="#FFFFFF" transform="translate(80.000000, 80.000000) scale(1, -1) translate(-80.000000, -80.000000) " x="0" y="0" width="160" height="160" rx="12"></rect>
                         <text id="点击上传" font-family="PingFangSC-Regular, PingFang SC" font-size="13" font-weight="normal" fill="#939599">
                         <text id="点击上传" font-family="PingFangSC-Regular, PingFang SC" font-size="13" font-weight="normal" fill="#939599">
                             <tspan x="54" y="106">点击上传</tspan>
                             <tspan x="54" y="106">点击上传</tspan>
                         </text>
                         </text>

+ 1 - 1
src/assets/svgs/login_icon_code.svg

@@ -2,7 +2,7 @@
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>login_icon_mima</title>
     <title>login_icon_mima</title>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="用户注册" transform="translate(-46.000000, -246.000000)" stroke="#00FFCB" stroke-width="1.2">
+        <g id="用户注册" transform="translate(-46.000000, -246.000000)" stroke="#3AB200" stroke-width="1.2">
             <g id="编组-11备份-11" transform="translate(46.000000, 234.000000)">
             <g id="编组-11备份-11" transform="translate(46.000000, 234.000000)">
                 <g id="编组-7" transform="translate(0.000000, 12.000000)">
                 <g id="编组-7" transform="translate(0.000000, 12.000000)">
                     <path d="M6.2121614,5.48050226 L12,3 L12,3 L17.7878386,5.48050226 C18.5232063,5.79565984 19,6.5187361 19,7.31879232 L19,12 C19,15.6399494 16.8307712,18.9296695 13.4851298,20.3635158 L12,21 L12,21 L10.5148702,20.3635158 C7.16922878,18.9296695 5,15.6399494 5,12 L5,7.31879232 C5,6.5187361 5.47679371,5.79565984 6.2121614,5.48050226 Z" id="矩形"></path>
                     <path d="M6.2121614,5.48050226 L12,3 L12,3 L17.7878386,5.48050226 C18.5232063,5.79565984 19,6.5187361 19,7.31879232 L19,12 C19,15.6399494 16.8307712,18.9296695 13.4851298,20.3635158 L12,21 L12,21 L10.5148702,20.3635158 C7.16922878,18.9296695 5,15.6399494 5,12 L5,7.31879232 C5,6.5187361 5.47679371,5.79565984 6.2121614,5.48050226 Z" id="矩形"></path>

+ 2 - 2
src/assets/svgs/login_icon_mima.svg

@@ -2,8 +2,8 @@
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>login_icon_mima</title>
     <title>login_icon_mima</title>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="用户注册" transform="translate(-46.000000, -310.000000)" stroke="#00FFCB" stroke-width="1.2">
-            <g id="编组-11备份-11" transform="translate(46.000000, 298.000000)">
+        <g id="用户注册" transform="translate(-46.000000, -374.000000)" stroke="#3AB200" stroke-width="1.2">
+            <g id="编组-11备份-11" transform="translate(46.000000, 362.000000)">
                 <g id="编组-7" transform="translate(0.000000, 12.000000)">
                 <g id="编组-7" transform="translate(0.000000, 12.000000)">
                     <g id="编组-4" transform="translate(4.500000, 3.000000)">
                     <g id="编组-4" transform="translate(4.500000, 3.000000)">
                         <path d="M2,8 L13,8 C14.1045695,8 15,8.8954305 15,10 L15,16 C15,17.1045695 14.1045695,18 13,18 L2,18 C0.8954305,18 1.3527075e-16,17.1045695 0,16 L0,10 C-1.3527075e-16,8.8954305 0.8954305,8 2,8 Z" id="矩形"></path>
                         <path d="M2,8 L13,8 C14.1045695,8 15,8.8954305 15,10 L15,16 C15,17.1045695 14.1045695,18 13,18 L2,18 C0.8954305,18 1.3527075e-16,17.1045695 0,16 L0,10 C-1.3527075e-16,8.8954305 0.8954305,8 2,8 Z" id="矩形"></path>

+ 5 - 5
src/assets/svgs/login_icon_zhanghao.svg

@@ -2,13 +2,13 @@
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>login_icon_zhanghao</title>
     <title>login_icon_zhanghao</title>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linecap="round" stroke-linejoin="round">
-        <g id="用户注册" transform="translate(-46.000000, -182.000000)" stroke="#00FFCB" stroke-width="1.2">
+        <g id="用户注册" transform="translate(-46.000000, -182.000000)" stroke="#3AB200" stroke-width="1.2">
             <g id="编组-11备份-11" transform="translate(46.000000, 170.000000)">
             <g id="编组-11备份-11" transform="translate(46.000000, 170.000000)">
                 <g id="编组-6" transform="translate(0.000000, 12.000000)">
                 <g id="编组-6" transform="translate(0.000000, 12.000000)">
-                    <g id="编组-2" transform="translate(4.500000, 3.000000)">
-                        <path d="M2.5,0 L12.5,0 C13.6045695,-2.02906125e-16 14.5,0.8954305 14.5,2 L14.5,16 C14.5,17.1045695 13.6045695,18 12.5,18 L2.5,18 C1.3954305,18 0.5,17.1045695 0.5,16 L0.5,2 C0.5,0.8954305 1.3954305,2.02906125e-16 2.5,0 Z" id="矩形"></path>
-                        <path d="M2.5,0 L12.5,0 C13.6045695,-2.02906125e-16 14.5,0.8954305 14.5,2 L14.5,12 L14.5,12 L0.5,12 L0.5,2 C0.5,0.8954305 1.3954305,2.02906125e-16 2.5,0 Z" id="矩形"></path>
-                        <line x1="5.5" y1="15" x2="9.5" y2="15" id="直线"></line>
+                    <g id="编组-2" transform="translate(5.000000, 3.000000)">
+                        <path d="M2,0 L12,0 C13.1045695,-2.02906125e-16 14,0.8954305 14,2 L14,16 C14,17.1045695 13.1045695,18 12,18 L2,18 C0.8954305,18 1.3527075e-16,17.1045695 0,16 L0,2 C-1.3527075e-16,0.8954305 0.8954305,2.02906125e-16 2,0 Z" id="矩形"></path>
+                        <path d="M2,0 L12,0 C13.1045695,-2.02906125e-16 14,0.8954305 14,2 L14,12 L14,12 L0,12 L0,2 C-1.3527075e-16,0.8954305 0.8954305,2.02906125e-16 2,0 Z" id="矩形"></path>
+                        <line x1="5" y1="15" x2="9" y2="15" id="直线"></line>
                     </g>
                     </g>
                 </g>
                 </g>
             </g>
             </g>

BIN=BIN
src/assets/tabbar_icon_01_pre.png


BIN=BIN
src/assets/tabbar_icon_02_pre.png


BIN=BIN
src/assets/tabbar_icon_03_pre.png


BIN=BIN
src/assets/tabbar_icon_04_pre.png


+ 24 - 3
src/components/AppBar.vue

@@ -13,7 +13,7 @@
     >
     >
         <template #left>
         <template #left>
             <div class="back">
             <div class="back">
-                <van-icon @click="back" size="24" name="arrow-left" color="#fff" />
+                <van-icon @click="back" size="24" name="arrow-left" :color="fontColor || $colors.font0" />
             </div>
             </div>
             <van-popover
             <van-popover
                 v-model:show="showPopover"
                 v-model:show="showPopover"
@@ -23,7 +23,7 @@
                 @select="onSelect"
                 @select="onSelect"
             >
             >
                 <template #reference>
                 <template #reference>
-                    <van-icon size="24" color="#fff" name="bars" />
+                    <van-icon size="24" :color="fontColor || $colors.font0" name="bars" />
                 </template>
                 </template>
             </van-popover>
             </van-popover>
         </template>
         </template>
@@ -41,9 +41,15 @@ export default {
                 { text: '发现', icon: require('@assets/menu2.png'), value: '/discover' },
                 { text: '发现', icon: require('@assets/menu2.png'), value: '/discover' },
                 { text: '藏品室', icon: require('@assets/menu3.png'), value: '/store' },
                 { text: '藏品室', icon: require('@assets/menu3.png'), value: '/store' },
                 { text: '我的', icon: require('@assets/menu4.png'), value: '/mine' }
                 { text: '我的', icon: require('@assets/menu4.png'), value: '/mine' }
-            ]
+            ],
+            tabColor: ''
         };
         };
     },
     },
+    computed: {
+        fontColor() {
+            return this.tabColor ? '#fff' : '';
+        }
+    },
     watch: {
     watch: {
         $route() {
         $route() {
             if (this.$route.meta.menuPage) {
             if (this.$route.meta.menuPage) {
@@ -51,6 +57,21 @@ export default {
             } else {
             } else {
                 this.show = true;
                 this.show = true;
             }
             }
+            if (this.$route.meta.tabColor) {
+                this.tabColor = this.$route.meta.tabColor;
+            } else {
+                this.tabColor = '';
+            }
+        },
+        tabColor() {
+            this.$nextTick(() => {
+                if (this.$el) {
+                    let children = this.$el.children;
+                    if (children && children.length > 0) {
+                        children[0].style.backgroundColor = this.tabColor;
+                    }
+                }
+            });
         }
         }
     },
     },
     mounted() {
     mounted() {

+ 4 - 4
src/components/CouponInfo.vue

@@ -134,7 +134,7 @@ export default {
         &::before {
         &::before {
             content: '';
             content: '';
             position: absolute;
             position: absolute;
-            background-color: #0f0f0f;
+            background-color: @bg3;;
             width: 16px;
             width: 16px;
             height: 16px;
             height: 16px;
             left: -18px;
             left: -18px;
@@ -144,7 +144,7 @@ export default {
         &::after {
         &::after {
             content: '';
             content: '';
             position: absolute;
             position: absolute;
-            background-color: #0f0f0f;
+            background-color: @bg3;;
             width: 16px;
             width: 16px;
             height: 16px;
             height: 16px;
             right: -18px;
             right: -18px;
@@ -192,7 +192,7 @@ export default {
     line-height: 26px;
     line-height: 26px;
     text-align: center;
     text-align: center;
     border-radius: 16px;
     border-radius: 16px;
-    background: linear-gradient(135deg, rgba(253, 251, 96, 1), rgba(255, 143, 62, 1));
+    background: linear-gradient(135deg, @prim, @warn);
     &::after {
     &::after {
         content: '';
         content: '';
         position: absolute;
         position: absolute;
@@ -221,7 +221,7 @@ export default {
 
 
 .tag {
 .tag {
     font-size: 11px;
     font-size: 11px;
-    color: #ffffff;
+    color: @text0;
     line-height: 18px;
     line-height: 18px;
     height: 18px;
     height: 18px;
     background: @text3;
     background: @text3;

+ 1 - 1
src/components/Driver.vue

@@ -9,6 +9,6 @@ export default {};
 <style lang="less" scoped>
 <style lang="less" scoped>
 .driver {
 .driver {
     height: 5px;
     height: 5px;
-    background-color: @bg2;
+    background-color: @bg3;
 }
 }
 </style>
 </style>

+ 3 - 3
src/components/LikeButton.vue

@@ -35,11 +35,11 @@ export default {
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
 .like {
 .like {
-    display: inline-block;
     color: #949699;
     color: #949699;
-    line-height: 24px;
+    // line-height: 24px;
     flex-shrink: 0;
     flex-shrink: 0;
-
+    .flex();
+    display: inline-flex;
     img {
     img {
         vertical-align: middle;
         vertical-align: middle;
         margin-right: 3px;
         margin-right: 3px;

+ 1 - 0
src/components/PageTitle.vue

@@ -21,6 +21,7 @@ export default {
         flex: 2;
         flex: 2;
         span {
         span {
             font-size: @font3;
             font-size: @font3;
+            color: @text0;
             // font-family: ZhenyanGB-Regular, ZhenyanGB;
             // font-family: ZhenyanGB-Regular, ZhenyanGB;
         }
         }
     }
     }

+ 1 - 1
src/components/asset/assetInfo.vue

@@ -98,7 +98,7 @@ export default {
 .product {
 .product {
     width: calc(50vw - 24px);
     width: calc(50vw - 24px);
     margin: 8px;
     margin: 8px;
-    background-color: @bg2;
+    background-color: #1c1e25;
     display: inline-block;
     display: inline-block;
     border-radius: 8px;
     border-radius: 8px;
     overflow: hidden;
     overflow: hidden;

+ 5 - 5
src/components/creator/CreatorInfo.vue

@@ -130,7 +130,7 @@ export default {
 
 
         .text1 {
         .text1 {
             font-size: @font2;
             font-size: @font2;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
         }
         }
 
 
@@ -171,14 +171,14 @@ export default {
                 min-width: 70px;
                 min-width: 70px;
                 border: solid 0px transparent;
                 border: solid 0px transparent;
                 padding: 1px;
                 padding: 1px;
-                background-image: linear-gradient(@bg, @bg), linear-gradient(135deg, #fdfb60, #ff8f3e);
+                background-image: linear-gradient(@bg3, @bg3), linear-gradient(135deg, @prim, @warn);
                 background-origin: border-box;
                 background-origin: border-box;
                 box-sizing: border-box;
                 box-sizing: border-box;
                 background-clip: content-box, border-box;
                 background-clip: content-box, border-box;
                 font-size: @font1;
                 font-size: @font1;
 
 
                 &.follow {
                 &.follow {
-                    background-image: linear-gradient(@bg, @bg), linear-gradient(135deg, @text3, @text3);
+                    background-image: linear-gradient(@bg3, @bg3), linear-gradient(135deg, @text3, @text3);
                     color: @text3;
                     color: @text3;
                 }
                 }
             }
             }
@@ -186,7 +186,7 @@ export default {
             .text4 {
             .text4 {
                 span {
                 span {
                     font-size: @font1;
                     font-size: @font1;
-                    color: #fff;
+                    color: @text0;
                     &:first-child {
                     &:first-child {
                         color: @text3;
                         color: @text3;
                         margin-right: 2px;
                         margin-right: 2px;
@@ -219,7 +219,7 @@ export default {
         right: 20px;
         right: 20px;
         top: 0;
         top: 0;
         height: 1px;
         height: 1px;
-        background-color: #202122;
+        background-color: @bg3;
     }
     }
 }
 }
 </style>
 </style>

+ 4 - 5
src/components/order/OrderInfo.vue

@@ -115,20 +115,19 @@ export default {
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
 .orderInfo {
 .orderInfo {
-    background: #181818;
+    background: @bg;
     border-radius: 12px;
     border-radius: 12px;
-    color: #fff;
+    color: @text0;
     padding: 16px 10px 0;
     padding: 16px 10px 0;
     margin: 20px 16px 0;
     margin: 20px 16px 0;
     display: block;
     display: block;
 }
 }
-
 .order-top {
 .order-top {
     display: flex;
     display: flex;
     justify-content: space-between;
     justify-content: space-between;
     span {
     span {
         font-size: 14px;
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 22px;
         line-height: 22px;
     }
     }
 
 
@@ -171,7 +170,7 @@ export default {
 .total-price {
 .total-price {
     font-size: 14px;
     font-size: 14px;
     font-weight: bold;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 60px;
     line-height: 60px;
     text-align: right;
     text-align: right;
     .flex();
     .flex();

+ 10 - 0
src/components/product/HashCode.vue

@@ -21,6 +21,12 @@
                 <img @click="copy(info.tokenId)" src="@assets/svgs/copy_icon.svg" alt="" />
                 <img @click="copy(info.tokenId)" src="@assets/svgs/copy_icon.svg" alt="" />
                 <span class="van-ellipsis">{{ getShort(info.tokenId) }}</span>
                 <span class="van-ellipsis">{{ getShort(info.tokenId) }}</span>
             </div>
             </div>
+            <div class="text-info" v-if="pageType === 'asset'">
+                <span class="text1">IPFS地址: </span>
+                <span class="flex1"></span>
+                <img @click="copy(info.ipfsUrl)" src="@assets/svgs/copy_icon.svg" alt="" />
+                <span class="van-ellipsis">{{ getShort(info.ipfsUrl) }}</span>
+            </div>
         </div>
         </div>
         <div v-else class="textName">铸造者未设置</div>
         <div v-else class="textName">铸造者未设置</div>
     </van-collapse-item>
     </van-collapse-item>
@@ -35,6 +41,10 @@ export default {
             default: () => {
             default: () => {
                 return {};
                 return {};
             }
             }
+        },
+        pageType: {
+            type: String,
+            default: 'product'
         }
         }
     },
     },
     mixins: [product],
     mixins: [product],

+ 2 - 2
src/components/product/productInfo.vue

@@ -98,7 +98,7 @@ export default {
 
 
         .name {
         .name {
             font-size: @font2;
             font-size: @font2;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
         }
         }
 
 
@@ -165,7 +165,7 @@ export default {
     }
     }
 }
 }
 .sold {
 .sold {
-    background-color: #1c1e25;
+    background-color: @bg2;
     font-size: @font1;
     font-size: @font1;
     color: #939599;
     color: #939599;
     padding: 0 17px;
     padding: 0 17px;

+ 5 - 5
src/components/product/productLarge.vue

@@ -124,7 +124,7 @@ export default {
     width: calc(100vw - 32px);
     width: calc(100vw - 32px);
     margin: 8px 16px;
     margin: 8px 16px;
     position: relative;
     position: relative;
-    background-color: #1c1e25;
+    background-color: @bg2;
     display: inline-block;
     display: inline-block;
     border-radius: 30px;
     border-radius: 30px;
     overflow: hidden;
     overflow: hidden;
@@ -167,7 +167,7 @@ export default {
         .name {
         .name {
             font-size: @font2;
             font-size: @font2;
             font-weight: bold;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
         }
         }
 
 
@@ -190,7 +190,7 @@ export default {
                     background: @prim;
                     background: @prim;
                     color: @bg;
                     color: @bg;
                 }
                 }
-                background-color: #27272b;
+                background-color: @bg3;
                 color: @prim;
                 color: @prim;
             }
             }
         }
         }
@@ -216,7 +216,7 @@ export default {
 
 
             .price {
             .price {
                 font-size: @font4;
                 font-size: @font4;
-                color: #fff;
+                color: @text0;
                 line-height: 20px;
                 line-height: 20px;
                 font-family: OSP;
                 font-family: OSP;
                 img {
                 img {
@@ -248,7 +248,7 @@ export default {
     color: #fff;
     color: #fff;
 }
 }
 .sold {
 .sold {
-    background-color: #1c1e25;
+    background-color: @bg2;
     font-size: @font1;
     font-size: @font1;
     color: #939599;
     color: #939599;
     padding: 0 17px;
     padding: 0 17px;

+ 9 - 3
src/plugins/colors.js

@@ -2,13 +2,19 @@ export default {
     install(app, options) {
     install(app, options) {
         if (process.env.VUE_APP_PAGE_TYPE == 'raex') {
         if (process.env.VUE_APP_PAGE_TYPE == 'raex') {
             app.config.globalProperties.$colors = {
             app.config.globalProperties.$colors = {
-                prim: '#00FFCB',
-                warn: '#006EFF'
+                prim: '#3AB200',
+                warn: '#3AB200',
+                font0: '#000000',
+                bg: '#ffffff',
+                bg3: '#f5f7fa'
             };
             };
         } else {
         } else {
             app.config.globalProperties.$colors = {
             app.config.globalProperties.$colors = {
                 prim: '#FDFB60',
                 prim: '#FDFB60',
-                warn: '#FF8F3E'
+                warn: '#FF8F3E',
+                font0: '#ffffff',
+                bg: '#181818',
+                bg3: '#0f0f0f'
             };
             };
         }
         }
     }
     }

+ 4 - 2
src/router/index.js

@@ -223,7 +223,8 @@ const routes = [
         component: () => import('../views/product/Detail.vue'),
         component: () => import('../views/product/Detail.vue'),
         meta: {
         meta: {
             pageType: Page.Every,
             pageType: Page.Every,
-            title: '第九空间'
+            title: '第九空间',
+            tabColor: '#181818'
         }
         }
     },
     },
     {
     {
@@ -286,7 +287,8 @@ const routes = [
         component: () => import('../views/asset/Detail.vue'),
         component: () => import('../views/asset/Detail.vue'),
         meta: {
         meta: {
             pageType: Page.Every,
             pageType: Page.Every,
-            title: '第九空间'
+            title: '第九空间',
+            tabColor: '#181818'
         }
         }
     },
     },
     {
     {

+ 10 - 10
src/styles/app.less

@@ -1,13 +1,13 @@
 :root {
 :root {
     --van-primary-color: @prim;
     --van-primary-color: @prim;
-    --van-tabbar-item-active-background-color: @bg;
+    --van-tabbar-item-active-background-color: transparent;
     --van-tabbar-background-color: @bg;
     --van-tabbar-background-color: @bg;
     --van-nav-bar-background-color: @bg;
     --van-nav-bar-background-color: @bg;
     --van-cell-background-color: @bg;
     --van-cell-background-color: @bg;
-    --van-text-color: #fff;
+    --van-text-color: @text0;
     --van-gray-6: @text3;
     --van-gray-6: @text3;
     --van-gray-3: @bg3;
     --van-gray-3: @bg3;
-    --van-tabbar-item-active-color: #fff;
+    --van-tabbar-item-active-color: @textP;
     --van-button-plain-background-color: transparent;
     --van-button-plain-background-color: transparent;
     --van-grid-item-content-background-color: transparent;
     --van-grid-item-content-background-color: transparent;
     --van-button-mini-height: 26px;
     --van-button-mini-height: 26px;
@@ -21,18 +21,18 @@
     --van-cell-background-color: transparent;
     --van-cell-background-color: transparent;
     --van-cell-group-background-color: transparent;
     --van-cell-group-background-color: transparent;
     --van-font-size-lg: 14px;
     --van-font-size-lg: 14px;
-    --van-divider-border-color: #202122;
-    --van-divider-text-color: #202122;
+    --van-divider-border-color: #939599;
+    --van-divider-text-color: @tabBorder;
     --van-divider-margin: 0;
     --van-divider-margin: 0;
-    --van-field-error-message-color: #fdfb60;
+    --van-field-error-message-color: @prim;
     --van-action-sheet-item-text-color: #000;
     --van-action-sheet-item-text-color: #000;
     --van-uploader-upload-active-color: transparent;
     --van-uploader-upload-active-color: transparent;
     --van-uploader-upload-background-color: transparent;
     --van-uploader-upload-background-color: transparent;
     --van-uploader-file-background-color: transparent;
     --van-uploader-file-background-color: transparent;
     --van-active-color: @bg3;
     --van-active-color: @bg3;
     --van-image-placeholder-background-color: @bg2;
     --van-image-placeholder-background-color: @bg2;
-    --van-search-background-color: #181818;
-    --van-search-content-background-color: #0f0f0f;
+    --van-search-background-color: @bg;
+    --van-search-content-background-color: @bg3;
     // --van-picker-background-color: @bg;
     // --van-picker-background-color: @bg;
     --van-button-default-height: 38px;
     --van-button-default-height: 38px;
     --van-dialog-has-title-message-text-color: #000;
     --van-dialog-has-title-message-text-color: #000;
@@ -85,7 +85,7 @@ body {
 
 
 input:-webkit-autofill {
 input:-webkit-autofill {
     box-shadow: 0 0 0px 1000px @bg inset;
     box-shadow: 0 0 0px 1000px @bg inset;
-    -webkit-text-fill-color: #fff;
+    -webkit-text-fill-color: @text0;
 }
 }
 
 
 .van-dialog {
 .van-dialog {
@@ -180,7 +180,7 @@ input:-webkit-autofill {
 .van-button--primary {
 .van-button--primary {
     // background: linear-gradient(135deg, @prim 0%, #ff8f3e 100%);
     // background: linear-gradient(135deg, @prim 0%, #ff8f3e 100%);
     border-width: 0;
     border-width: 0;
-    color: #333230;
+    color: @btnText;
 }
 }
 
 
 .popup-content {
 .popup-content {

+ 16 - 11
src/styles/common/theme.less

@@ -1,27 +1,32 @@
 @divider: #f2f4f5;
 @divider: #f2f4f5;
-@prim: #00FFCB;
+@prim: #3ab200;
 @success: #67c23a;
 @success: #67c23a;
 @danger: #f56c6c;
 @danger: #f56c6c;
-@warn: #006EFF;
-@text0: #181818;
+@warn: #3ab200;
+@textP: #3ab200;
+@text0: #000000;
 @text1: #323233;
 @text1: #323233;
 @text2: #606266;
 @text2: #606266;
 @text3: #939599;
 @text3: #939599;
-@text4: #c6c8cc;
+@text4: #939599;
 @border1: #dcdfe6;
 @border1: #dcdfe6;
 @border2: #f2f3f5;
 @border2: #f2f3f5;
 @border3: #dfe1e6;
 @border3: #dfe1e6;
 @border4: #f2f6fc;
 @border4: #f2f6fc;
-@bg: #181818;
-@bg2: #1c1e25;
-@bg3: #0f0f0f;
+@bg: #ffffff;
+@bg2: #ffffff;
+@bg3: #f5f7fa;
+@bgProductDetail: #0f0f0f;
 @menu-text-color: #bfcbd9;
 @menu-text-color: #bfcbd9;
 @menu-text-color-active: #409eff;
 @menu-text-color-active: #409eff;
 @menu-bg: #324157;
 @menu-bg: #324157;
 @menu-bg-active: #1f2d3d;
 @menu-bg-active: #1f2d3d;
 @menu-bg-hover: #232e3b;
 @menu-bg-hover: #232e3b;
 @background-color-light: #181818;
 @background-color-light: #181818;
-@font1:12px;
-@font2:14px;
-@font3:16px;
-@font4:20px;
+@font1: 12px;
+@font2: 14px;
+@font3: 16px;
+@font4: 20px;
+@hotBg: #f5f7fa;
+@btnText: #fff;
+@tabBorder: #f5f7fa;

+ 8 - 7
src/views/Discover.vue

@@ -278,8 +278,9 @@ export default {
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     .logo {
     .logo {
-        width: 74px;
-        height: 26px;
+        width: auto;
+        height: 34px;
+        display: block;
     }
     }
 
 
     .search {
     .search {
@@ -308,7 +309,7 @@ export default {
 ::v-deep(.mySwiper) {
 ::v-deep(.mySwiper) {
     width: calc(100vw - 32px);
     width: calc(100vw - 32px);
     height: calc(40vw - 12.8px);
     height: calc(40vw - 12.8px);
-    padding-top: 12px;
+    padding-top: 20px;
 
 
     .swiper-pagination {
     .swiper-pagination {
         bottom: 6px;
         bottom: 6px;
@@ -358,14 +359,14 @@ export default {
     width: 38px;
     width: 38px;
     height: 38px;
     height: 38px;
 }
 }
-.van-grid {
-    margin-top: 12px;
-}
+// .van-grid {
+//     margin-top: 12px;
+// }
 /deep/ .van-grid-item__content {
 /deep/ .van-grid-item__content {
     padding: 14px 0 16px;
     padding: 14px 0 16px;
 }
 }
 /deep/ .van-grid-item__text {
 /deep/ .van-grid-item__text {
-    color: #fff;
+    color: @text0;
     font-size: @font1;
     font-size: @font1;
     line-height: 18px;
     line-height: 18px;
     margin-top: 4px;
     margin-top: 4px;

+ 28 - 19
src/views/Givesubmit.vue

@@ -42,7 +42,7 @@
                 <div class="pay-item" @click="payType = item.type" v-for="(item, index) in payInfos" :key="index">
                 <div class="pay-item" @click="payType = item.type" v-for="(item, index) in payInfos" :key="index">
                     <img :src="item.icon" alt="" />
                     <img :src="item.icon" alt="" />
                     <span>{{ item.name }}</span>
                     <span>{{ item.name }}</span>
-                    <img :src="payType === item.type ? icons[1] : icons[0]" alt="" />
+                    <img class="choose" :src="payType === item.type ? icons[1] : icons[0]" alt="" />
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
@@ -91,7 +91,7 @@ export default {
                 //   name: "DCEP",
                 //   name: "DCEP",
                 // },
                 // },
             ],
             ],
-            icons: [require('@assets/svgs/icon_gouxuan_huise.svg'), require('@assets/svgs/icon_gouxuan_pre.svg')],
+            icons: [require('@assets/icon_gouxuan_huise.png'), require('@assets/icon_gouxuan_pre.png')],
             bottom: null,
             bottom: null,
             orderId: 0,
             orderId: 0,
             gas: 1,
             gas: 1,
@@ -210,22 +210,25 @@ export default {
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
 .submit {
 .submit {
-    padding: 20px 0;
+    padding: 0 0 20px;
+    background-color: @bg3;
 }
 }
 .page-top {
 .page-top {
-    padding: 0 16px;
+    padding: 20px 16px 0;
+    background-color: @bg;
 }
 }
 
 
 .pageTitle {
 .pageTitle {
     font-size: 14px;
     font-size: 14px;
-    color: #ffffff;
+    color: @text0;
     line-height: 22px;
     line-height: 22px;
 }
 }
 .input {
 .input {
     padding: 20px 16px;
     padding: 20px 16px;
+    background-color: @bg;
     .text1 {
     .text1 {
         font-size: 14px;
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
         margin-bottom: 6px;
         margin-bottom: 6px;
         text-align: center;
         text-align: center;
@@ -267,7 +270,7 @@ export default {
     }
     }
 }
 }
 /deep/.van-number-keyboard__body {
 /deep/.van-number-keyboard__body {
-    background-color: #4a4a4a;
+    background-color: fade(#4a4a4a, 50%);
     .van-key {
     .van-key {
         background-color: @bg;
         background-color: @bg;
         &:active {
         &:active {
@@ -277,23 +280,24 @@ export default {
 }
 }
 .list {
 .list {
     padding: 0 16px;
     padding: 0 16px;
+    background-color: @bg;
 }
 }
 .info {
 .info {
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     justify-content: space-between;
     justify-content: space-between;
     height: 60px;
     height: 60px;
-    border-bottom: 1px solid #202122;
+    border-bottom: 1px solid @tabBorder;
     .text1 {
     .text1 {
         font-size: 14px;
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
     }
     }
 
 
     .text2 {
     .text2 {
         font-size: 16px;
         font-size: 16px;
         font-weight: bold;
         font-weight: bold;
-        color: #fdfb60;
+        color: @prim;
         line-height: 24px;
         line-height: 24px;
     }
     }
 
 
@@ -316,7 +320,7 @@ export default {
                 border-right: 1px solid @text3;
                 border-right: 1px solid @text3;
             }
             }
             i {
             i {
-                background-color: #fff;
+                background-color: @text0;
             }
             }
         }
         }
     }
     }
@@ -344,7 +348,7 @@ export default {
         }
         }
         .text1 {
         .text1 {
             font-size: @font2;
             font-size: @font2;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
         }
         }
         .text3 {
         .text3 {
@@ -359,7 +363,7 @@ export default {
         .price {
         .price {
             font-size: 16px;
             font-size: 16px;
             font-weight: bold;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
         }
         }
     }
     }
@@ -369,7 +373,7 @@ export default {
     padding: 20px 0;
     padding: 20px 0;
     .van-field__label {
     .van-field__label {
         font-size: 14px;
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
     }
     }
     .van-field__control {
     .van-field__control {
@@ -386,11 +390,16 @@ export default {
     span {
     span {
         font-size: 14px;
         font-size: 14px;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
         flex-grow: 1;
         flex-grow: 1;
         padding: 0 10px;
         padding: 0 10px;
     }
     }
+
+    .choose {
+        width: 24px;
+        height: 24px;
+    }
 }
 }
 
 
 .bottom {
 .bottom {
@@ -400,7 +409,7 @@ export default {
     right: 0;
     right: 0;
     background-color: @bg;
     background-color: @bg;
     z-index: 20;
     z-index: 20;
-    border-top: 1px solid #313233;
+    border-top: 1px solid @tabBorder;
 
 
     .bottom-content {
     .bottom-content {
         padding: 6px 16px;
         padding: 6px 16px;
@@ -423,8 +432,8 @@ export default {
             line-height: 44px;
             line-height: 44px;
             text-align: center;
             text-align: center;
 
 
-            color: #333230;
-            background: linear-gradient(135deg, #fdfb60 0%, #ff8f3e 100%);
+            color: @btnText;
+            background: linear-gradient(135deg, @prim 0%, @prim 100%);
             border-radius: 22px;
             border-radius: 22px;
         }
         }
         .van-button {
         .van-button {
@@ -443,7 +452,7 @@ export default {
             font-size: 34px;
             font-size: 34px;
             font-family: OSP;
             font-family: OSP;
             font-weight: normal;
             font-weight: normal;
-            color: #fdfb60;
+            color: @prim;
             line-height: 34px;
             line-height: 34px;
             // flex-grow: 1;
             // flex-grow: 1;
             margin: 0 10px;
             margin: 0 10px;

+ 10 - 2
src/views/Index.vue

@@ -1,7 +1,14 @@
 <template>
 <template>
     <div class="index">
     <div class="index">
         <router-view class="container" />
         <router-view class="container" />
-        <van-tabbar v-model="active" z-index="20" safe-area-inset-bottom route ref="tabbar">
+        <van-tabbar
+            :style="{ backgroundColor: tabColor }"
+            v-model="active"
+            z-index="20"
+            safe-area-inset-bottom
+            route
+            ref="tabbar"
+        >
             <van-tabbar-item replace v-for="item in menus" :name="item.name" :to="`/${item.name}`" :key="item.name">
             <van-tabbar-item replace v-for="item in menus" :name="item.name" :to="`/${item.name}`" :key="item.name">
                 <span>{{ item.title }}</span>
                 <span>{{ item.title }}</span>
                 <template #icon="props">
                 <template #icon="props">
@@ -47,7 +54,8 @@ export default {
     },
     },
     data() {
     data() {
         return {
         return {
-            menu: null
+            menu: null,
+            tabColor: ''
         };
         };
     }
     }
 };
 };

+ 14 - 12
src/views/Mine.vue

@@ -104,7 +104,7 @@
                     <van-icon :name="require('@assets/icon_yinhangka.png')" class="search-icon" />
                     <van-icon :name="require('@assets/icon_yinhangka.png')" class="search-icon" />
                 </template>
                 </template>
             </van-grid-item>
             </van-grid-item>
-            <van-grid-item text="我的积分" :to="{ path: '/minePoint' }">
+            <van-grid-item text="我的积分" @click="wait">
                 <template #icon>
                 <template #icon>
                     <van-icon :name="require('@assets/icon-jifen.png')" class="search-icon" />
                     <van-icon :name="require('@assets/icon-jifen.png')" class="search-icon" />
                 </template>
                 </template>
@@ -205,7 +205,7 @@ export default {
 <style lang="less" scoped>
 <style lang="less" scoped>
 .mine {
 .mine {
     padding-bottom: 100px;
     padding-bottom: 100px;
-    background-color: @bg3;
+    background-color: @bg;
 }
 }
 
 
 .top {
 .top {
@@ -223,7 +223,7 @@ export default {
         .text1 {
         .text1 {
             font-size: @font3;
             font-size: @font3;
             font-weight: bold;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
             img {
             img {
                 width: 18px;
                 width: 18px;
@@ -258,6 +258,7 @@ export default {
         span {
         span {
             font-size: @font3;
             font-size: @font3;
             line-height: 28px;
             line-height: 28px;
+            color: @text0;
         }
         }
     }
     }
 
 
@@ -289,7 +290,7 @@ export default {
         }
         }
         span {
         span {
             font-size: @font2;
             font-size: @font2;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
         }
         }
 
 
@@ -308,7 +309,7 @@ export default {
 /deep/ .van-grid-item {
 /deep/ .van-grid-item {
     .van-grid-item__text {
     .van-grid-item__text {
         font-size: @font1;
         font-size: @font1;
-        color: #ffffff;
+        color: @text0;
         line-height: 18px;
         line-height: 18px;
         margin-top: 4px;
         margin-top: 4px;
     }
     }
@@ -332,12 +333,13 @@ export default {
 }
 }
 
 
 .search-icon {
 .search-icon {
-    width: 24px;
-    height: 24px;
+    width: 28px;
+    height: 28px;
     // margin-right: 10px;
     // margin-right: 10px;
+    display: block;
     /deep/.van-icon__image {
     /deep/.van-icon__image {
-        width: 24px;
-        height: 24px;
+        width: 28px;
+        height: 28px;
         display: block;
         display: block;
     }
     }
 }
 }
@@ -373,7 +375,7 @@ export default {
             .flex();
             .flex();
             .text1 {
             .text1 {
                 font-size: @font2;
                 font-size: @font2;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
                 line-height: 24px;
                 margin-left: 6px;
                 margin-left: 6px;
             }
             }
@@ -395,7 +397,7 @@ export default {
                 width: 18px;
                 width: 18px;
                 height: 18px;
                 height: 18px;
             }
             }
-            color: #fff !important;
+            color: @text0 !important;
         }
         }
         .van-button + .van-button {
         .van-button + .van-button {
             margin-left: 10px;
             margin-left: 10px;
@@ -428,7 +430,7 @@ export default {
         .text1 {
         .text1 {
             font-size: @font3;
             font-size: @font3;
             font-weight: bold;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
             .flex();
             .flex();
             img {
             img {

+ 25 - 5
src/views/Store.vue

@@ -186,6 +186,7 @@ export default {
     mounted() {
     mounted() {
         this.$nextTick(() => {
         this.$nextTick(() => {
             this.stiky = this.$refs.top.$el.childNodes[0];
             this.stiky = this.$refs.top.$el.childNodes[0];
+            this.$el.parentNode.childNodes[1].style.backgroundColor = '#131313';
         });
         });
         this.checkLogin();
         this.checkLogin();
     },
     },
@@ -279,7 +280,7 @@ export default {
 .top {
 .top {
     display: flex;
     display: flex;
     padding: 10px 16px;
     padding: 10px 16px;
-    background-color: @bg;
+    background-color: #181818;
     .top-btn {
     .top-btn {
         flex-grow: 1;
         flex-grow: 1;
         .btn {
         .btn {
@@ -287,6 +288,7 @@ export default {
             line-height: 26px;
             line-height: 26px;
             display: inline-block;
             display: inline-block;
             vertical-align: text-bottom;
             vertical-align: text-bottom;
+            color: #fff;
 
 
             &.active {
             &.active {
                 color: @prim;
                 color: @prim;
@@ -306,6 +308,10 @@ export default {
         }
         }
     }
     }
 }
 }
+
+.van-tabs {
+    background-color: #181818;
+}
 .select {
 .select {
     position: absolute;
     position: absolute;
     right: 16px;
     right: 16px;
@@ -318,7 +324,7 @@ export default {
 // }
 // }
 
 
 .discover {
 .discover {
-    background-color: @bg3;
+    background-color: #0f0f0f;
     min-height: 100vh;
     min-height: 100vh;
     box-sizing: border-box;
     box-sizing: border-box;
 }
 }
@@ -351,9 +357,6 @@ export default {
     padding: 8px 8px 100px;
     padding: 8px 8px 100px;
 }
 }
 
 
-.van-tabs {
-    background-color: @bg;
-}
 .tab {
 .tab {
     position: relative;
     position: relative;
     padding-right: 14px;
     padding-right: 14px;
@@ -370,4 +373,21 @@ export default {
         }
         }
     }
     }
 }
 }
+/deep/.coupon {
+    &::after {
+        background-color: #181818;
+    }
+
+    .coupon-bottom {
+        &::before,
+        &::after {
+            background-color: #0f0f0f;
+        }
+    }
+    .btn {
+        &::after {
+            background-color: #181818;
+        }
+    }
+}
 </style>
 </style>

+ 47 - 41
src/views/Submit.vue

@@ -1,39 +1,41 @@
 <template>
 <template>
-    <div class="submit">
-        <div class="pageTitle">{{ info.minter }}</div>
-        <div class="product">
-            <van-image width="80" height="80" :radius="6" :src="getImg(changeImgs(info.pic))" fit="cover" />
-            <div class="product-content">
-                <div class="text1">
-                    {{ info.name }}
+    <div class="page">
+        <div class="submit">
+            <div class="pageTitle">{{ info.minter }}</div>
+            <div class="product">
+                <van-image width="80" height="80" :radius="6" :src="getImg(changeImgs(info.pic))" fit="cover" />
+                <div class="product-content">
+                    <div class="text1">
+                        {{ info.name }}
+                    </div>
+                    <div class="no">{{ info.number }}</div>
+                    <div class="price">¥{{ info.price }}</div>
                 </div>
                 </div>
-                <div class="no">{{ info.number }}</div>
-                <div class="price">¥{{ info.price }}</div>
             </div>
             </div>
-        </div>
 
 
-        <div class="list">
-            <div class="info">
-                <div class="text1">作品费用</div>
-                <div class="text2">¥{{ info.price }}</div>
-            </div>
-            <div class="info">
-                <div class="text1">GAS费用</div>
-                <div class="text2">¥{{ gas }}</div>
-            </div>
-            <div v-if="couponList.length > 0" class="info" :class="{ not: !couponInfo }" @click="goCoupon">
-                <div class="text1">藏品兑换券</div>
-                <div class="text2">{{ couponInfo ? '已选择兑换券' : '请选择' }}</div>
-                <img class="inter" src="@assets/icon_inter.png" alt="" />
-            </div>
+            <div class="list">
+                <div class="info">
+                    <div class="text1">作品费用</div>
+                    <div class="text2">¥{{ info.price }}</div>
+                </div>
+                <div class="info">
+                    <div class="text1">GAS费用</div>
+                    <div class="text2">¥{{ gas }}</div>
+                </div>
+                <div v-if="couponList.length > 0" class="info" :class="{ not: !couponInfo }" @click="goCoupon">
+                    <div class="text1">藏品兑换券</div>
+                    <div class="text2">{{ couponInfo ? '已选择兑换券' : '请选择' }}</div>
+                    <img class="inter" src="@assets/icon_inter.png" alt="" />
+                </div>
 
 
-            <!-- <van-field type="text" label="订单留言" placeholder="选填" v-model="message" /> -->
+                <!-- <van-field type="text" label="订单留言" placeholder="选填" v-model="message" /> -->
 
 
-            <div class="pay">
-                <div class="pay-item" @click="payType = item.type" v-for="(item, index) in payInfos" :key="index">
-                    <img :src="item.icon" alt="" />
-                    <span>{{ item.name }}</span>
-                    <img class="choose-icon" :src="payType === item.type ? icons[1] : icons[0]" alt="" />
+                <div class="pay">
+                    <div class="pay-item" @click="payType = item.type" v-for="(item, index) in payInfos" :key="index">
+                        <img :src="item.icon" alt="" />
+                        <span>{{ item.name }}</span>
+                        <img class="choose-icon" :src="payType === item.type ? icons[1] : icons[0]" alt="" />
+                    </div>
                 </div>
                 </div>
             </div>
             </div>
         </div>
         </div>
@@ -351,13 +353,17 @@ export default {
 </script>
 </script>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
+.page {
+    background-color: @bg3;
+}
 .submit {
 .submit {
     padding: 20px 16px;
     padding: 20px 16px;
+    background-color: @bg;
 }
 }
 
 
 .pageTitle {
 .pageTitle {
     font-size: 14px;
     font-size: 14px;
-    color: #ffffff;
+    color: @text0;
     line-height: 22px;
     line-height: 22px;
 }
 }
 
 
@@ -366,10 +372,10 @@ export default {
     align-items: center;
     align-items: center;
     justify-content: space-between;
     justify-content: space-between;
     height: 60px;
     height: 60px;
-    border-bottom: 1px solid #202122;
+    border-bottom: 1px solid @tabBorder;
     .text1 {
     .text1 {
         font-size: 14px;
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
         flex-grow: 1;
         flex-grow: 1;
     }
     }
@@ -403,7 +409,7 @@ export default {
 .product {
 .product {
     display: flex;
     display: flex;
     padding: 12px 0 20px;
     padding: 12px 0 20px;
-    border-bottom: 1px solid #202122;
+    border-bottom: 1px solid @tabBorder;
     .product-content {
     .product-content {
         flex-grow: 1;
         flex-grow: 1;
         margin-left: 10px;
         margin-left: 10px;
@@ -420,14 +426,14 @@ export default {
         .text1 {
         .text1 {
             font-size: @font2;
             font-size: @font2;
             font-weight: bold;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
         }
         }
 
 
         .price {
         .price {
             font-size: @font2;
             font-size: @font2;
             font-weight: bold;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
         }
         }
     }
     }
@@ -437,7 +443,7 @@ export default {
     padding: 20px 0;
     padding: 20px 0;
     .van-field__label {
     .van-field__label {
         font-size: 14px;
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
     }
     }
     .van-field__control {
     .van-field__control {
@@ -450,11 +456,11 @@ export default {
     display: flex;
     display: flex;
     align-items: center;
     align-items: center;
     height: 60px;
     height: 60px;
-    border-top: 1px solid #202122;
+    border-bottom: 1px solid @tabBorder;
     span {
     span {
         font-size: 14px;
         font-size: 14px;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
         flex-grow: 1;
         flex-grow: 1;
         padding: 0 10px;
         padding: 0 10px;
@@ -472,7 +478,7 @@ export default {
     right: 0;
     right: 0;
     background-color: @bg;
     background-color: @bg;
     z-index: 20;
     z-index: 20;
-    border-top: 1px solid #313233;
+    border-top: 1px solid @tabBorder;
 
 
     .bottom-content {
     .bottom-content {
         padding: 6px 16px;
         padding: 6px 16px;
@@ -486,7 +492,7 @@ export default {
         }
         }
         .van-button {
         .van-button {
             flex-grow: 1;
             flex-grow: 1;
-            color: #333230 !important;
+            color: @btnText !important;
             max-width: 132px;
             max-width: 132px;
         }
         }
         .text {
         .text {

+ 4 - 4
src/views/account/About.vue

@@ -31,19 +31,19 @@ export default {
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
 .title {
 .title {
-    background-color: #181818;
+    background-color: @bg;
     padding: 10px 16px;
     padding: 10px 16px;
     font-size: 20px;
     font-size: 20px;
     font-weight: bold;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 30px;
     line-height: 30px;
 }
 }
 .page {
 .page {
-    background-color: #0f0f0f;
+    background-color: @bg3;
 }
 }
 
 
 .van-cell-group {
 .van-cell-group {
-    background-color: #181818;
+    background-color: @bg;
 }
 }
 .van-cell {
 .van-cell {
     padding: 23px 16px;
     padding: 23px 16px;

+ 2 - 2
src/views/account/Agreement.vue

@@ -27,11 +27,11 @@ export default {
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
 .page {
 .page {
-    background-color: #0f0f0f;
+    background-color: @bg3;
     padding: 16px;
     padding: 16px;
 }
 }
 /deep/.content {
 /deep/.content {
-    background: #181818;
+    background: @bg;
     border-radius: 8px;
     border-radius: 8px;
     padding: 16px;
     padding: 16px;
     .align-center {
     .align-center {

+ 7 - 6
src/views/account/Authentication.vue

@@ -73,6 +73,7 @@ export default {
 <style lang="less" scoped>
 <style lang="less" scoped>
 .container {
 .container {
     padding: 0 16px;
     padding: 0 16px;
+    background-color: @bg3;
     .btn {
     .btn {
         width: 80px;
         width: 80px;
         height: 34px;
         height: 34px;
@@ -87,7 +88,7 @@ export default {
         height: 42px;
         height: 42px;
         font-size: 20px;
         font-size: 20px;
         font-weight: 400;
         font-weight: 400;
-        color: #ffffff;
+        color: @text0;
         line-height: 42px;
         line-height: 42px;
         padding-top: 10px;
         padding-top: 10px;
     }
     }
@@ -122,7 +123,7 @@ export default {
             font-size: 16px;
             font-size: 16px;
             font-weight: bold;
             font-weight: bold;
             margin: 0 50px 0 16px;
             margin: 0 50px 0 16px;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
         }
         }
     }
     }
@@ -133,7 +134,7 @@ export default {
     .auth {
     .auth {
         .flex();
         .flex();
         position: relative;
         position: relative;
-        background: #1f2021;
+        background: @bg;
         height: 88px;
         height: 88px;
         padding: 0 30px;
         padding: 0 30px;
         border-radius: 8px;
         border-radius: 8px;
@@ -162,7 +163,7 @@ export default {
         &.active {
         &.active {
             background: linear-gradient(135deg, @prim, @warn);
             background: linear-gradient(135deg, @prim, @warn);
             .text1 {
             .text1 {
-                color: #fff;
+                color: @text0;
             }
             }
         }
         }
 
 
@@ -173,7 +174,7 @@ export default {
             top: 1px;
             top: 1px;
             right: 1px;
             right: 1px;
             bottom: 1px;
             bottom: 1px;
-            background: #1f2021;
+            background: @bg;
             z-index: 0;
             z-index: 0;
             border-radius: 8px;
             border-radius: 8px;
         }
         }
@@ -186,7 +187,7 @@ export default {
     margin: 40px 48px;
     margin: 40px 48px;
     .van-button {
     .van-button {
         background: linear-gradient(135deg, @prim 0%, @warn 100%);
         background: linear-gradient(135deg, @prim 0%, @warn 100%);
-        color: #333230;
+        color: @btnText;
         font-size: @font2;
         font-size: @font2;
         border-width: 0px;
         border-width: 0px;
     }
     }

+ 2 - 2
src/views/account/ChangePhone.vue

@@ -182,7 +182,7 @@ export default {
         &.active {
         &.active {
             font-size: 24px;
             font-size: 24px;
             font-weight: bold;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 33px;
             line-height: 33px;
         }
         }
     }
     }
@@ -222,7 +222,7 @@ export default {
 
 
     .del {
     .del {
         margin-top: 20px;
         margin-top: 20px;
-        border-color: #ffffff;
+        border-color: @text0;
     }
     }
 
 
     .sure {
     .sure {

+ 4 - 4
src/views/account/Connect.vue

@@ -23,19 +23,19 @@ export default {
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
 .title {
 .title {
-    background-color: #181818;
+    background-color: @bg;
     padding: 10px 16px;
     padding: 10px 16px;
     font-size: 20px;
     font-size: 20px;
     font-weight: bold;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 30px;
     line-height: 30px;
 }
 }
 .page {
 .page {
-    background-color: #0f0f0f;
+    background-color: @bg3;;
 }
 }
 
 
 .van-cell-group {
 .van-cell-group {
-    background-color: #181818;
+    background-color: @bg;
 }
 }
 .van-cell {
 .van-cell {
     padding: 23px 16px;
     padding: 23px 16px;

+ 2 - 2
src/views/account/Forget.vue

@@ -168,7 +168,7 @@ export default {
         &.active {
         &.active {
             font-size: 24px;
             font-size: 24px;
             font-weight: bold;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 33px;
             line-height: 33px;
         }
         }
     }
     }
@@ -201,7 +201,7 @@ export default {
 
 
     .del {
     .del {
         margin-top: 20px;
         margin-top: 20px;
-        border-color: #ffffff;
+        border-color: @text0;
     }
     }
 
 
     .sure {
     .sure {

+ 2 - 2
src/views/account/Login.vue

@@ -201,7 +201,7 @@ export default {
         &.active {
         &.active {
             font-size: 24px;
             font-size: 24px;
             font-weight: bold;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 33px;
             line-height: 33px;
         }
         }
     }
     }
@@ -235,7 +235,7 @@ export default {
 
 
     .del {
     .del {
         margin-top: 20px;
         margin-top: 20px;
-        border-color: #ffffff;
+        border-color: @text0;
     }
     }
 
 
     .sure {
     .sure {

+ 2 - 2
src/views/account/Register.vue

@@ -185,7 +185,7 @@ export default {
         &.active {
         &.active {
             font-size: 24px;
             font-size: 24px;
             font-weight: bold;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 33px;
             line-height: 33px;
         }
         }
     }
     }
@@ -218,7 +218,7 @@ export default {
 
 
     .del {
     .del {
         margin-top: 20px;
         margin-top: 20px;
-        border-color: #ffffff;
+        border-color: @text0;
     }
     }
 
 
     .sure {
     .sure {

+ 7 - 4
src/views/account/Security.vue

@@ -32,19 +32,19 @@ export default {
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
 .title {
 .title {
-    background-color: #181818;
+    background-color: @bg;
     padding: 10px 16px;
     padding: 10px 16px;
     font-size: 20px;
     font-size: 20px;
     font-weight: bold;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 30px;
     line-height: 30px;
 }
 }
 .page {
 .page {
-    background-color: #0f0f0f;
+    background-color: @bg3;
 }
 }
 
 
 .van-cell-group {
 .van-cell-group {
-    background-color: #181818;
+    background-color: @bg;
 }
 }
 .van-cell {
 .van-cell {
     padding: 23px 16px;
     padding: 23px 16px;
@@ -52,4 +52,7 @@ export default {
 .logout {
 .logout {
     padding: 50px 30px 50px;
     padding: 50px 30px 50px;
 }
 }
+.van-button {
+    border-width: 1px;
+}
 </style>
 </style>

+ 3 - 3
src/views/account/Setting.vue

@@ -129,7 +129,7 @@ export default {
 .tabs {
 .tabs {
     font-size: 20px;
     font-size: 20px;
     font-weight: bold;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 30px;
     line-height: 30px;
     padding: 0 16px;
     padding: 0 16px;
 }
 }
@@ -156,7 +156,7 @@ export default {
     .van-cell__value {
     .van-cell__value {
         span {
         span {
             font-size: 16px;
             font-size: 16px;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
         }
         }
     }
     }
@@ -176,7 +176,7 @@ export default {
         .van-cell__value {
         .van-cell__value {
             span {
             span {
                 font-size: 13px;
                 font-size: 13px;
-                color: #fff;
+                color: @text0;
                 line-height: 24px;
                 line-height: 24px;
                 display: -webkit-box;
                 display: -webkit-box;
                 overflow: hidden;
                 overflow: hidden;

+ 3 - 3
src/views/account/TradingPassword.vue

@@ -180,7 +180,7 @@ export default {
         &.active {
         &.active {
             font-size: 24px;
             font-size: 24px;
             font-weight: bold;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 33px;
             line-height: 33px;
         }
         }
     }
     }
@@ -220,7 +220,7 @@ export default {
 
 
     .del {
     .del {
         margin-top: 20px;
         margin-top: 20px;
-        border-color: #ffffff;
+        border-color: @text0;
     }
     }
 
 
     .sure {
     .sure {
@@ -279,7 +279,7 @@ export default {
     margin-top: 20px;
     margin-top: 20px;
     .text1 {
     .text1 {
         font-size: 14px;
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
         margin-bottom: 6px;
         margin-bottom: 6px;
     }
     }

+ 6 - 6
src/views/account/Verified.vue

@@ -195,7 +195,7 @@ export default {
     .text1 {
     .text1 {
         font-size: 20px;
         font-size: 20px;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
         line-height: 30px;
     }
     }
     .text2 {
     .text2 {
@@ -211,7 +211,7 @@ export default {
     }
     }
 }
 }
 .van-cell::after {
 .van-cell::after {
-    border-bottom-color: #202122;
+    border-bottom-color: @tabBorder;
 }
 }
 
 
 .icon {
 .icon {
@@ -236,7 +236,7 @@ export default {
     .van-field__label {
     .van-field__label {
         font-size: 14px;
         font-size: 14px;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
         margin-top: 25px;
         margin-top: 25px;
     }
     }
@@ -246,7 +246,7 @@ export default {
 
 
     .del {
     .del {
         margin-top: 20px;
         margin-top: 20px;
-        border-color: #ffffff;
+        border-color: @text0;
     }
     }
 
 
     .sure {
     .sure {
@@ -270,7 +270,7 @@ export default {
     .img-label {
     .img-label {
         font-size: 14px;
         font-size: 14px;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 20px;
         line-height: 20px;
         margin: 5px 12px 5px 0;
         margin: 5px 12px 5px 0;
         min-width: 86px;
         min-width: 86px;
@@ -315,6 +315,6 @@ export default {
 
 
 /deep/.van-field__control {
 /deep/.van-field__control {
     font-size: @font1 !important;
     font-size: @font1 !important;
-    color: @text3;
+    color: @text0;
 }
 }
 </style>
 </style>

+ 2 - 2
src/views/account/VerifiedSuc.vue

@@ -115,7 +115,7 @@ export default {
     .text1 {
     .text1 {
         font-size: 20px;
         font-size: 20px;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
         line-height: 30px;
     }
     }
     .text2 {
     .text2 {
@@ -161,7 +161,7 @@ export default {
             right: 0px;
             right: 0px;
             bottom: 0;
             bottom: 0;
             height: 1px;
             height: 1px;
-            background-color: #202122;
+            background-color: @tabBorder;
         }
         }
     }
     }
 }
 }

+ 8 - 7
src/views/account/VerifiedSucs.vue

@@ -286,7 +286,7 @@ export default {
     .text1 {
     .text1 {
         font-size: 20px;
         font-size: 20px;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
         line-height: 30px;
     }
     }
     .text2 {
     .text2 {
@@ -319,13 +319,13 @@ export default {
     .name {
     .name {
         font-size: 14px;
         font-size: 14px;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
         margin-top: 20px;
         margin-top: 20px;
     }
     }
 }
 }
 .van-cell::after {
 .van-cell::after {
-    border-bottom-color: #202122;
+    border-bottom-color: @tabBorder;
 }
 }
 
 
 .icon {
 .icon {
@@ -350,7 +350,7 @@ export default {
     .van-field__label {
     .van-field__label {
         font-size: 14px;
         font-size: 14px;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
         margin-top: 25px;
         margin-top: 25px;
     }
     }
@@ -360,7 +360,7 @@ export default {
 
 
     .del {
     .del {
         margin-top: 20px;
         margin-top: 20px;
-        border-color: #ffffff;
+        border-color: @text0;
     }
     }
 
 
     .sure {
     .sure {
@@ -384,7 +384,7 @@ export default {
     .img-label {
     .img-label {
         font-size: 14px;
         font-size: 14px;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 20px;
         line-height: 20px;
         margin: 5px 12px 5px 0;
         margin: 5px 12px 5px 0;
         min-width: 86px;
         min-width: 86px;
@@ -401,6 +401,7 @@ export default {
         .van-uploader__upload {
         .van-uploader__upload {
             width: 160px;
             width: 160px;
             height: 160px;
             height: 160px;
+            background-color: @bg;
         }
         }
     }
     }
 }
 }
@@ -437,6 +438,6 @@ export default {
 }
 }
 /deep/.van-field__control {
 /deep/.van-field__control {
     font-size: @font1 !important;
     font-size: @font1 !important;
-    color: @text3;
+    color: @text0;
 }
 }
 </style>
 </style>

+ 3 - 1
src/views/account/Waiting.vue

@@ -25,6 +25,7 @@ export default {
             } else {
             } else {
                 return {};
                 return {};
             }
             }
+            // return this.info.PENDING;
         }
         }
     },
     },
     data() {
     data() {
@@ -55,6 +56,7 @@ export default {
     flex-direction: column;
     flex-direction: column;
     align-items: center;
     align-items: center;
     padding: 50px;
     padding: 50px;
+    background-color: @bg3;
 
 
     .img {
     .img {
         width: 110px;
         width: 110px;
@@ -63,7 +65,7 @@ export default {
 
 
     .title {
     .title {
         font-size: 20px;
         font-size: 20px;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
         line-height: 30px;
         margin-top: 38px;
         margin-top: 38px;
     }
     }

+ 1 - 1
src/views/activity/Detail.vue

@@ -34,7 +34,7 @@ export default {
 
 
 .name {
 .name {
     font-size: 14px;
     font-size: 14px;
-    color: #ffffff;
+    color: @text0;
     line-height: 24px;
     line-height: 24px;
     margin-bottom: 4px;
     margin-bottom: 4px;
 }
 }

+ 1 - 1
src/views/activity/List.vue

@@ -51,7 +51,7 @@ export default {
     display: block;
     display: block;
     .text1 {
     .text1 {
         font-size: 16px;
         font-size: 16px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
         margin-bottom: 12px;
         margin-bottom: 12px;
     }
     }

+ 39 - 32
src/views/asset/Consignment.vue

@@ -1,27 +1,29 @@
 <template>
 <template>
     <div class="top">
     <div class="top">
-        <div class="title">寄售说明</div>
-        <div class="name" v-for="(item, index) in list" :key="index">
-            <span>{{ item.title }}</span>
-        </div>
-        <div class="border border1"></div>
-        <div class="content">
-            <van-field type="number" label="寄售价格(元)" placeholder="请设置寄售价格" v-model="price" />
-        </div>
-        <div class="border"></div>
-        <div class="input">
-            <div class="text1">请输入交易密码,验证信息</div>
-            <div v-if="sets">
-                <van-password-input :value="password" :focused="showKeyboard" @focus="showKeyboard = true" />
-                <van-number-keyboard
-                    v-model="password"
-                    :show="showKeyboard"
-                    @blur="showKeyboard = false"
-                    maxlength="6"
-                />
-                <div class="text2" @click="$router.push('/tradingPassword')">忘记密码?</div>
+        <div class="top-content">
+            <div class="title">寄售说明</div>
+            <div class="name" v-for="(item, index) in list" :key="index">
+                <span>{{ item.title }}</span>
+            </div>
+            <div class="border border1"></div>
+            <div class="content">
+                <van-field type="number" label="寄售价格(元)" placeholder="请设置寄售价格" v-model="price" />
+            </div>
+            <div class="border"></div>
+            <div class="input">
+                <div class="text1">请输入交易密码,验证信息</div>
+                <div v-if="sets">
+                    <van-password-input :value="password" :focused="showKeyboard" @focus="showKeyboard = true" />
+                    <van-number-keyboard
+                        v-model="password"
+                        :show="showKeyboard"
+                        @blur="showKeyboard = false"
+                        maxlength="6"
+                    />
+                    <div class="text2" @click="$router.push('/tradingPassword')">忘记密码?</div>
+                </div>
+                <div v-else class="text3" @click="$router.push('/tradingPassword')">您当前没有交易密码,点击去设置</div>
             </div>
             </div>
-            <div v-else class="text3" @click="$router.push('/tradingPassword')">您当前没有交易密码,点击去设置</div>
         </div>
         </div>
         <div class="bottom van-safe-area-bottom" ref="bottom">
         <div class="bottom van-safe-area-bottom" ref="bottom">
             <van-notice-bar
             <van-notice-bar
@@ -143,7 +145,7 @@ export default {
     }
     }
 }
 }
 /deep/.van-number-keyboard__body {
 /deep/.van-number-keyboard__body {
-    background-color: #4a4a4a;
+    background-color: fade(#4a4a4a, 50%);
     .van-key {
     .van-key {
         background-color: @bg;
         background-color: @bg;
         &:active {
         &:active {
@@ -156,12 +158,17 @@ export default {
     padding: 20px 0;
     padding: 20px 0;
     .text1 {
     .text1 {
         font-size: @font2;
         font-size: @font2;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
         margin-bottom: 6px;
         margin-bottom: 6px;
     }
     }
 }
 }
+.top-content {
+    background-color: @bg;
+    padding-top: 10px;
+}
 .top {
 .top {
+    background-color: @bg3;
     /deep/ .van-password-input {
     /deep/ .van-password-input {
         margin: 10px 0;
         margin: 10px 0;
         padding: 0 25px;
         padding: 0 25px;
@@ -186,15 +193,15 @@ export default {
     /deep/.van-cell__title {
     /deep/.van-cell__title {
         font-size: @font2;
         font-size: @font2;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
     }
     }
-    // background-color: #0f0f0f;
+    // background-color: @bg3;;
     padding-bottom: 100px;
     padding-bottom: 100px;
     .title {
     .title {
         font-size: 20px;
         font-size: 20px;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
         line-height: 30px;
         margin-top: 5px;
         margin-top: 5px;
         padding-left: 16px;
         padding-left: 16px;
@@ -215,7 +222,7 @@ export default {
         right: 0;
         right: 0;
         background-color: @bg;
         background-color: @bg;
         z-index: 20;
         z-index: 20;
-        border-top: 1px solid #313233;
+        border-top: 1px solid @tabBorder;
 
 
         .bottom-content {
         .bottom-content {
             padding: 6px 16px;
             padding: 6px 16px;
@@ -238,8 +245,8 @@ export default {
                 line-height: 44px;
                 line-height: 44px;
                 text-align: center;
                 text-align: center;
 
 
-                color: #333230;
-                background: linear-gradient(135deg, #fdfb60 0%, #ff8f3e 100%);
+                color: @btnText;
+                background: linear-gradient(135deg, @prim 0%, @warn 100%);
                 border-radius: 22px;
                 border-radius: 22px;
             }
             }
             .van-button {
             .van-button {
@@ -258,7 +265,7 @@ export default {
     .border {
     .border {
         width: 375px;
         width: 375px;
         height: 5px;
         height: 5px;
-        background: #202122;
+        background: @bg3;
         &.border1 {
         &.border1 {
             margin-top: 20px;
             margin-top: 20px;
         }
         }
@@ -267,14 +274,14 @@ export default {
         width: 375px;
         width: 375px;
         height: 70px;
         height: 70px;
         line-height: 70px;
         line-height: 70px;
-        background: #19191b;
+        background: @bg;
     }
     }
     .input {
     .input {
         margin-top: 20px;
         margin-top: 20px;
         width: 100%;
         width: 100%;
         .text1 {
         .text1 {
             font-size: @font2;
             font-size: @font2;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
             margin-bottom: 6px;
             margin-bottom: 6px;
             text-align: center;
             text-align: center;

+ 19 - 7
src/views/asset/Detail.vue

@@ -174,7 +174,7 @@
                     </div>
                     </div>
                     <div v-else class="textName">铸造者未设置</div>
                     <div v-else class="textName">铸造者未设置</div>
                 </van-collapse-item>
                 </van-collapse-item>
-                <hash-code :info="info"></hash-code>
+                <hash-code :info="info" pageType="asset"></hash-code>
                 <van-collapse-item name="8" class="goods-info">
                 <van-collapse-item name="8" class="goods-info">
                     <template #title>
                     <template #title>
                         <div class="page-title"><img src="@assets/info_icon_jiaoyijilu1.png" alt="" />交易记录</div>
                         <div class="page-title"><img src="@assets/info_icon_jiaoyijilu1.png" alt="" />交易记录</div>
@@ -611,6 +611,7 @@ export default {
 <style lang="less" scoped>
 <style lang="less" scoped>
 .detail {
 .detail {
     padding-bottom: 100px;
     padding-bottom: 100px;
+    background-color: @bgProductDetail;
 }
 }
 /deep/ .van-collapse-item__content {
 /deep/ .van-collapse-item__content {
     background: #181818 !important;
     background: #181818 !important;
@@ -682,7 +683,7 @@ export default {
 }
 }
 .info {
 .info {
     // height: 164px;
     // height: 164px;
-    background-color: @bg;
+    background-color: @bgProductDetail;
     border-radius: 20px 20px 0 0;
     border-radius: 20px 20px 0 0;
     transform: translateY(-16px);
     transform: translateY(-16px);
     position: relative;
     position: relative;
@@ -769,6 +770,7 @@ export default {
     .van-cell__title {
     .van-cell__title {
         margin-left: 12px;
         margin-left: 12px;
         .text1 {
         .text1 {
+            color: #fff;
             font-size: @font1;
             font-size: @font1;
             line-height: 24px;
             line-height: 24px;
         }
         }
@@ -975,7 +977,7 @@ export default {
                 top: 1px;
                 top: 1px;
                 right: 1px;
                 right: 1px;
                 bottom: 1px;
                 bottom: 1px;
-                background-color: @bg;
+                background-color: @bgProductDetail;
                 z-index: 0;
                 z-index: 0;
                 border-radius: 4px;
                 border-radius: 4px;
             }
             }
@@ -1037,24 +1039,30 @@ export default {
         margin: 12px 16px 0 0;
         margin: 12px 16px 0 0;
         width: 94px;
         width: 94px;
         height: 32px;
         height: 32px;
-        color: #000;
+        color: @btnText;
         background: linear-gradient(48deg, @prim 0%, @warn 100%);
         background: linear-gradient(48deg, @prim 0%, @warn 100%);
         border-radius: 4px;
         border-radius: 4px;
         &.prim {
         &.prim {
             background: #202122;
             background: #202122;
             color: @text3;
             color: @text3;
+            .prive2 {
+                color: @text3;
+            }
         }
         }
 
 
         &.opened {
         &.opened {
             background: @bg;
             background: @bg;
             border: 1px solid #303133;
             border: 1px solid #303133;
+            .prive2 {
+                color: @text3;
+            }
         }
         }
     }
     }
     .prive2 {
     .prive2 {
         font-size: @font1;
         font-size: @font1;
         text-align: center;
         text-align: center;
         margin-left: 2px;
         margin-left: 2px;
-        color: @text3;
+        color: @btnText;
     }
     }
     .img {
     .img {
         text-align: center;
         text-align: center;
@@ -1101,7 +1109,7 @@ export default {
         left: 1px;
         left: 1px;
         right: 1px;
         right: 1px;
         bottom: 1px;
         bottom: 1px;
-        background-color: @bg;
+        background-color: @bgProductDetail;
         border-radius: 4px;
         border-radius: 4px;
         z-index: 0;
         z-index: 0;
     }
     }
@@ -1172,7 +1180,7 @@ export default {
     }
     }
     .van-button {
     .van-button {
         background: linear-gradient(135deg, @prim 0%, @warn 100%);
         background: linear-gradient(135deg, @prim 0%, @warn 100%);
-        color: #333230;
+        color: @btnText;
         font-size: @font2;
         font-size: @font2;
         border-width: 0px;
         border-width: 0px;
     }
     }
@@ -1355,6 +1363,7 @@ export default {
 }
 }
 .goods {
 .goods {
     // padding: 0 16px 0px;
     // padding: 0 16px 0px;
+    background-color: #1c1c1c;
 
 
     .page-title {
     .page-title {
         font-size: @font2;
         font-size: @font2;
@@ -1382,6 +1391,9 @@ export default {
         &::after {
         &::after {
             content: none;
             content: none;
         }
         }
+        &:active {
+            background-color: @bgProductDetail;
+        }
     }
     }
 }
 }
 
 

+ 8 - 8
src/views/asset/GiveSearch.vue

@@ -94,16 +94,16 @@ export default {
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
 .search {
 .search {
-    background-color: #0f0f0f;
+    background-color: @bg3;
     padding-bottom: 100px;
     padding-bottom: 100px;
     .title {
     .title {
         font-size: 20px;
         font-size: 20px;
         font-weight: bold;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
         line-height: 30px;
         padding-top: 5px;
         padding-top: 5px;
         padding-left: 16px;
         padding-left: 16px;
-        background-color: #181818;
+        background-color: @bg;
     }
     }
     .name {
     .name {
         font-size: 12px;
         font-size: 12px;
@@ -111,10 +111,10 @@ export default {
         color: @text3;
         color: @text3;
         line-height: 22px;
         line-height: 22px;
         padding-left: 16px;
         padding-left: 16px;
-        background-color: #181818;
+        background-color: @bg;
     }
     }
     span {
     span {
-        color: #fdfb60;
+        color: @prim;
     }
     }
     .content {
     .content {
         // padding: 0px 16px;
         // padding: 0px 16px;
@@ -138,7 +138,7 @@ export default {
             .text1 {
             .text1 {
                 font-size: @font2;
                 font-size: @font2;
                 font-weight: bold;
                 font-weight: bold;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
                 line-height: 24px;
                 margin-bottom: 5px;
                 margin-bottom: 5px;
             }
             }
@@ -148,7 +148,7 @@ export default {
                 line-height: 24px;
                 line-height: 24px;
             }
             }
             span {
             span {
-                color: #ffffff;
+                color: @text0;
             }
             }
         }
         }
     }
     }
@@ -160,7 +160,7 @@ export default {
     color: @prim;
     color: @prim;
 }
 }
 .top {
 .top {
-    background-color: #181818;
+    background-color: @bg;
     padding: 0 16px;
     padding: 0 16px;
     height: 50px;
     height: 50px;
     display: flex;
     display: flex;

+ 26 - 2
src/views/asset/Search.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-    <div class="discover">
+    <div class="discover" :style="{ backgroundColor: isSearch ? $colors.bg3 : $colors.bg }">
         <van-sticky ref="top" :offset-top="bar.value.show ? 46 : 0">
         <van-sticky ref="top" :offset-top="bar.value.show ? 46 : 0">
             <van-search
             <van-search
                 ref="top"
                 ref="top"
@@ -133,6 +133,23 @@ export default {
         }
         }
     }
     }
 }
 }
+/deep/.van-search {
+    .van-field__left-icon {
+        display: flex;
+        align-items: center;
+    }
+    .van-icon {
+        display: flex;
+        align-items: center;
+    }
+    .van-field__control {
+        color: @text0;
+    }
+
+    .van-search__action {
+        color: @text4;
+    }
+}
 .select {
 .select {
     position: absolute;
     position: absolute;
     right: 16px;
     right: 16px;
@@ -263,9 +280,16 @@ export default {
             line-height: 22px;
             line-height: 22px;
             padding: 0 12px;
             padding: 0 12px;
             margin: 6px 16px 0 0;
             margin: 6px 16px 0 0;
-            background: rgba(39, 40, 40, 0.6);
+            background: @hotBg;
             border-radius: 12px;
             border-radius: 12px;
         }
         }
     }
     }
 }
 }
+
+/deep/.product {
+    background-color: @bg;
+    .name {
+        color: @text0!important;
+    }
+}
 </style>
 </style>

+ 14 - 6
src/views/creator/Detail.vue

@@ -280,17 +280,18 @@ export default {
     margin-right: 26px !important;
     margin-right: 26px !important;
 }
 }
 .mine {
 .mine {
-    background-color: #0f0f0f;
+    background-color: @bg3;
 }
 }
 .userInfo {
 .userInfo {
     padding-top: 35vw;
     padding-top: 35vw;
     position: relative;
     position: relative;
+    background-color: @bg;
 
 
     .history {
     .history {
         position: absolute;
         position: absolute;
         right: 16px;
         right: 16px;
         font-size: @font1;
         font-size: @font1;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
         padding: 0 10px;
         padding: 0 10px;
         background-color: fade(@bg, 80%);
         background-color: fade(@bg, 80%);
@@ -337,7 +338,7 @@ export default {
             justify-content: flex-end;
             justify-content: flex-end;
             .text1 {
             .text1 {
                 font-size: @font2;
                 font-size: @font2;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
                 line-height: 24px;
                 margin-left: 6px;
                 margin-left: 6px;
             }
             }
@@ -364,7 +365,7 @@ export default {
         .follow {
         .follow {
             border: solid 0px transparent;
             border: solid 0px transparent;
             padding: 1px;
             padding: 1px;
-            background-image: linear-gradient(@bg, @bg), linear-gradient(135deg, #fdfb60, #ff8f3e);
+            background-image: linear-gradient(@bg, @bg), linear-gradient(135deg, @prim, @warn);
             background-origin: border-box;
             background-origin: border-box;
             box-sizing: border-box;
             box-sizing: border-box;
             background-clip: content-box, border-box;
             background-clip: content-box, border-box;
@@ -406,7 +407,7 @@ export default {
         .text1 {
         .text1 {
             font-size: @font3;
             font-size: @font3;
             font-weight: bold;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             line-height: 24px;
             .flex();
             .flex();
 
 
@@ -436,7 +437,7 @@ export default {
     align-items: center;
     align-items: center;
     padding: 0 16px;
     padding: 0 16px;
     // border-bottom: 1px solid #202122;
     // border-bottom: 1px solid #202122;
-    background-color: transparent;
+    background-color: @bg;
     .menu-item {
     .menu-item {
         font-size: 16px;
         font-size: 16px;
         color: @text3;
         color: @text3;
@@ -456,6 +457,13 @@ export default {
         }
         }
     }
     }
 }
 }
+.van-tabs {
+    background-color: @bg;
+}
+
+/deep/.van-tabs__nav--line.van-tabs__nav--complete {
+    border-color: @tabBorder;
+}
 
 
 .list {
 .list {
     padding: 8px 8px 100px;
     padding: 8px 8px 100px;

+ 16 - 2
src/views/creator/List.vue

@@ -85,11 +85,14 @@ export default {
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
 .follow {
 .follow {
-    background-color: #0f0f0f;
+    background-color: @bg3;
     padding-bottom: 100px;
     padding-bottom: 100px;
 }
 }
+/deep/.van-tabs__nav--line.van-tabs__nav--complete {
+    border-color: @tabBorder;
+}
 .top {
 .top {
-    background-color: #181818;
+    background-color: @bg;
     padding: 0 16px;
     padding: 0 16px;
     height: 50px;
     height: 50px;
     display: flex;
     display: flex;
@@ -129,4 +132,15 @@ export default {
 .van-tabs {
 .van-tabs {
     background-color: @bg;
     background-color: @bg;
 }
 }
+.info {
+    background-color: @bg;
+
+    /deep/.van-button--mini {
+        background-image: linear-gradient(@bg, @bg), linear-gradient(135deg, @prim, @warn) !important;
+
+        &.follow {
+            background-image: linear-gradient(@bg, @bg), linear-gradient(135deg, @text3, @text3) !important;
+        }
+    }
+}
 </style>
 </style>

+ 23 - 5
src/views/creator/Search.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-    <div class="search">
+    <div class="search" :style="{ backgroundColor: isSearch ? $colors.bg3 : $colors.bg }">
         <van-sticky ref="top" :offset-top="bar.value.show ? 46 : 0">
         <van-sticky ref="top" :offset-top="bar.value.show ? 46 : 0">
             <van-search
             <van-search
                 ref="top"
                 ref="top"
@@ -80,11 +80,11 @@ export default {
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
 .search {
 .search {
-    background-color: #0f0f0f;
+    background-color: @bg3;
     padding-bottom: 100px;
     padding-bottom: 100px;
 }
 }
 .top {
 .top {
-    background-color: #181818;
+    background-color: @bg3;
     padding: 0 16px;
     padding: 0 16px;
     height: 50px;
     height: 50px;
     display: flex;
     display: flex;
@@ -148,6 +148,13 @@ export default {
         display: flex;
         display: flex;
         align-items: center;
         align-items: center;
     }
     }
+    .van-field__control {
+        color: @text0;
+    }
+
+    .van-search__action {
+        color: @text4;
+    }
 }
 }
 
 
 .hot-content {
 .hot-content {
@@ -163,13 +170,24 @@ export default {
         span {
         span {
             display: inline-block;
             display: inline-block;
             font-size: @font1;
             font-size: @font1;
-            color: @text3;
+            color: @text4;
             line-height: 22px;
             line-height: 22px;
             padding: 0 12px;
             padding: 0 12px;
             margin: 6px 16px 0 0;
             margin: 6px 16px 0 0;
-            background: rgba(39, 40, 40, 0.6);
+            background: @hotBg;
             border-radius: 12px;
             border-radius: 12px;
         }
         }
     }
     }
 }
 }
+.info {
+    background-color: @bg;
+
+    /deep/.van-button--mini {
+        background-image: linear-gradient(@bg, @bg), linear-gradient(135deg, @prim, @warn) !important;
+
+        &.follow {
+            background-image: linear-gradient(@bg, @bg), linear-gradient(135deg, @text3, @text3) !important;
+        }
+    }
+}
 </style>
 </style>

+ 9 - 0
src/views/order/CouponList.vue

@@ -91,4 +91,13 @@ export default {
     border-color: #ebebeb50;
     border-color: #ebebeb50;
     margin: 32px 8px 8px;
     margin: 32px 8px 8px;
 }
 }
+
+/deep/.coupon {
+    .coupon-bottom {
+        &::before,
+        &::after {
+            background-color: @bg3;
+        }
+    }
+}
 </style>
 </style>

+ 76 - 69
src/views/order/Detail.vue

@@ -1,76 +1,78 @@
 <template>
 <template>
     <div class="order">
     <div class="order">
-        <div class="order-top">
-            <div class="text1">{{ getLabelName(info.status, statusOptions) }}</div>
-            <div class="text2">
-                {{
-                    info.status === 'FINISH'
-                        ? '交易成功啦!交易后的藏品将在您的藏品室中展示'
-                        : '支付成功,等待平台确认交易'
-                }}
+        <div class="order-content">
+            <div class="order-top">
+                <div class="text1">{{ getLabelName(info.status, statusOptions) }}</div>
+                <div class="text2">
+                    {{
+                        info.status === 'FINISH'
+                            ? '交易成功啦!交易后的藏品将在您的藏品室中展示'
+                            : '支付成功,等待平台确认交易'
+                    }}
+                </div>
             </div>
             </div>
-        </div>
-        <driver />
-        <div class="product">
-            <div class="product-name">{{ info.minter }}</div>
-            <div class="product-info">
-                <van-image :radius="6" width="80" height="80" :src="getImg(changeImgs(info.pic))" fit="cover" />
-                <div class="product-content">
-                    <div class="text1 van-multi-ellipsis--l2">{{ info.name }}</div>
-                    <div class="text2" v-if="info.number">编号:{{ info.number }}</div>
-                    <div class="flex1"></div>
-                    <div class="price">¥{{ info.price }}</div>
+            <driver />
+            <div class="product">
+                <div class="product-name">{{ info.minter }}</div>
+                <div class="product-info">
+                    <van-image :radius="6" width="80" height="80" :src="getImg(changeImgs(info.pic))" fit="cover" />
+                    <div class="product-content">
+                        <div class="text1 van-multi-ellipsis--l2">{{ info.name }}</div>
+                        <div class="text2" v-if="info.number">编号:{{ info.number }}</div>
+                        <div class="flex1"></div>
+                        <div class="price">¥{{ info.price }}</div>
+                    </div>
                 </div>
                 </div>
             </div>
             </div>
-        </div>
-        <div class="info-item">
-            <div class="text1">作品费用</div>
-            <div class="text1">¥{{ info.price }}</div>
-        </div>
-        <div class="info-item">
-            <div class="text1">GAS费用</div>
-            <div class="text1">¥{{ info.gasPrice }}</div>
-        </div>
-        <div class="info-item" v-if="info.couponId">
-            <div class="text1">藏品兑换券</div>
-            <div class="text1 prim">已选择兑换券</div>
-        </div>
-        <div class="info-item">
-            <div class="text1">实际支付</div>
-            <div class="text1 prim" style="font-weight: bold">¥{{ info.couponId ? 0 : info.totalPrice }}</div>
-        </div>
-        <div class="info-item" v-if="info.txHash">
-            <div class="text1">链上hash</div>
-            <div class="van-ellipsis" style="width: 120px">{{ getShort(info.txHash) }}</div>
-        </div>
+            <div class="info-item">
+                <div class="text1">作品费用</div>
+                <div class="text1">¥{{ info.price }}</div>
+            </div>
+            <div class="info-item">
+                <div class="text1">GAS费用</div>
+                <div class="text1">¥{{ info.gasPrice }}</div>
+            </div>
+            <div class="info-item" v-if="info.couponId">
+                <div class="text1">藏品兑换券</div>
+                <div class="text1 prim">已选择兑换券</div>
+            </div>
+            <div class="info-item">
+                <div class="text1">实际支付</div>
+                <div class="text1 prim" style="font-weight: bold">¥{{ info.couponId ? 0 : info.totalPrice }}</div>
+            </div>
+            <div class="info-item" v-if="info.txHash">
+                <div class="text1">链上hash</div>
+                <div class="van-ellipsis">{{ getShort(info.txHash) }}</div>
+            </div>
 
 
-        <div class="info-item" v-if="info.gasUsed">
-            <div class="text1">消耗gas</div>
-            <div class="text1">{{ info.gasUsed }}</div>
-        </div>
+            <div class="info-item" v-if="info.gasUsed">
+                <div class="text1">消耗gas</div>
+                <div class="text1">{{ info.gasUsed }}</div>
+            </div>
 
 
-        <div class="info-item">
-            <div class="text1">支付方式</div>
-            <div class="text1">{{ getLabelName(info.payMethod, payMethodOptions) }}支付</div>
-        </div>
+            <div class="info-item">
+                <div class="text1">支付方式</div>
+                <div class="text1">{{ getLabelName(info.payMethod, payMethodOptions) }}支付</div>
+            </div>
 
 
-        <div class="tips-item">
-            <div class="text1">订单编号</div>
-            <div class="text2">
-                <van-button @click="copy" color="#939599" plain size="mini">复制</van-button>
-                <span>{{ info.id }}</span>
+            <div class="tips-item">
+                <div class="text1">订单编号</div>
+                <div class="text2">
+                    <van-button @click="copy" color="#939599" plain size="mini">复制</van-button>
+                    <span>{{ info.id }}</span>
+                </div>
             </div>
             </div>
-        </div>
-        <div class="tips-item">
-            <div class="text1">创建时间</div>
-            <div class="text2">
-                {{ info.createdAt }}
+            <div class="tips-item">
+                <div class="text1">创建时间</div>
+                <div class="text2">
+                    {{ info.createdAt }}
+                </div>
             </div>
             </div>
-        </div>
-        <div class="tips-item">
-            <div class="text1">付款时间</div>
-            <div class="text2">
-                {{ info.payTime }}
+            <div class="tips-item">
+                <div class="text1">付款时间</div>
+                <div class="text2">
+                    {{ info.payTime }}
+                </div>
             </div>
             </div>
         </div>
         </div>
         <order-open ref="box" :imgSrc="getImg(changeImgs(info.pic))"></order-open>
         <order-open ref="box" :imgSrc="getImg(changeImgs(info.pic))"></order-open>
@@ -122,7 +124,12 @@ export default {
 </script>
 </script>
 <style lang="less" scoped>
 <style lang="less" scoped>
 .order {
 .order {
-    padding-bottom: 50px;
+    padding-bottom: 100px;
+    color: @text0;
+    background-color: @bg3;
+}
+.order-content {
+    background-color: @bg;
 }
 }
 .order-top {
 .order-top {
     padding: 26px 16px 20px;
     padding: 26px 16px 20px;
@@ -134,13 +141,13 @@ export default {
     }
     }
     .text2 {
     .text2 {
         font-size: 14px;
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
     }
     }
 }
 }
 .product {
 .product {
     padding: 0 16px 20px;
     padding: 0 16px 20px;
-    border-bottom: 1px solid #202122;
+    border-bottom: 1px solid @bg3;
     .product-name {
     .product-name {
         padding: 15px 0 12px;
         padding: 15px 0 12px;
     }
     }
@@ -159,7 +166,7 @@ export default {
             .text1 {
             .text1 {
                 font-size: @font2;
                 font-size: @font2;
                 font-weight: bold;
                 font-weight: bold;
-                color: #ffffff;
+                color: @text0;
                 line-height: 22px;
                 line-height: 22px;
             }
             }
 
 
@@ -172,7 +179,7 @@ export default {
             .price {
             .price {
                 font-size: @font2;
                 font-size: @font2;
                 font-weight: bold;
                 font-weight: bold;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
                 line-height: 24px;
             }
             }
         }
         }
@@ -184,7 +191,7 @@ export default {
     padding: 0 16px;
     padding: 0 16px;
     height: 48px;
     height: 48px;
     align-items: center;
     align-items: center;
-    border-bottom: 1px solid #202122;
+    border-bottom: 1px solid @bg3;
     font-size: @font2;
     font-size: @font2;
     .text1 {
     .text1 {
         flex-shrink: 0;
         flex-shrink: 0;

+ 3 - 0
src/views/order/Orders.vue

@@ -146,6 +146,9 @@ export default {
     padding-bottom: 100px;
     padding-bottom: 100px;
 }
 }
 
 
+/deep/.van-tabs__nav--line.van-tabs__nav--complete {
+    border-color: @tabBorder;
+}
 .grid-img {
 .grid-img {
     display: block;
     display: block;
 }
 }

+ 23 - 8
src/views/product/Detail.vue

@@ -428,8 +428,16 @@ export default {
 </script>
 </script>
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
+/deep/.scroll-wrapper {
+    background-color: @bgProductDetail;
+}
+
+/deep/.van-nav-bar {
+    background-color: @bgProductDetail;
+}
 .detail {
 .detail {
     padding-bottom: 100px;
     padding-bottom: 100px;
+    background-color: @bgProductDetail;
 }
 }
 .prive {
 .prive {
     display: flex;
     display: flex;
@@ -460,13 +468,13 @@ export default {
             font-size: @font1;
             font-size: @font1;
             text-align: center;
             text-align: center;
             margin-left: 2px;
             margin-left: 2px;
-            color: #303133;
+            color: @btnText;
         }
         }
     }
     }
 }
 }
 .info {
 .info {
     // height: 164px;
     // height: 164px;
-    background-color: @bg;
+    background-color: @bgProductDetail;
     border-radius: 20px 20px 0 0;
     border-radius: 20px 20px 0 0;
     transform: translateY(-16px);
     transform: translateY(-16px);
     position: relative;
     position: relative;
@@ -622,11 +630,13 @@ export default {
     }
     }
 }
 }
 /deep/.creator {
 /deep/.creator {
+    .flex();
     align-items: center;
     align-items: center;
     padding: 24px 16px 24px;
     padding: 24px 16px 24px;
     .van-cell__title {
     .van-cell__title {
         margin-left: 6px !important;
         margin-left: 6px !important;
         .text1 {
         .text1 {
+            color: #fff;
             font-size: @font1;
             font-size: @font1;
             line-height: 20px;
             line-height: 20px;
         }
         }
@@ -738,7 +748,8 @@ export default {
 }
 }
 
 
 .goods {
 .goods {
-    // padding: 20px 16px 0px;
+    // padding: 0 16px 0px;
+    background-color: #1c1c1c;
 
 
     .page-title {
     .page-title {
         font-size: @font2;
         font-size: @font2;
@@ -791,7 +802,7 @@ export default {
     &::after {
     &::after {
         content: '';
         content: '';
         border-radius: 4px;
         border-radius: 4px;
-        background-color: @bg;
+        background-color: @bgProductDetail;
         position: absolute;
         position: absolute;
         top: 1px;
         top: 1px;
         left: 1px;
         left: 1px;
@@ -835,7 +846,7 @@ export default {
         left: 1px;
         left: 1px;
         right: 1px;
         right: 1px;
         bottom: 1px;
         bottom: 1px;
-        background-color: @bg;
+        background-color: @bgProductDetail;
         border-radius: 4px;
         border-radius: 4px;
         z-index: 0;
         z-index: 0;
     }
     }
@@ -875,7 +886,7 @@ export default {
     bottom: 0;
     bottom: 0;
     left: 0;
     left: 0;
     right: 0;
     right: 0;
-    background-color: @bg;
+    background-color: @bgProductDetail;
     // background: #202122ee;
     // background: #202122ee;
 
 
     // filter: blur(19px);
     // filter: blur(19px);
@@ -897,7 +908,7 @@ export default {
         width: 132px;
         width: 132px;
         .van-button--primary {
         .van-button--primary {
             background: linear-gradient(135deg, @prim 0%, @warn 100%);
             background: linear-gradient(135deg, @prim 0%, @warn 100%);
-            color: #333230;
+            color: @btnText;
             font-size: @font2;
             font-size: @font2;
             border-width: 0px;
             border-width: 0px;
         }
         }
@@ -965,6 +976,10 @@ export default {
         &::after {
         &::after {
             content: none;
             content: none;
         }
         }
+
+        &:active {
+            background-color: @bgProductDetail;
+        }
     }
     }
 }
 }
 /deep/.van-collapse-item--border::after {
 /deep/.van-collapse-item--border::after {
@@ -1043,7 +1058,7 @@ export default {
     // margin-top: 12px;
     // margin-top: 12px;
     &::after {
     &::after {
         content: '';
         content: '';
-        background-color: @bg;
+        background-color: @bgProductDetail;
         position: absolute;
         position: absolute;
         left: 1px;
         left: 1px;
         top: 1px;
         top: 1px;

+ 7 - 3
src/views/product/List.vue

@@ -125,14 +125,14 @@ export default {
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
 .follow {
 .follow {
-    background-color: #0f0f0f;
+    background-color: @bg3;
     padding-bottom: 100px;
     padding-bottom: 100px;
 }
 }
 .van-list {
 .van-list {
     padding: 8px;
     padding: 8px;
 }
 }
 .top {
 .top {
-    background-color: #181818;
+    background-color: @bg;
     padding: 0 16px;
     padding: 0 16px;
     height: 50px;
     height: 50px;
     display: flex;
     display: flex;
@@ -141,7 +141,7 @@ export default {
     .name {
     .name {
         font-size: @font3;
         font-size: @font3;
         font-weight: bold;
         font-weight: bold;
-        color: @prim;
+        color: @text0;
         line-height: 30px;
         line-height: 30px;
     }
     }
 
 
@@ -153,6 +153,10 @@ export default {
         top: 13px;
         top: 13px;
     }
     }
 }
 }
+
+/deep/.van-tabs__nav--line.van-tabs__nav--complete{
+    border-color: @tabBorder;
+}
 // /deep/.van-tab {
 // /deep/.van-tab {
 // flex-grow: 0;
 // flex-grow: 0;
 // padding: 0 0 0 0;
 // padding: 0 0 0 0;

+ 13 - 6
src/views/product/Search.vue

@@ -1,5 +1,5 @@
 <template>
 <template>
-    <div class="search">
+    <div class="search" :style="{ backgroundColor: isSearch ? $colors.bg3 : $colors.bg }">
         <van-sticky ref="top" :offset-top="bar.value.show ? 46 : 0">
         <van-sticky ref="top" :offset-top="bar.value.show ? 46 : 0">
             <van-search
             <van-search
                 ref="top"
                 ref="top"
@@ -38,7 +38,7 @@
                     <span v-for="(item, index) in historys" :key="index" @click="getSearch(item)">{{ item }}</span>
                     <span v-for="(item, index) in historys" :key="index" @click="getSearch(item)">{{ item }}</span>
                 </div>
                 </div>
             </div>
             </div>
-            <div class="hot-content">
+            <div class="hot-content" v-if="hots.length > 0">
                 <div class="title">热门搜索</div>
                 <div class="title">热门搜索</div>
                 <div class="hot-list">
                 <div class="hot-list">
                     <span v-for="(item, index) in hots" :key="index" @click="getSearch(item)">{{ item }}</span>
                     <span v-for="(item, index) in hots" :key="index" @click="getSearch(item)">{{ item }}</span>
@@ -100,11 +100,11 @@ export default {
 
 
 <style lang="less" scoped>
 <style lang="less" scoped>
 .search {
 .search {
-    background-color: #0f0f0f;
+    background-color: @bg3;
     padding-bottom: 100px;
     padding-bottom: 100px;
 }
 }
 .top {
 .top {
-    background-color: #181818;
+    background-color: @bg3;
     padding: 0 16px;
     padding: 0 16px;
     height: 50px;
     height: 50px;
     display: flex;
     display: flex;
@@ -171,6 +171,13 @@ export default {
         display: flex;
         display: flex;
         align-items: center;
         align-items: center;
     }
     }
+    .van-field__control {
+        color: @text0;
+    }
+
+    .van-search__action {
+        color: @text4;
+    }
 }
 }
 
 
 .hot-content {
 .hot-content {
@@ -186,11 +193,11 @@ export default {
         span {
         span {
             display: inline-block;
             display: inline-block;
             font-size: @font1;
             font-size: @font1;
-            color: @text3;
+            color: @text4;
             line-height: 22px;
             line-height: 22px;
             padding: 0 12px;
             padding: 0 12px;
             margin: 6px 16px 0 0;
             margin: 6px 16px 0 0;
-            background: rgba(39, 40, 40, 0.6);
+            background: @hotBg;
             border-radius: 12px;
             border-radius: 12px;
         }
         }
     }
     }

+ 1 - 1
src/views/user/Address.vue

@@ -43,7 +43,7 @@ export default {
 .title {
 .title {
     font-size: 20px;
     font-size: 20px;
     font-weight: bold;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 30px;
     line-height: 30px;
     padding: 10px 10px;
     padding: 10px 10px;
     background-color: @bg;
     background-color: @bg;

+ 1 - 1
src/views/user/Banks.vue

@@ -60,7 +60,7 @@ export default {
 
 
     span {
     span {
         font-size: 14px;
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         line-height: 24px;
         margin-top: 17px;
         margin-top: 17px;
     }
     }

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio