Helius
2021-04-09 143ae971fb4f79af8bfa0166f30666f193a533ef
Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop
1 files modified
5 ■■■■■ changed files
zq-erp/src/main/resources/templates/views/common/login.html 5 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/templates/views/common/login.html
@@ -312,7 +312,6 @@
        });
        loginQrCodeKey="loginQrCodeKey_" + MTools.randomStr();
        let qrInfo={webClientId:webClientId,loginQrCodeKey:loginQrCodeKey}
        console.log(qrInfo);
        qrcode.makeCode(JSON.stringify(qrInfo));
        $('#qrCodeIcon canvas').show();
@@ -390,7 +389,7 @@
            //实现化WebSocket对象,指定要连接的服务器地址与端口  建立连接
            let  wsPath= getRootPath();
            var socketUrl=  wsPath.replace("http","ws")+ "/webSocketServer?userId="+webClientId;
            console.log(socketUrl);
            if(socket!=null){
                socket.close();
                socket=null;
@@ -403,7 +402,7 @@
            };
            //获得消息事件
            socket.onmessage = function(msg) {
                console.log(msg);
                var serverMsg = JSON.parse(msg.data);
                if(serverMsg.msgType==1){