Browse Source

颜色改版

panhui 4 years ago
parent
commit
e4dc85e199
75 changed files with 395 additions and 291 deletions
  1. BIN
      src/main/nine-space/src/assets/raex/icon-anquan.png
  2. BIN
      src/main/nine-space/src/assets/raex/icon-dianzan1.png
  3. BIN
      src/main/nine-space/src/assets/raex/icon-guanyuwomen.png
  4. BIN
      src/main/nine-space/src/assets/raex/icon-jifen.png
  5. BIN
      src/main/nine-space/src/assets/raex/icon_dizhi.png
  6. BIN
      src/main/nine-space/src/assets/raex/icon_gouxuan.png
  7. BIN
      src/main/nine-space/src/assets/raex/icon_gouxuan_pre.png
  8. BIN
      src/main/nine-space/src/assets/raex/icon_liaojiegengduo.png
  9. BIN
      src/main/nine-space/src/assets/raex/icon_yinhangka.png
  10. BIN
      src/main/nine-space/src/assets/raex/info_icon_jiaoyijilu.png
  11. BIN
      src/main/nine-space/src/assets/raex/info_icon_shangpindingdan.png
  12. BIN
      src/main/nine-space/src/assets/raex/kong_png_dianzan.png
  13. BIN
      src/main/nine-space/src/assets/raex/kong_png_duihuanquan.png
  14. BIN
      src/main/nine-space/src/assets/raex/kong_png_fensi.png
  15. BIN
      src/main/nine-space/src/assets/raex/kong_png_gaunzhu.png
  16. BIN
      src/main/nine-space/src/assets/raex/kong_png_maichude.png
  17. BIN
      src/main/nine-space/src/assets/raex/kong_png_wudingdan.png
  18. BIN
      src/main/nine-space/src/assets/raex/kong_png_wusousuo.png
  19. BIN
      src/main/nine-space/src/assets/raex/kong_png_yongyoude (1).png
  20. BIN
      src/main/nine-space/src/assets/raex/kong_png_yongyoude (2).png
  21. BIN
      src/main/nine-space/src/assets/raex/kong_png_yongyoude .png
  22. BIN
      src/main/nine-space/src/assets/raex/png-diwen.png
  23. BIN
      src/main/nine-space/src/assets/raex/png-tianjia.png
  24. BIN
      src/main/nine-space/src/assets/raex/renzheng-icon-geren-pre.png
  25. BIN
      src/main/nine-space/src/assets/raex/renzheng-icon-qiye-pre.png
  26. BIN
      src/main/nine-space/src/assets/raex/shenqing_shenhezhong.png
  27. 1 1
      src/main/nine-space/src/assets/raex/svgs/bg-png.svg
  28. 1 1
      src/main/nine-space/src/assets/raex/svgs/login_icon_code.svg
  29. 2 2
      src/main/nine-space/src/assets/raex/svgs/login_icon_mima.svg
  30. 5 5
      src/main/nine-space/src/assets/raex/svgs/login_icon_zhanghao.svg
  31. 1 1
      src/main/nine-space/src/components/AppBar.vue
  32. 4 4
      src/main/nine-space/src/components/CouponInfo.vue
  33. 1 1
      src/main/nine-space/src/components/Driver.vue
  34. 4 5
      src/main/nine-space/src/components/order/OrderInfo.vue
  35. 2 2
      src/main/nine-space/src/plugins/colors.js
  36. 2 1
      src/main/nine-space/src/router/index.js
  37. 7 7
      src/main/nine-space/src/styles/app.less
  38. 28 19
      src/main/nine-space/src/views/Givesubmit.vue
  39. 10 2
      src/main/nine-space/src/views/Index.vue
  40. 14 12
      src/main/nine-space/src/views/Mine.vue
  41. 25 5
      src/main/nine-space/src/views/Store.vue
  42. 47 41
      src/main/nine-space/src/views/Submit.vue
  43. 4 4
      src/main/nine-space/src/views/account/About.vue
  44. 2 2
      src/main/nine-space/src/views/account/Agreement.vue
  45. 7 6
      src/main/nine-space/src/views/account/Authentication.vue
  46. 2 2
      src/main/nine-space/src/views/account/ChangePhone.vue
  47. 4 4
      src/main/nine-space/src/views/account/Connect.vue
  48. 2 2
      src/main/nine-space/src/views/account/Forget.vue
  49. 2 2
      src/main/nine-space/src/views/account/Login.vue
  50. 2 2
      src/main/nine-space/src/views/account/Register.vue
  51. 7 4
      src/main/nine-space/src/views/account/Security.vue
  52. 3 3
      src/main/nine-space/src/views/account/Setting.vue
  53. 3 3
      src/main/nine-space/src/views/account/TradingPassword.vue
  54. 6 6
      src/main/nine-space/src/views/account/Verified.vue
  55. 2 2
      src/main/nine-space/src/views/account/VerifiedSuc.vue
  56. 8 7
      src/main/nine-space/src/views/account/VerifiedSucs.vue
  57. 3 1
      src/main/nine-space/src/views/account/Waiting.vue
  58. 1 1
      src/main/nine-space/src/views/activity/Detail.vue
  59. 1 1
      src/main/nine-space/src/views/activity/List.vue
  60. 39 32
      src/main/nine-space/src/views/asset/Consignment.vue
  61. 1 1
      src/main/nine-space/src/views/asset/Detail.vue
  62. 8 8
      src/main/nine-space/src/views/asset/GiveSearch.vue
  63. 1 1
      src/main/nine-space/src/views/creator/Detail.vue
  64. 9 0
      src/main/nine-space/src/views/order/CouponList.vue
  65. 76 69
      src/main/nine-space/src/views/order/Detail.vue
  66. 3 0
      src/main/nine-space/src/views/order/Orders.vue
  67. 1 1
      src/main/nine-space/src/views/user/Address.vue
  68. 1 1
      src/main/nine-space/src/views/user/Banks.vue
  69. 1 1
      src/main/nine-space/src/views/user/BanksAdd.vue
  70. 1 1
      src/main/nine-space/src/views/user/Exchange.vue
  71. 14 3
      src/main/nine-space/src/views/user/Followers.vue
  72. 14 3
      src/main/nine-space/src/views/user/Follows.vue
  73. 7 3
      src/main/nine-space/src/views/user/Likes.vue
  74. 3 3
      src/main/nine-space/src/views/user/Point.vue
  75. 3 3
      src/main/nine-space/src/views/user/Wallet.vue

BIN
src/main/nine-space/src/assets/raex/icon-anquan.png


BIN
src/main/nine-space/src/assets/raex/icon-dianzan1.png


BIN
src/main/nine-space/src/assets/raex/icon-guanyuwomen.png


BIN
src/main/nine-space/src/assets/raex/icon-jifen.png


BIN
src/main/nine-space/src/assets/raex/icon_dizhi.png


BIN
src/main/nine-space/src/assets/raex/icon_gouxuan.png


BIN
src/main/nine-space/src/assets/raex/icon_gouxuan_pre.png


BIN
src/main/nine-space/src/assets/raex/icon_liaojiegengduo.png


BIN
src/main/nine-space/src/assets/raex/icon_yinhangka.png


BIN
src/main/nine-space/src/assets/raex/info_icon_jiaoyijilu.png


BIN
src/main/nine-space/src/assets/raex/info_icon_shangpindingdan.png


BIN
src/main/nine-space/src/assets/raex/kong_png_dianzan.png


BIN
src/main/nine-space/src/assets/raex/kong_png_duihuanquan.png


BIN
src/main/nine-space/src/assets/raex/kong_png_fensi.png


BIN
src/main/nine-space/src/assets/raex/kong_png_gaunzhu.png


BIN
src/main/nine-space/src/assets/raex/kong_png_maichude.png


BIN
src/main/nine-space/src/assets/raex/kong_png_wudingdan.png


BIN
src/main/nine-space/src/assets/raex/kong_png_wusousuo.png


BIN
src/main/nine-space/src/assets/raex/kong_png_yongyoude (1).png


BIN
src/main/nine-space/src/assets/raex/kong_png_yongyoude (2).png


BIN
src/main/nine-space/src/assets/raex/kong_png_yongyoude .png


BIN
src/main/nine-space/src/assets/raex/png-diwen.png


BIN
src/main/nine-space/src/assets/raex/png-tianjia.png


BIN
src/main/nine-space/src/assets/raex/renzheng-icon-geren-pre.png


BIN
src/main/nine-space/src/assets/raex/renzheng-icon-qiye-pre.png


BIN
src/main/nine-space/src/assets/raex/shenqing_shenhezhong.png


+ 1 - 1
src/main/nine-space/src/assets/raex/svgs/bg-png.svg

@@ -6,7 +6,7 @@
             <g id="编组-4" transform="translate(0.000000, 166.000000)">
                 <g id="编组-3" transform="translate(0.000000, 284.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">
                             <tspan x="54" y="106">点击上传</tspan>
                         </text>

+ 1 - 1
src/main/nine-space/src/assets/raex/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">
     <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="用户注册" 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="编组-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>

+ 2 - 2
src/main/nine-space/src/assets/raex/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">
     <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="用户注册" 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="编组-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>

+ 5 - 5
src/main/nine-space/src/assets/raex/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">
     <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="用户注册" 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="编组-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>

+ 1 - 1
src/main/nine-space/src/components/AppBar.vue

@@ -23,7 +23,7 @@
                 @select="onSelect"
             >
                 <template #reference>
-                    <van-icon size="24" color="#fff" name="bars" />
+                    <van-icon size="24" :color="fontColor || $colors.font0" name="bars" />
                 </template>
             </van-popover>
         </template>

+ 4 - 4
src/main/nine-space/src/components/CouponInfo.vue

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

+ 1 - 1
src/main/nine-space/src/components/Driver.vue

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

+ 4 - 5
src/main/nine-space/src/components/order/OrderInfo.vue

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

+ 2 - 2
src/main/nine-space/src/plugins/colors.js

@@ -2,8 +2,8 @@ export default {
     install(app, options) {
         if (process.env.VUE_APP_PAGE_TYPE == 'raex') {
             app.config.globalProperties.$colors = {
-                prim: '#00FFCB',
-                warn: '#006EFF',
+                prim: '#3AB200',
+                warn: '#3AB200',
                 font0: '#000000',
                 bg: '#ffffff',
                 bg3: '#f5f7fa'

+ 2 - 1
src/main/nine-space/src/router/index.js

@@ -98,7 +98,8 @@ const routes = [
                 meta: {
                     pageType: Page.Every,
                     menuPage: true,
-                    title: '第九空间'
+                    title: '第九空间',
+                    tabColor: '#181818'
                 }
             },
             {

+ 7 - 7
src/main/nine-space/src/styles/app.less

@@ -1,10 +1,10 @@
 :root {
     --van-primary-color: @prim;
-    --van-tabbar-item-active-background-color: @bg;
+    --van-tabbar-item-active-background-color: transparent;
     --van-tabbar-background-color: @bg;
     --van-nav-bar-background-color: @bg;
     --van-cell-background-color: @bg;
-    --van-text-color: #fff;
+    --van-text-color: @text0;
     --van-gray-6: @text3;
     --van-gray-3: @bg3;
     --van-tabbar-item-active-color: @textP;
@@ -21,10 +21,10 @@
     --van-cell-background-color: transparent;
     --van-cell-group-background-color: transparent;
     --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-field-error-message-color: #fdfb60;
+    --van-field-error-message-color: @prim;
     --van-action-sheet-item-text-color: #000;
     --van-uploader-upload-active-color: transparent;
     --van-uploader-upload-background-color: transparent;
@@ -85,7 +85,7 @@ body {
 
 input:-webkit-autofill {
     box-shadow: 0 0 0px 1000px @bg inset;
-    -webkit-text-fill-color: #fff;
+    -webkit-text-fill-color: @text0;
 }
 
 .van-dialog {
@@ -180,7 +180,7 @@ input:-webkit-autofill {
 .van-button--primary {
     // background: linear-gradient(135deg, @prim 0%, #ff8f3e 100%);
     border-width: 0;
-    color: #333230;
+    color: @btnText;
 }
 
 .popup-content {

+ 28 - 19
src/main/nine-space/src/views/Givesubmit.vue

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

+ 10 - 2
src/main/nine-space/src/views/Index.vue

@@ -1,7 +1,14 @@
 <template>
     <div class="index">
         <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">
                 <span>{{ item.title }}</span>
                 <template #icon="props">
@@ -47,7 +54,8 @@ export default {
     },
     data() {
         return {
-            menu: null
+            menu: null,
+            tabColor: ''
         };
     }
 };

+ 14 - 12
src/main/nine-space/src/views/Mine.vue

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

+ 25 - 5
src/main/nine-space/src/views/Store.vue

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

+ 47 - 41
src/main/nine-space/src/views/Submit.vue

@@ -1,39 +1,41 @@
 <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 class="no">{{ info.number }}</div>
-                <div class="price">¥{{ info.price }}</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>
@@ -351,13 +353,17 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.page {
+    background-color: @bg3;
+}
 .submit {
     padding: 20px 16px;
+    background-color: @bg;
 }
 
 .pageTitle {
     font-size: 14px;
-    color: #ffffff;
+    color: @text0;
     line-height: 22px;
 }
 
@@ -366,10 +372,10 @@ export default {
     align-items: center;
     justify-content: space-between;
     height: 60px;
-    border-bottom: 1px solid #202122;
+    border-bottom: 1px solid @tabBorder;
     .text1 {
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         flex-grow: 1;
     }
@@ -403,7 +409,7 @@ export default {
 .product {
     display: flex;
     padding: 12px 0 20px;
-    border-bottom: 1px solid #202122;
+    border-bottom: 1px solid @tabBorder;
     .product-content {
         flex-grow: 1;
         margin-left: 10px;
@@ -420,14 +426,14 @@ export default {
         .text1 {
             font-size: @font2;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
         }
 
         .price {
             font-size: @font2;
             font-weight: bold;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
         }
     }
@@ -437,7 +443,7 @@ export default {
     padding: 20px 0;
     .van-field__label {
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
     }
     .van-field__control {
@@ -450,11 +456,11 @@ export default {
     display: flex;
     align-items: center;
     height: 60px;
-    border-top: 1px solid #202122;
+    border-bottom: 1px solid @tabBorder;
     span {
         font-size: 14px;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         flex-grow: 1;
         padding: 0 10px;
@@ -472,7 +478,7 @@ export default {
     right: 0;
     background-color: @bg;
     z-index: 20;
-    border-top: 1px solid #313233;
+    border-top: 1px solid @tabBorder;
 
     .bottom-content {
         padding: 6px 16px;
@@ -486,7 +492,7 @@ export default {
         }
         .van-button {
             flex-grow: 1;
-            color: #333230 !important;
+            color: @btnText !important;
             max-width: 132px;
         }
         .text {

+ 4 - 4
src/main/nine-space/src/views/account/About.vue

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

+ 2 - 2
src/main/nine-space/src/views/account/Agreement.vue

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

+ 7 - 6
src/main/nine-space/src/views/account/Authentication.vue

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

+ 2 - 2
src/main/nine-space/src/views/account/ChangePhone.vue

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

+ 4 - 4
src/main/nine-space/src/views/account/Connect.vue

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

+ 2 - 2
src/main/nine-space/src/views/account/Forget.vue

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

+ 2 - 2
src/main/nine-space/src/views/account/Login.vue

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

+ 2 - 2
src/main/nine-space/src/views/account/Register.vue

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

+ 7 - 4
src/main/nine-space/src/views/account/Security.vue

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

+ 3 - 3
src/main/nine-space/src/views/account/Setting.vue

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

+ 3 - 3
src/main/nine-space/src/views/account/TradingPassword.vue

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

+ 6 - 6
src/main/nine-space/src/views/account/Verified.vue

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

+ 2 - 2
src/main/nine-space/src/views/account/VerifiedSuc.vue

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

+ 8 - 7
src/main/nine-space/src/views/account/VerifiedSucs.vue

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

+ 3 - 1
src/main/nine-space/src/views/account/Waiting.vue

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

+ 1 - 1
src/main/nine-space/src/views/activity/Detail.vue

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

+ 1 - 1
src/main/nine-space/src/views/activity/List.vue

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

+ 39 - 32
src/main/nine-space/src/views/asset/Consignment.vue

@@ -1,27 +1,29 @@
 <template>
     <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 v-else class="text3" @click="$router.push('/tradingPassword')">您当前没有交易密码,点击去设置</div>
         </div>
         <div class="bottom van-safe-area-bottom" ref="bottom">
             <van-notice-bar
@@ -143,7 +145,7 @@ export default {
     }
 }
 /deep/.van-number-keyboard__body {
-    background-color: #4a4a4a;
+    background-color: fade(#4a4a4a, 50%);
     .van-key {
         background-color: @bg;
         &:active {
@@ -156,12 +158,17 @@ export default {
     padding: 20px 0;
     .text1 {
         font-size: @font2;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         margin-bottom: 6px;
     }
 }
+.top-content {
+    background-color: @bg;
+    padding-top: 10px;
+}
 .top {
+    background-color: @bg3;
     /deep/ .van-password-input {
         margin: 10px 0;
         padding: 0 25px;
@@ -186,15 +193,15 @@ export default {
     /deep/.van-cell__title {
         font-size: @font2;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
     }
-    // background-color: #0f0f0f;
+    // background-color: @bg3;;
     padding-bottom: 100px;
     .title {
         font-size: 20px;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
         margin-top: 5px;
         padding-left: 16px;
@@ -215,7 +222,7 @@ export default {
         right: 0;
         background-color: @bg;
         z-index: 20;
-        border-top: 1px solid #313233;
+        border-top: 1px solid @tabBorder;
 
         .bottom-content {
             padding: 6px 16px;
@@ -238,8 +245,8 @@ export default {
                 line-height: 44px;
                 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;
             }
             .van-button {
@@ -258,7 +265,7 @@ export default {
     .border {
         width: 375px;
         height: 5px;
-        background: #202122;
+        background: @bg3;
         &.border1 {
             margin-top: 20px;
         }
@@ -267,14 +274,14 @@ export default {
         width: 375px;
         height: 70px;
         line-height: 70px;
-        background: #19191b;
+        background: @bg;
     }
     .input {
         margin-top: 20px;
         width: 100%;
         .text1 {
             font-size: @font2;
-            color: #ffffff;
+            color: @text0;
             line-height: 24px;
             margin-bottom: 6px;
             text-align: center;

+ 1 - 1
src/main/nine-space/src/views/asset/Detail.vue

@@ -1108,7 +1108,7 @@ export default {
         left: 1px;
         right: 1px;
         bottom: 1px;
-        background-color: @bg;
+        background-color: @bgProductDetail;
         border-radius: 4px;
         z-index: 0;
     }

+ 8 - 8
src/main/nine-space/src/views/asset/GiveSearch.vue

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

+ 1 - 1
src/main/nine-space/src/views/creator/Detail.vue

@@ -291,7 +291,7 @@ export default {
         position: absolute;
         right: 16px;
         font-size: @font1;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
         padding: 0 10px;
         background-color: fade(@bg, 80%);

+ 9 - 0
src/main/nine-space/src/views/order/CouponList.vue

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

+ 76 - 69
src/main/nine-space/src/views/order/Detail.vue

@@ -1,76 +1,78 @@
 <template>
     <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>
-        <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 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 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 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>
         <order-open ref="box" :imgSrc="getImg(changeImgs(info.pic))"></order-open>
@@ -122,7 +124,12 @@ export default {
 </script>
 <style lang="less" scoped>
 .order {
-    padding-bottom: 50px;
+    padding-bottom: 100px;
+    color: @text0;
+    background-color: @bg3;
+}
+.order-content {
+    background-color: @bg;
 }
 .order-top {
     padding: 26px 16px 20px;
@@ -134,13 +141,13 @@ export default {
     }
     .text2 {
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
     }
 }
 .product {
     padding: 0 16px 20px;
-    border-bottom: 1px solid #202122;
+    border-bottom: 1px solid @bg3;
     .product-name {
         padding: 15px 0 12px;
     }
@@ -159,7 +166,7 @@ export default {
             .text1 {
                 font-size: @font2;
                 font-weight: bold;
-                color: #ffffff;
+                color: @text0;
                 line-height: 22px;
             }
 
@@ -172,7 +179,7 @@ export default {
             .price {
                 font-size: @font2;
                 font-weight: bold;
-                color: #ffffff;
+                color: @text0;
                 line-height: 24px;
             }
         }
@@ -184,7 +191,7 @@ export default {
     padding: 0 16px;
     height: 48px;
     align-items: center;
-    border-bottom: 1px solid #202122;
+    border-bottom: 1px solid @bg3;
     font-size: @font2;
     .text1 {
         flex-shrink: 0;

+ 3 - 0
src/main/nine-space/src/views/order/Orders.vue

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

+ 1 - 1
src/main/nine-space/src/views/user/Address.vue

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

+ 1 - 1
src/main/nine-space/src/views/user/Banks.vue

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

+ 1 - 1
src/main/nine-space/src/views/user/BanksAdd.vue

@@ -137,7 +137,7 @@ export default {
         .van-field__body {
             line-height: 48px;
             border-radius: 8px;
-            border: 1px solid #494a4d;
+            border: 1px solid #939599;
             padding: 0 16px;
             margin-top: 6px;
 

+ 1 - 1
src/main/nine-space/src/views/user/Exchange.vue

@@ -47,7 +47,7 @@ export default {
     padding: 14px 16px 15px;
     .text1 {
         font-size: 14px;
-        color: #ffffff;
+        color: @text0;
         line-height: 20px;
     }
     .text2 {

+ 14 - 3
src/main/nine-space/src/views/user/Followers.vue

@@ -42,10 +42,10 @@ export default {
 
 <style lang="less" scoped>
 .follow {
-    background-color: #0f0f0f;
+    background-color: @bg3;
 }
 .top {
-    background-color: #181818;
+    background-color: @bg;
     padding: 0 16px;
     height: 50px;
     display: flex;
@@ -53,8 +53,19 @@ export default {
     .name {
         font-size: 20px;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
     }
 }
+.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>

+ 14 - 3
src/main/nine-space/src/views/user/Follows.vue

@@ -58,10 +58,10 @@ export default {
 
 <style lang="less" scoped>
 .follow {
-    background-color: #0f0f0f;
+    background-color: @bg3;;
 }
 .top {
-    background-color: #181818;
+    background-color: @bg;
     padding: 0 16px;
     height: 50px;
     display: flex;
@@ -69,8 +69,19 @@ export default {
     .name {
         font-size: 20px;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
     }
 }
+.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>

+ 7 - 3
src/main/nine-space/src/views/user/Likes.vue

@@ -91,14 +91,14 @@ export default {
 
 <style lang="less" scoped>
 .follow {
-    background-color: #0f0f0f;
+    background-color: @bg3;
     padding-bottom: 100px;
 }
 .list {
     padding: 8px;
 }
 .top {
-    background-color: #181818;
+    background-color: @bg;
     padding: 0 16px;
     height: 50px;
     display: flex;
@@ -106,15 +106,19 @@ export default {
     .name {
         font-size: 20px;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 30px;
     }
 }
 /deep/.van-tabs {
+    background-color: @bg;
     .van-tabs__nav {
         padding-left: 16px;
     }
 }
+/deep/.van-tabs__nav--line.van-tabs__nav--complete {
+    border-color: @tabBorder;
+}
 /deep/.van-tab {
     flex-grow: 0;
     padding: 0 0 0 0;

+ 3 - 3
src/main/nine-space/src/views/user/Point.vue

@@ -138,7 +138,7 @@ export default {
     padding: 20px 16px;
     font-size: 16px;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 22px;
     display: flex;
     justify-content: space-between;
@@ -165,7 +165,7 @@ export default {
         flex-grow: 1;
         .text1 {
             font-size: 14px;
-            color: #ffffff;
+            color: @text0;
             line-height: 20px;
             margin-bottom: 4px;
         }
@@ -181,7 +181,7 @@ export default {
     .text3 {
         font-size: 16px;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
     }
 

+ 3 - 3
src/main/nine-space/src/views/user/Wallet.vue

@@ -132,7 +132,7 @@ export default {
     padding: 20px 16px;
     font-size: 16px;
     font-weight: bold;
-    color: #ffffff;
+    color: @text0;
     line-height: 22px;
     display: flex;
     justify-content: space-between;
@@ -159,7 +159,7 @@ export default {
         flex-grow: 1;
         .text1 {
             font-size: 14px;
-            color: #ffffff;
+            color: @text0;
             line-height: 20px;
             margin-bottom: 4px;
         }
@@ -175,7 +175,7 @@ export default {
     .text3 {
         font-size: 16px;
         font-weight: bold;
-        color: #ffffff;
+        color: @text0;
         line-height: 24px;
     }