xing.li преди 3 години
родител
ревизия
6f6246d628
променени са 8 файла, в които са добавени 42 реда и са изтрити 12 реда
  1. 2 2
      src/App.vue
  2. 13 0
      src/assets/css/common.scss
  3. 1 0
      src/assets/css/index-banner.scss
  4. 2 6
      src/assets/css/news.scss
  5. 2 2
      src/assets/css/recruit.scss
  6. 3 1
      src/main.js
  7. 18 1
      src/views/news.vue
  8. 1 0
      src/views/recruit.vue

+ 2 - 2
src/App.vue

@@ -16,7 +16,7 @@
 
                 <div class="col-lg-12 nav-link flex-row">
                   <img src="./assets/image/img/logo.png" alt=""  class="navbar-brand logo">
-                  <div>
+                  <div style="min-width: 1400px;justify-content: flex-end" class="flex-row">
                   <router-link class="navbar-brand" to="/index" tag="a" >
                     <span>首</span>
                     <span>页</span>
@@ -46,7 +46,7 @@
                     <span>招</span>
                     <span>聘</span>
                     </router-link>
-                  <span class="navbar-brand" style="margin-right: 155px">
+                  <span class="navbar-brand" style="margin-right: 100px">
 
                    <a :href="'tel:400-878-124'">
                      <img src="./assets/image/img/tel.png" alt style="height: 30px;width: 34px"/>

+ 13 - 0
src/assets/css/common.scss

@@ -13,3 +13,16 @@
 .router-link-active{
   color: #E84E47!important;
 }
+
+.el-pager li:hover,.el-pagination button:hover,.el-pager li.active{
+  color: #E84E47!important;
+}
+.el-input.is-active .el-input__inner, .el-input__inner:focus{
+  border-color: #E84E47!important;
+}
+.mb40{
+  margin-bottom: 40px;
+}
+.mt100{
+  margin-top: 100px;
+}

+ 1 - 0
src/assets/css/index-banner.scss

@@ -25,6 +25,7 @@
     flex-flow: row nowrap;
     //justify-content: flex-end;
     align-items: center;
+
   }
   .logo{
     width: 126px;

+ 2 - 6
src/assets/css/news.scss

@@ -6,9 +6,8 @@
 
 .news-bg{
   width: 100%;
-  height: 1900px;
+  //height: 1900px;
   background-color: #ffffff;
-  //padding: 0px 360px;
   box-sizing: border-box;
 }
 .news-bottom{
@@ -66,7 +65,6 @@
 
 .img-list{
   width: 1200px;
-  height: 1240px;
   overflow-y: scroll;
 }
 .img-list::-webkit-scrollbar {
@@ -113,11 +111,9 @@
 
 }
 
-
-
 .video-list{
   width: 1260px;
-  height: 1000px;
+  //height: 1000px;
   display: flex;
   flex-flow: row wrap;
   justify-content: space-between;

+ 2 - 2
src/assets/css/recruit.scss

@@ -6,7 +6,7 @@
 
 .recruit-bg{
   width: 100%;
-  height: 1450px;
+  //height: 1450px;
   background-color: #ffffff;
   box-sizing: border-box;
 }
@@ -17,7 +17,7 @@
 .recruit-list{
   margin-top: 130px;
   width: 1640px;
-  height: 750px;
+  //height: 750px;
   display: flex;
   flex-flow: row wrap;
   justify-content: left;

+ 3 - 1
src/main.js

@@ -7,7 +7,7 @@ import VueAwesomeSwiper from 'vue-awesome-swiper'
 import 'swiper/dist/css/swiper.css'
 import '../public/bootstrap3/css/bootstrap.min.css'
 import '../public/bootstrap3/js/bootstrap.min.js'
-import { Button, Card,Drawer,Cascader } from 'element-ui';
+import { Button, Card,Drawer,Cascader, Carousel, Pagination  } from 'element-ui';
 import 'element-ui/lib/theme-chalk/index.css';
 import router from './router'
 
@@ -16,6 +16,8 @@ Vue.use(Button);
 Vue.use(Card);
 Vue.use(Drawer);
 Vue.use(Cascader);
+Vue.use(Carousel);
+Vue.use(Pagination);
 Vue.use(VueAwesomeSwiper);
 Vue.config.productionTip = false
 

+ 18 - 1
src/views/news.vue

@@ -101,6 +101,16 @@
 
           </div>
 
+          <el-pagination
+              class="mb40 mt100"
+              @size-change="handleSizeChange"
+              @current-change="handleCurrentChange"
+              :current-page.sync="currentPage3"
+              :page-size="100"
+              layout="prev, pager, next, jumper"
+              :total="1000">
+          </el-pagination>
+
         </div>
       </div>
 
@@ -118,7 +128,8 @@ export default {
       index:1,
       title:'企业新闻',
       titleEn:'CORPORATE NEWS',
-      showImg:true
+      showImg:true,
+      currentPage3:1
     }
   },
   created() {
@@ -141,6 +152,12 @@ export default {
         this.titleEn = 'WONDERFUL VIDEO'
         this.showImg = false
       }
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
     }
   },
   destroyed() {

+ 1 - 0
src/views/recruit.vue

@@ -158,6 +158,7 @@
         </div>
 
         <el-pagination
+            class="mb40"
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
             :current-page.sync="currentPage3"