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

@@ -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>
@@ -292,6 +292,7 @@ export default {
 .div4{
   margin-bottom: 30px;
   .list-style{
+    min-height: 100%;
     background: #fff;
     border-top: 5px solid #F05587;
     padding-bottom: 10px;
@@ -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,13 +451,12 @@ 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;
       }
     }