panhui před 3 roky
rodič
revize
0b94809d2f

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

@@ -1310,7 +1310,7 @@ export default {
 }
 
 .card-content {
-    padding: 0 0 16px;
+    padding: 0 0;
 
     .card-info {
         .flex();

+ 13 - 7
src/components/auction/info.vue

@@ -27,8 +27,7 @@
                     /></span>
                 </div>
 
-                <div class="time" v-else>
-                    <img src="../../assets/info_icon_time1.png" alt="" />
+                <div class="time end" v-else>
                     <span>{{ timeText }}</span>
                 </div>
             </div>
@@ -141,7 +140,7 @@ export default {
 
             .time {
                 .flex();
-                height: 22px;
+                height: 18px;
                 border-radius: 4px;
                 display: inline-flex;
                 padding: 0 4px;
@@ -153,14 +152,14 @@ export default {
                 span {
                     margin-left: 2px;
                     .flex();
-                    font-size: 12px;
+                    font-size: 11px;
                     color: #ff7f1f;
-                    line-height: 22px;
+                    line-height: 18px;
                     white-space: nowrap;
                     .van-count-down {
                         font-size: 12px;
                         color: #ff7f1f;
-                        line-height: 22px;
+                        line-height: 18px;
                     }
                 }
             }
@@ -212,19 +211,26 @@ export default {
     }
 
     &.isDark {
-        background-color: #000000;
+        background-color: #2e3031;
         color: #fff;
         .content {
             .text2 {
                 .time {
                     background-color: transparent;
                     border: 1px solid #ffe196;
+                    box-sizing: border-box;
                     span {
                         color: #ffe196;
                         .van-count-down {
                             color: #ffe196;
                         }
                     }
+                    &.end {
+                        border-color: #939599;
+                        span {
+                            color: #939599;
+                        }
+                    }
                 }
             }
         }

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

@@ -23,7 +23,7 @@
                     <img src="@assets/info_icon_time2.png" alt="" />
                     <span>一口价成交</span>
                 </div>
-                <div class="price-right" v-else>
+                <div class="price-right isEnd" v-else>
                     <span>{{ timeText }}</span>
                     <span class="time-box">{{ time }}</span>
                 </div>
@@ -515,7 +515,7 @@ export default {
                 min-width: 22px;
                 height: 22px;
                 display: inline-block;
-                color: #cc9163;
+                color: #ff7f1f;
                 line-height: 22px;
                 text-align: center;
                 background-color: #fff;
@@ -537,6 +537,10 @@ export default {
                 font-weight: normal;
             }
         }
+
+        &.isEnd {
+            justify-content: flex-end;
+        }
     }
 }
 
@@ -685,6 +689,7 @@ export default {
         margin-left: 31px;
         .flex();
         .van-button {
+            --van-button-primary-background-color: #3ab200;
             flex-grow: 1;
             font-weight: bold;
             /deep/.van-button__text {
@@ -696,7 +701,7 @@ export default {
                 font-weight: normal;
                 transform: scale(0.83);
                 text-align: center;
-                margin-top: 2px;
+                margin-top: 3px;
                 .van-count-down {
                     color: #fff;
                 }
@@ -721,14 +726,14 @@ export default {
         }
     }
 }
-
+.card-content {
+    background-color: #131313;
+}
 .record-item {
     .flex();
     font-size: 12px;
     color: #939599;
     line-height: 17px;
-    margin-top: 10px;
-
     span {
         &:first-child {
             width: 20%;
@@ -751,6 +756,9 @@ export default {
         color: @prim;
     }
 }
+.record-item + .record-item {
+    margin-top: 10px;
+}
 
 .dark {
     background-color: #0f0f0f;

+ 6 - 3
src/views/auction/Home.vue

@@ -227,13 +227,13 @@ export default {
 }
 
 /deep/.van-tabs {
-    padding: 0 16px;
+    // padding: 0 16px;
     position: relative;
     --van-tabs-nav-background-color: #222426;
 
     .van-tab {
         flex-grow: 1 !important;
-        margin-right: 30px;
+        margin-right: auto;
         .van-tab__text {
             font-size: 16px;
         }
@@ -243,11 +243,14 @@ export default {
     }
     .van-tabs__nav--line {
         padding-bottom: 0;
+        &.van-tabs__nav--complete {
+            padding: 0 0 !important;
+        }
     }
     .van-tabs__line {
         width: 16px;
         height: 2px;
-        bottom: 0px;
+        bottom: 1px;
     }
 }