Merge remote-tracking branch 'origin/master'

zyd_public/LoginFromQrCode/index.js

@@ -8,7 +8,7 @@ import LoginWithQrCode from './LoginWithQrCode';
  *  wxSocketGateWay: websocket链接地址 'ws://scjoyedu.eicp.net:51337/wswx/test106/socket/'
  *  mockServer: 获取sessionId 接口前缀  'http://scjoyedu.eicp.net:51337/test106',
  * */
-export default function LoginByQrCode({ url, LoginType, wxSocketGateWay, mockServer }) {
+export default function LoginByQrCode({ hintStyle, url, LoginType, wxSocketGateWay, mockServer }) {
   return (
     <div>
       <div style={{ backgroundColor: 'white', width: 288, padding: 10, margin: 'auto' }}>
@@ -19,7 +19,7 @@ export default function LoginByQrCode({ url, LoginType, wxSocketGateWay, mockSer
           wxSocketGateWay={wxSocketGateWay}
         />
       </div>
-      <div style={{ marginTop: 20, color: 'white' }}>
+      <div style={{ marginTop: 20, color: 'white', ...hintStyle, }}>
         请使用
         <span style={{ color: 'red' }}>微信扫一扫</span>
         扫码登录