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

src/layout/index/login.vue

@@ -8,13 +8,13 @@
             <span class="mainTwoTit">生源信息</span>
           </el-link>
         </el-col>
-        <el-col :span="6" class="common green">
+        <el-col :span="6" 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">
+        <el-col :span="6" 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>
@@ -39,7 +39,11 @@ export default {
   data: () => ({}),
   created() {},
   computed: {},
-  methods: {},
+  methods: {
+    turnTo(uri) {
+      window.location.href = uri;
+    },
+  },
 };
 </script>
 

src/layout/index/news.vue

@@ -7,20 +7,22 @@
             <span :style="`border-color:${borderColor}`">就业新闻</span>
           </el-col>
           <el-col :span="4" style="text-align:right;">
-            <el-link :underline="false" :style="`color:${Color}`">MORE<i class="el-icon-video-play"></i></el-link>
+            <el-link :underline="false" :style="`color:${Color}`" @click="$router.push({ path: `/info/list/${news.column.id}` })">
+              MORE<i class="el-icon-video-play"></i>
+            </el-link>
           </el-col>
         </el-col>
         <el-col :span="24" class="newsMain">
           <el-col :span="14" class="block">
             <el-carousel ref="shubiao">
-              <el-carousel-item v-for="(item, index) in newsList" :key="index" :name="`${index}`">
-                <el-link :underline="false"><img :src="item.picurl" class="newsList"/></el-link>
+              <el-carousel-item v-for="(item, index) in news.infoList" :key="index" :name="`${index}`">
+                <el-link :underline="false"><img :src="item.pic" class="newsList"/></el-link>
               </el-carousel-item>
             </el-carousel>
           </el-col>
           <el-col :span="10" class="newsLi">
             <ul>
-              <li v-for="(tag, index) in newsList" :key="index" :type="tag.type" @mouseover="shuYi(index)" :class="newListActive(tag)">
+              <li v-for="(tag, index) in news.infoList" :key="index" :type="tag.type" @mouseover="shuYi(index)" :class="newListActive(tag)">
                 <el-link :underline="false" class="newsListTit">{{ tag.title }}</el-link>
               </li>
             </ul>
@@ -35,7 +37,7 @@
 export default {
   name: 'news',
   props: {
-    newsList: null,
+    news: null,
   },
   components: {},
   data: () => ({

src/layout/index/notice.vue

@@ -7,13 +7,15 @@
             <span :style="`border-color:${borderColor}`">最新公告</span>
           </el-col>
           <el-col :span="4">
-            <el-link :underline="false" :style="`color:${Color}`">MORE<i class="el-icon-video-play"></i></el-link>
+            <el-link :underline="false" :style="`color:${Color}`" @click="$router.push({ path: `/info/list/${notice.column.id}` })">
+              MORE<i class="el-icon-video-play"></i>
+            </el-link>
           </el-col>
         </el-col>
         <el-col :span="24" class="noticeMain">
-          <el-col :span="24" class="noticeList" v-for="(item, index) in noticeList" :key="index" :name="`${index}`">
+          <el-col :span="24" class="noticeList" v-for="(item, index) in notice.infoList" :key="index" :name="`${index}`">
             <el-col :span="4" class="time">
-              {{ item.time }}
+              {{ item.publish_time | getDate }}
             </el-col>
             <el-col :span="20" class="title">
               <el-link :underline="false">
@@ -31,7 +33,7 @@
 export default {
   name: 'notice',
   props: {
-    noticeList: null,
+    notice: null,
   },
   components: {},
   data: () => ({
@@ -41,6 +43,12 @@ export default {
   created() {},
   computed: {},
   methods: {},
+  filters: {
+    getDate(date) {
+      let arr = date.split('-');
+      return `${arr[1]}-${arr[2]}`;
+    },
+  },
 };
 </script>
 

src/layout/index/top.vue

@@ -1,14 +1,14 @@
 <template>
   <div id="top">
     <el-row>
-      <el-col :span="24" class="top" :style="`background: url('${topInfo && topInfo.logoBei ? topInfo.logoBei : ''} ');height:300px;`">
+      <el-col :span="24" class="top" :style="`background: url('${topInfo && topInfo.banner ? topInfo.banner : ''} ');height:300px;`">
         <div class="w_1200">
           <el-col :span="2">
             <el-image style="width:100px;height:100px" :src="topInfo.logo" v-if="topInfo && topInfo.logo"></el-image>
           </el-col>
           <el-col :span="22" class="topTit">
             <el-link :underline="false">
-              {{ topInfo && topInfo.title ? topInfo.title : '' }}
+              {{ topInfo && topInfo.name ? topInfo.name : '' }}
             </el-link>
           </el-col>
         </div>

src/views/index.vue

@@ -9,7 +9,9 @@
       <el-col :span="24">
         <el-col :span="24" class="menu" :style="`background:${backColor}`">
           <div class="w_1200">
-            <native></native>
+            <slot name="native">
+              <!-- <native></native> -->
+            </slot>
           </div>
         </el-col>
       </el-col>
@@ -17,10 +19,10 @@
         <div class="w_1200">
           <el-col :span="24" class="mainTop">
             <el-col :span="16" class="news">
-              <news :newsList="newsList"></news>
+              <news :news="news"></news>
             </el-col>
             <el-col :span="7" class="notice">
-              <notice :noticeList="noticeList"></notice>
+              <notice :notice="notice"></notice>
             </el-col>
           </el-col>
           <el-col :span="24" class="mainLogin">
@@ -28,7 +30,8 @@
           </el-col>
           <el-col :span="24" class="mainData">
             <el-col :span="7" class="RiLi">
-              <calendar :calendar="calendar"></calendar>
+              <slot name="calendar"></slot>
+              <!-- <calendar :calendar="calendar"></calendar> -->
             </el-col>
             <el-col :span="16" class="recruit">
               <recruit :talksList="talksList" :fairsList="fairsList" :talksoutList="talksoutList" :infoList="infoList"> </recruit>
@@ -76,11 +79,11 @@
 
 <script>
 import top from '@publics/src/layout/index/top.vue';
-import native from '@publics/src/layout/index/native.vue';
+// import native from '@publics/src/layout/index/native.vue';
 import news from '@publics/src/layout/index/news.vue';
 import notice from '@publics/src/layout/index/notice.vue';
 import login from '@publics/src/layout/index/login.vue';
-import calendar from '@publics/src/layout/index/calendar.vue';
+// import calendar from '@publics/src/layout/index/calendar.vue';
 import recruit from '@publics/src/layout/index/recruit.vue';
 import fast from '@publics/src/layout/index/fast.vue';
 import cause from '@publics/src/layout/index/cause.vue';
@@ -94,8 +97,8 @@ export default {
   name: 'index',
   props: {
     topInfo: null, //头部信息
-    newsList: null, //新闻模块
-    noticeList: null, //公告模块
+    news: null, //新闻模块
+    notice: null, //公告模块
     calendar: null, //日历(这里应该是凹槽,允许自定义组件放入)
     talksList: null, //校内宣讲会列表
     fairsList: null, //校内招聘会列表
@@ -112,11 +115,11 @@ export default {
   },
   components: {
     top, //头部
-    native, //导航
+    // native, //导航 slot
     news, //新闻
     notice, //通告
     login, //登录
-    calendar, //日历
+    // calendar, //日历 slot
     recruit, //招聘
     fast, //快速链接
     cause, //吉林省事业单位/教师招聘