footer config

config/dev.env.js

@@ -1,4 +1,6 @@
 'use strict'
+import {CONFIG} from "../src/config";
+
 const merge = require('webpack-merge')
 const prodEnv = require('./prod.env')
 
@@ -9,11 +11,11 @@ const prodEnv = require('./prod.env')
 //   LOGIN_URL: '"http://127.0.0.1:8081/page/login?redirect=http%3a%2f%2f127.0.0.1%2f%23%2fhome"',
 //   REGISTER_URL: '"http://127.0.0.1:8081/page/register"'
 // })
-
-module.exports = merge(prodEnv, {
+console.log(CONFIG)
+module.exports = {
   NODE_ENV: '"development"',
   ENV_CONFIG: "'dev'",
   API_ROOT: '"//crowd.dev.mooctest.net"',
   LOGIN_URL: '"http://user.mooctest.net:8081/page/login?redirect=http%3a%2f%2fcrowd.dev.mooctest.net%2f%23%2fhome"',
   REGISTER_URL: '"http://user.mooctest.net:8081/page/register"'
-})
+}

src/components/commons/Footer2.0.vue

@@ -6,20 +6,20 @@
           <div class="nav-title-wrapper">
             <img :src="logo_white" alt="logo" class="nav-logo">
             <div class="nav-title">
-              标准驱动的集成化众测服务<br/>
-              平台及示范应用
+              {{ footer_title_one }}<br/>
+              {{ footer_title_two }}
             </div>
           </div>
         </el-col>
         <el-col :span="19" style="padding-left: 15%">
           <div class="copyright-block pull-left" style="margin: 12px 0">
             版权所有©信息产品及科技服务集成化众测服务平台与应用项目组<br/>
-            <a href="http://www.beian.miit.gov.cn/" style="color: white; font-size: 16px">粤ICP备09019504号</a><br/>
-            电话：020-32068333-223  传真：020-32068111<br/>
-            电子邮箱：topstest@gdsoftpark.com
+            <a href="http://www.beian.miit.gov.cn/" style="color: white; font-size: 16px">{{ footer_provider_number }}</a><br/>
+            电话：{{ footer_mobile }}  传真：{{ footer_fax }}1<br/>
+            电子邮箱：{{ footer_email }}
           </div>
           <div class="code-block pull-right">
-            <img src="../../assets/img/QRcode.png" alt="QRcode" class="mooctest-code" style="width: 110px;height: 110px;display: block">
+            <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>
         </el-col>
@@ -35,7 +35,14 @@ export default {
   name: "Footer2.0",
   data(){
     return{
-      logo_white:CONFIG.logo_white
+      logo_white:CONFIG.logo_white,
+      footer_title_one:CONFIG.footer_title_one,
+      footer_title_two:CONFIG.footer_title_two,
+      footer_provider_number:CONFIG.footer_provider_number,
+      footer_mobile:CONFIG.footer_mobile,
+      footer_fax:CONFIG.footer_fax,
+      footer_email:CONFIG.footer_email,
+      footer_QRcode:CONFIG.footer_QRcode,
     }
   }
 }

src/pages/Homepage/TestCard.vue

@@ -24,8 +24,8 @@ export default {
     return {}
   },
   components: {
-    Waterfall,
-    WaterfallSlot
+    // Waterfall,
+    // WaterfallSlot
   },
   methods: {},
   mounted() {