Browse Source

fix:sk大屏修改

chenzhen2 1 year ago
parent
commit
abd38aa765
46 changed files with 1182 additions and 38 deletions
  1. 1 1
      dist/sk/index.html
  2. 1 1
      dist/sk/static/css/app.5e876e53.css
  3. 0 1
      dist/sk/static/css/chunk-3e46444f.dcb6d310.css
  4. BIN
      dist/sk/static/css/chunk-3e46444f.dcb6d310.css.gz
  5. 1 0
      dist/sk/static/css/chunk-5a154787.304bd6e6.css
  6. 0 1
      dist/sk/static/css/chunk-6433e872.f0217c7d.css
  7. 1 0
      dist/sk/static/css/chunk-6ac763d3.984f2e58.css
  8. 1 0
      dist/sk/static/css/chunk-c34a08d2.217f9e6f.css
  9. BIN
      dist/sk/static/css/chunk-c34a08d2.217f9e6f.css.gz
  10. BIN
      dist/sk/static/fonts/HarmonyOS_Sans_TC_Bold.46b74ab6.ttf
  11. BIN
      dist/sk/static/fonts/HarmonyOS_Sans_TC_Regular.0c6cea96.ttf
  12. BIN
      dist/sk/static/fonts/Montserrat-Medium.8a47bc0b.ttf
  13. BIN
      dist/sk/static/fonts/Montserrat-Regular.96bd8167.ttf
  14. 2 0
      dist/sk/static/js/app.163e57ef.js
  15. BIN
      dist/sk/static/js/app.163e57ef.js.gz
  16. 1 0
      dist/sk/static/js/app.163e57ef.js.map
  17. 0 2
      dist/sk/static/js/app.d0c4b6d3.js
  18. BIN
      dist/sk/static/js/app.d0c4b6d3.js.gz
  19. 0 1
      dist/sk/static/js/app.d0c4b6d3.js.map
  20. 0 2
      dist/sk/static/js/chunk-3e46444f.e6a5c19a.js
  21. BIN
      dist/sk/static/js/chunk-3e46444f.e6a5c19a.js.gz
  22. 0 1
      dist/sk/static/js/chunk-3e46444f.e6a5c19a.js.map
  23. 0 1
      dist/sk/static/js/chunk-4b78c198.60b82872.js.map
  24. 2 2
      dist/sk/static/js/chunk-4b78c198.60b82872.js
  25. BIN
      dist/sk/static/js/chunk-4b78c198.60b82872.js.gz
  26. 1 0
      dist/sk/static/js/chunk-4b78c198.721c7fdc.js.map
  27. 2 0
      dist/sk/static/js/chunk-5a154787.e676b6df.js
  28. 1 0
      dist/sk/static/js/chunk-5a154787.e676b6df.js.map
  29. 2 2
      dist/sk/static/js/chunk-6433e872.ecb9285c.js
  30. 1 1
      dist/sk/static/js/chunk-6433e872.ecb9285c.js.map
  31. 2 0
      dist/sk/static/js/chunk-c34a08d2.e9ba8234.js
  32. BIN
      dist/sk/static/js/chunk-c34a08d2.e9ba8234.js.gz
  33. 1 0
      dist/sk/static/js/chunk-c34a08d2.e9ba8234.js.map
  34. BIN
      src/assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Black.ttf
  35. BIN
      src/assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Bold.ttf
  36. BIN
      src/assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Light.ttf
  37. BIN
      src/assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Medium.ttf
  38. BIN
      src/assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Regular.ttf
  39. BIN
      src/assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Thin.ttf
  40. 11 1
      src/router/index.ts
  41. 18 0
      src/styles/font.scss
  42. 6 0
      src/styles/index.scss
  43. 19 17
      src/utils/index.ts
  44. 2 1
      src/views/home/index.vue
  45. 1101 0
      src/views/home/tiantan.vue
  46. 5 3
      src/views/weather/index.vue

File diff suppressed because it is too large
+ 1 - 1
dist/sk/index.html


File diff suppressed because it is too large
+ 1 - 1
dist/sk/static/css/app.5e876e53.css


File diff suppressed because it is too large
+ 0 - 1
dist/sk/static/css/chunk-3e46444f.dcb6d310.css


BIN
dist/sk/static/css/chunk-3e46444f.dcb6d310.css.gz


File diff suppressed because it is too large
+ 1 - 0
dist/sk/static/css/chunk-5a154787.304bd6e6.css


File diff suppressed because it is too large
+ 0 - 1
dist/sk/static/css/chunk-6433e872.f0217c7d.css


File diff suppressed because it is too large
+ 1 - 0
dist/sk/static/css/chunk-6ac763d3.984f2e58.css


File diff suppressed because it is too large
+ 1 - 0
dist/sk/static/css/chunk-c34a08d2.217f9e6f.css


BIN
dist/sk/static/css/chunk-c34a08d2.217f9e6f.css.gz


BIN
dist/sk/static/fonts/HarmonyOS_Sans_TC_Bold.46b74ab6.ttf


BIN
dist/sk/static/fonts/HarmonyOS_Sans_TC_Regular.0c6cea96.ttf


BIN
dist/sk/static/fonts/Montserrat-Medium.8a47bc0b.ttf


BIN
dist/sk/static/fonts/Montserrat-Regular.96bd8167.ttf


File diff suppressed because it is too large
+ 2 - 0
dist/sk/static/js/app.163e57ef.js


BIN
dist/sk/static/js/app.163e57ef.js.gz


File diff suppressed because it is too large
+ 1 - 0
dist/sk/static/js/app.163e57ef.js.map


File diff suppressed because it is too large
+ 0 - 2
dist/sk/static/js/app.d0c4b6d3.js


BIN
dist/sk/static/js/app.d0c4b6d3.js.gz


File diff suppressed because it is too large
+ 0 - 1
dist/sk/static/js/app.d0c4b6d3.js.map


File diff suppressed because it is too large
+ 0 - 2
dist/sk/static/js/chunk-3e46444f.e6a5c19a.js


BIN
dist/sk/static/js/chunk-3e46444f.e6a5c19a.js.gz


File diff suppressed because it is too large
+ 0 - 1
dist/sk/static/js/chunk-3e46444f.e6a5c19a.js.map


File diff suppressed because it is too large
+ 0 - 1
dist/sk/static/js/chunk-4b78c198.60b82872.js.map


File diff suppressed because it is too large
+ 2 - 2
dist/sk/static/js/chunk-4b78c198.60b82872.js


BIN
dist/sk/static/js/chunk-4b78c198.60b82872.js.gz


File diff suppressed because it is too large
+ 1 - 0
dist/sk/static/js/chunk-4b78c198.721c7fdc.js.map


File diff suppressed because it is too large
+ 2 - 0
dist/sk/static/js/chunk-5a154787.e676b6df.js


File diff suppressed because it is too large
+ 1 - 0
dist/sk/static/js/chunk-5a154787.e676b6df.js.map


File diff suppressed because it is too large
+ 2 - 2
dist/sk/static/js/chunk-6433e872.ecb9285c.js


File diff suppressed because it is too large
+ 1 - 1
dist/sk/static/js/chunk-6433e872.ecb9285c.js.map


File diff suppressed because it is too large
+ 2 - 0
dist/sk/static/js/chunk-c34a08d2.e9ba8234.js


BIN
dist/sk/static/js/chunk-c34a08d2.e9ba8234.js.gz


File diff suppressed because it is too large
+ 1 - 0
dist/sk/static/js/chunk-c34a08d2.e9ba8234.js.map


BIN
src/assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Black.ttf


BIN
src/assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Bold.ttf


BIN
src/assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Light.ttf


BIN
src/assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Medium.ttf


BIN
src/assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Regular.ttf


BIN
src/assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Thin.ttf


+ 11 - 1
src/router/index.ts

@@ -1,17 +1,27 @@
 import { createRouter, Router, createWebHashHistory, createWebHistory, RouteRecordRaw } from 'vue-router'
 
 const Home: any = () => import('@/views/home/index.vue')
+const Tiantan: any = () => import('@/views/home/tiantan.vue')
 const Weather: any = () => import('@/views/weather/index.vue')
 export const constantRoutes: Array<RouteRecordRaw> = [
   {
     path: '/',
-    redirect: '/home',
+    redirect: '/index',
     meta: {
       title: '首页',
       hideHeader: true
     }
   },
   {
+    path: '/index',
+    component: Tiantan,
+    name: 'tiantan',
+    meta: {
+      title: '天团',
+      hideHeader: true
+    }
+  },
+  {
     path: '/home',
     component: Home,
     name: 'home',

+ 18 - 0
src/styles/font.scss

@@ -0,0 +1,18 @@
+@font-face {
+    font-family: "Montserrat";
+    src: url('../assets/font/Montserrat/Montserrat-Regular.ttf'); // 找到你自己的字体文件地址
+}
+
+@font-face {
+    font-family: "Montserrat-Medium";
+    src: url('../assets/font/Montserrat/Montserrat-Medium.ttf'); // 找到你自己的字体文件地址
+}
+
+@font-face {
+    font-family: "HarmonyOS Sans TC";
+    src: url('../assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Bold.ttf'); // 找到你自己的字体文件地址
+}
+@font-face {
+    font-family: "HarmonyOS_Sans_TC_Regular";
+    src: url('../assets/font/HarmonyOS_Sans_TC/HarmonyOS_Sans_TC_Regular.ttf'); // 找到你自己的字体文件地址
+}

+ 6 - 0
src/styles/index.scss

@@ -1,3 +1,9 @@
+@import "font";
+
+body {
+  font-family: "Source Han Sans"
+}
+
 #app {
   width: 100%;
   height: 100%;

+ 19 - 17
src/utils/index.ts

@@ -251,23 +251,25 @@ export const formatEnergyDate = function (type: any = 1) {
 
 // 获取当前时间是周几
 export const getWeek = function () {
-  let week:any = new Date().getDay();  
-  let str:any=''
-  if (week == 0) {  
-          str = "星期日";  
-  } else if (week == 1) {  
-          str = "星期一";  
-  } else if (week == 2) {  
-          str = "星期二";  
-  } else if (week == 3) {  
-          str = "星期三";  
-  } else if (week == 4) {  
-          str = "星期四";  
-  } else if (week == 5) {  
-          str = "星期五";  
-  } else if (week == 6) {  
-          str = "星期六";  
-  }  
+  let week: any = new Date().getDay();
+  let str: any = ''
+  if (week == 0) {
+    str = "星期日";
+  } else if (week == 1) {
+    str = "星期一";
+  } else if (week == 2) {
+    str = "星期二";
+  } else if (week == 3) {
+    str = "星期三";
+  } else if (week == 4) {
+    str = "星期四";
+  } else if (week == 5) {
+    str = "星期五";
+  } else if (week == 6) {
+    str = "星期六";
+  }
+
+  return str
 }
 
 

+ 2 - 1
src/views/home/index.vue

@@ -394,7 +394,8 @@ export default defineComponent({
   //  width: 500px;
   //  height: 450px;
   // height: 41vh;
-  width: 26vw;
+  // width: 26vw;
+  height: 400px;
 }
 
 .logoLeftAni {

File diff suppressed because it is too large
+ 1101 - 0
src/views/home/tiantan.vue


+ 5 - 3
src/views/weather/index.vue

@@ -341,6 +341,7 @@ export default defineComponent({
       }
       .env-text {
         text-align: center;
+        font-family: 'HarmonyOS Sans TC';
         font-size: 130px;
         line-height: 160px;
         font-weight: 700;
@@ -348,6 +349,7 @@ export default defineComponent({
         color: rgba(255, 255, 255, 1);
       }
       .env-rate {
+        font-family: 'HarmonyOS_Sans_TC_Regular';
         padding-top: 80px;
         font-size: 60px;
         font-weight: 400;
@@ -405,7 +407,7 @@ export default defineComponent({
             opacity: 1;
             padding-bottom: 20px;
             /** 文本1 */
-            font-size: 18px;
+            font-size: 32px;
             font-weight: 500;
             letter-spacing: 0px;
             color: rgba(255, 255, 255, 1);
@@ -439,14 +441,14 @@ export default defineComponent({
         span {
           display: inline-block;
           padding-left: 10px;
-          font-size: 24px;
+          font-size: 58px;
           font-weight: 400;
           color: rgba(242, 244, 246, 1);
           vertical-align: middle;
         }
       }
       .d-bottom {
-        font-size: 24px;
+        font-size: 38px;
         font-weight: 400;
         color: rgba(242, 244, 246, 1);
         span {