Merge remote-tracking branch 'power_fs3/master'

# Conflicts:
#	power-admin/src/main/webapp/static/js/login.js

power-admin/src/main/webapp/static/js/login.js

@@ -1,3 +1,6 @@
+
+
+
 /**
  * Created by ljx on 2019/4/25.
  */
@@ -56,7 +59,7 @@ function login() {
                     if(data.code == 100){
                         window.location.href = data.extend.url;
                     }else{
-                        alert(data.msg)
+                        $("#msg").text(data.msg);
                     }
                 }
             })
@@ -67,8 +70,6 @@ function login() {
 
 var interval ="";
 var qrCodeIdentity ="";
-
-//获取扫码登录二维码
     function handoffLogin(){
     $.ajax({
         type : "POST",
@@ -77,7 +78,6 @@ function handoffLogin() {
         success : function(data) {
              qrCodeIdentity = data.qrCodeIdentity;
             $("#QRcordImg").prop("src","data:image/jpeg;base64,"+data.qrCodeBase64);
-            //轮询监听用户扫码
              interval = setInterval(scanCodeLogin, 1000,qrCodeIdentity);
         }
 
@@ -95,7 +95,6 @@ function scanCodeLogin() {
         url : path+'/font/getScanCode',
         success : function (body) {
             if (body.verifyStatus ==0) {
-                //扫码认证成功后撤销监听
                 clearInterval(interval);
                     $.ajax({
                         type:"POST",
@@ -128,6 +127,9 @@ function scanCodeLogin() {
 }
 
 
+
+
+
 function handoffLogin2(){
 
     $("#switchHandoff").css("display","block");