Merge branch 'master' of http://47.99.164.66:3000/hzdyjs-xg/all-project

mobile/src/pages/login/index.vue

@@ -4,7 +4,7 @@
             <!-- Logo和标题区域 -->
             <view class="login-header">
                 <view class="login-logo">
-                    <image class="logo-img" src="/static/logo-2.png" mode="aspectFit" />
+                    <image class="logo-img" src="/static/logo.png" mode="aspectFit" />
                 </view>
                 <view class="login-text">
                     <view class="login-title">智慧校园</view>

mobile/src/utils/user.js

@@ -107,7 +107,7 @@ export const userManager = {
 
         return {
             name: this.getDisplayName(),
-            avatar: user.avatar || '/static/logo.svg',
+            avatar: user.avatar || '/static/logo.png',
             deptName: user.deptName || '未设置部门',
             status: user.status,
             loginDate: user.loginDate,

web/src/layout/components/Navbar.vue

@@ -7,7 +7,7 @@
     <!-- 左侧Logo和系统名称 -->
     <div class="left-menu flex align-center">
       <div class="logo-container">
-        <img src="@/assets/logo/logo.svg" alt="学校Logo" class="school-logo" />
+        <img src="@/assets/logo/logo.png" alt="学校Logo" class="school-logo" />
       </div>
       <div class="system-title">
         <span class="title-text">杭州第一技师学院智慧校园管理系统</span>