更新

src/layout/index/cause.vue

@@ -2,24 +2,15 @@
   <div id="cause">
     <el-row>
       <el-col :span="24">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="吉林省事业单位招聘" name="first">
-            <el-col :span="24" v-for="(item, index) in enterList" :key="index" class="enterList">
+        <el-tabs type="border-card">
+          <el-tab-pane v-for="(item, index) in enterList" :key="index">
+            <span slot="label">{{item.title}}</span>
+            <el-col :span="24" v-for="(tag, index) in item.enterInfoList" :key="index" class="enterList">
               <el-col :span="20" class="title textOver">
-                <el-link :underline="false">{{item.title}}</el-link>
+                <el-link :underline="false">{{tag.title}}</el-link>
               </el-col>
               <el-col :span="4" class="time">
-                {{item.time}}
-              </el-col>
-            </el-col>
-          </el-tab-pane>
-          <el-tab-pane label="吉林省教师招聘" name="second">
-            <el-col :span="24" v-for="(item, index) in teacherList" :key="index" class="teacherList">
-              <el-col :span="20" class="title textOver">
-                <el-link :underline="false">{{item.title}}</el-link>
-              </el-col>
-              <el-col :span="4" class="time">
-                {{item.time}}
+                {{tag.time}}
               </el-col>
             </el-col>
           </el-tab-pane>
@@ -36,7 +27,7 @@ export default {
   name: 'cause',
   props: {
     enterList: null,
-    teacherList: null,
+    enterInfoList: null,
   },
   components: {},
   data: () => ({
@@ -61,12 +52,12 @@ export default {
   right: 10px;
   color: #850000;
 }
-/deep/.el-tabs__nav {
-  left: 20px;
-}
 /deep/.el-tabs__header {
   margin: 0;
 }
+/deep/.el-tabs--border-card > .el-tabs__content {
+  padding: 0;
+}
 .talksList {
   padding: 12px 10px;
   border-bottom: 1px dashed #ccc;

src/layout/index/danwei.vue

@@ -2,7 +2,7 @@
   <div id="danwei">
     <el-row>
       <el-col :span="24">
-         <el-tabs v-model="activeName" @tab-click="handleClick">
+         <!-- <el-tabs v-model="activeName" @tab-click="handleClick">
           <el-tab-pane label="事业单位" name="first">
             <el-col :span="24" v-for="(item, index) in shiyeList" :key="index" class="shiyeList">
               <el-col :span="20" class="title textOver">
@@ -73,6 +73,19 @@
               </el-col>
             </el-col>
           </el-tab-pane>
+        </el-tabs> -->
+        <el-tabs type="border-card">
+          <el-tab-pane v-for="(item, index) in danweiList" :key="index">
+            <span slot="label">{{item.title}}</span>
+            <el-col :span="24" v-for="(tag, index) in item.danweiInfoList" :key="index" class="shiyeList">
+              <el-col :span="20" class="title textOver">
+                <el-link :underline="false">{{tag.title}}</el-link>
+              </el-col>
+              <el-col :span="4" class="time">
+                {{tag.time}}
+              </el-col>
+            </el-col>
+          </el-tab-pane>
         </el-tabs>
         <el-link :inderline="false" class="moreLink" :style="`color:${Color}`">MORE<i class="el-icon-video-play"></i>
         </el-link>
@@ -85,13 +98,8 @@
 export default {
   name: 'danwei',
   props: {
-    shiyeList:null,
-    gongwuyuanList:null,
-    xuantiaoList:null,
-    xibuList:null,
-    teguangList:null,
-    sanzhiList:null,
-    xueshengList:null,
+    danweiList:null,
+    danweiInfoList:null,
   },
   components: {},
   data: () => ({
@@ -116,12 +124,12 @@ export default {
   right: 10px;
   color: #850000;
 }
-/deep/.el-tabs__nav {
-  left: 20px;
-}
 /deep/.el-tabs__header {
   margin: 0;
 }
+/deep/.el-tabs--border-card > .el-tabs__content {
+  padding: 0;
+}
 .talksList {
   padding: 12px 10px;
   border-bottom: 1px dashed #ccc;

src/layout/index/friendLink.vue

@@ -41,7 +41,7 @@ export default {
 <style lang="less" scoped>
 .title {
   height: 49px;
-  background-color: #fbfbfb;
+  background-color: #F5F7FA;
   border-bottom: 1px solid #850000;
 }
 .title span {

src/views/index/index.vue

@@ -40,7 +40,7 @@
               <fast></fast>
             </el-col>
             <el-col :span="16" class="cause">
-              <cause :enterList="enterList" :teacherList="teacherList"></cause>
+              <cause :enterList="enterList" :enterInfoList="enterInfoList"></cause>
             </el-col>
           </el-col>
           <el-col :span="24" class="mainWheel">
@@ -54,9 +54,7 @@
             </el-col>
             <el-col :span="16" class="wheelRight">
               <el-col :span="24" class="danwei">
-                <danwei :shiyeList="shiyeList" :gongwuyuanList="gongwuyuanList" :xuantiaoList="xuantiaoList"
-                        :xibuList="xibuList" :teguangList="teguangList" :sanzhiList="sanzhiList"
-                        :xueshengList="xueshengList"></danwei>
+                <danwei :danweiList="danweiList" :danweiInfoList="danweiInfoList"></danwei>
               </el-col>
               <el-col :span="24" class="yizhanshi">
                 <yizhanshi :image="image" :yizhanList="yizhanList"></yizhanshi>
@@ -105,17 +103,12 @@ export default {
     talksoutList: null,
     infoList: null,
     enterList: null,
-    teacherList: null,
-    shiyeList: null,
-    gongwuyuanList: null,
-    xuantiaoList: null,
-    xibuList: null,
-    teguangList: null,
-    sanzhiList: null,
-    xueshengList: null,
-    image:null,
-    lunboList:null,
-    yizhanList:null,
+    enterInfoList: null,
+    danweiList: null,
+    danweiInfoList: null,
+    image: null,
+    lunboList: null,
+    yizhanList: null,
     linkImgList: null,
     downList: null,
   },
@@ -192,6 +185,7 @@ export default {
   width: 830px;
   height: 340px;
   overflow: hidden;
+  border: 1px solid #ccc;
 }
 .mainQuick {
   margin: 0 0 20px 0;
@@ -204,6 +198,7 @@ export default {
   width: 830px;
   height: 315px;
   overflow: hidden;
+  border: 1px solid #ccc;
 }
 .mainWheel {
   margin: 0 0 20px 0;
@@ -229,13 +224,16 @@ export default {
   height: 315px;
   margin: 0 0 20px 0;
   overflow: hidden;
+  border: 1px solid #ccc;
 }
 .mainWheel .wheelRight .yizhanshi {
   height: 285px;
+  border: 1px solid #ccc;
 }
 .mainLink {
   margin: 0 0 20px 0;
   height: 150px;
+  border: 1px solid #ccc;
 }
 .down {
   height: 100px;