Merge remote-tracking branch 'origin/master'

src/views/Home/index.vue

@@ -814,14 +814,14 @@ export default {
         },
         {
           id: '8',
-          ico: require("../../assets/image/home/dzfw-ico9.png"),
-          name: "ECODE",
+          ico: require("../../assets/image/home/dzfw-ico13.png"),
+          name: "教育培训平台",
           isChecked: true,
         },
         {
           id: '9',
-          ico: require("../../assets/image/home/dzfw-ico13.png"),
-          name: "教育知识管理平台",
+          ico: require("../../assets/image/home/dzfw-ico9.png"),
+          name: "ECODE",
           isChecked: true,
         },
         {

src/views/News/Retail.vue

@@ -23,14 +23,14 @@
                         &nbsp;&nbsp;&nbsp;李弘凯<i class="bi bi-telephone-fill"></i>010-84295522<i class="bi bi-envelope-fill"></i>lihk@ancc.org.cn
                         </p>
                     </div>
-                    
+
                 </div>
-                
+
             </div>
         </div>
     </div>
 
-  
+
     <div class="div4">
       <div class="row">
         <div class="col-lg-6 " v-for="(item,i) in typeList" :key="i">
@@ -44,7 +44,7 @@
             </ul>
 
           </div>
-          
+
         </div>
       </div>
     </div>
@@ -67,7 +67,7 @@
             <img src="../../assets/image/news/ls3.png" class="div4-img" alt="" />
 
           </div>
-          
+
         </div>
         <div class="col-lg-6 lunbo ">
             <div class="lunbo-cnt">
@@ -86,7 +86,7 @@
                             <img src="../../assets/image/news/ls4.png" class="d-block w-100" alt="...">
                             <div class="carousel-caption d-none d-md-block">
                                 <p>国家市场监督管理总局赴中国物品编码中心进行追溯工作调研</p>
-                                 
+
                             </div>
                         </div>
                         <div class="carousel-item">
@@ -101,19 +101,19 @@
                             <p>国家市场监督管理总局赴中国物品编码中心进行追溯工作调研</p>
                             </div>
                         </div>
-                       
+
                     </div>
-                    
+
                     <button class="carousel-control-prev" type="button" data-bs-target="#carouselExampleCaptions" data-bs-slide="prev">
                         <span class="carousel-control-prev-icon" aria-hidden="true"></span>
-                        
+
                     </button>
                     <button class="carousel-control-next" type="button" data-bs-target="#carouselExampleCaptions" data-bs-slide="next">
                         <span class="carousel-control-next-icon" aria-hidden="true"></span>
-                        
+
                     </button>
                     </div>
-                
+
             </div>
         </div>
         <div class="div5">
@@ -121,7 +121,7 @@
             <div class="div5-cnt">
                 <p>欢迎加入</p>
                 <p><img src="../../assets/image/news/icon.png" />中国ECR委员会 <img src="../../assets/image/news/icon.png" />全渠道零售工作委员会</p>
-                <p style="font-size:12px;">支俊凯<i class="bi bi-telephone-fill"></i>010-84295518<i class="bi bi-envelope-fill"></i>zhijk@ancc.org.cn&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;李弘凯<i class="bi bi-telephone-fill"></i>010-84295522<i class="bi bi-envelope-fill"></i>lihk@ancc.org.cn</p>
+                <p>支俊凯<i class="bi bi-telephone-fill"></i>010-84295518<i class="bi bi-envelope-fill"></i>zhijk@ancc.org.cn&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;李弘凯<i class="bi bi-telephone-fill"></i>010-84295522<i class="bi bi-envelope-fill"></i>lihk@ancc.org.cn</p>
             </div>
         </div>
       </div>
@@ -139,7 +139,7 @@ export default {
   },
   data() {
     return {
-      
+
      typeList:[
        {
          title:'商品条码在零售领域应用指南',
@@ -165,13 +165,13 @@ export default {
            {
              name:'如何在非零售商品上使用商品条码——应用标识符的使用',
            },
-             
 
-           
+
+
          ]
        },
        {
-        
+
          title:'最新动态',
          list:[
            {
@@ -197,8 +197,8 @@ export default {
            },
          ]
        },
-      
-      
+
+
      ]
     };
   },
@@ -210,21 +210,21 @@ export default {
     ]);
   },
   methods: {},
-  
+
 };
 </script>
 <style lang="scss" scoped>
 .container {
   @media screen and (min-width: 992px) {
-    
+
   }
   @media screen and (max-width: 992px) {
    .div2-text-box{
        display: none;
    }
-    
-  }   
-  
+
+  }
+
 }
 </style>
 <style lang="scss" scoped>
@@ -252,7 +252,7 @@ export default {
   }
 .div2{
   margin-bottom: 30px;
-  
+
   img{
     width: 100%;
   }
@@ -269,7 +269,7 @@ export default {
         left: -74px;
         background: url('../../assets/image/news/ls6.png') no-repeat;
         border-right: 24px solid #F05587;
-        
+
     }
     .div2-text-des{
         padding-left: 16px;
@@ -279,19 +279,20 @@ export default {
         p:first-child{
             padding-right: 5%;
             margin-bottom: 34px;
-            
+
         }
         i{
             margin: 0 9px 0 20px;
         }
     }
-    
+
   }
 }
 
 .div4{
   margin-bottom: 30px;
   .list-style{
+    min-height: 100%;
     background: #fff;
     border-top: 5px solid #F05587;
     padding-bottom: 10px;
@@ -318,16 +319,16 @@ export default {
     }
     ul{
       padding:0 20px 10px;
-      li{ 
+      li{
         color: #414345;
         font-size: 14px;
         line-height: 40px;
         overflow: hidden;
-        text-overflow: ellipsis;  
+        text-overflow: ellipsis;
         white-space:nowrap;
       }
       li::before{
-            content: "●"; 
+            content: "●";
             color: #F05587;
             margin-right: 10px;
         }
@@ -339,7 +340,7 @@ export default {
     .list-style:first-child{
         border-top: 5px solid #F05587;
     }
-    
+
     .list-style{
         position: relative;
         border: none;
@@ -387,7 +388,7 @@ export default {
             width: 6px;
             height: 6px;
             border-radius: 50%;
-            
+
         }
         .active{
             // width: 4px;
@@ -396,7 +397,7 @@ export default {
             border: 0;
             background: #F05587;
         }
-       
+
     }
     .lunbo-bottom{
         width: 100%;
@@ -407,7 +408,7 @@ export default {
     }
 }
  /deep/.carousel-caption{
-    
+
     font-size: 10px!important;
     left: 4%!important;
     bottom: 15px!important;
@@ -438,9 +439,11 @@ export default {
       // top: 20%;
       text-align: center;
       color: #fff;
-      padding-top: 40px;
+      padding-top: 30px;
       p{
         width: 100%;
+        font-size: 14px;
+        line-height: 35px;
         i{
           margin: 0 9px 0 20px;
         }
@@ -448,15 +451,14 @@ export default {
       p:first-child{
         overflow-wrap: break-word;
         color: rgba(255, 255, 255, 1);
-        font-size: 25px;
+        font-size: 26px;
         // font-family: PangMenZhengDao;
         white-space: nowrap;
-        line-height: 25px;
       }
       p:nth-child(2){
-        font-size: 14px;
+        font-size: 16px;
         letter-spacing: 0.4000000059604645px;
       }
     }
 }
-</style>
+</style>
\ No newline at end of file