Merge branch 'dev' into 'master'

src/pages/user/login/template/project/dazu/index.js

@@ -20,8 +20,19 @@ import styles from './index.less';
 import Account from '../../../js/useAccount';
 import { defaultApp } from '../../../../../../micro';
 import logo from './images/logo.png';
+import qrcodePng from './images/1.png'
+import QRCode from 'qrcode.react';
 import loginTitlePng from './images/text.png';
 
+
+const PopOvercontent = () =>{
+    const qrcodes = window.globalConfig && window.globalConfig.qrcode;
+    if (qrcodes) {
+        return <QRCode value={qrcodes}/>;
+    }
+    return <span>手持APP下载未配置</span>;
+}
+
 const Login = forwardRef((props, _ref) => {
   const sliVerify = useRef();
   const videoRef = useRef();
@@ -183,7 +194,7 @@ const Login = forwardRef((props, _ref) => {
 
       <div className={classnames(styles.dazulogin)} onClick={onShow}>
         {show ? (
-          <>
+          <div className={classnames(styles['wrapper'])}>
             <QueueAnim type="top">
               <div key="outwrapper" className={styles.dazu_out_wrapper}>
                 <div className={styles.dazu_out_logo}>
@@ -202,9 +213,15 @@ const Login = forwardRef((props, _ref) => {
                     {renderPlatform()}
                   </div>
                 </div>
+                <Popover content={PopOvercontent} title="扫码下载APP" placement='right'  overlayClassName={'popover-style'}>
+                    <img src={qrcodePng} alt="APP" className={styles['qrcode-box']}/>
+                </Popover>
               </div>
             </QueueAnim>
 
+            
+
+
             <div key="loginheader" className={classnames(styles['login-header'])}>
               <QueueAnim type="left">
                 <div key="logintitle" className={styles['left-title']}>
@@ -224,7 +241,7 @@ const Login = forwardRef((props, _ref) => {
                 </div>
               </QueueAnim>
             </div>
-          </>
+          </div>
         ) : null}
         {videoShow ? (
           <video

src/pages/user/login/template/project/dazu/index.less

@@ -220,9 +220,9 @@
     .qrcode-box {
         position: absolute;
         bottom: 0;
-        right: -35px;
-        width: 35px;
-        height: 35px;
+        right: -23px;
+        width: 23px;
+        height: 23px;
         background: #FFFFFF;
         opacity: 0.8;
         cursor: pointer;
@@ -231,4 +231,33 @@
 }
 
 
-& :global {}
+& :global {
\ No newline at end of file
+
+    .popover-style{
+        .@{ant-prefix}-popover-inner-content{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+        .@{ant-prefix}-popover-title{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+    }
+}
+
+:global{
+    .popover-style{
+        .@{ant-prefix}-popover-inner-content{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+        .@{ant-prefix}-popover-title{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+        }
+    }
+}
\ No newline at end of file

src/pages/user/login/template/project/lvcheng/index.less

@@ -211,9 +211,6 @@
             align-items: center;
         }
     }
-        
-    
-    
 }