Browse Source

更改配置文件获取方式

wjj 4 years ago
parent
commit
4f7e74ea77

+ 1 - 1
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="require('../../assets/image/' + logo_white)" alt="logo" class="nav-logo">
+            <img :src="logo_white" alt="logo" class="nav-logo">
             <div class="nav-title">
               标准驱动的集成化众测服务<br/>
               平台及示范应用

+ 0 - 0
src/js/test.js


+ 6 - 7
src/main.js

@@ -12,6 +12,7 @@ import moment from 'moment'
 import vRegion from 'v-region'
 import echarts from "echarts";
 import Http from '@/js/http.js'
+import {configToJson} from './utils/filters'
 import {
   Avatar,
   Alert,
@@ -209,13 +210,11 @@ Vue.config.productionTip = false
 
 
 Http.get('/api/common/configuration').then((res) => {
-  this.homeDataNoCache = res.data;
-  // console.log(res.data.configurationList.configuration);
-  // console.log(JSON.parse(res.data.configurationList.configuration));
-  // console.log(JSON.parse(res.data.configurationList.configuration).home_searchTypeArr);
-  let config = JSON.parse(res.data.configurationList.configuration);
-  setConfig(config);
-  storageSave('config', config);
+  let config = res.data&&res.data.configurationList;
+  let configData = configToJson(config);
+  this.homeDataNoCache = configToJson(config);
+  setConfig(configData);
+  storageSave('config', configData);
   new Vue({
     el: '#app',
     router,

+ 1 - 1
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="require('../../assets/image/' + logo_transparent)" :to="'/home'"/>
+            <img class="logo-img" :src="logo_transparent" :to="'/home'"/>
             <span class="logo-title">{{ logoTitle }}</span>
           </div>
         </el-col>

+ 1 - 1
src/pages/Homepage/HotContest.vue

@@ -8,7 +8,7 @@
     <div class="popular-list">
       <el-row class="popular-list-item" v-for="item in competitionList" :key="item.id">
         <el-col :span="23" @click.native="gotoDetail(item)">
-          <img :src="require('../../assets/image/' + logo_background)" alt="logo-project" class="pull-left project-logo-img">
+          <img :src="logo_background" alt="logo-project" class="pull-left project-logo-img">
           <div style="margin-left: 55px">
             <div class="list-item-title">
               {{item.name}}

+ 1 - 1
src/pages/Square/PopularProject.vue

@@ -10,7 +10,7 @@
     <div class="popular-list" v-else>
       <el-row class="popular-list-item" v-for="item in hotCrowdTestProjectVOs" :key="item.id">
         <el-col :span="19">
-          <img :src="require('../../assets/image/' + logo_background)" alt="logo-project" class="pull-left project-logo-img">
+          <img :src="logo_background" alt="logo-project" class="pull-left project-logo-img">
           <div style="margin-left: 55px; cursor: pointer;"  @click="goToProjectDetail(item.code)">
             <div class="list-item-title">
               {{item.name}}

+ 1 - 1
src/pages/Square/PopularTask.vue

@@ -9,7 +9,7 @@
     <div class="popular-list" v-else>
       <el-row class="popular-list-item" v-for="item in hotCrowdTaskVOs" :key="item.id">
         <el-col :span="19">
-          <img :src="require('../../assets/image/' + logo_transparent)" alt="logo-project" class="pull-left project-logo-img">
+          <img :src="logo_transparent" alt="logo-project" class="pull-left project-logo-img">
           <div style="margin-left: 55px; cursor: pointer;"  @click="goToTaskDetail(item.projectId,item.code)">
             <div class="list-item-title" >
               {{item.title}}

+ 8 - 0
src/utils/filters.js

@@ -0,0 +1,8 @@
+export const configToJson = (config) => {
+  let configs = {};
+  Object.keys(config).forEach(function (key){
+    let confValue = JSON.parse(config[key]);
+    configs[Object.keys(confValue)[0]] = confValue[Object.keys(confValue)[0]];
+  })
+  return configs;
+}