wjj hace 4 años
padre
commit
e8a53a6cf6

+ 10 - 3
src/components/commons/Footer2.0.vue

@@ -4,7 +4,7 @@
       <el-row style="height: 120px">
         <el-col :span="5" class="nav-logo-block">
           <div class="nav-title-wrapper">
-            <img src="../../assets/img/logo-white.png" alt="logo" class="nav-logo">
+            <img :src="require('../../assets/image/' + logo_white)" alt="logo" class="nav-logo">
             <div class="nav-title">
               标准驱动的集成化众测服务<br/>
               平台及示范应用
@@ -29,9 +29,16 @@
 </template>
 
 <script>
-  export default {
-    name: "Footer2.0"
+import {logo_white} from "../../config";
+
+export default {
+  name: "Footer2.0",
+  data(){
+    return{
+      logo_white
+    }
   }
+}
 </script>
 
 <style scoped lang="scss">

+ 5 - 2
src/config/index.js

@@ -3,8 +3,11 @@ export const title = '信创产业 领引国产新未来';
 export const subtitle = '共/建/信/创/生/态/共/推/产/业/发/展';
 //配置logo标题
 export const logoTitle = '群智众测平台';
-//配置logo src
-
+//配置logo src(img方式的图片地址)
+//这里的地址写的是 src/assets/image 下的图片地址
+export const logo_transparent = 'logo-transparent.png';//searchNav logo
+export const logo_background = 'logo-background.png';//login card
+export const logo_white = 'logo-white.png';//footer logo
 
 //home页配置(导航数据 + 组件展示)
 //home_searchTypeArr

+ 4 - 3
src/pages/Homepage/Homepage.vue

@@ -5,7 +5,7 @@
       <el-row class="search-nav" style="padding: 30px 0 20px 0">
         <el-col :span="6">
           <div class="pull-left">
-            <img class="logo-img" src="../../assets/image/logo-transparent.png" :to="'/home'"/>
+            <img class="logo-img" :src="require('../../assets/image/' + logo_transparent)" :to="'/home'"/>
             <span class="logo-title">{{ logoTitle }}</span>
           </div>
         </el-col>
@@ -89,7 +89,8 @@ import {getAllFields, storageGet} from '@/js/index.js'
 import {notify} from "../../constants";
 import Apis from '@/js/api'
 import {logoTitle, home_searchTypeArr, home_homeTabArr_left,home_searchType,
-  home_homeTabArr_right,home_homeTabArr_default,HOME_DISPLAY} from "../../config";
+  home_homeTabArr_right,home_homeTabArr_default,HOME_DISPLAY,
+  logo_background,logo_transparent,logo_white} from "../../config";
 
 // console.log(commonData);
 export default {
@@ -115,6 +116,7 @@ export default {
     return {
       logoTitle,
       HOME_DISPLAY,
+      logo_transparent,
       user: {},
       isLogin: false,
       loading: false,
@@ -236,7 +238,6 @@ export default {
   mounted() {
     this.setUserInfo();
     this.loadData();
-    this.$refs.searchInput.focus()
   },
   watch: {
     getUserInfo(val) {

+ 4 - 4
src/pages/Homepage/LoginCard.vue

@@ -1,9 +1,8 @@
 <template>
   <el-card class="login-card">
     <div class="login-welcome">
-      <img :src="this.userImg==null?defaultValue.image:this.userImg" alt="welcome-img"
+      <img :src="!this.userImg?require('../../assets/image/' + logo_background):this.userImg" alt="welcome-img"
            class="pull-left welcome-img">
-      <!--      <img v-else src="../../assets/img/logo-project.png" alt="welcome-img" class="pull-left welcome-img">-->
       <div style="margin-left: 46px">
         <div class="welcome-title">
           hi,欢迎使用{{logoTitle}}
@@ -28,17 +27,18 @@
   import Http from '@/js/http.js'
   import {logout, storageGet} from '@/js/index.js'
   import {mapActions,mapGetters} from 'vuex'
-  import {logoTitle} from "../../config";
+  import {logoTitle,logo_background} from "../../config";
 
   export default {
     name: "LoginCard",
     data() {
       return {
         logoTitle,
+        logo_background,
         isLogin: false,
         user: {},
         loginUrl: process.env.LOGIN_URL,
-        userImg: require('../../assets/image/logo-transparent.png')
+        userImg: ''
       }
     },
     computed: {