林旭祥 пре 5 месеци
родитељ
комит
d21fccd091
1 измењених фајлова са 22 додато и 3 уклоњено
  1. 22 3
      src/components/Header/index.vue

+ 22 - 3
src/components/Header/index.vue

@@ -10,10 +10,17 @@
       <img src="@/assets/images/ranking/ranking.png" />
     </div>
     <div class="logo" :class="{ logo2: logoClass == 'logo2' }" v-else>
-      <!-- <img v-if="userInfo?.avatar_url" :src="userInfo.avatar_url" />
-      <img v-else src="@/assets/images/common/logo.png" /> -->
-      <img v-if="!userInfo?.avatar_url" src="@/assets/images/common/logo.png" />
+
       <div class="title" v-if="parameter.project"><i></i><span>{{ dic.project[parameter.project] || "" }}</span></div>
+      <div class="logoBox" v-else>
+        <template v-if="userInfo?.avatar_url">
+          <img v-if="userInfo?.avatar_url" :src="userInfo.avatar_url" />
+          <div class="schoolName">{{ userInfo.school_name }}</div>
+        </template>
+        <template v-else>
+          <img src="@/assets/images/common/logo.png" />
+        </template>
+      </div>
     </div>
   </div>
 </template>
@@ -143,6 +150,14 @@ $waiPadding: 6.51rem;
   img {
     //width: 14.563rem;
     height: 3rem;
+    margin-right: 2rem;
+  }
+
+  .schoolName {
+    font-size: 2.5rem;
+    height: 3rem;
+    line-height: 3rem;
+    color: #00FFE8;
   }
 
   .title {
@@ -171,6 +186,10 @@ $waiPadding: 6.51rem;
   }
 }
 
+.logoBox{
+  display: flex;
+}
+
 .close {
   position: absolute;
   right: calc($waiPadding - 3.2rem);