Browse Source

Merge branch 'dev_1.1.2' of DeNet/de-net-official into master

nieyuge 2 years ago
parent
commit
5f6363a1bd
2 changed files with 26 additions and 24 deletions
  1. 20 24
      pages/luckdraw.vue
  2. 6 0
      static/svg/icon-time.svg

+ 20 - 24
pages/luckdraw.vue

@@ -23,8 +23,8 @@
                             </div>
                         </div>
                         <div class="time">
-                            <span class="t">🕒 {{ validity || '00:00:00' }}</span>
-                            <span class="w">🏆 {{ detail.postBizData.totalCount }} WINNERS</span>
+                            <img class="img" :src=" require('../static/svg/icon-time.svg') " />
+                            {{ validity || '00:00:00' }}
                         </div>
                         <div class="box">
                             <img src="../static/subject/icon-box.png" />
@@ -124,8 +124,8 @@
                                     </div>
                                 </div>
                                 <div class="time">
-                                    <span class="t">🕒 {{ validity || '00:00:00' }}</span>
-                                    <span class="w">🏆 {{ detail.postBizData.totalCount }} WINNERS</span>
+                                    <img class="img" :src=" require('../static/svg/icon-time.svg') " />
+                                    {{ validity || '00:00:00' }}
                                 </div>
                                 <div class="box">
                                     <img src="../static/subject/icon-box.png" />
@@ -648,20 +648,18 @@ body,
                 }
                 .time {
                     display: flex;
-                    height: 30px;
+                    height: 46px;
+                    color: #FFCC4D;
                     align-items: center;
                     justify-content: center;
                     font-weight: bold;
-                    font-size: 17px;
-                    line-height: 22px;
+                    font-size: 26px;
+                    line-height: 33px;
                     text-align: center;
-                    .t {
-                        color: #fff;
-                        margin-right: 8px;
-                    }
-                    .w {
-                        color: #fcc74e;
-                        margin-left: 8px;
+                    background: rgba($color: #000000, $alpha: .15);
+                    .img {
+                        width: 26px;
+                        margin-right: 10px;
                     }
                 }
                 .box {
@@ -768,20 +766,18 @@ body,
     }
     .time {
         display: flex;
-        height: 30px;
+        height: 46px;
+        color: #FFCC4D;
         align-items: center;
         justify-content: center;
         font-weight: bold;
-        font-size: 17px;
-        line-height: 22px;
+        font-size: 26px;
+        line-height: 33px;
         text-align: center;
-        .t {
-            color: #fff;
-            margin-right: 8px;
-        }
-        .w {
-            color: #fcc74e;
-            margin-left: 8px;
+        background: rgba($color: #000000, $alpha: .15);
+        .img {
+            width: 26px;
+            margin-right: 10px;
         }
     }
     .box {

File diff suppressed because it is too large
+ 6 - 0
static/svg/icon-time.svg


Some files were not shown because too many files changed in this diff