panhui 4 лет назад
Родитель
Сommit
616a7718a1
2 измененных файлов с 15 добавлено и 6 удалено
  1. 4 1
      src/styles/font.less
  2. 11 5
      src/views/Home.vue

+ 4 - 1
src/styles/font.less

@@ -12,7 +12,10 @@
   font-family: 'DIN';
   src: url(https://zhirongip.oss-cn-hangzhou.aliyuncs.com/fonts/OSP-DIN.ttf);
 }
-
+@font-face {
+  font-family: 'SourceHanSans-Medium';
+  src: url(https://raex-meta.oss-cn-shenzhen.aliyuncs.com/font/SourceHanSans-Medium.otf);
+}
 
 
 @font-face {

+ 11 - 5
src/views/Home.vue

@@ -3,12 +3,12 @@
         <div class="filter-bg"></div>
         <div class="welcom">
             <div class="left">
-                <div class="text1">欢迎您!</div>
-                <div class="text2">{{ isLogin ? userInfo.nickname : '探索者!' }}</div>
+                <div class="text1">WELCOME</div>
+                <div class="text2" :class="{ text3: isLogin }">{{ isLogin ? `${userInfo.nickname}!` : '探索者!' }}</div>
             </div>
             <van-image
-                width="32"
-                height="32"
+                width="38"
+                height="38"
                 :radius="32"
                 :src="isLogin ? userInfo.avatar : require('@assets/img_default_photo.png')"
             ></van-image>
@@ -243,7 +243,7 @@ export default {
     .left {
         flex-grow: 1;
         .text1 {
-            font-size: 14px;
+            font-size: 12px;
             font-weight: bold;
             color: #939599;
             line-height: 24px;
@@ -254,6 +254,12 @@ export default {
             color: #0a0a0a;
             line-height: 32px;
             letter-spacing: 2px;
+
+            &.text3 {
+                letter-spacing: 0px;
+                font-weight: normal;
+                font-family: SourceHanSans-Medium;
+            }
         }
     }
 }