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

src/layout/index/daohang.vue

@@ -15,7 +15,7 @@
           <el-col :span="8" class="list" v-for="(item, index) in list" :key="index">
             <el-link :underline="false" target="_blank" @click="clickUrl(item.title)">
               <el-image style="width:55px;height:55px;border-radius: 10px;" :src="item.pic"></el-image>
-              <P>{{ item.title }}</P>
+              <P :title="item.title">{{ item.title }}</P>
             </el-link>
           </el-col>
         </el-col>

src/layout/index/huji.vue

@@ -14,7 +14,7 @@
       <el-col :span="24" class="info">
         <el-col :span="24" class="list" v-for="(item, index) in infoList" :key="index" @click.native="$router.push({ path: `/detail?id=${item.id}` })">
           <el-col :span="19" class="title">
-            <p class="textOver"><i class="el-icon-caret-right icon"></i>{{ item.title }}</p>
+            <p class="textOver" :title="item.title"><i class="el-icon-caret-right icon"></i>{{ item.title }}</p>
           </el-col>
           <el-col :span="5" class="date">
             {{ item.publish_time }}

src/layout/index/law.vue

@@ -12,7 +12,7 @@
       <el-col :span="24" class="info">
         <el-col :span="24" class="list" v-for="(item, index) in infoList" :key="index" @click.native="$turnTo(item)">
           <el-col :span="19" class="title">
-            <p class="textOver"><i class="el-icon-caret-right icon"></i>{{ item.title }}</p>
+            <p class="textOver" :title="item.title"><i class="el-icon-caret-right icon"></i>{{ item.title }}</p>
           </el-col>
           <el-col :span="5" class="date">
             {{ item.publish_time }}

src/layout/index/lunbo.vue

@@ -6,7 +6,7 @@
           <el-carousel height="304px">
             <el-carousel-item class="list" v-for="(item, index) in infoList" :key="index" @click.native="$turnTo(item)">
               <el-image style="width:540px;height:304px;" :src="item.pic"></el-image>
-              <span class="title textOver">{{ item.title }}</span>
+              <span class="title textOver" :title="item.title">{{ item.title }}</span>
               <span>{{ item.url }}</span>
             </el-carousel-item>
           </el-carousel>

src/layout/index/naitve.vue

@@ -10,7 +10,7 @@
             <span slot="label">{{ item.title }}</span>
             <el-col :span="6" v-for="(tag, index) in item.children" :key="index" class="enterList">
               <el-col :span="24" class="title">
-                <el-link :underline="false" :href="tag.url" target="_blank">{{ tag.title }} </el-link>
+                <el-link :underline="false" :href="tag.url" target="_blank" :title="tag.title">{{ tag.title }} </el-link>
               </el-col>
             </el-col>
           </el-tab-pane>

src/layout/index/news.vue

@@ -19,7 +19,7 @@
                 <el-link :underline="false" @click="$router.push({ path: `/detail?id=${item.id}` })">
                   <el-image style="width:369px;height:242px;" :src="item.pic"></el-image>
                   <el-col :span="24" class="cont">
-                    <p>{{ item.title }}</p>
+                    <p :title="item.title">{{ item.title }}</p>
                   </el-col>
                 </el-link>
               </el-carousel-item>

src/layout/index/notice.vue

@@ -15,7 +15,7 @@
         <el-col :span="24" class="info">
           <el-col :span="24" class="list" v-for="(item, index) in infoList" :key="index" @click.native="$router.push({ path: `/detail?id=${item.id}` })">
             <span class="shu"></span>
-            <span class="title">{{ item.title }}</span>
+            <span class="title" :title="item.title">{{ item.title }}</span>
           </el-col>
         </el-col>
       </el-col>

src/layout/index/noticeNews.vue

@@ -15,7 +15,7 @@
         <el-col :span="24" class="info">
           <el-col :span="24" class="list" v-for="(item, index) in infoList" :key="index" @click.native="$turnTo(item)">
             <el-col :span="19" class="title">
-              <p class="textOver"><i class="el-icon-caret-right icon"></i>{{ item.title }}</p>
+              <p class="textOver" :title="item.title"><i class="el-icon-caret-right icon"></i>{{ item.title }}</p>
             </el-col>
             <el-col :span="5" class="date">
               {{ item.publish_time }}

src/layout/index/recruit.vue

@@ -37,7 +37,7 @@
                     <p class="textOver">{{ item.jobs | getJobs }}</p>
                   </el-col>
                   <el-col :span="4" class="jobs">
-                    <p class="textOver">{{ item.schname }}</p>
+                    <p class="textOver" :title="item.schname">{{ item.schname }}</p>
                   </el-col>
                   <el-col :span="8" class="company" v-if="item.corpid">
                     <p class="textOver" @click="$router.push({ path: '/corp', query: { id: item.corpid } })">{{ item.corpname }}</p>
@@ -66,7 +66,7 @@
                 </el-col>
                 <el-col :span="24">
                   <el-col :span="24" class="zixunList" v-for="(item, index) in infoList" :key="index" @click.native="$turnTo(item)">
-                    <p class="title textOver">{{ item.title }}</p>
+                    <p class="title textOver" :title="item.title">{{ item.title }}</p>
                   </el-col>
                 </el-col>
               </el-col>

src/layout/index/service.vue

@@ -14,7 +14,7 @@
       <el-col :span="24" class="info">
         <el-col :span="24" class="list" v-for="(item, index) in infoList" :key="index" @click.native="$router.push({ path: `/detail?id=${item.id}` })">
           <el-col :span="19" class="title">
-            <p class="textOver"><i class="el-icon-caret-right icon"></i>{{ item.title }}</p>
+            <p class="textOver" :title="item.title"><i class="el-icon-caret-right icon"></i>{{ item.title }}</p>
           </el-col>
           <el-col :span="5" class="date">
             {{ item.publish_time }}

src/layout/index/xiazai.vue

@@ -13,7 +13,7 @@
       </el-col>
       <el-col :span="24" class="info">
         <el-col :span="24" class="list" v-for="(item, index) in infoList" :key="index" @click.native="$router.push({ path: `/detail?id=${item.id}` })">
-          <p class="title textOver">{{ item.title }}</p>
+          <p class="title textOver" :title="item.title">{{ item.title }}</p>
         </el-col>
       </el-col>
     </el-row>

src/layout/index/zhidao.vue

@@ -14,7 +14,7 @@
       <el-col :span="24" class="info">
         <el-col :span="24" class="list" v-for="(item, index) in infoList" :key="index" @click.native="$turnTo(item)">
           <el-col :span="19" class="title">
-            <p class="textOver"><i class="el-icon-caret-right icon"></i>{{ item.title }}</p>
+            <p class="textOver" :title="item.title"><i class="el-icon-caret-right icon"></i>{{ item.title }}</p>
           </el-col>
           <el-col :span="5" class="date">
             {{ item.publish_time }}

src/layout/jobs-list/jobfair.vue

@@ -2,7 +2,7 @@
   <div id="jobfair">
     <el-col :span="24" class="list" @click.native="$router.push({ path: '/jobfairDetail', query: { id: data.id } })">
       <el-col :span="20" class="title">
-        <p class="textOver tit"><span class="dian"></span>{{ data.title }}</p>
+        <p class="textOver tit" :title="data.title"><span class="dian"></span>{{ data.title }}</p>
         <p class="textOver"><span class="dian"></span>地址:{{ data.city }}{{ data.address }}</p>
         <p class="textOver"><span class="dian"></span>举办方:{{ data.organizer }}</p>
       </el-col>

src/layout/jobs-list/jobinfo.vue

@@ -2,7 +2,7 @@
   <div id="jobinfo">
     <el-col :span="24" class="list" @click.native="$router.push({ path: '/jobinfoDetail', query: { id: data.id } })">
       <el-col :span="20" class="title">
-        <p class="textOver"><span class="dian"></span>{{ data.title }}</p>
+        <p class="textOver" :title="data.title"><span class="dian"></span>{{ data.title }}</p>
         <p class="textOver"><span class="dian"></span>发布方:{{ data.corpname }}</p>
         <p class="textOver"><span class="dian"></span>发布站点:{{ data.schname }}</p>
       </el-col>

src/layout/jobs-list/post.vue

@@ -2,7 +2,7 @@
   <div id="post">
     <el-col :span="24" class="list" @click.native="$router.push({ path: '/jobsDetail', query: { id: data.id } })">
       <el-col :span="20" class="title">
-        <p class="textOver"><span class="dian"></span>{{ data.job_name }}</p>
+        <p class="textOver" :title="data.job_name"><span class="dian"></span>{{ data.job_name }}</p>
         <p class="textOver"><span class="dian"></span>需求人数:{{ data.job_number }}</p>
         <p class="textOver"><span class="dian"></span>薪资:{{ data | getSalary }}</p>
         <p class="textOver"><span class="dian"></span>福利待遇:{{ data.welfare }}</p>

src/layout/jobs-list/talk.vue

@@ -2,7 +2,7 @@
   <div id="talk">
     <el-col :span="24" class="list" @click.native="$router.push({ path: '/talkDetail', query: { id: data.id } })">
       <el-col :span="20" class="title">
-        <p class="textOver tit"><span class="dian"></span>{{ data.title }}</p>
+        <p class="textOver tit" :title="data.title"><span class="dian"></span>{{ data.title }}</p>
         <p class="textOver"><span class="dian"></span>地址:{{ data.address }}</p>
         <p class="textOver"><span class="dian"></span>宣讲方:{{ data.corpname }}</p>
       </el-col>

src/layout/list/mainRight.vue

@@ -13,7 +13,7 @@
           <el-col :span="19" class="right">
             <el-col :span="24" class="rightTop">
               <el-col :span="20" class="title">
-                <p class="textOver">{{ item.title }}</p>
+                <p class="textOver" :title="item.title">{{ item.title }}</p>
               </el-col>
               <el-col :span="4" class="date">
                 {{ item.publish_time }}

src/layout/list/newsInfo.vue

@@ -22,7 +22,7 @@
             <el-col :span="19">
               <el-col :span="24">
                 <el-col :span="20" class="title" @click.native="$turnTo(item)">
-                  <p class="textOver">{{ item.title }}</p>
+                  <p class="textOver" :title="item.title">{{ item.title }}</p>
                 </el-col>
                 <el-col :span="4" class="date">
                   {{ item.publish_time }}

src/layout/member/dangjian.vue

@@ -27,7 +27,7 @@
           <el-col :span="24" class="infoLeftList">
             <el-col :span="24" class="rencaiList" v-for="(item, index) in infoList" :key="index" @click.native="$turnTo(item)">
               <el-col :span="16" class="title">
-                <p class="textOver"><i class="el-icon-s-flag icon"></i>{{ item.title }}</p>
+                <p class="textOver" :title="item.title"><i class="el-icon-s-flag icon"></i>{{ item.title }}</p>
               </el-col>
               <el-col :span="8" class="date"> [{{ item.publish_time }}] </el-col>
             </el-col>
@@ -45,14 +45,11 @@
             </el-col>
           </el-col>
           <el-col :span="24" class="infoCenterList">
-            <el-col :span="12" class="dangjianList" v-for="(item, index) in infosList" :key="index" @click.native="$turnTo(item)">
-              <el-col :span="24" class="imageTit">
-                <el-image style="width:180px;height:120px;" fit="contain" :src="item.pic" v-if="item.pic"></el-image>
-                <el-image style="width:180px;height:120px;" fit="contain" :src="Nopic" v-else></el-image>
-              </el-col>
-              <el-col :span="24" class="title">
-                <p>{{ item.title }}</p>
+            <el-col :span="24" class="rencaiList" v-for="(item, index) in infosList" :key="index" @click.native="$turnTo(item)">
+              <el-col :span="16" class="title">
+                <p class="textOver" :title="item.title"><i class="el-icon-s-flag icon"></i>{{ item.title }}</p>
               </el-col>
+              <el-col :span="8" class="date"> [{{ item.publish_time }}]</el-col>
             </el-col>
           </el-col>
         </el-col>
@@ -70,7 +67,7 @@
           <el-col :span="24" class="infoLeftList">
             <el-col :span="24" class="rencaiList" v-for="(item, index) in infossList" :key="index" @click.native="$turnTo(item)">
               <el-col :span="16" class="title">
-                <p class="textOver"><i class="el-icon-s-flag icon"></i>{{ item.title }}</p>
+                <p class="textOver" :title="item.title"><i class="el-icon-s-flag icon"></i>{{ item.title }}</p>
               </el-col>
               <el-col :span="8" class="date"> [{{ item.publish_time }}]</el-col>
             </el-col>

src/layout/member/gaoceng.vue

@@ -18,14 +18,14 @@
             <el-carousel-item class="infoList" v-for="(item, index) in infoList" :key="index" @click.native="$turnTo(item)">
               <el-image style="width:100%;height:400px;" :src="item.pic" v-if="item.pic"></el-image>
               <el-image style="width:100%;height:400px;" :src="noPic" v-else></el-image>
-              <span class="textOver">{{ item.title }}</span>
+              <span class="textOver" :title="item.title">{{ item.title }}</span>
             </el-carousel-item>
           </el-carousel>
         </el-col>
         <el-col :span="12" style="height:400px;" v-loading="loading">
           <el-col :span="24" class="newsList" v-for="(item, index) in infosList" :key="index" @click.native="$turnTo(item)">
             <el-col :span="20" class="title">
-              <p class="textOver">
+              <p class="textOver" :title="item.title">
                 <i class="el-icon-s-flag icon"></i><span>{{ item.title }}</span>
               </p>
             </el-col>

src/layout/member/meesage.vue

@@ -7,7 +7,7 @@
         </el-col>
         <el-col :span="21" class="info">
           <el-col :span="24" class="title">
-            <p class="textOver">{{ messageInfo.title }}</p>
+            <p class="textOver" :title="messageInfo.title">{{ messageInfo.title }}</p>
           </el-col>
           <el-col :span="24" class="content">
             <p>{{ messageInfo.content }}</p>

src/layout/member/xuexi.vue

@@ -27,7 +27,7 @@
           <el-col :span="24" class="infoLeftList">
             <el-col :span="24" class="rencaiList" v-for="(item, index) in infoList" :key="index" @click.native="$turnTo(item)">
               <el-col :span="24" class="title">
-                <p class="textOver"><i class="el-icon-s-flag icon"></i>{{ item.title }}</p>
+                <p class="textOver" :title="item.title"><i class="el-icon-s-flag icon"></i>{{ item.title }}</p>
               </el-col>
             </el-col>
           </el-col>
@@ -46,7 +46,7 @@
           <el-col :span="24" class="infoLeftList">
             <el-col :span="24" class="zhishiList" v-for="(item, index) in infosList" :key="index" @click.native="$turnTo(item)">
               <el-col :span="16" class="title">
-                <p class="textOver"><i class="el-icon-s-flag icon"></i>{{ item.title }}</p>
+                <p class="textOver" :title="item.title"><i class="el-icon-s-flag icon"></i>{{ item.title }}</p>
               </el-col>
               <el-col :span="8" class="date"> [{{ item.publish_time }}] </el-col>
             </el-col>
@@ -63,12 +63,12 @@
               ></el-link>
             </el-col>
           </el-col>
-          <el-col :span="24" class="infoRightList">
-            <el-col :span="24" v-for="(item, index) in infossList" :key="index" @click.native="$turnTo(item)">
-              <el-col :span="24">
-                <el-image style="width:400px;height:280px;" :src="item.pic" v-if="item.pic"></el-image>
-                <el-image style="width:400px;height:280px;" :src="Nopic" v-else></el-image>
+          <el-col :span="24" class="infoLeftList">
+            <el-col :span="24" class="zhishiList" v-for="(item, index) in infossList" :key="index" @click.native="$turnTo(item)">
+              <el-col :span="16" class="title">
+                <p class="textOver" :title="item.title"><i class="el-icon-s-flag icon"></i>{{ item.title }}</p>
               </el-col>
+              <el-col :span="8" class="date"> [{{ item.publish_time }}] </el-col>
             </el-col>
           </el-col>
         </el-col>
@@ -234,7 +234,7 @@ p {
   color: #bd000b;
 }
 .zhishiList {
-  padding: 8px;
+  padding: 7px 8px;
 }
 .zhishiList .title {
   padding: 4px 0;

src/views/index.vue

@@ -302,8 +302,8 @@ export default {
     },
     //请求广告列表
     async getAdv() {
-      let res1 = await this.advQuery({ skip: 0, limit: 1, is_use: '0', type: '1' });
-      let res0 = await this.advQuery({ skip: 0, limit: 1, is_use: '0', type: '0' });
+      let res1 = await this.advQuery({ skip: 0, limit: 1, is_use: '0', position: '1' });
+      let res0 = await this.advQuery({ skip: 0, limit: 1, is_use: '0', position: '2' });
       let method = (res, index) => {
         if (this.$checkRes(res)) {
           let adv = res.data[0];