Merge remote-tracking branch 'origin/麦塔' into 麦塔

# Conflicts:
#	src/views/client/Index.vue

src/api/login.js

@@ -17,3 +17,19 @@ export function getOrgList(data = {}) {
                        data,
                    });
 }
+//  describe: 【前台】行业资讯 : Client Industry Controlle author: Wgy date:2020-08-05
+export function homeIndustryList(data = {}) {
+    return request({
+                       url:    `/home/industry/list`,
+                       method: 'post',
+                       data,
+                   });
+}
+//  describe: 【前台】行业资讯 : Client Industry Controlle author: Wgy date:2020-08-05
+export function homeIndustryInfo(data = {}) {
+    return request({
+                       url:    `/home/industry/info`,
+                       method: 'post',
+                       data,
+                   });
+}

src/router.js

@@ -46,6 +46,19 @@ const router = new Router({
                                       },
                                   },
                                   {
+                                      path: '/industryDetails',
+                                      name: 'industryDetails',
+                                      meta:      {
+                                          parentPath: 'croot',
+                                          breadcrumb: {
+                                              display: '行业详情',
+                                          },
+                                      },
+                                      component: () => {
+                                          return import(/* webpackChunkName: "index" */ './views/client/industryDetails.vue');
+                                      },
+                                  },
+                                  {
                                       name:      'admin',
                                       path:      '/admin',
                                       meta: {

src/views/client/Index.vue

@@ -5,7 +5,8 @@
             <div class="website-container head-layout">
                 <div class="head-left">
                     <a></a>
-                    <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
+                    <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal"
+                             @select="handleSelect">
                         <el-menu-item index="首页">首页</el-menu-item>
                         <el-menu-item index="考试平台">考试平台</el-menu-item>
                         <el-menu-item index="培训平台">培训平台</el-menu-item>
@@ -165,10 +166,11 @@
         <!-- 行业资讯 -->
         <div class="website-industry-information">
             <h1 class="website-index-title">行业资讯</h1>
-            <el-carousel :interval="200000" type="card"  :autoplay="false" arrow="always">
-                <el-carousel-item v-for="item in topCarousels" :key="item">
-                    <div class="website-img-box" :style="{backgroundImage: 'url(' + item + ')'}"></div>
-                    <div class="website-content-box"><h1>企业为什么需要微课</h1><p>新时代人才的特点，移动互联网、智能手机的普及，企业环境的变革，都是推动微课迅猛发展的重要原因。</p><a>了解详情</a></div>
+            <el-carousel :interval="200000" type="card" :autoplay="false" arrow="always">
+                <el-carousel-item v-for="(item,index) in topCarousels" :key="index">
+                    <div class="website-img-box" :style="{backgroundImage: 'url(' + item.pic + ')'}"></div>
+                    <div class="website-content-box"><h1>{{item.title}}</h1>
+                        <p>{{item.intro}}</p><a @click="checkInfo(item)">了解详情</a></div>
                 </el-carousel-item>
             </el-carousel>
         </div>
@@ -228,36 +230,37 @@
 </template>
 
 <script>
+    import { homeIndustryList } from '@/api/login.js';
+
     export default {
         name:       'index',
-        props:      {
-        },
+        props:      {},
         data() {
             return {
                 // 需求img
-                bannerTelImg: require(`@/assets/images/website/index/index-banner-screen.png`),
-                demandImg1: require(`@/assets/images/website/index/index-demand-img1.png`),
-                demandImg2: require(`@/assets/images/website/index/index-demand-img2.png`),
-                demandImg3: require(`@/assets/images/website/index/index-demand-img3.png`),
-                demandImg4: require(`@/assets/images/website/index/index-demand-img4.png`),
-                demandImg5: require(`@/assets/images/website/index/index-demand-img5.png`),
-                demandImg6: require(`@/assets/images/website/index/index-demand-img6.png`),
-                demandImg7: require(`@/assets/images/website/index/index-demand-img7.png`),
-                demandImg8: require(`@/assets/images/website/index/index-demand-img8.png`),
-                demandImg9: require(`@/assets/images/website/index/index-demand-img9.png`),
-                demandImg10: require(`@/assets/images/website/index/index-demand-img10.png`),
-                demandImg11: require(`@/assets/images/website/index/index-demand-img11.png`),
-                demandImg12: require(`@/assets/images/website/index/index-demand-img12.png`),
+                bannerTelImg:  require(`@/assets/images/website/index/index-banner-screen.png`),
+                demandImg1:    require(`@/assets/images/website/index/index-demand-img1.png`),
+                demandImg2:    require(`@/assets/images/website/index/index-demand-img2.png`),
+                demandImg3:    require(`@/assets/images/website/index/index-demand-img3.png`),
+                demandImg4:    require(`@/assets/images/website/index/index-demand-img4.png`),
+                demandImg5:    require(`@/assets/images/website/index/index-demand-img5.png`),
+                demandImg6:    require(`@/assets/images/website/index/index-demand-img6.png`),
+                demandImg7:    require(`@/assets/images/website/index/index-demand-img7.png`),
+                demandImg8:    require(`@/assets/images/website/index/index-demand-img8.png`),
+                demandImg9:    require(`@/assets/images/website/index/index-demand-img9.png`),
+                demandImg10:   require(`@/assets/images/website/index/index-demand-img10.png`),
+                demandImg11:   require(`@/assets/images/website/index/index-demand-img11.png`),
+                demandImg12:   require(`@/assets/images/website/index/index-demand-img12.png`),
                 // 客户logo
-                customerImg1: require(`@/assets/images/website/index/index-customer-img1.png`),
-                customerImg2: require(`@/assets/images/website/index/index-customer-img2.png`),
-                customerImg3: require(`@/assets/images/website/index/index-customer-img3.png`),
-                customerImg4: require(`@/assets/images/website/index/index-customer-img4.png`),
-                customerImg5: require(`@/assets/images/website/index/index-customer-img5.png`),
-                customerImg6: require(`@/assets/images/website/index/index-customer-img6.png`),
-                customerImg7: require(`@/assets/images/website/index/index-customer-img7.png`),
-                customerImg8: require(`@/assets/images/website/index/index-customer-img8.png`),
-                customerImg9: require(`@/assets/images/website/index/index-customer-img9.png`),
+                customerImg1:  require(`@/assets/images/website/index/index-customer-img1.png`),
+                customerImg2:  require(`@/assets/images/website/index/index-customer-img2.png`),
+                customerImg3:  require(`@/assets/images/website/index/index-customer-img3.png`),
+                customerImg4:  require(`@/assets/images/website/index/index-customer-img4.png`),
+                customerImg5:  require(`@/assets/images/website/index/index-customer-img5.png`),
+                customerImg6:  require(`@/assets/images/website/index/index-customer-img6.png`),
+                customerImg7:  require(`@/assets/images/website/index/index-customer-img7.png`),
+                customerImg8:  require(`@/assets/images/website/index/index-customer-img8.png`),
+                customerImg9:  require(`@/assets/images/website/index/index-customer-img9.png`),
                 customerImg10: require(`@/assets/images/website/index/index-customer-img10.png`),
                 customerImg11: require(`@/assets/images/website/index/index-customer-img11.png`),
                 customerImg12: require(`@/assets/images/website/index/index-customer-img12.png`),
@@ -270,16 +273,16 @@
                 customerImg19: require(`@/assets/images/website/index/index-customer-img19.png`),
                 customerImg20: require(`@/assets/images/website/index/index-customer-img20.png`),
                 //证书图片
-                certImg1: require(`@/assets/images/website/index/index-cert-img1.jpg`),
-                certImg2: require(`@/assets/images/website/index/index-cert-img2.jpg`),
-                certImg3: require(`@/assets/images/website/index/index-cert-img3.jpg`),
-                certImg4: require(`@/assets/images/website/index/index-cert-img4.jpg`),
-                certImg5: require(`@/assets/images/website/index/index-cert-img5.jpg`),
-                certImg6: require(`@/assets/images/website/index/index-cert-img6.jpg`),
-                certImg7: require(`@/assets/images/website/index/index-cert-img7.jpg`),
-                certImg8: require(`@/assets/images/website/index/index-cert-img8.jpg`),
-                activeIndex:  '首页',
-                topCarousels: [],
+                certImg1:      require(`@/assets/images/website/index/index-cert-img1.jpg`),
+                certImg2:      require(`@/assets/images/website/index/index-cert-img2.jpg`),
+                certImg3:      require(`@/assets/images/website/index/index-cert-img3.jpg`),
+                certImg4:      require(`@/assets/images/website/index/index-cert-img4.jpg`),
+                certImg5:      require(`@/assets/images/website/index/index-cert-img5.jpg`),
+                certImg6:      require(`@/assets/images/website/index/index-cert-img6.jpg`),
+                certImg7:      require(`@/assets/images/website/index/index-cert-img7.jpg`),
+                certImg8:      require(`@/assets/images/website/index/index-cert-img8.jpg`),
+                activeIndex:   '首页',
+                topCarousels:  [],
             };
         },
         components: {},
@@ -287,21 +290,33 @@
         methods:    {
             handleSelect(key, keyPath) {
                 if (key === '考试平台') {
-                    window.location.href = "https://www.baidu.com";
+                    window.location.href = 'https://www.baidu.com';
                 } else if (key === '培训平台') {
-                    window.location.href = "http://39.97.175.90:7788/zentao/my/";
+                    window.location.href = 'http://39.97.175.90:7788/zentao/my/';
                 } else {
                     this.$router.push({ name: key });
                 }
             },
+            getshufflingData() {
+                homeIndustryList().then(res=>{
+                       if(res.code===0){
+                           console.log(res);
+                           this.topCarousels = res.data.data
+                       }
+                })
+            },
+            checkInfo(data){
+                this.$router.push({ name: 'industryDetails' ,params:data});
+            }
+
         },
         created() {
-
+            this.getshufflingData();
         },
         mounted() {
-            for (let i = 0; i < 4; i++) {
-                this.topCarousels.push(require(`@/assets/images/client/carousels/${i + 1}.png`));
-            }
+           /* for (let i = 0; i < 5; i++) {
+                this.topCarousels.push(require(`@/assets/images/client/carousels/${i + 1}.jpg`));
+            }*/
 
         },
         beforeDestroy() {

src/views/client/industryDetails.vue

@@ -0,0 +1,72 @@
+<template>
+    <div>
+        <el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect">
+            <el-menu-item index="首页">首页</el-menu-item>
+            <el-menu-item index="考试平台">考试平台</el-menu-item>
+            <el-menu-item index="培训平台">培训平台</el-menu-item>
+            <el-menu-item index="课程开发">课程开发</el-menu-item>
+            <el-menu-item index="新闻资讯">新闻资讯</el-menu-item>
+            <el-menu-item index="帮助中心">帮助中心</el-menu-item>
+            <el-menu-item index="关于我们">关于我们</el-menu-item>
+        </el-menu>
+        <MtaBreadcrumb style="margin-left: 0"></MtaBreadcrumb>
+    </div>
+</template>
+
+<script>
+    import MtaBreadcrumb    from '@/components/client/common/MtaBreadcrumb.vue';
+    import { homeIndustryInfo } from '@/api/login.js';
+    export default {
+        name:       'courseDev',
+        props:      {
+        },
+        data() {
+            return {
+                activeIndex:  '首页',
+                iiId:  '',
+                infoData:{}
+            };
+        },
+        components: {
+            MtaBreadcrumb
+        },
+        computed:   {},
+        methods:    {
+            handleSelect(key, keyPath) {
+                if (key === '考试平台') {
+                    window.location.href = "https://www.baidu.com";
+                } else if (key === '培训平台') {
+                    window.location.href = "http://39.97.175.90:7788/zentao/my/";
+                } else {
+                    this.$router.push({ name: key });
+                }
+            },
+            getIndustryInfo(){
+                let req = {
+                    iiId  : this.iiId,
+                    }
+                homeIndustryInfo(req).then(res=>{
+                       if(res.code===0){
+                           console.log(res.data);
+                          this.infoData =  res.data
+                       }
+                })
+
+            }
+
+        },
+        created() {
+           console.log(this.$route.params);
+           this.iiId = this.$route.params.iiId;
+           this.getIndustryInfo()
+        },
+        mounted() {
+
+        },
+        beforeDestroy() {
+        },
+    };
+</script>
+<style>
+
+</style>