Merge branch 'new_pad_branch' of http://git.shengws.com/zhangbj/xt_pad into new_pad_branch

src/pages/home/login.vue

@@ -187,7 +187,7 @@ export default {
             width: 90%;
             border: none;
             outline: none;
-            font-size: 0.45rem;
+            font-size: 0.6rem;
           }
           .mint-cell {
             width: 100%;
@@ -224,7 +224,7 @@ export default {
         line-height: 1.4rem;
         background: $main-color;
         color: #fff;
-        font-size: 0.45rem;
+        font-size: 0.6rem;
         @include text-align;
         border-radius: 4px;
         margin: 1rem 0 0 0;

src/styles/style.scss

@@ -364,7 +364,7 @@ body {
 }
 
 .van-popup {
-  top: 5% !important;
+  top: 7% !important;
   transform: translate3d(-50%, 0, 0) !important;
 }