Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_mobile

config/dev.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  VUE_APP_BASE_API:'"/api"'
+  VUE_APP_BASE_API: '"/dev-api"'
 })

src/views/authenticRight/login.vue

@@ -188,7 +188,8 @@ export default {
         .signIn_container {
           flex: 1;
           display: flex;
-          margin-bottom: 18px;
+          max-height: 90px;
+          margin-bottom: 24px;
           &:last-child {
             margin-bottom: 0;
           }

src/views/homestead/login.vue

@@ -189,7 +189,8 @@ export default {
         .signIn_container {
           flex: 1;
           display: flex;
-          margin-bottom: 18px;
+          max-height: 90px;
+          margin-bottom: 24px;
           &:last-child {
             margin-bottom: 0;
           }