合并分支

components/layout/h5/Footer.vue

@@ -57,7 +57,7 @@ export default {
   }
   .about {
     p {
-      font-size: 0.11rem;
+      font-size: 0.12rem;
     }
     p + p {
       margin-top: 10px;
@@ -66,14 +66,15 @@ export default {
   .link {
     margin-top: 0.22rem;
     a {
-      font-size: 0.14rem;
+      font-size: 0.12rem;
       margin-right: 0.2rem;
     }
   }
   .friendlink {
     margin-top: 0.22rem;
+    font-size: 0.12rem;
     a {
-      font-size: 0.11rem;
+      font-size: 0.12rem;
       line-height: 0.18rem;
       margin-right: 0.1rem;
       white-space: nowrap;

components/layout/pc/Foot.vue

@@ -97,7 +97,7 @@ export default {
     .left-content{
       div{
         opacity: 0.7;
-        font-size: 22px;
+        font-size: 18px;
         font-weight: 300;
         line-height: 50px;
         color: #FFFFFF;
@@ -106,7 +106,7 @@ export default {
       }
     }
     .center-content{
-      font-size: 16px;
+      font-size: 18px;
       line-height: 32px;
       color: #FFFFFF;
       letter-spacing: 3px;