Merge branch 'referMaster' of http://223.93.170.82:10080/zhouna/preliminary into his/shaoyifu

build/webpack.dev.conf.js

@@ -34,7 +34,7 @@ const devWebpackConfig = merge(baseWebpackConfig, {
     compress: true,
     // host: HOST || config.dev.host,
     // host: '192.168.3.6',
-    //host: '192.168.1.108',
+    host: '192.168.3.106',
     port: PORT || config.dev.port,
     open: config.dev.autoOpenBrowser,
     overlay: config.dev.errorOverlay

src/components/Login.vue

@@ -102,10 +102,11 @@ export default {
     },
     blur() {
       if(MobileDevice.getModels().join(' or ').indexOf('6') == -1){
-        document.activeElement.scrollIntoViewIfNeeded(true);
+        document.activeElement.scrollIntoView({behavior: "smooth", block: "end"});
+        /*document.activeElement.scrollIntoViewIfNeeded(true);
         setTimeout(() => {
           document.activeElement.scrollIntoViewIfNeeded(true);
-        }, 300);
+        }, 300);*/
       }
     },
     changeName() {