Merge remote-tracking branch 'origin/master' into referMaster

src/components/Login.vue

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