Merge branch 'dev' into 'master'

src/pages/user/login/index.js

@@ -39,6 +39,7 @@ import Queshan from './template/project/queshan';
 import Queshansl from './template/project/queshansl';
 import PiZhouLogin from './template/project/pizhou';
 import GaoyaoLogin from './template/project/gaoyao';
+import JianzhaLogin from './template/project/jianzha';
 import { AppInitState } from '../../../render';
 const LoginTemplate = {
   '新春.html': baseLoginNewYear,
@@ -74,6 +75,7 @@ const LoginTemplate = {
   '项目 - 确山水利.html': Queshansl,
   '项目 - 邳州.html': PiZhouLogin,
   '项目 - 高要.html': GaoyaoLogin,
+  '项目 - 尖扎.html': JianzhaLogin,
   default: BaseLogin,
 };
 /* eslint-disable */

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

+import React, { forwardRef, useEffect, useRef, useState } from 'react';
+
+import { Modal, Popover } from 'antd';
+import { Helmet, HelmetProvider } from 'react-helmet-async';
+import { connect } from 'react-redux';
+import { useHistory, withRouter } from '@wisdom-utils/runtime';
+import { actionCreators } from '@/containers/App/store';
+import defaultSetting from '../../../../../../../config/defaultSetting';
+import LoginAction from '../../../login';
+import styles from './index.less';
+import Account from '../../../js/useAccount';
+import { defaultApp } from '../../../../../../micro';
+import logoPng from './images/7.png'
+import qrcodePng from './images/1.png'
+import QRCode from 'qrcode.react';
+import classnames from 'classnames';
+import moment from 'moment';
+
+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 loginFormRef = useRef();
+    const formRef = useRef(null);
+    const [status, setStatus] = useState('normal');
+
+    const [autoLogin, setAutoLogin] = useState(false);
+    const [submitting, setSubmitting] = useState(false);
+    const [type, setType] = useState('Account');
+    const [visible, setVisible] = useState(false);
+    const history = useHistory();
+    const [action, setAction] = useState(() => new LoginAction(Object.assign({}, props, { history }), setVisible, false));
+    const [dateObj, setDateObj] = useState({})
+
+    const handleSubmit = values => {
+        /* eslint-disable */
+        action &&
+            (type === 'Account'
+                ? action.loginHandler(values.userName, values.password, null, autoLogin, sliVerify)
+                : type === 'Mobile'
+                    ? action.phoneLoginFormHandler(values.mobile, values.captcha)
+                    : null);
+
+        setSubmitting(true);
+        props.updateCurrentIndex && props.updateCurrentIndex(-1);
+    };
+
+    useEffect(() => {
+        action &&
+            action.events.on('loginSuccess', event => {
+                setSubmitting(false);
+                props.updateCurrentIndex && props.updateCurrentIndex(0);
+                props.history.push(`/?client=${props.global.client}`);
+                // window.share.event.emit('triggerMicro', props.global);
+                // initMicroApps();
+                defaultApp();
+            });
+        action &&
+            action.events.on('loginError', event => {
+                setVisible(false);
+                setSubmitting(false);
+            });
+        action &&
+            action.events.on('loginVisible', status => {
+                setVisible(status);
+            });
+        return () => {
+            action && action.events && action.events.removeAllListeners('loginSuccess');
+            action && action.events && action.events.removeAllListeners('loginError');
+            action && action.events && action.events.removeAllListeners('loginVisible');
+        };
+    }, [props.loginMode]);
+
+    useEffect(() => {
+        setSubmitting(false);
+    }, [visible]);
+
+    const renderPlatform = () => {
+        const template = props.global.loginTemplate;
+        const params = {
+            fromRef: formRef,
+            type,
+            setType,
+            status,
+            submitting,
+            autoLogin,
+            setAutoLogin,
+            action,
+            onSubmit: handleSubmit,
+            loginMode: props.loginMode,
+            updateLoginMode: props.updateLoginMode,
+            welcome: null,
+        };
+        return <Account {...params} />;
+    };
+    /* eslint-disable */
+
+    const handleWeek =() => {
+        const weekOfDay = Number(moment().format('E'));
+        let weekDayName = ''
+        switch(weekOfDay){
+            case 1:
+                weekDayName = '周一'
+                break
+            case 2:
+                weekDayName = '周二'
+                break
+            case 3:
+                weekDayName = '周三'
+                break
+            case 4:
+                weekDayName = '周四'
+                break
+            case 5:
+                weekDayName = '周五'
+                break
+            case 6:
+                weekDayName = '周六'
+                break
+            case 0:
+                weekDayName = '周日'
+                break
+            default:
+                weekDayName = ''
+        }
+        return weekDayName
+    }
+
+    useEffect(()=>{
+        const timer = setInterval(() => {
+            setDateObj({
+                curTime: moment().format('HH:mm:ss'),
+                week: handleWeek(),
+                date: moment().format('YYYY/MM/DD')
+            });
+          }, 1000);
+          return () => {
+            clearInterval(timer);
+          };
+    }, [])
+
+
+    return (
+        <HelmetProvider>
+            <Helmet>
+                <title>{props.global.title || defaultSetting.title}</title>
+                <meta name="description" content={props.global.title || defaultSetting.title} />
+            </Helmet>
+            <div className={classnames(styles.jianzhalogin, "jianzha")}>
+                <div className={styles['inner-wrapper']}>
+                    <div className={styles['inner-center']}>
+                        <div className={styles['welcome-title']}>
+                            {/* <div className={styles['welcome-bg']}></div> */}
+                            水是生命之源，请珍惜每一滴水
+                        </div>
+                        <div className={classnames(styles['inner-bg'], styles['login-part'])} ref={loginFormRef}>
+                            {renderPlatform()}
+                        </div>
+                    </div>
+                    <Popover content={PopOvercontent} title="扫码下载APP" placement='topLeft' overlayClassName={'popover-style'}>
+                        <img src={qrcodePng} alt="APP" className={styles['qrcode-box']}/>
+                    </Popover>
+                </div>
+                <div className={styles['login-header']}>
+                    <div className={styles['left-title']}>
+                        <img src={logoPng} alt='logo' className={styles['logo-png']}/>
+                        <div className={styles['cn-title']}>尖扎县饮用水服务中心</div>
+                    </div>
+                    <div className={styles['right-timebox']}>
+                        <div className={styles['curr-time']}>{dateObj.curTime}</div>
+                        <div className={styles['curr-week-date']}>
+                            <div className={styles['curr-week']}>{dateObj.week}</div>
+                            <div className={styles['curr-date']}>{dateObj.date}</div>
+                        </div>
+                    </div>
+                </div>
+                <Modal centered visible={visible} width={340} footer={null} closable={false} bodyStyle={{ padding: '15px' }}>
+                    <div ref={sliVerify} />
+                </Modal>
+            </div>
+        </HelmetProvider>
+    );
+});
+
+const mapStateToProps = state => ({
+    global: state.getIn(['global', 'globalConfig']),
+    loginMode: state.getIn(['global', 'loginMode']),
+});
+
+const mapDispatchToProps = dispatch => ({
+    updateConfig(config) {
+        dispatch(actionCreators.getConfig(config));
+    },
+    createContext(data) {
+        dispatch(actionCreators.createContext(data));
+    },
+    updateLoginMode(mode) {
+        dispatch(actionCreators.changeLoginMode(mode));
+    },
+    updateCurrentIndex(index) {
+        dispatch(actionCreators.updateCurrentIndex(index));
+    },
+});
+export default connect(
+    mapStateToProps,
+    mapDispatchToProps,
+)(withRouter(Login));

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

+
+.jianzhalogin {
+    width: 100%;
+    height: 100%;
+    background: url('./images/2.jpg') no-repeat;
+    background-size: 100% 100%;
+    background-clip: border-box;
+    position: relative;
+    min-height: 7.0rem;
+    overflow: hidden;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .inner-bg {
+        width: 100%;
+        // height: 100%;
+    
+    
+        &>div {
+            width: 70%;
+            margin: 0 auto;
+        }
+    }
+
+    .inner-wrapper {
+        position: relative;
+        width: 480px;
+        // height: 380px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        border-radius: 10px;
+        // margin-bottom: 100px;
+    }
+
+    .title-image{
+        background: url('./images/3.png') no-repeat;
+        width: 466px;
+        height: 42px;
+        background-size: 100% 100%;
+        margin-bottom: 20px;
+    }
+
+    .inner-bg .title {
+        font-size: 27px;
+        font-weight: bold;
+        color: rgba(255, 255, 255, 1);
+        letter-spacing: 2px;
+    }
+
+    .form-control:focus {
+        border-color: #66afe9;
+        outline: 0;
+        -webkit-box-shadow: none;
+        box-shadow: none;
+    }
+    
+    
+    .inner-center {
+        position: relative;
+        width: 100%;
+        // height: 316px;
+        background: rgba(255,255,255, 1);
+        // border: 1px solid #FFFFFF;
+        // box-shadow: 0px 15px 15px 3px rgba(140,142,145,0.52);
+        border-radius: 10px;
+    }
+
+    .welcome-title{
+        width: 100%;
+        height: 100px;
+        background: linear-gradient(0deg, rgba(9, 128, 238, 1) 0%, rgba(0, 182, 251, 1) 100%);
+        border-radius: 10px 10px 0 0;
+        padding: 16px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        margin-bottom: 40px;
+        color: #FFFFFF;
+        font-size: 30px;
+        font-weight: 500;
+    }
+
+    .welcome-bg{
+        background: url('./images/4.png') no-repeat;
+        width: 358px;
+        height: 35px;
+        background-size: 100% 100%;
+    }
+    
+    .formgroup2 {
+        display: flex;
+        align-items: center;
+        display: flex;
+        margin: 0px 5.5%;
+        margin-bottom: 10%;
+        align-items: center;
+        margin-bottom: 40px;
+    }
+
+    .APPcodeBox {
+        width: 100%;
+        display: flex;
+        flex-flow: column;
+        align-items: center;
+        cursor: pointer;
+        position: relative;
+    }
+    
+    .APPCtext {
+        font-size: 14px;
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        color: #000000;
+        line-height: 30px;
+        opacity: 0.75;
+    }
+
+    .login-header{
+        width: 100%;
+        position: absolute;
+        top: 0;
+        height: 90px;
+        padding: 0 20px;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        box-shadow: 0px 1px 3px 0px rgba(235, 235, 235, 0.55);
+        .left-title{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            .cn-title{
+                font-size: 36px;
+                font-weight: 600;
+                color: #0980ee;
+            }
+            .logo-png{
+                width: 54px;
+                margin-right: 20px;
+            }
+        }
+        .right-timebox{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 60px;
+            .curr-time{
+                width: 140px;
+                font-size: 36px;
+                font-family: Microsoft YaHei;
+                font-weight: 300;
+                color: #0980ee;
+            }
+            .curr-week-date{
+                margin-left: 10px;
+                .curr-week{
+                    font-size: 16px;
+                    font-family: Microsoft YaHei;
+                    font-weight: 400;
+                    color: #0980ee;
+                }
+                .curr-date{
+                    font-size: 14px;
+                    font-family: Microsoft YaHei;
+                    font-weight: 400;
+                    color: #0980ee;
+                }
+            }
+        }
+    }
+    .copyright{
+        position: absolute;
+        bottom: 7%;
+        width: 100%;
+        margin: 0 auto;
+        font-size: 12px;
+        font-family: Microsoft YaHei;
+        font-weight: 400;
+        color: #F1F6FD;
+        text-align: center;
+    }
+    .qrcode-box{
+        position: absolute;
+        bottom: 0;
+        right: -23px;
+        width: 23px;
+        height: 23px;
+        background: #FFFFFF;
+        opacity: 0.8;
+        cursor: pointer;
+    }
+    
+}
+
+
+: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;
+        }
+    }
+}
+    
+
+@keyframes waving {
+    from {
+        top: 0;
+    }
+
+    to {
+        top: 10px;
+    }
+}
+
+@keyframes waving2 {
+    from {
+        left: 0;
+    }
+
+    to {
+        left: -9999px;
+    }
+}
+
+
+
+
+
+
+
+