Merge branch 'dev-sy'

src/layout/header.vue

@@ -4,6 +4,7 @@ import { mainStore } from 'store/main'
 import { useStore } from 'store/user'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getHotSearchListApi } from '../http/api/home/index'
+import imgSrc from '@/assets/img/logo.png'
 const store: any = mainStore()
 const userStore = useStore()
 
@@ -204,11 +205,17 @@ const onCarts = () => {
         <!-- 中间logo 部分 -->
 
         <div class="logo-ipt-container wapper">
-            <img
-                src="@/assets/img/home//机械化装备平台.png"
+            <!-- <img
+                src="@/assets/img/logo.png"
                 alt="首页"
                 title="首页"
                 @click="$router.push('/home')"
+            /> -->
+
+            <el-image
+                style="width: 190px; cursor: pointer; margin-left: 60px"
+                :src="imgSrc"
+                fit="contain"
             />
             <input
                 :placeholder="placeholderText"
@@ -368,8 +375,9 @@ const onCarts = () => {
         padding: 30px 0;
 
         img {
-            width: 210px;
-            height: 48px;
+            margin-left: 38px;
+            width: 160px;
+            height: 60px;
             cursor: pointer;
         }
 

src/views/user/index.vue

@@ -14,6 +14,8 @@ const userInfo: any = computed(() => {
     return mainStore().userInfo
 })
 
+import imgSrc from '@/assets/img/logo.png'
+
 // 求租按钮
 // const seekingRentClick = () => {
 //     store.editcurrentMenuItem('baseInfo')
@@ -85,7 +87,13 @@ const activeMenuItem = computed(() => {
     <Header />
     <div class="app-container" id="user-container">
         <div class="left-menu">
-            <div class="logo-title" @click="$router.push({ name: 'home' })">机械化装备平台</div>
+            <div class="logo-title" @click="$router.push({ name: 'home' })">
+                <el-image
+                    style="width: 100%; height: 60px; cursor: pointer"
+                    :src="imgSrc"
+                    fit="contain"
+                />
+            </div>
             <!-- <div class="pic-box">
                 <img v-if="userInfo.logoUrl" :src="userInfo.logoUrl" alt="" />
 
@@ -137,7 +145,7 @@ const activeMenuItem = computed(() => {
         // margin-right: 15px;
 
         .logo-title {
-            background-color: #1ea193;
+            // background-color: #1ea193;
             cursor: pointer;
             text-align: center;
             padding: 15px;