Merge branch 'master' of https://gitee.com/gs1-office-web-sit/gs1

src/views/Djwh/comps/footer.vue

@@ -29,6 +29,8 @@ export default {
 </style>
 <style lang="scss" scoped>
 .foot {
+  overflow: hidden;
+  width: 100%;
      background-color: #eeeeee;
     padding: 10px;
     text-align: center;

src/views/Djwh/index.vue

 <template>
   <div class="djwh ">
-    <div class="row  status-container">
-      <div class="col-lg-2"></div>
-      <div class="col-lg-8" style="padding:0 20px">
+    <div class="status-container">
+      <div class="">
         <!-- header -->
         <div class="header">
            <img src="../../assets/image/djwh/top_pho.jpg" />
@@ -11,13 +10,13 @@
             </p>
         </div>
         <!-- container -->
-        <div class="row djwh-container">
-          <div class="col-lg-9 " >
-            <div class="row row-left" >
-              <div class="col-lg-5 left-img" style="padding-left:23px;padding-right:15px">
+        <div class="djwh-container">
+          <div class="cnt-left"  >
+            <div class="row-left" >
+              <div class="left-img">
                 <div class="border-div">
                     <a href="https://www.12371.cn/special/19jlzqh/">
-                      <img :src="`${urls.gs1cnTwo}djwh/images/19jlzqh.jpg`" alt="">
+                      <img src="../../assets/image/djwh/ssjwzqh.jpg" alt="">
                     </a>
                     <a href="http://www.samr.gov.cn/zt/bwcx/">
                       <img src="../../assets/image/djwh/19thpic1.jpg" alt="">
@@ -25,7 +24,7 @@
                 </div>
 
               </div>
-              <div class="col-lg-7 middle-header" style="padding-right:15px">
+              <div class=" middle-header" >
                 <div class="border-div ">
                    <a href="http://www.samr.gov.cn/zt/bwcx/">
                       <img src="../../assets/image/djwh/tt_pho.gif" alt="">
@@ -52,7 +51,7 @@
                 </div>
 
               </div>
-              <div class="col-lg-12"  style="padding-left:23px;padding-right:15px">
+              <div  style="margin-top:15px;overflow:hidden;width:100%">
                   <div class="ds">
                     <div>
                       <img src="../../assets/image/djwh/dsjy-title.gif" alt="">
@@ -66,7 +65,7 @@
                     </div>
                   </div>
               </div>
-              <div class="col-lg-12"  style="padding-left:23px;padding-right:15px">
+              <div class=""  style="overflow:hidden">
                 <div class="ds hdtp">
                     <div>
                       <img src="../../assets/image/djwh/pho_bg5.gif" alt="">
@@ -82,13 +81,12 @@
                     </div>
                   </div>
               </div>
-              <div class="col-lg-12 foottp"  style="padding-left:23px;padding-right:15px">
-
+              <div class=" foottp"  style="overflow:hidden;">
                 <img src="../../assets/image/djwh/19th.gif" alt="">
               </div>
           </div>
         </div>
-          <div class="col-lg-3 right-con">
+          <div class=" right-con">
              <div class="border-div  list-style">
                     <div class="middle-title">
                       <h4>党的十九大文件</h4>
@@ -147,7 +145,6 @@
         </div>
        <Footer></Footer>
       </div>
-      <div class="col-lg-2"></div>
 <!-- footer -->
 
     </div>
@@ -309,22 +306,35 @@ export default {
 </script>
 <style lang="scss"  scoped>
 
-  @media screen and(min-width: 992px) {
+  @media screen and(max-width: 723px) {
+    .status-container{
+      box-sizing: border-box;
+      width: 100%!important;
+      padding:0 15px;
+      
+    }
+    .left-img,.cnt-left,.right-con{
+      width: 100%!important;
+    }
+    .middle-header{
+      margin-top: 15px;
+      width: 100%!important;
+    }
 
   }
   @media screen and (max-width:  992px) {
-  .middle-header{
-      .border-div{
-        height: auto!important;
-        overflow: hidden;
-        img{
-          height: 60px!important;
-        }
+  // .middle-header{
+  //     .border-div{
+  //       height: auto!important;
+  //       overflow: hidden;
+  //       img{
+  //         height: 60px!important;
+  //       }
 
-     }
+  //    }
 
 
-    }
+  //   }
     .row{
        >div{
          padding:0 12px!important;
@@ -381,8 +391,17 @@ html{
      border:1px solid #BADFF2;
    }
    .djwh-container{
+     background: #fff;
      margin-top: 20px;
+     .cnt-left{
+       float: left;
+       width: 723px;
+       margin-right: 15px;
+     }
      .left-img{
+       float: left;
+       width: 282px;
+       margin-right: 15px;
       img{
         width: 100%;
       }
@@ -392,6 +411,8 @@ html{
      }
     
      .middle-header{
+       float: left;
+       width: 425px;
       .border-div:first-child{
         padding: 6px;
         height: 78px;
@@ -475,6 +496,7 @@ html{
 
    }
    .foottp{
+     width: 100%;
      margin-top: 10px;
 
      img{
@@ -508,6 +530,8 @@ html{
       transition: all 1s ;
     }
     .right-con{
+      width: 237px;
+      float: left;
       h4{
         color: #fff;
         font-size: 15px;
@@ -558,7 +582,8 @@ html{
 </style>
 <style lang="scss" scoped>
 .status-container{
-  margin: 0!important;
+  width: 976px;
+  margin: 0 auto;
 }
 .list-style{
         padding: 0;