合并

src/layout/index/cause.vue

@@ -2,20 +2,20 @@
   <div id="cause">
     <el-row>
       <el-col :span="24">
-        <el-tabs type="border-card">
+        <el-tabs v-model="activeName" 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="24" v-for="(tag, index) in item.children" :key="index" class="enterList">
               <el-col :span="20" class="title textOver">
-                <el-link :underline="false">{{ tag.title }}</el-link>
+                <el-link :underline="false" @click="$router.push({ path: `/info/detail?id=${tag.id}` })">{{ tag.title }} </el-link>
               </el-col>
               <el-col :span="4" class="time">
-                {{ tag.time }}
+                {{ tag.publish_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>
+        <el-link :inderline="false" class="moreLink" :style="`color:${Color}`" @click="moreClick()">MORE<i class="el-icon-video-play"></i> </el-link>
       </el-col>
     </el-row>
   </div>
@@ -26,19 +26,17 @@ export default {
   name: 'cause',
   props: {
     enterList: null,
-    enterInfoList: null,
   },
   components: {},
   data: () => ({
-    activeName: 'first',
+    activeName: '',
     Color: '#850000',
   }),
   created() {},
   computed: {},
   methods: {
-    handleClick(tab, event) {
-      // eslint-disable-next-line no-console
-      console.log(tab, event);
+    moreClick() {
+      this.$router.push({ path: `/info/list/${this.enterList[this.activeName].id}` });
     },
   },
 };

src/layout/index/danwei.vue

@@ -2,12 +2,12 @@
   <div id="danwei">
     <el-row>
       <el-col :span="24">
-        <el-tabs type="border-card">
+        <el-tabs v-model="activeName" 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="24" v-for="(tag, index) in item.children" :key="index" class="shiyeList">
               <el-col :span="20" class="title textOver">
-                <el-link :underline="false">{{ tag.title }}</el-link>
+                <el-link :underline="false" @click="$router.push({ path: `/info/detail?id=${tag.id}` })">{{ tag.title }}</el-link>
               </el-col>
               <el-col :span="4" class="time">
                 {{ tag.time }}
@@ -15,7 +15,7 @@
             </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>
+        <el-link :inderline="false" class="moreLink" :style="`color:${Color}`" @click="moreClick()">MORE<i class="el-icon-video-play"></i> </el-link>
       </el-col>
     </el-row>
   </div>
@@ -26,19 +26,17 @@ export default {
   name: 'danwei',
   props: {
     danweiList: null,
-    danweiInfoList: null,
   },
   components: {},
   data: () => ({
-    activeName: 'first',
+    activeName: '',
     Color: '#850000',
   }),
   created() {},
   computed: {},
   methods: {
-    handleClick(tab, event) {
-      // eslint-disable-next-line no-console
-      console.log(tab, event);
+    moreClick() {
+      this.$router.push({ path: `/info/list/${this.danweiList[this.activeName].id}` });
     },
   },
 };

src/layout/index/login.vue

@@ -2,30 +2,24 @@
   <div id="login">
     <el-row>
       <el-col :span="24" class="login">
-        <el-col :span="6" class="common red">
+        <el-col :span="8" class="common red">
           <el-link :underline="false">
             <span class="mainTwoIcon"><i class="el-icon-user"></i></span>
             <span class="mainTwoTit">生源信息</span>
           </el-link>
         </el-col>
-        <el-col :span="6" class="common green" @click.native="turnTo('http://hr.smart.cc-lotus.info/www/login')">
+        <el-col :span="8" class="common green" @click.native="turnTo('http://hr.smart.cc-lotus.info/www/login')">
           <el-link :underline="false">
             <span class="mainTwoIcon"><i class="el-icon-office-building"></i></span>
             <span class="mainTwoTit">单位登录/注册</span>
           </el-link>
         </el-col>
-        <el-col :span="6" class="common blue" @click.native="turnTo('/www/student/login')">
+        <el-col :span="8" class="common blue" @click.native="turnTo('/www/student/login')">
           <el-link :underline="false">
             <span class="mainTwoIcon"><i class="el-icon-user"></i></span>
             <span class="mainTwoTit">学生登录</span>
           </el-link>
         </el-col>
-        <el-col :span="6" class="common orange">
-          <el-link :underline="false">
-            <span class="mainTwoIcon"><i class="el-icon-user"></i></span>
-            <span class="mainTwoTit">管理员登录</span>
-          </el-link>
-        </el-col>
       </el-col>
     </el-row>
   </div>
@@ -56,7 +50,7 @@ export default {
   text-align: center;
   border-radius: 17px;
   margin: 0 10px 0 0;
-  width: 284px;
+  width: 380px;
 }
 .mainTwoIcon {
   display: inline-block;
@@ -70,8 +64,9 @@ export default {
 }
 .mainTwoTit {
   color: #fff;
-  font-weight: 700;
   padding: 0 0 0 10px;
+  font-size: 20px;
+  font-weight: 500;
 }
 .red {
   background-color: #d0122c;

src/layout/index/recruit.vue

@@ -2,13 +2,13 @@
   <div id="recruit">
     <el-row>
       <el-col :span="24">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tabs v-model="activeName" type="border-card">
           <el-tab-pane label="校内宣讲" name="talkIn">
             <el-col :span="24">
               <el-col :span="12" v-for="(item, index) in talksList" :key="index" class="talksList">
                 <el-col :span="18">
                   <el-col :span="24" class="title textOver">
-                    <el-link :underline="false" @click="$router.push({ path: `/talk/detail?id=${item.id}` })">{{ item.title }}</el-link>
+                    <el-link :underline="false" @click.native="$router.push({ path: '/talk/detail', query: { id: item.id } })"> {{ item.title }}</el-link>
                   </el-col>
                   <el-col :span="24" class="schname textOver">
                     {{ item.schname }}
@@ -30,7 +30,7 @@
               <el-col :span="12" v-for="(item, index) in talksoutList" :key="index" class="talksList">
                 <el-col :span="18">
                   <el-col :span="24" class="title textOver">
-                    <el-link :underline="false" @click="$router.push({ path: `/talk/detail?id=${item.id}` })">{{ item.title }}</el-link>
+                    <el-link :underline="false" @click.native="$router.push({ path: '/talk/detail', query: { id: item.id } })">{{ item.title }}</el-link>
                   </el-col>
                   <el-col :span="24" class="schname textOver">
                     {{ item.schname }}
@@ -51,7 +51,7 @@
             <el-col :span="24" v-for="(item, index) in fairsList" :key="index" class="fairsList">
               <el-col :span="19">
                 <el-col :span="24" class="title textOver">
-                  <el-link :underline="false" @click="$router.push({ path: `/jobfair/detail?id=${item.id}` })">{{ item.title }}</el-link>
+                  <el-link :underline="false" @click.native="$router.push({ path: '/jobfair/detail', query: { id: item.id } })">{{ item.title }}</el-link>
                 </el-col>
                 <el-col :span="24" class="schname textOver">主办方：{{ item.schname }}</el-col>
                 <el-col :span="24" class="address textOver">{{ item.address }}</el-col>
@@ -62,7 +62,7 @@
           <el-tab-pane label="招聘快讯" name="jobinfo">
             <el-col :span="24" v-for="(item, index) in infoList" :key="index" class="fairsList">
               <el-col :span="24" class="title textOver">
-                <el-link :underline="false" @click="$router.push({ path: `/jobinfo/detail?id=${item.id}` })">{{ item.title }}</el-link>
+                <el-link :underline="false" @click.native="$router.push({ path: '/jobinfo/detail', query: { id: item.id } })">{{ item.title }}</el-link>
               </el-col>
               <el-col :span="24" class="schname textOver">主办方：{{ item.schname }}</el-col>
               <el-col :span="24" class="address textOver">{{ item.corpname }}</el-col>
@@ -92,10 +92,6 @@ export default {
   created() {},
   computed: {},
   methods: {
-    handleClick(tab, event) {
-      // eslint-disable-next-line no-console
-      // console.log(tab, event);
-    },
     toMore() {
       if (this.activeName === 'talkIn') this.$router.push({ path: '/talk/list/in' });
       if (this.activeName === 'talkOut') this.$router.push({ path: '/talk/list/out' });
@@ -113,12 +109,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/views/index.vue

@@ -42,7 +42,8 @@
               <fast></fast>
             </el-col>
             <el-col :span="16" class="cause">
-              <cause :enterList="enterList" :enterInfoList="enterInfoList"></cause>
+              <cause :enterList="enterList"></cause>
+              <!-- :enterInfoList="enterInfoList" -->
             </el-col>
           </el-col>
           <el-col :span="24" class="mainWheel">
@@ -56,7 +57,7 @@
             </el-col>
             <el-col :span="16" class="wheelRight">
               <el-col :span="24" class="danwei">
-                <danwei :danweiList="danweiList" :danweiInfoList="danweiInfoList"></danwei>
+                <danwei :danweiList="danweiList"></danwei>
               </el-col>
               <el-col :span="24" class="yizhanshi">
                 <yizhanshi :yizhanList="yizhanList"></yizhanshi>
@@ -105,9 +106,7 @@ export default {
     talksoutList: null, //校外宣讲会列表
     infoList: null, //招聘信息列表
     enterList: null, //吉林省事业单位
-    enterInfoList: null, //吉林省事业单位内容
     danweiList: null, //事业单位
-    danweiInfoList: null, //事业单位内容
     lunboList: null, //轮播图
     yizhanList: null, //一站式招聘
     linkImgList: null, //友情链接