抽取底部配置项

src/components/commons/Footer2.0.vue

@@ -13,16 +13,16 @@
         </el-col>
         <el-col :span="19" style="padding-left: 15%">
           <div class="copyright-block pull-left" style="margin: 12px 0">
-            版权所有©信息产品及科技服务集成化众测服务平台与应用项目组<br/>
-            <img src="@/assets/image/police.png" style="width: 20px;height: 20px;vertical-align:middle;">
-            <span style="vertical-align: middle;height: 20px;line-height: 20px">粤公网安备 44011602000570号</span><br/>
+            {{copy_right}}<br/>
+            <img :src="police_photo_url" style="width: 20px;height: 20px;vertical-align:middle;">
+            <span style="vertical-align: middle;height: 20px;line-height: 20px">{{internet_content_provider}}</span><br/>
             <a :href="footer_provider_number_url" style="color: white; font-size: 16px">{{ footer_provider_number }}</a><br/>
-            电话：{{ footer_mobile }}  传真：{{ footer_fax }}1<br/>
-            电子邮箱：{{ footer_email }}
+            {{ footer_mobile }}  {{ footer_fax }}<br/>
+            {{ footer_email }}
           </div>
           <div class="code-block pull-right" v-if="footer_QRcode">
             <img :src="footer_QRcode" alt="QRcode" class="mooctest-code" style="width: 110px;height: 110px;display: block">
-            <div style="width: 110px;text-align: center">官方微信公众号</div>
+            <div style="margin-top: 5px; width: 110px;text-align: center">{{name_QRcode}}</div>
           </div>
         </el-col>
       </el-row>
@@ -40,11 +40,15 @@ export default {
       logo_white:CONFIG.logo_white,
       footer_title_one:CONFIG.footer_title_one,
       footer_title_two:CONFIG.footer_title_two,
+      copy_right: CONFIG.copy_right,
+      police_photo_url: CONFIG.police_photo_url,
       footer_provider_number:CONFIG.footer_provider_number,
+      internet_content_provider: CONFIG.internet_content_provider,
       footer_mobile:CONFIG.footer_mobile,
       footer_fax:CONFIG.footer_fax,
       footer_email:CONFIG.footer_email,
       footer_QRcode:CONFIG.footer_QRcode,
+      name_QRcode: CONFIG.name_QRcode,
       footer_provider_number_url: CONFIG.footer_provider_number_url
     }
   }
@@ -55,15 +59,15 @@ export default {
   @import "../../style/main";
 
   .footer-nav{
-    height: 120px;
+    height: 140px;
     background:$--color-primary;
     color: $--color-title-color;
-    padding: 30px 0;
+    padding: 20px 0 30px 0;
     font-size: 14px;
     font-family:Source Han Sans CN;
   }
   .footer-nav-online{
-    height: 120px;
+    height: 140px;
     background:$__color-primary;
     color: $--color-title-color;
     padding: 30px 0;
@@ -80,10 +84,11 @@ export default {
   }
   .nav-logo-block{
     border-right: 1px solid $--color-title-color;
-    padding: 10px 0;
+    padding: 30px 0;
     margin: 20px 0
   }
   .copyright-block , .code-block{
     display: inline-block;
+    margin-top: 10px;
   }
 </style>

src/pages/Homepage/Homepage.vue

@@ -4,11 +4,18 @@
       <!--搜索框-->
       <el-row class="container search-nav" style="padding: 30px 0 20px 0" :gutter="40">
         <el-col :span="5">
-          <div class="pull-left to-mooctest-ranking" @click="handleLogoClick">
+          <div class="pull-left to-mooctest-ranking" :style="{backgroundImage: 'url(' +logo_transparent+ ')'}" @click="handleLogoClick">
 <!--            <img class="logo-img" :src="logo_transparent" :to="'/home'"/>-->
 <!--            <span class="logo-title">{{ logoTitle }}</span>-->
           </div>
         </el-col>
+<!--        <el-col :span="5">-->
+<!--          <div class="pull-left logo-block" @click="handleLogoClick">-->
+<!--            <img class="logo-img" :src="logo_transparent"/>-->
+<!--            <div class="logo-title">{{ logoTitle }}</div>-->
+<!--          </div>-->
+<!--        </el-col>-->
+
         <el-col :span="15">
           <div class="search-nav-input">
             <div id="search-block ">
@@ -44,15 +51,6 @@
 
     <div class="container home-page ">
       <el-row :gutter="15">
-        <el-col :span="5" class="homepage-right-modules">
-          <LoginCard v-if="HOME_DISPLAY.login_card"/>
-          <PopularTask :hotCrowdTaskVOs="homeData.taskList" v-if="HOME_DISPLAY.hot_task"/>
-          <HotCrowd :applicationTypeRank="homeDataNoCache.applicationTypeRank" v-if="HOME_DISPLAY.hot_crowd"/>
-          <HotAgency :agencyRank="homeDataNoCache.agencyRank" v-if="HOME_DISPLAY.hot_agency"/>
-          <HotUser :userRank="homeDataNoCache.userRank" v-if="HOME_DISPLAY.hot_user"/>
-          <HotContest :competitionList="homeData.competitionList" v-if="HOME_DISPLAY.hot_contest"/>
-        </el-col>
-
         <el-col :span="19" class="test-type-wrapper">
           <TestMenu :testTypeList="homeData.testTypeList" v-if="HOME_DISPLAY.test_menu && homeData.testTypeList"></TestMenu>
           <RankingCard></RankingCard>
@@ -61,11 +59,13 @@
             <ResourceAndTool :resourceList="homeDataNoCache.toolList && homeDataNoCache.toolList"></ResourceAndTool>
           </el-row>
           <el-row>
-            <BrandCard :residentAgencyList=homeData.residentAgencyList></BrandCard>
+            <BrandCard :residentAgencyList="homeData.residentAgencyList" v-if="HOME_DISPLAY.brand_card && homeData.residentAgencyList"></BrandCard>
           </el-row>
         </el-col>
+
         <el-col :span="5" class="homepage-right-modules">
           <LoginCard v-if="HOME_DISPLAY.login_card"/>
+          <PopularTask :hotCrowdTaskVOs="homeData.taskList" v-if="HOME_DISPLAY.hot_task"/>
           <HotCrowd :applicationTypeRank="homeDataNoCache.applicationTypeRank" v-if="HOME_DISPLAY.hot_crowd"/>
           <HotAgency :agencyRank="homeDataNoCache.agencyRank" v-if="HOME_DISPLAY.hot_agency"/>
           <HotUser :userRank="homeDataNoCache.userRank" v-if="HOME_DISPLAY.hot_user"/>
@@ -129,6 +129,7 @@ export default {
       logoTitle:CONFIG.logoTitle,
       HOME_DISPLAY:CONFIG.HOME_DISPLAY,
       logo_transparent:CONFIG.logo_transparent,
+      background_image: CONFIG.background_image,
       user: {},
       isLogin: false,
       searchType: CONFIG.home_searchType,
@@ -191,7 +192,7 @@ export default {
       this.checkCreateProjectAuth();
     },
     handleLogoClick(){
-      window.open('http://47.98.174.59:8200/#/');
+      location.reload();
     },
     checkCreateProjectAuth() {
       if (!this.isLogin) {

src/pages/Homepage/HomepagePrivate.vue

@@ -58,7 +58,7 @@
             <ResourceAndTool :resourceList="homeDataNoCache.toolList && homeDataNoCache.toolList"></ResourceAndTool>
           </el-row>
           <el-row>
-            <BrandCard :residentAgencyList=homeData.residentAgencyList></BrandCard>
+            <BrandCard :residentAgencyList=homeData.residentAgencyList v-if="HOME_DISPLAY.brand_card && homeData.residentAgencyList"></BrandCard>
           </el-row>
         </el-col>
       </el-row>

src/style/search-nav.scss

@@ -67,7 +67,7 @@
   width: 1px;
 }
 .to-mooctest-ranking {
-  background-image: url("~@/assets/image/ranking-bcg.png");
+  //background-image: url("~@/assets/image/ranking-bcg.png");
   background-size: 100% 100%;
   width: 160px;
   height: 50px;