首页更新

src/layout/master/index/company.vue

@@ -2,18 +2,13 @@
   <div id="company">
     <el-row>
       <el-col :span="24">
-        <el-col :span="24" class="top">
-          <el-col :span="24" class="english">
-            {{ companytop.english }}
-          </el-col>
-          <el-col :span="24" class="title">
-            {{ companytop.title }}
-          </el-col>
+        <el-col :span="24" class="topTitle">
+          {{ companytop.title }}
         </el-col>
         <el-col :span="24" class="info">
-          <el-col :span="12" class="companylist" v-for="(item, index) in companylist" :key="index">
-            <el-col :span="24">
-              <p class="title">{{ item.corpname }}</p>
+          <el-col :span="12" class="list" v-for="(item, index) in companylist" :key="index">
+            <el-col :span="24" class="title">
+              <p class="textOver">{{ item.corpname }}</p>
             </el-col>
           </el-col>
         </el-col>
@@ -39,32 +34,23 @@ export default {
 
 <style lang="less" scoped>
 p {
-  margin: 0;
   padding: 0;
+  margin: 0;
 }
-.top {
-  height: 92px;
-  text-align: center;
-}
-.top .english {
-  text-transform: uppercase;
-  color: #5b5e66;
-  font-family: 微软雅黑;
-  font-size: 42px;
+.topTitle {
+  font-size: 24px;
+  color: #535353;
+  height: 80px;
+  padding: 35px 0px 0 10px;
 }
-.top .title {
-  color: #415285;
-  font-size: 36px;
-  font-family: 微软雅黑;
+.list {
+  padding: 12px;
 }
-.companylist {
-  padding: 48px 10px 0 0;
+.list .title {
+  font-size: 14px;
+  color: #959595;
 }
-.companylist .title {
-  color: #5b5e66;
-  font-size: 24px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+.list .title p:hover {
+  cursor: pointer;
 }
 </style>

src/layout/master/index/contact.vue

@@ -2,32 +2,10 @@
   <div id="contact">
     <el-row>
       <el-col :span="24">
-        <el-col :span="10" class="contact">
-          <el-col :span="24" class="english">
-            {{ contactinfo.english }}
-          </el-col>
-          <el-col :span="24" class="title">
-            {{ contactinfo.title }}
-          </el-col>
-        </el-col>
-        <el-col :span="14" class="right">
-          <!-- <el-col :span="24" class="text">
-            <i class="el-icon-location-outline"></i><span>{{ contactinfo.address }}</span>
-          </el-col>
-          <el-col :span="24" class="text">
-            <i class="el-icon-phone-outline"></i><span>{{ contactinfo.youzheng }}</span>
-          </el-col>
-          <el-col :span="24" class="text">
-            <i class="el-icon-monitor"></i><span>{{ contactinfo.rexian }}</span>
-          </el-col>
-          <el-col :span="24" class="text">
-            <i class="el-icon-printer"></i><span>{{ contactinfo.chuanzhen }}</span>
-          </el-col>
-          <el-col :span="24" class="text">
-            <i class="el-icon-message"></i><span>{{ contactinfo.email }}</span>
-          </el-col> -->
-          <el-col :span="24" class="text" v-if="content" v-html="content"></el-col>
+        <el-col :span="24" class="title">
+          {{ contactinfo.title }}
         </el-col>
+        <el-col :span="24" class="text" v-if="content" v-html="content"></el-col>
       </el-col>
     </el-row>
   </div>
@@ -49,26 +27,20 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.contact {
-  text-align: center;
-  padding: 60px 0;
-}
-.contact .english {
-  font-size: 42px;
-  color: #5b5e66;
-  padding: 10px 0;
-}
-.contact .title {
-  color: #415285;
-  font-size: 36px;
+p {
+  padding: 0;
+  margin: 0;
 }
-.right .text i {
-  color: #576693;
-  padding: 0 15px 0 0;
-}
-.right .text {
-  color: #5b5e66;
+.title {
   font-size: 24px;
-  padding: 14px 0 0 0;
+  color: #535353;
+  height: 80px;
+  padding: 35px 0px 0 10px;
+}
+.text {
+  font-size: 14px;
+  color: #868686;
+  padding: 0 10px;
+  line-height: 20px;
 }
 </style>

src/layout/master/index/foot.vue

@@ -3,12 +3,10 @@
     <el-row>
       <el-col :span="24" class="foot">
         <div class="w_1200">
-          <el-col :span="24" class="title">
-            {{ footinfo.copyright }}
-          </el-col>
-          <el-col :span="24" class="title">
-            {{ footinfo.domain }}
+          <el-col :span="24" class="common text">
+            <p>{{ footinfo.copyright }}|{{ footinfo.domain }}</p>
           </el-col>
+          <el-col :span="24" class="common" v-html="footinfo.remark"> </el-col>
         </div>
       </el-col>
     </el-row>
@@ -34,15 +32,20 @@ export default {
   width: 1200px;
   margin: 0 auto;
 }
+p {
+  margin: 0;
+  padding: 0;
+}
 .foot {
+  height: 109px;
   background: #393939;
-  height: 185px;
   text-align: center;
-  padding: 37px 0 0 0;
-  font-size: 24px;
-  color: #a7a7a7;
 }
-.foot .title {
-  padding: 20px 0 0 0;
+.foot .text p {
+  margin: 14px 0 0 0;
+}
+.foot .common {
+  font-size: 14px;
+  color: #a7a7a7;
 }
 </style>

src/layout/master/index/login.vue

@@ -33,7 +33,7 @@ export default {
   components: {},
   data: () => ({
     shengyuan: require('../../../assets/shengyuan.png'),
-    qiye: require('../../../assets/qiye.png'),
+    qiye: require('../../../assets/company.png'),
     xuesheng: require('../../../assets/stu.png'),
   }),
   created() {},

src/layout/master/index/news.vue

@@ -5,46 +5,13 @@
         <el-col :span="24" class="title">
           <span>{{ title }}</span>
         </el-col>
-        <!-- <el-col :span="24">
-          <el-col :span="13" class="block">
-            <el-carousel ref="shubiao">
-              <el-carousel-item v-for="(item, index) in newsList" :key="index" :name="`${index}`">
-                <el-link :underline="false" @click="$router.push({ path: `/master/detail/news/${item.id}` })">
-                  <el-image style="width:396px;height:280px;" :src="item.pic" class="newsList"></el-image>
-                </el-link>
-              </el-carousel-item>
-            </el-carousel>
-          </el-col>
-          <el-col :span="11" class="newsLi">
-            <ul>
-              <li class="listdata">
-                <span class="qiudata"></span>
-                <el-link :underline="false">今天（3月8日星期五）</el-link>
-              </li>
-              <li
-                class="list"
-                v-for="(tag, index) in newsList"
-                :key="index"
-                :type="tag.type"
-                @mouseover="shuYi(index)"
-                :class="newListActive(tag)"
-                @click="$router.push({ path: `/master/detail/news/${tag.id}` })"
-              >
-                <span class="qiu"></span>
-                <el-link :underline="false" class="newsListTit">{{ tag.title }}</el-link>
-              </li>
-            </ul>
-          </el-col>
-        </el-col> -->
         <el-col :span="24" class="list">
           <el-col :span="13" class="block">
             <el-carousel ref="shubiao">
               <el-carousel-item v-for="(item, index) in newsList" :key="index" :name="`${index}`">
                 <el-link :underline="false" @click="$router.push({ path: `/master/detail/news/${item.id}` })">
                   <el-image style="width:396px;height:280px;" :src="item.pic" class="newsList"></el-image>
-                  <el-col :span="24" class="content"
-                    ><p>{{ item.parent }}</p></el-col
-                  >
+                  <el-col :span="24" class="content"><p v-html="item.content"></p></el-col>
                 </el-link>
               </el-carousel-item>
             </el-carousel>
@@ -152,7 +119,10 @@ p {
   display: -webkit-box;
   -webkit-box-orient: vertical;
 }
-
+/deep/.content p p {
+  padding: 3px 0 0 0;
+  margin: 0;
+}
 .block {
   width: 396px;
   height: 280px;

src/layout/master/index/notice.vue

@@ -16,12 +16,6 @@
                 <P>{{ item.title }}</P>
               </el-col>
             </li>
-            <li class="listTitle">
-              <el-col :span="24" class="title">
-                <span class="qiu"></span>
-                <P class="textOver">昆侖山搭街坊擴大技法盧卡斯房間阿里山看</P>
-              </el-col>
-            </li>
           </ul>
         </el-col>
       </el-col>

src/layout/master/index/unit.vue

@@ -1,20 +1,15 @@
 <template>
   <div id="unit">
     <el-row>
-      <el-col :span="24" class="unit" :style="'background: url(' + unittop.logoBei + ');height:700px;'">
+      <el-col :span="24" class="unit" :style="'background: url(' + unittop.logoBei + ');height:360px;'">
         <div class="w_1200">
-          <el-col :span="24" class="top">
-            <el-col :span="24" class="english">
-              {{ unittop.english }}
-            </el-col>
-            <el-col :span="24" class="title">
-              {{ unittop.title }}
-            </el-col>
+          <el-col :span="24" class="topTitle">
+            {{ unittop.title }}
           </el-col>
           <el-col :span="24" class="info">
-            <el-col :span="4" class="unitlist" v-for="(item, index) in unitlist" :key="index">
+            <el-col :span="3" class="list" v-for="(item, index) in unitlist" :key="index">
               <el-link :underline="false">
-                <el-image style="width:145px;height:145px;border-radius:90px;" :src="item.pic" @click="toOpen(item.url)"></el-image>
+                <el-image style="width:85px;height:85px;border-radius:90px;" :src="item.pic" @click="toOpen(item.url)"></el-image>
               </el-link>
             </el-col>
           </el-col>
@@ -32,7 +27,9 @@ export default {
     unitlist: null,
   },
   components: {},
-  data: () => ({}),
+  data: () => ({
+    pic: require('../../../assets/shengyuan.png'),
+  }),
   created() {},
   computed: {},
   methods: {
@@ -49,26 +46,21 @@ export default {
   margin: 0 auto;
 }
 .unit {
-  height: 700px;
-}
-.top {
-  height: 238px;
-  text-align: center;
-  padding: 77px 0 73px;
+  height: 360px;
 }
-.top .english {
-  text-transform: uppercase;
+.topTitle {
+  font-size: 36px;
   color: #fff;
-  font-family: 微软雅黑;
-  font-size: 42px;
+  text-align: center;
+  height: 120px;
+  line-height: 120px;
 }
-.top .title {
-  color: #fff;
-  font-size: 36px;
-  font-family: 微软雅黑;
+.info {
+  padding: 0 55px;
 }
-.unitlist {
+.list {
   text-align: center;
-  margin: 0 0 48px 0;
+  width: 85px;
+  margin: 10px 18px;
 }
 </style>

src/views/master/index/index.vue

@@ -51,61 +51,23 @@
             <yizhan></yizhan>
           </div>
         </el-col>
-        <el-col :span="24" class="contUnit">
+        <el-col :span="24" class="contCom">
           <div class="w_1200">
             <el-col :span="8">
-              联系
+              <contact :contactinfo="contactinfo" :content="content"></contact>
             </el-col>
             <el-col :span="16">
-              招聘企业
+              <company :companytop="companytop" :companylist="companylist"></company>
             </el-col>
           </div>
         </el-col>
       </el-col>
-      <!-- <el-col :span="24" class="huodong">
-        <div class="w_1200">
-          <huodong :huodonginfo="huodonginfo" :fairsList="fairsList" :talksList="talksList" :infoList="infoList"></huodong>
-        </div>
-      </el-col>
-      <el-col :span="24" class="recruit">
-        <div class="w_1200">
-          <recruit :recruitList="recruitList"></recruit>
-        </div>
-      </el-col>
-      <el-col :span="24" class="other">
-        <div class="w_1200">
-          <other :otherList="otherList"></other>
-        </div>
-      </el-col>
-      <el-col :span="24" class="rili">
-        <calendar :rilitop="rilitop">
-          <slot name="rili"></slot>
-        </calendar>
-      </el-col>
-      <el-col :span="24" class="fast">
-        <div class="w_1200">
-          <fast :fasttop="fasttop" :fastlist="fastlist"></fast>
-        </div>
-      </el-col>
-      <el-col :span="24" class="contact">
-        <div class="w_1200">
-          <contact :contactinfo="contactinfo" :content="content"></contact>
-        </div>
-      </el-col>
-      <el-col :span="24" class="yizhan">
-        <yizhan></yizhan>
-      </el-col>
-      <el-col :span="24" class="company">
-        <div class="w_1200">
-          <company :companytop="companytop" :companylist="companylist"></company>
-        </div>
-      </el-col>
       <el-col :span="24" class="unit">
         <unit :unittop="unittop" :unitlist="unitlist"></unit>
       </el-col>
       <el-col :span="24" class="foot">
         <foot :footinfo="footinfo"></foot>
-      </el-col>  -->
+      </el-col>
     </el-row>
   </div>
 </template>
@@ -119,7 +81,6 @@ import login from '../../../layout/master/index/login.vue';
 import huodong from '../../../layout/master/index/huodong.vue';
 import recruit from '../../../layout/master/index/recruit.vue';
 import other from '../../../layout/master/index/other.vue';
-// import calendar from '../../../layout/master/index/calendar.vue';
 import fast from '../../../layout/master/index/fast.vue';
 import contact from '../../../layout/master/index/contact.vue';
 import yizhan from '../../../layout/master/index/yizhan.vue';
@@ -164,10 +125,10 @@ export default {
     other,
     fast,
     yizhan,
-    // contact,
-    // company,
-    // unit,
-    // foot,
+    contact,
+    company,
+    unit,
+    foot,
   },
   data: () => ({}),
   created() {},
@@ -189,7 +150,7 @@ export default {
   overflow: hidden;
 }
 .main {
-  height: 1846px;
+  height: 1488px;
   overflow: hidden;
 }
 .newsNotice {
@@ -257,35 +218,16 @@ export default {
   height: 55px;
   overflow: hidden;
 }
-.contUnit {
+.contCom {
   height: 213px;
   overflow: hidden;
 }
-.huodong {
-  height: 632px;
-  margin-bottom: 50px;
-}
-.other {
-  height: 476px;
-  margin-bottom: 166px;
-}
-.fast {
-  height: 508px;
-  margin-bottom: 110px;
-}
-.contact {
-  height: 270px;
-  margin-bottom: 60px;
-}
-
-.company {
-  height: 465px;
-  margin-bottom: 76px;
-}
 .unit {
-  height: 699px;
+  height: 360px;
+  overflow: hidden;
 }
 .foot {
-  height: 185px;
+  height: 109px;
+  overflow: hidden;
 }
 </style>