Merge remote-tracking branch 'origin/大连青谷网站' into 大连青谷网站

components/common/newsComp.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <!-- 新闻资讯 PC-->
-    <div class="client-news-information mta-hidden-xs">
+    <div class="client-news-information mta-hidden-xs" v-if="newsData.length">
       <h4 class="client-title">新闻资讯</h4>
       <div class="client-container">
         <div class="industry-information-box">
@@ -28,7 +28,7 @@
 
     <!-- 新闻资讯 手机-->
 
-      <div class="client-newsInfo-phone mta-hidden-sm">
+      <div class="client-newsInfo-phone mta-hidden-sm" v-if="newsData.length">
         <div class="client-container">
         <h4 class="client-title">新闻资讯</h4>
         <el-carousel :interval="5000" type="card" height="300px" indicator-position="none" arrow="never">

defaultConfig.js

@@ -57,6 +57,10 @@ const classifys = {
   peixunxitong: {
     classify: 0,
     keyword: '培训系统'
+  },
+  wanrengaobingfa: {
+    classify: 0,
+    keyword: '万人高并发'
   }
 }
 

pages/index.vue

@@ -157,7 +157,7 @@ export default {
   },
   async asyncData({$axios, store}) {
     let [res1, res2] = await Promise.all([
-      await $axios.$post(`/home/news/carousel`, {newsClassifyId: classifys.shouye.classify, 'keyword': classifys.kaoshixitong.keyword}).then(res => {
+      await $axios.$post(`/home/news/carousel`, {newsClassifyId: classifys.shouye.classify, 'keyword': classifys.shouye.keyword}).then(res => {
         return res;
       }),
       await $axios.$post(`/home/banner/list`, {code: BannerImgs.shouye}).then(res => {

pages/solution/erupt.vue

@@ -119,7 +119,7 @@ import chanPinTiYan from "~/components/common/chanPinTiYan";
 import freeTrialBtn from "~/components/common/freeTrialBtn";
 import onlineInformationBtn from "~/components/common/onlineInformationBtn";
 import newsComp2 from "~/components/common/newsComp2";
-import {BannerImgs} from "~/defaultConfig";
+import {BannerImgs, classifys} from "~/defaultConfig";
 import desWithCode from "~/components/common/layout/desComp/desWithCode";
 import imgCardLv4 from "~/components/common/layout/imgDes/imgCardLv4";
 
@@ -139,12 +139,13 @@ export default {
 
     const arr = [
       $axios.$post(`/home/banner/list`, {'code': BannerImgs.wanrengaobingfa}),
-      $axios.post('/home/news/list', opt)
+      $axios.$post(`/home/news/carousel`, {newsClassifyId: classifys.wanrengaobingfa.classify, 'keyword': classifys.wanrengaobingfa.keyword})
+      // $axios.post('/home/news/list', opt)
     ];
     const [res2, res3] = await Promise.all(arr);
     return {
       bannerList: res2.data.data || [],
-      anliList: res3.data.data.data || [],
+      anliList: res3.data.data || [],
     }
   },
   head(){