Przeglądaj źródła

fix:首页的日期调整

chenzhen2 1 rok temu
rodzic
commit
96e3dae8ee
30 zmienionych plików z 135 dodań i 123 usunięć
  1. 1 1
      dist/sk/index.html
  2. 0 1
      dist/sk/static/css/chunk-52c1d82a.79345285.css
  3. 0 1
      dist/sk/static/css/chunk-64f296b4.f672fe10.css
  4. 1 0
      dist/sk/static/css/chunk-acbd1346.b2aa40e8.css
  5. 1 0
      dist/sk/static/css/chunk-c503e766.49c504f9.css
  6. BIN
      dist/sk/static/css/chunk-c503e766.49c504f9.css.gz
  7. 0 1
      dist/sk/static/css/chunk-c503e766.9187ba72.css
  8. BIN
      dist/sk/static/css/chunk-c503e766.9187ba72.css.gz
  9. 1 0
      dist/sk/static/css/chunk-e41b133a.0016c540.css
  10. 2 2
      dist/sk/static/js/app.8ea5cff8.js
  11. BIN
      dist/sk/static/js/app.348f43e2.js.gz
  12. 1 1
      dist/sk/static/js/app.8ea5cff8.js.map
  13. BIN
      dist/sk/static/js/app.8ea5cff8.js.gz
  14. 0 2
      dist/sk/static/js/chunk-52c1d82a.35154c92.js
  15. 0 1
      dist/sk/static/js/chunk-52c1d82a.35154c92.js.map
  16. 0 2
      dist/sk/static/js/chunk-64f296b4.a67c7fed.js
  17. 0 1
      dist/sk/static/js/chunk-64f296b4.a67c7fed.js.map
  18. 2 0
      dist/sk/static/js/chunk-acbd1346.6b3f5a45.js
  19. 1 0
      dist/sk/static/js/chunk-acbd1346.6b3f5a45.js.map
  20. 1 1
      dist/sk/static/js/chunk-c503e766.e3730904.js
  21. BIN
      dist/sk/static/js/chunk-c503e766.e3730904.js.gz
  22. 1 1
      dist/sk/static/js/chunk-c503e766.e3730904.js.map
  23. 2 0
      dist/sk/static/js/chunk-e41b133a.7e96993e.js
  24. 1 0
      dist/sk/static/js/chunk-e41b133a.7e96993e.js.map
  25. 8 1
      public/skImage/time-icon.svg
  26. 2 2
      src/config/default/vue.custom.config.js
  27. 1 1
      src/styles/index.scss
  28. 47 48
      src/views/home/index.vue
  29. 48 50
      src/views/home/tiantan.vue
  30. 14 6
      src/views/weather/index.vue

Plik diff jest za duży
+ 1 - 1
dist/sk/index.html


Plik diff jest za duży
+ 0 - 1
dist/sk/static/css/chunk-52c1d82a.79345285.css


Plik diff jest za duży
+ 0 - 1
dist/sk/static/css/chunk-64f296b4.f672fe10.css


Plik diff jest za duży
+ 1 - 0
dist/sk/static/css/chunk-acbd1346.b2aa40e8.css


Plik diff jest za duży
+ 1 - 0
dist/sk/static/css/chunk-c503e766.49c504f9.css


BIN
dist/sk/static/css/chunk-c503e766.49c504f9.css.gz


Plik diff jest za duży
+ 0 - 1
dist/sk/static/css/chunk-c503e766.9187ba72.css


BIN
dist/sk/static/css/chunk-c503e766.9187ba72.css.gz


Plik diff jest za duży
+ 1 - 0
dist/sk/static/css/chunk-e41b133a.0016c540.css


Plik diff jest za duży
+ 2 - 2
dist/sk/static/js/app.8ea5cff8.js


BIN
dist/sk/static/js/app.348f43e2.js.gz


Plik diff jest za duży
+ 1 - 1
dist/sk/static/js/app.8ea5cff8.js.map


BIN
dist/sk/static/js/app.8ea5cff8.js.gz


Plik diff jest za duży
+ 0 - 2
dist/sk/static/js/chunk-52c1d82a.35154c92.js


Plik diff jest za duży
+ 0 - 1
dist/sk/static/js/chunk-52c1d82a.35154c92.js.map


Plik diff jest za duży
+ 0 - 2
dist/sk/static/js/chunk-64f296b4.a67c7fed.js


Plik diff jest za duży
+ 0 - 1
dist/sk/static/js/chunk-64f296b4.a67c7fed.js.map


Plik diff jest za duży
+ 2 - 0
dist/sk/static/js/chunk-acbd1346.6b3f5a45.js


Plik diff jest za duży
+ 1 - 0
dist/sk/static/js/chunk-acbd1346.6b3f5a45.js.map


Plik diff jest za duży
+ 1 - 1
dist/sk/static/js/chunk-c503e766.e3730904.js


BIN
dist/sk/static/js/chunk-c503e766.e3730904.js.gz


Plik diff jest za duży
+ 1 - 1
dist/sk/static/js/chunk-c503e766.e3730904.js.map


Plik diff jest za duży
+ 2 - 0
dist/sk/static/js/chunk-e41b133a.7e96993e.js


Plik diff jest za duży
+ 1 - 0
dist/sk/static/js/chunk-e41b133a.7e96993e.js.map


Plik diff jest za duży
+ 8 - 1
public/skImage/time-icon.svg


+ 2 - 2
src/config/default/vue.custom.config.js

@@ -6,14 +6,14 @@ const vueDefaultConfig = {
   lintOnSave: false,
   transpileDependencies: ['vue-echarts', 'resize-detector'],
   //webpack 配置的项目名称
-  title: 'SagaCare',
+  title: 'SKCHINA',
   titleSeparator: ' - ',
   titleReverse: false,
   devPort: '9999',
   abbreviation: 'vt2at',
   providePlugin: {},
   build7z: false,
-  startMessage: '欢迎使用SagaCare'
+  startMessage: '欢迎使用SKCHINA'
 }
 
 module.exports = vueDefaultConfig

+ 1 - 1
src/styles/index.scss

@@ -125,7 +125,7 @@ body {
   }
 
   .slogan34 {
-    width: 140px;
+    width: 130px;
     top: 550px;
     opacity: 0;
     z-index: 1000px;

+ 47 - 48
src/views/home/index.vue

@@ -111,7 +111,7 @@
       <div id="ani2" class="ani2">
         <div class="time-top">
           <span>北京时间</span>
-          <span>首尔时间&nbsp;&nbsp;&nbsp;</span>
+          <span>首尔时间</span>
         </div>
         <div class="time-box">
           <span>{{ nowTime }}</span>
@@ -120,10 +120,8 @@
         </div>
         <div class="time-line"></div>
         <div class="time-bottom">
-          <div class="time-left">
-            <img src="/sk/skImage/time-icon.svg" alt="" />
-            <span>{{ nowDate }}</span>
-          </div>
+          <img src="/sk/skImage/time-icon.svg" alt="" />
+          <span>{{ nowDate }}</span>
           <div class="time-right">
             <span>{{ week }}</span>
           </div>
@@ -316,7 +314,7 @@ export default defineComponent({
                 // query: { showSpaceTip: 'true' }
               });
               // 30000
-            },  30000);
+            }, 30000);
           }, 30000);
         });
       },
@@ -449,7 +447,7 @@ export default defineComponent({
   opacity: 0;
   position: absolute;
   top: 20vh;
-  left: 54vw;
+  left: 52vw;
   height: 41vh;
   width: 4px;
   background-color: #ccc;
@@ -608,69 +606,70 @@ export default defineComponent({
 
 .ani2 {
   opacity: 0;
-  // top: 725px;
-  // left: 200px;
-  width: 25%;
-  // top: 70%;
+  font-size: 0;
   left: 10.4vw;
   position: absolute;
   .time-top {
-    display: flex;
-    justify-content: space-between;
+    // display: flex;
+    // justify-content: space-between;
     span {
       display: inline-block;
-      font-size: 30px;
-      color: #6b6b6b;
+      font-size: 34px;
+      color: #7e7e82;
+      &:nth-child(1) {
+        padding-left: 10px;
+        margin-right: 8.2vw;
+      }
     }
   }
   .time-line {
     margin: 0 auto;
-    margin-top: 20px;
-    width: 98%;
+    margin-top: 0.7vh;
+    margin-bottom: 0.7vh;
+    // width: 440px;
+    width: 95%;
     height: 1px;
-    background: #c1c1c3;
+    background: #cacaca;
   }
   .time-bottom {
-    width: 100%;
-    margin: 0 auto;
-    padding: 10px 0;
-    font-size: 20px;
-    color: #7e7e80;
-    display: flex;
-    justify-content: space-around;
-    .time-left {
-      text-align: left;
-      flex: 1;
-      img {
-        width: 25px;
-        height: 25px;
-        vertical-align: middle;
-      }
-      span {
-        display: inline-block;
-        vertical-align: middle;
-        padding-left: 10px;
-      }
+    display: inline-block;
+    vertical-align: middle;
+    font-size: 34px;
+    padding-left: 10px;
+    color: #7e7e82;
+    img {
+      display: inline-block;
+      vertical-align: middle;
+      width: 34px;
+      height: 34px;
+    }
+    span {
+      display: inline-block;
+      vertical-align: middle;
+      font-size: 34px;
+      padding-left: 15px;
     }
     .time-right {
-      text-align: right;
-      width: 100px;
+      display: inline-block;
+      margin-top: -2px;
+      vertical-align: middle;
+      font-size: 34px;
+      padding-left: 20px;
     }
   }
   .time-box {
-    padding-top: 20px;
-    font-size: 60px;
-    display: flex;
+    padding-top: 0.1vh;
+    font-size: 70px;
+    font-family: "HarmonyOS Sans TC";
     color: #01b59a;
-    justify-content: space-between;
     span {
       display: inline-block;
       vertical-align: middle;
       &:nth-child(2) {
-        margin-top: 30px;
-        height: 20px;
-        border: 1px solid #c1c1c3;
-        // background: #6b6b6b;
+        margin-left: 52px;
+        margin-right: 52px;
+        height: 45px;
+        border-left: 1px solid #cacaca;
       }
     }
   }

+ 48 - 50
src/views/home/tiantan.vue

@@ -120,7 +120,7 @@
       <div id="ani2" class="ani2">
         <div class="time-top">
           <span>北京时间</span>
-          <span>首尔时间&nbsp;&nbsp;&nbsp;</span>
+          <span>首尔时间</span>
         </div>
         <div class="time-box">
           <span>{{ nowTime }}</span>
@@ -129,10 +129,8 @@
         </div>
         <div class="time-line"></div>
         <div class="time-bottom">
-          <div class="time-left">
-            <img src="/sk/skImage/time-icon.svg" alt="" />
-            <span>{{ nowDate }}</span>
-          </div>
+          <img src="/sk/skImage/time-icon.svg" alt="" />
+          <span>{{ nowDate }}</span>
           <div class="time-right">
             <span>{{ week }}</span>
           </div>
@@ -326,7 +324,7 @@ export default defineComponent({
       updateStyle() {
         let ani1 = document.getElementById("ani1");
         let ani2 = document.getElementById("ani2");
-        ani2.style.top = ani1.offsetHeight + "px";
+        ani2.style.top = ani1.offsetHeight - ani1.offsetHeight * 0.014 + "px";
         let line = document.getElementById("line");
         let text = document.getElementById("text");
         line.style.height = logoLeft.offsetHeight + "px";
@@ -442,7 +440,7 @@ export default defineComponent({
   opacity: 0;
   position: absolute;
   top: 20vh;
-  left: 54vw;
+  left: 52vw;
   height: 41vh;
   width: 4px;
   background-color: #ccc;
@@ -532,70 +530,70 @@ export default defineComponent({
 
 .ani2 {
   opacity: 0;
-  // top: 725px;
-  // left: 200px;
-  width: 25%;
-  // top: 70%;
+  font-size: 0;
   left: 10.4vw;
   position: absolute;
   .time-top {
-    display: flex;
-    justify-content: space-between;
+    // display: flex;
+    // justify-content: space-between;
     span {
       display: inline-block;
-      font-size: 30px;
-      color: #6b6b6b;
+      font-size: 34px;
+      color: #7e7e82;
+      &:nth-child(1) {
+        padding-left: 10px;
+        margin-right: 8.2vw;
+      }
     }
   }
   .time-line {
     margin: 0 auto;
-    margin-top: 20px;
-    width: 98%;
+    margin-top: 0.7vh;
+    margin-bottom: 0.7vh;
+    // width: 440px;
+    width: 95%;
     height: 1px;
-    background: #c1c1c3;
+    background: #cacaca;
   }
   .time-bottom {
-    width: 100%;
-    margin: 0 auto;
-    padding: 10px 0;
-    font-size: 20px;
-    color: #7e7e80;
-    display: flex;
-    justify-content: space-around;
-    .time-left {
-      text-align: left;
-      flex: 1;
-      img {
-        width: 25px;
-        height: 25px;
-        vertical-align: middle;
-      }
-      span {
-        display: inline-block;
-        vertical-align: middle;
-        padding-left: 10px;
-      }
+    display: inline-block;
+    vertical-align: middle;
+    font-size: 34px;
+    padding-left: 10px;
+    color: #7e7e82;
+    img {
+      display: inline-block;
+      vertical-align: middle;
+      width: 34px;
+      height: 34px;
+    }
+    span {
+      display: inline-block;
+      vertical-align: middle;
+      font-size: 34px;
+      padding-left: 15px;
     }
     .time-right {
-      text-align: right;
-      width: 100px;
+      display: inline-block;
+      margin-top: -2px;
+      vertical-align: middle;
+      font-size: 34px;
+      padding-left: 20px;
     }
   }
   .time-box {
-    padding-top: 20px;
-    font-size: 60px;
-    display: flex;
-    // color: #01b59a;
-    color: #ff6f22;
-    justify-content: space-between;
+    padding-top: 0.1vh;
+    font-size: 70px;
+    font-family: "HarmonyOS Sans TC";
+    color: #ff7a00;
     span {
       display: inline-block;
       vertical-align: middle;
       &:nth-child(2) {
-        margin-top: 30px;
-        height: 20px;
-        border: 1px solid #c1c1c3;
-        // background: #6b6b6b;
+        margin-left: 52px;
+        margin-right: 52px;
+        height: 45px;
+        border-left: 1px solid #cacaca;
       }
     }
   }

+ 14 - 6
src/views/weather/index.vue

@@ -21,7 +21,7 @@
         <div class="weather-left">
           <div class="b-time">
             <span>北京时间</span>
-            <span>{{ nowTime }}</span>
+            <span>{{ nowTime }}<i></i></span>
           </div>
           <div class="b-line">
             <span></span>
@@ -29,7 +29,7 @@
           </div>
           <div class="b-time">
             <span>首尔时间</span>
-            <span>{{ sTime }}</span>
+            <span>{{ sTime }}<i></i></span>
           </div>
           <div class="weather-detail">
             <div class="d-top">
@@ -308,7 +308,7 @@ export default defineComponent({
   },
 });
 </script>
-  
+  1840
 <style lang="scss" scoped>
 .weather-box {
   position: relative;
@@ -317,7 +317,7 @@ export default defineComponent({
   .weather {
     position: absolute;
     box-sizing: border-box;
-    padding: 80px 40px;
+    padding: 0 40px;
     padding-top: 7.4vh;
     padding-bottom: 0;
     width: 100%;
@@ -410,7 +410,7 @@ export default defineComponent({
     .weather-left {
       position: relative;
       // text-align: right;
-      width: 72%;
+      width: 74%;
       white-space: nowrap;
       overflow: hidden;
       .b-time {
@@ -418,7 +418,15 @@ export default defineComponent({
         vertical-align: middle;
         margin-right: 90px;
         width: 270px;
-        border-bottom: 2px solid rgba(255, 255, 255, 1);
+        // border-bottom: 2px solid rgba(255, 255, 255, 1);
+        i {
+          display: block;
+          width: 85%;
+          height: 2px;
+          background: rgba(255, 255, 255, 1);
+          // border-bottom: 2px solid rgba(255, 255, 255, 1);
+          margin: 0 auto;
+        }
         span {
           display: block;
           text-align: center;