Merge remote-tracking branch 'origin/master'

pages/courseware/index.vue

@@ -183,7 +183,7 @@
       store.commit('setActiveNav', '/courseware');
 
       let [res1,res2] =  await Promise.all([
-                                             await $axios.$post(`/home/news/carousel`,{'newsClassifyId':2}).then(res=>{
+                                             await $axios.$post(`/home/news/carousel`,{'newsClassifyId':2,'keyword':'课程'}).then(res=>{
                                                return res
                                              }),
                                              await $axios.$post(`/home/banner/list`, { 'code': 4 }).then(res => {

pages/examsystem/index.vue

@@ -116,6 +116,16 @@
           <a rel="nofollow" class="free-trial-default-btn" href="https://cdnks.mtavip.com/a/register?flug=1" target="_blank">免费试用</a>
         </div>
       </div>
+
+      <div>
+        <div>
+          <ul>
+            <li style="font-size: 16px" v-for="(item, index) in topCarousels" v-if="index >= 1">
+              {{item.title}}
+            </li>
+          </ul>
+        </div>
+      </div>
     </div>
   </div>
 
@@ -134,11 +144,17 @@
                                              await $axios.$post(`/home/banner/list`, { 'code': 2 }).then(res => {
                                                return res;
                                              }),
+                                             await $axios.$post(`/home/news/carousel`, { 'newsClassifyId': 1,'keyword':'考试' }).then(res => {
+                                               return res;
+                                             })
                                            ]);
+      console.log(res2.data.data);
       return {
         bannerList: res1.data.data||[],
+        topCarousels: res2.data.data||[],
 
       };
+
     },
     data() {
       return {

pages/trainsystem/index.vue

@@ -154,9 +154,13 @@
                                              await $axios.$post(`/home/banner/list`, { 'code': 3 }).then(res => {
                                                return res;
                                              }),
+                                             await $axios.$post(`/home/news/carousel`, { 'newsClassifyId': 1,'keyword':'培训' }).then(res => {
+                                               return res;
+                                             })
                                            ]);
       return {
         bannerList: res1.data.data||[],
+        topCarousels: res2.data.data||[],
 
       };
     },