Merge pull request '邓洁 : 修改细节' (#13) from dj into master

Reviewed-on: #13

src/views/aboutUs/index.vue

@@ -184,6 +184,21 @@ export default {
 </script>
 
 <style scoped lang="scss">
+@media only screen and (max-width: 1660px) {
+  .culture_img {
+    img{
+      width: 550px !important;
+    }
+  }
+}
+
+@media only screen and (max-width: 1480px) {
+  .culture_img {
+    img{
+      width: 500px !important;
+    }
+  }
+}
 #band {
   display: none;
 }

src/views/header/index.vue

@@ -68,7 +68,7 @@ export default {
           title: '关于我们',
           children: [
             {
-              href: '',
+              href: '/about_us',
               title: '企业简介'
             },
             {
@@ -137,7 +137,7 @@ export default {
           title: '形象展示',
           children: [
             {
-              href: '',
+              href: '/image_display',
               title: '资质荣誉'
             },
             {
@@ -150,7 +150,7 @@ export default {
           title: '招商加盟',
           children: [
             {
-              href: '',
+              href: '/attract_and_join',
               title: '支持策略'
             },
             {
@@ -193,29 +193,29 @@ export default {
 </script>
 
 <style scoped lang="scss">
-*{
+* {
   font: 14px / 1.8 微软正黑体, "Microsoft JhengHei", "Microsoft Yahei", 微软雅黑, "Hiragino Sans GB", 冬青黑体, Arial, Helvetica, SimHei, 黑体, STXihei, 华文细黑, sans-serif;
 }
 @media screen and (max-width: 1660px) {
   .down_header {
-    width: 1230px!important;
+    width: 1230px !important;
   }
   .up_header {
-    width: 1230px!important;
+    width: 1230px !important;
   }
   .headerItems {
-    width: 1230px!important;
+    width: 1230px !important;
   }
 }
 @media screen and (max-width: 1480px) {
   .down_header {
-    width: 1100px!important;
+    width: 1100px !important;
   }
   .up_header {
-    width: 1100px!important;
+    width: 1100px !important;
   }
   .headerItems {
-    width: 1100px!important;
+    width: 1100px !important;
   }
 }
 .header_bg {

src/views/news/index.vue

@@ -6,14 +6,14 @@
     <!--标签栏 -->
     <ProductsTabsItem :tab-list="newsTab" :fatherMethod="handleClick"/>
     <!--图片栏-->
-    <PicturesBox :image-list="imageAndWord"  v-if="company_news"/>
+    <PicturesBox :image-list="imageAndWord"  v-show="company_news"/>
-    <PicturesBox :image-list="industryList"  v-if="industry_dynamics"/>
+    <PicturesBox :image-list="industryList"  v-show="industry_dynamics"/>
-    <PicturesBox :image-list="ceramicList" v-if="ceramic"/>
+    <PicturesBox :image-list="ceramicList" v-show="ceramic"/>
     <!--页码-->
-    <Pagination :currentPage="1" :total="20" :pageSize="10" v-if="showPagination"/>
+    <Pagination :currentPage="1" :total="20" :pageSize="10" v-show="showPagination"/>
 
     <!--新闻详情-->
-    <detail v-if="showDetail"/>
+    <detail v-show="showDetail"/>
   </div>
 </template>