Merge branch 'master' of http://git.cc-lotus.info/smart-jobs/web-common

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>
@@ -35,7 +26,7 @@ export default {
   name: 'cause',
   props: {
     enterList: null,
-    teacherList: null,
+    enterInfoList: null,
   },
   components: {},
   data: () => ({
@@ -60,12 +51,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,74 +2,15 @@
   <div id="danwei">
     <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 shiyeList" :key="index" class="shiyeList">
+        <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">{{ 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 gongwuyuanList" :key="index" class="shiyeList">
-              <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 }}
-              </el-col>
-            </el-col>
-          </el-tab-pane>
-          <el-tab-pane label="选调生" name="third">
-            <el-col :span="24" v-for="(item, index) in xuantiaoList" :key="index" class="shiyeList">
-              <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 }}
-              </el-col>
-            </el-col>
-          </el-tab-pane>
-          <el-tab-pane label="西部计划" name="fourth">
-            <el-col :span="24" v-for="(item, index) in xibuList" :key="index" class="shiyeList">
-              <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 }}
-              </el-col>
-            </el-col>
-          </el-tab-pane>
-          <el-tab-pane label="特岗教师" name="fifth">
-            <el-col :span="24" v-for="(item, index) in teguangList" :key="index" class="shiyeList">
-              <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 }}
-              </el-col>
-            </el-col>
-          </el-tab-pane>
-          <el-tab-pane label="三支一扶" name="sith">
-            <el-col :span="24" v-for="(item, index) in sanzhiList" :key="index" class="shiyeList">
-              <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 }}
-              </el-col>
-            </el-col>
-          </el-tab-pane>
-          <el-tab-pane label="大学生村官" name="seventh">
-            <el-col :span="24" v-for="(item, index) in xueshengList" :key="index" class="shiyeList">
-              <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>
@@ -84,13 +25,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: () => ({
@@ -115,12 +51,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.vue

@@ -42,7 +42,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">
@@ -56,15 +56,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>
@@ -112,15 +104,10 @@ export default {
     fairsList: null, //校内招聘会列表
     talksoutList: null, //校外宣讲会列表
     infoList: null, //招聘信息列表
-    enterList: null, //吉林省事业单位招聘
-    teacherList: null, //吉林省教师招聘
-    shiyeList: null, //事业单位
-    gongwuyuanList: null, //公务员
-    xuantiaoList: null, //选调生
-    xibuList: null, //西部计划
-    teguangList: null, //特岗教师
-    sanzhiList: null, //三支一扶
-    xueshengList: null, //大学生村官
+    enterList: null, //吉林省事业单位
+    enterInfoList: null, //吉林省事业单位内容
+    danweiList: null, //事业单位
+    danweiInfoList: null, //事业单位内容
     lunboList: null, //轮播图
     image: null, //一站式头部图片
     yizhanList: null, //一站式招聘
@@ -199,6 +186,7 @@ export default {
   width: 830px;
   height: 340px;
   overflow: hidden;
+  border: 1px solid #ccc;
 }
 .mainQuick {
   margin: 0 0 20px 0;
@@ -211,6 +199,7 @@ export default {
   width: 830px;
   height: 315px;
   overflow: hidden;
+  border: 1px solid #ccc;
 }
 .mainWheel {
   margin: 0 0 20px 0;
@@ -236,13 +225,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;