kun 19/9/26 9:28

src/App.vue

@@ -6,9 +6,6 @@
 
 <style lang="less">
 * {
-  margin: 0;
-  padding: 0;
-
   /*隐藏滚动条，当IE下溢出，仍然可以滚动*/
   -ms-overflow-style: none;
   /*火狐下隐藏滚动条*/
@@ -23,8 +20,6 @@ html {
 }
 body {
   background-color: #fcfbfb;
-  display: flex;
-  justify-content: center;
 
   &::-webkit-scrollbar {
     width: 0px;

src/components/FooterNav.vue

@@ -1,5 +1,6 @@
 <template>
-  <div id="wrapper-w" :style="{'background-image':'url('+imgUrl.foot+')'}">
+  <div id="wrapper-w"
+       :style="{'background-image':'url('+imgUrl.foot+')'}">
     <div>
       <p>版权所有：朝阳区委社会工委区民政局</p>
       <p>京ICP备19040879号 Copyright 2019-2029 www.cyteam.orz.cn All Rights Reserved</p>
@@ -28,7 +29,8 @@ export default {
 
 <style lang='scss' scoped>
 #wrapper-w {
-  width: 1280px;
+  // width: 1280px;
+  width: 100%;
   height: 227px !important;
   background-size: 100% 100%;
   background-color: rgba($color: #000000, $alpha: 0.6);

src/components/HeaderNav.vue

@@ -1,5 +1,9 @@
 <template>
-  <div id="wrapper" :style="{'background-image':'url('+imgUrl.home+')'}">
+  <div id="wrapper">
+    <!--  :style="{'background-image':'url('+imgUrl.home1+')'}"  -->
+    <div class="img-box">
+      <img :src="imgUrl.home1" alt />
+    </div>
     <div class="box">
       <div @click="$jump('homePage')" :class="styleNum == 0 ? 'style': ''">党组织建设</div>
       <div
@@ -22,7 +26,10 @@ export default {
   props: ['index_num'],
   data () {
     return {
-      imgUrl: { home: require('../../static/img/home.png') },
+      imgUrl: {
+        home: require('../../static/img/home.png'),
+        home1: require('../../static/img/home1.png')
+      },
       styleNum: 0
     }
   },
@@ -34,27 +41,43 @@ export default {
     sub = this.$props.index_num
     this.styleNum = sub
   },
-  mounted () {}
+  mounted () { }
 }
 </script>
 
 <style lang='scss' scoped>
 #wrapper {
-  width: 1280px;
+  min-width: 1280px;
+  // width: 100%;
   height: 389px;
   box-sizing: border-box;
+  background-repeat: no-repeat;
   background-size: 100% 100%;
   position: relative;
+  overflow: hidden;
+
+  .img-box {
+    width: 100%;
+    height: 389px;
+    display: flex;
+    justify-content: center;
+
+    img{
+      // width: 100%;
+      height:100%;
+    }
+  }
 
   .box {
     position: absolute;
     bottom: 0%;
     left: 0%;
-    width: 1280px;
+    // width: 1280px;
+    width: 100%;
     height: 63px;
     background-color: rgba($color: #fff, $alpha: 0.5);
     display: flex;
-    justify-content: space-evenly;
+    justify-content: space-around;
     align-items: center;
 
     & > div {

src/router.js

@@ -1,10 +1,18 @@
 import Vue from 'vue'
 import Router from 'vue-router'
 
+/** 头部导航 */
+import HeaderNav from './components/HeaderNav'
+/** 尾部导航 */
+import FooterNav from './components/FooterNav'
+
 /** 首页 */
 import HomePage from './views/home/HomePage'
+/** 党组织申请 */
 import ApplyFor from './views/home/ApplyFor'
+/** 新闻详情 */
 import NewsDetails from './views/home/NewsDetails'
+/** 新闻列表 */
 import NewsList from './views/home/NewsList'
 /** 登录 */
 import Login from './views/Login'
@@ -12,33 +20,42 @@ import Login from './views/Login'
 import Registered from './views/Registered'
 /** 项目管理 */
 import Project from './views/project/Project'
+/** 项目进度 */
 import Schedule from './views/project/Schedule'
+/** 项目创建 */
 import Application from './views/project/Application'
 /** 个人中心 */
 import PersonalZte from './views/personal/PersonalZte'
+/** 党组织申请 */
 import Apply from './views/personal/Apply'
+/** 我的收藏 */
 import Collection from './views/personal/Collection'
+/** 项目申报 */
 import Declare from './views/personal/Declare'
+/** 修改密码 */
 import Modify from './views/personal/Modify'
 /** 信息查询 */
 import InformationQuery from './views/InformationQuery'
 
-/** 头部导航 */
-import HeaderNav from './components/HeaderNav'
-/** 尾部导航 */
-import FooterNav from './components/FooterNav'
-
 Vue.use(Router)
 
 export default new Router({
   mode: 'hash',
   base: process.env.BASE_URL,
   routes: [
+    /** 头部导航 */
     {
-      path: '/newsList',
-      name: 'newsList',
-      component: NewsList
+      path: '/headerNav',
+      name: 'headerNav',
+      component: HeaderNav
     },
+    /** 尾部导航 */
+    {
+      path: '/footerNav',
+      name: 'footerNav',
+      component: FooterNav
+    },
+    /** 信息查询 */
     {
       path: '/informationQuery',
       name: 'informationQuery',
@@ -47,6 +64,7 @@ export default new Router({
       },
       component: InformationQuery
     },
+    /** 修改密码 */
     {
       path: '/modify',
       name: 'modify',
@@ -55,6 +73,7 @@ export default new Router({
       },
       component: Modify
     },
+    /** 项目申报 */
     {
       path: '/declare',
       name: 'declare',
@@ -63,6 +82,7 @@ export default new Router({
       },
       component: Declare
     },
+    /** 我的收藏 */
     {
       path: '/collection',
       name: 'collection',
@@ -71,6 +91,7 @@ export default new Router({
       },
       component: Collection
     },
+    /** 党组织申请 */
     {
       path: '/apply',
       name: 'apply',
@@ -79,6 +100,7 @@ export default new Router({
       },
       component: Apply
     },
+    /** 个人中心 */
     {
       path: '/personalZte',
       name: 'personalZte',
@@ -87,6 +109,7 @@ export default new Router({
       },
       component: PersonalZte
     },
+    /** 项目创建 */
     {
       path: '/application',
       name: 'application',
@@ -95,14 +118,7 @@ export default new Router({
       },
       component: Application
     },
-    {
-      path: '/project',
-      name: 'project',
-      meta: {
-        requireAuth: true
-      },
-      component: Project
-    },
+    /** 项目进度 */
     {
       path: '/schedule',
       name: 'schedule',
@@ -111,40 +127,53 @@ export default new Router({
       },
       component: Schedule
     },
+    /** 项目管理 */
     {
-      path: '/',
-      name: 'homePage',
-      component: HomePage
-    },
-    {
-      path: '/applyFor',
-      name: 'applyFor',
-      component: ApplyFor
-    },
-    {
-      path: '/newsDetails',
-      name: 'newsDetails',
-      component: NewsDetails
-    },
-    {
-      path: '/login',
-      name: 'login',
-      component: Login
+      path: '/project',
+      name: 'project',
+      meta: {
+        requireAuth: true
+      },
+      component: Project
     },
+    /** 注册 */
     {
       path: '/registered',
       name: 'registered',
       component: Registered
     },
+    /** 登录 */
     {
-      path: '/headerNav',
-      name: 'headerNav',
-      component: HeaderNav
+      path: '/login',
+      name: 'login',
+      component: Login
     },
+    /** 新闻列表 */
     {
-      path: '/footerNav',
-      name: 'footerNav',
-      component: FooterNav
+      path: '/newsList',
+      name: 'newsList',
+      component: NewsList
+    },
+    /** 新闻详情 */
+    {
+      path: '/newsDetails',
+      name: 'newsDetails',
+      component: NewsDetails
+    },
+    /** 党组织申请 */
+    {
+      path: '/applyFor',
+      name: 'applyFor',
+      meta: {
+        requireAuth: true
+      },
+      component: ApplyFor
+    },
+    /** 首页 */
+    {
+      path: '/',
+      name: 'homePage',
+      component: HomePage
     }
   ]
 })

src/views/InformationQuery.vue

@@ -246,7 +246,7 @@ export default {
 
 <style lang='scss' scoped>
 .wrapper {
-  width: 1280px;
+  min-width: 1280px;
   box-sizing: border-box;
   position: relative;
 

src/views/Login.vue

@@ -37,58 +37,58 @@
 export default {
   components: {},
   props: {},
-  data() {
+  data () {
     return {
       imgUrl: {
-        login: require("../../static/img/login.png"),
-        yh: require("../../static/img/yh.png"),
-        mm: require("../../static/img/mm.png")
+        login: require('../../static/img/login.png'),
+        yh: require('../../static/img/yh.png'),
+        mm: require('../../static/img/mm.png')
       },
       postData: {
-        account: "",
-        password: ""
+        account: '',
+        password: ''
       }
-    };
+    }
   },
   computed: {},
   watch: {},
   methods: {
-    login() {
+    login () {
       this.postData = {
         account: this.postData.account,
         password: this.$md5(this.postData.password)
-      };
+      }
 
-      console.log(this.postData);
+      console.log(this.postData)
 
       this.$http
-        .post("/login", this.postData)
+        .post('/login', this.postData)
         .then(res => {
           if (res.data.errno === 0) {
-            this.$Message.success("登陆成功");
-            this.$router.push("roomInfo");
+            this.$Message.success('登陆成功')
+            this.$router.push('roomInfo')
             /** 全局存储token */
             // window.localStorage['token'] = JSON.stringify(res.data.data.token)
-            window.localStorage["token"] = JSON.stringify("shenxuekundetoken");
+            window.localStorage['token'] = JSON.stringify('shenxuekundetoken')
           } else {
-            this.$Message.error("登录失败");
-            this.forgetPassword = true;
+            this.$Message.error('登录失败')
+            this.forgetPassword = true
           }
         })
         // eslint-disable-next-line handle-callback-err
         .catch(err => {
-          console.log("登录失败");
-        });
+          console.log('登录失败')
+        })
     }
   },
-  created() {},
-  mounted() {}
-};
+  created () {},
+  mounted () {}
+}
 </script>
 
 <style lang='scss' scoped>
 .wrapper {
-  width: 1280px;
+  min-width: 1280px;
   height: 720px;
   background-size: 100% 100%;
   display: flex;

src/views/Registered.vue

@@ -178,20 +178,20 @@
 export default {
   components: {},
   props: {},
-  data() {
+  data () {
     return {
       imgUrl: {
-        registered: require("../../static/img/registered.png"),
-        yy: require("../../static/img/yy.png")
+        registered: require('../../static/img/registered.png'),
+        yy: require('../../static/img/yy.png')
       }
-    };
+    }
   },
   computed: {},
   watch: {},
   methods: {},
-  created() {},
-  mounted() {}
-};
+  created () {},
+  mounted () {}
+}
 </script>
 
 <style lang='scss' scoped>
@@ -204,7 +204,7 @@ input:required:valid {
   border-color: green !important;
 }
 .wrapper {
-  width: 1280px;
+  min-width: 1280px;
   height: 1398px;
   background-size: 100% 100%;
   box-sizing: border-box;

src/views/home/ApplyFor.vue

@@ -247,7 +247,7 @@ export default {
 
 <style lang='scss' scoped>
 .wr {
-  width: 1280px;
+ min-width: 1280px;
   box-sizing: border-box;
 
   .footer {

src/views/home/HomePage.vue

@@ -192,7 +192,7 @@
 
 <script>
 /* eslint-disable */
-import HeaderNav from "../../components/HeaderNav";
+import HeaderNav from '../../components/HeaderNav';
 /* eslint-disable */
 import FooterNav from "../../components/FooterNav";
 import Swiper from "swiper";
@@ -378,15 +378,17 @@ export default {
 }
 
 .wrapper {
-  width: 1280px;
+  min-width: 1280px;
+  // width: 100%;
   box-sizing: border-box;
   position: relative;
 
-  .footer {
-    margin-top: 80px;
-  }
-
-  /** FOUR */
+  #box{
+    width:1200px;
+    padding-top: 40px;
+    margin: 0 auto 80px;
+    box-sizing: border-box;
+ /** FOUR */
   .container-four {
     width: 100%;
     height: 260px;
@@ -811,9 +813,8 @@ export default {
   /** ONE */
   .container {
     width: 100%;
-    padding: 0 40px;
+    // padding: 0 40px;
     box-sizing: border-box;
-    margin-top: 40px;
     display: flex;
     justify-content: space-between;
     align-items: center;
@@ -973,5 +974,8 @@ export default {
       }
     }
   }
+  }
+
+ 
 }
 </style>

src/views/home/NewsDetails.vue

@@ -93,11 +93,12 @@ export default {
 
 <style lang='scss' scoped>
 .wrapper {
-  width: 1280px;
+  min-width: 1280px;
   box-sizing: border-box;
 
   .box {
-    width: 100%;
+    margin: 0 auto;
+    width: 1280px;
     padding: 42px 40px 0px;
     box-sizing: border-box;
     display: flex;

src/views/home/NewsList.vue

@@ -79,7 +79,7 @@ export default {
 
 <style lang='scss' scoped>
 .wrapper {
-  width: 1280px;
+  min-width: 1280px;
   box-sizing: border-box;
   position: relative;
 

src/views/personal/PersonalZte.vue

@@ -72,13 +72,13 @@ export default {
 
 <style lang='scss' scoped>
 .wrapper {
-  width: 1280px;
+  min-width: 1280px;
 
   #box {
-    width: 100%;
+    width: 1200px;
     margin: 40px auto 0;
     box-sizing: border-box;
-    padding: 0 40px;
+    // padding: 0 40px;
     display: flex;
     justify-content: space-between;
     align-items: center;

src/views/project/Application.vue

@@ -424,7 +424,7 @@ export default {
 
 <style lang='scss' scoped>
 .wrapper {
-  width: 1280px;
+  min-width: 1280px;
   box-sizing: border-box;
 
   #box {

src/views/project/Project.vue

@@ -196,7 +196,7 @@ export default {
 
 <style lang='scss' scoped>
 .wrapper {
-  width: 1280px;
+  min-width: 1280px;
   box-sizing: border-box;
 
   .footer {

src/views/project/Schedule.vue

@@ -254,7 +254,7 @@ export default {
 
 <style lang='scss' scoped>
 .wrapper {
-  width: 1280px;
+  min-width: 1280px;
   box-sizing: border-box;
 
   #box {