添加临时退出按钮

f250f8dc · Zhang Xin · 36365fad · f250f8dc · f250f8dc · f250f8dc
Commit f250f8dc authored Nov 05, 2018 by Zhang Xin
8 changed files
--- a/client/actions/common.js
+++ b/client/actions/common.js
@@ -115,7 +115,7 @@ const saveCommonInfo = (data)=>{
    }
 };
 const logout = ()=>{
-    let data = Object.assign({},{userInfo:{},taskInfo:{}});
+    let data = Object.assign({},{userInfo:{},taskInfo:{},taskList:{}});
    return {
        type : actionType.EMPTYCOMMONINFO,
        data

--- a/client/components/CommonComponent/HeaderComponent/HeaderComponent.jsx
+++ b/client/components/CommonComponent/HeaderComponent/HeaderComponent.jsx
@@ -15,12 +15,14 @@ export default class HeaderComponent extends React.Component{
    }
    componentWillReceiveProps(nextProps){
    }
    handleShowClassify(){
-        this.setState({
+        // this.setState({
-            showClassify : !this.state.showClassify
+        //     showClassify : !this.state.showClassify
-        })
+        // })
+        this.props.showLogoutPopup();
    }
    getHeader(){
@@ -42,22 +44,6 @@ export default class HeaderComponent extends React.Component{
    getHomeHeader(){
        let headerInfo = this.props.headerInfo;
        let {storeInfo,userInfo,taskInfo} = headerInfo;
-        // storeInfo = {
-        //     id : 1,
-        //     name : '华茂商业街'
-        // };
-        // userInfo = {
-        //     employeeName : '李大仁',
-        //     id : '00001',
-        //     headImageUrl : ""
-        // };
-        //
-        // taskInfo = {
-        //     currentTaskNum : 2,
-        //     totalTaskNum : 6
-        // }
        let style = {}
        if(taskInfo && taskInfo.currentTaskNum && taskInfo.totalTaskNum){
            style = {

--- a/client/components/CommonComponent/PopupComponent/index.css
+++ b/client/components/CommonComponent/PopupComponent/index.css
@@ -157,4 +157,8 @@
    width: 100%;
 }
+.popupComponent .btne5{
+    border : 2px solid #e5e5e5;
+}
 /*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtJQUNJLG1CQUFtQjtJQUNuQiw4QkFBOEI7SUFDOUIsWUFBWTtJQUNaLGFBQWE7SUFDYixPQUFPO0lBQ1AsUUFBUTtJQUNSLFdBQVc7Q0FDZDs7QUFFRDtJQUNJLGNBQWM7SUFDZCxhQUFhO0lBQ2IsbUJBQW1CO0lBQ25CLFNBQVM7SUFDVCxVQUFVO0lBQ1YseUNBQWlDO1lBQWpDLGlDQUFpQztJQUNqQyxvQkFBb0I7SUFDcEIsaUJBQWlCO0lBQ2pCLG1CQUFtQjtDQUN0Qjs7QUFFRDtJQUNJLGtCQUFrQjtJQUNsQixrQkFBa0I7SUFDbEIsaUJBQWlCO0NBQ3BCOztBQUVEO0lBQ0ksY0FBYztJQUNkLG9CQUFvQjtJQUNwQixrQkFBa0I7SUFDbEIsd0JBQXdCO0lBQ3hCLGlCQUFpQjtDQUNwQjs7QUFFRDtJQUNJLGFBQWE7SUFDYixhQUFhO0lBQ2IsMEJBQTBCO0lBQzFCLGtCQUFrQjtJQUNsQixvQkFBb0I7SUFDcEIsa0JBQWtCO0NBQ3JCOztBQUVEO0lBQ0ksVUFBVTtDQUNiOztBQUVEOztDQUVDOztBQUVEO0lBQ0ksY0FBYztJQUNkLGNBQWM7SUFDZCxpQkFBaUI7SUFDakIsb0JBQW9CO0lBQ3BCLFVBQVU7SUFDVixTQUFTO0lBQ1QseUNBQWlDO1lBQWpDLGlDQUFpQztJQUNqQyxtQkFBbUI7SUFDbkIsbUJBQW1CO0lBQ25CLGlCQUFpQjtDQUNwQjs7QUFFRDtJQUNJLFlBQVk7SUFDWiwwQkFBMEI7SUFDMUIsY0FBYztJQUNkLG1CQUFtQjtDQUN0Qjs7QUFFRDtJQUNJLFlBQVk7Q0FDZjs7QUFFRCxrQ0FBa0M7O0FBRWxDO0lBQ0ksbUJBQW1CO0lBQ25CLDhCQUE4QjtJQUM5QixZQUFZO0lBQ1osYUFBYTtJQUNiLE9BQU87SUFDUCxRQUFRO0lBQ1IsV0FBVztDQUNkOztBQUVEO0lBQ0ksZ0JBQWdCO0lBQ2hCLDRCQUE0QjtJQUM1QixtQkFBbUI7SUFDbkIsU0FBUztJQUNULFVBQVU7SUFDVix5Q0FBaUM7WUFBakMsaUNBQWlDO0lBQ2pDLG9CQUFvQjtJQUNwQixpQkFBaUI7SUFDakIsbUJBQW1CO0NBQ3RCOztBQUVEO0lBQ0kscUJBQXFCO0lBQ3JCLG1DQUFtQztJQUNuQyxpQ0FBaUM7Q0FDcEM7O0FBRUQ7SUFDSSxjQUFjO0lBQ2Qsb0JBQW9CO0lBQ3BCLGtCQUFrQjtJQUNsQix3QkFBd0I7SUFDeEIsa0NBQWtDO0NBQ3JDOztBQUVEO0lBQ0ksNkJBQTZCO0lBQzdCLDhCQUE4QjtJQUM5QiwwQkFBMEI7SUFDMUIsbUNBQW1DO0lBQ25DLHNDQUFzQztJQUN0QyxxQkFBcUI7Q0FDeEI7O0FBRUQ7SUFDSSxVQUFVO0NBQ2I7O0FBRUQ7Q0FDQzs7QUFFRDtJQUNJLGFBQWE7SUFDYiw2QkFBNkI7SUFDN0IsaUJBQWlCO0lBQ2pCLHNDQUFzQztJQUN0QyxVQUFVO0lBQ1YsU0FBUztJQUNULHlDQUFpQztZQUFqQyxpQ0FBaUM7SUFDakMsbUJBQW1CO0lBQ25CLG1CQUFtQjtJQUNuQixpQkFBaUI7Q0FDcEI7O0FBRUQ7SUFDSSxZQUFZO0lBQ1osMEJBQTBCO0lBQzFCLDhCQUE4QjtJQUM5QixtQ0FBbUM7Q0FDdEM7O0FBRUQ7SUFDSSxZQUFZO0NBQ2YiLCJmaWxlIjoiaW5kZXguY3NzIiwic291cmNlc0NvbnRlbnQiOlsiLnBvcHVwQ29tcG9uZW50IHtcclxuICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTtcclxuICAgIGJhY2tncm91bmQ6IHJnYmEoMCwgMCwgMCwgLjgpO1xyXG4gICAgd2lkdGg6IDEwMCU7XHJcbiAgICBoZWlnaHQ6IDEwMCU7XHJcbiAgICB0b3A6IDA7XHJcbiAgICBsZWZ0OiAwO1xyXG4gICAgei1pbmRleDogOTtcclxufVxyXG5cclxuLmRlZmF1bHRQb3B1cCB7XHJcbiAgICBoZWlnaHQ6IDM2NnB4O1xyXG4gICAgd2lkdGg6IDgwMHB4O1xyXG4gICAgcG9zaXRpb246IGFic29sdXRlO1xyXG4gICAgdG9wOiA1MCU7XHJcbiAgICBsZWZ0OiA1MCU7XHJcbiAgICB0cmFuc2Zvcm06IHRyYW5zbGF0ZSgtNTAlLCAtNTAlKTtcclxuICAgIGJhY2tncm91bmQ6ICNmZmZmZmY7XHJcbiAgICBvdmVyZmxvdzogaGlkZGVuO1xyXG4gICAgdGV4dC1hbGlnbjogY2VudGVyO1xyXG59XHJcblxyXG4uZGVmYXVsdFBvcHVwIC5kZWZhdWx0UG9wdXBUZXh0IHtcclxuICAgIG1hcmdpbi10b3A6IDExMXB4O1xyXG4gICAgbGluZS1oZWlnaHQ6IDQwcHg7XHJcbiAgICBwYWRkaW5nOiAwIDE2MHB4O1xyXG59XHJcblxyXG4uZGVmYXVsdFBvcHVwIC5kZWZhdWx0UG9wdXBCdXR0b25zIHtcclxuICAgIGRpc3BsYXk6IGZsZXg7XHJcbiAgICBmbGV4LWRpcmVjdGlvbjogcm93O1xyXG4gICAgZmxleC13cmFwOiBub3dyYXA7XHJcbiAgICBqdXN0aWZ5LWNvbnRlbnQ6IGNlbnRlcjtcclxuICAgIG1hcmdpbi10b3A6IDcwcHg7XHJcbn1cclxuXHJcbi5kZWZhdWx0UG9wdXAgLmRlZmF1bHRQb3B1cEJ1dHRvbnMgLmRlZmF1bHRQb3B1cEJ1dHRvbiB7XHJcbiAgICB3aWR0aDogMjYwcHg7XHJcbiAgICBoZWlnaHQ6IDgwcHg7XHJcbiAgICBib3JkZXI6IDJweCBzb2xpZCAjZTVlNWU1O1xyXG4gICAgbGluZS1oZWlnaHQ6IDgwcHg7XHJcbiAgICBib3JkZXItcmFkaXVzOiAxMHB4O1xyXG4gICAgbWFyZ2luLWxlZnQ6IDMwcHg7XHJcbn1cclxuXHJcbi5kZWZhdWx0UG9wdXAgLmRlZmF1bHRQb3B1cEJ1dHRvbnMgLmRlZmF1bHRQb3B1cEJ1dHRvbjpmaXJzdC1jaGlsZCB7XHJcbiAgICBtYXJnaW46IDA7XHJcbn1cclxuXHJcbi5kZWZhdWx0UG9wdXAgLmljb24ge1xyXG5cclxufVxyXG5cclxuLnBvcHVwQ2hpbGRDb21wb25lbnQge1xyXG4gICAgd2lkdGg6IDEyMDBweDtcclxuICAgIGhlaWdodDogODAwcHg7XHJcbiAgICBiYWNrZ3JvdW5kOiAjZmZmO1xyXG4gICAgYm9yZGVyLXJhZGl1czogMTBweDtcclxuICAgIGxlZnQ6IDUwJTtcclxuICAgIHRvcDogNTAlO1xyXG4gICAgdHJhbnNmb3JtOiB0cmFuc2xhdGUoLTUwJSwgLTUwJSk7XHJcbiAgICBwb3NpdGlvbjogYWJzb2x1dGU7XHJcbiAgICB0ZXh0LWFsaWduOiBjZW50ZXI7XHJcbiAgICBvdmVyZmxvdzogaGlkZGVuO1xyXG59XHJcblxyXG4ucG9wdXBDaGlsZENvbXBvbmVudCAucG9wdXBUaXRsZSB7XHJcbiAgICB3aWR0aDogMTAwJTtcclxuICAgIGJhY2tncm91bmQtY29sb3I6ICNmZjliODc7XHJcbiAgICBoZWlnaHQ6IDEwMHB4O1xyXG4gICAgbGluZS1oZWlnaHQ6IDEwMHB4O1xyXG59XHJcblxyXG4ucG9wdXBDaGlsZENvbXBvbmVudCAucG9wdXBDb250ZW50IHtcclxuICAgIHdpZHRoOiAxMDAlO1xyXG59XHJcblxyXG4vKi0tLS0tLS0tLXB4IHJlbSDliIblibLnur8tLS0tLS0tLS0tLSovXHJcblxyXG4ucG9wdXBDb21wb25lbnQge1xyXG4gICAgcG9zaXRpb246IGFic29sdXRlO1xyXG4gICAgYmFja2dyb3VuZDogcmdiYSgwLCAwLCAwLCAuOCk7XHJcbiAgICB3aWR0aDogMTAwJTtcclxuICAgIGhlaWdodDogMTAwJTtcclxuICAgIHRvcDogMDtcclxuICAgIGxlZnQ6IDA7XHJcbiAgICB6LWluZGV4OiA5O1xyXG59XHJcblxyXG4uZGVmYXVsdFBvcHVwIHtcclxuICAgIGhlaWdodDogMy4wNXJlbTtcclxuICAgIHdpZHRoOiA2LjY2NjY2NjY2NjY2NjY2N3JlbTtcclxuICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTtcclxuICAgIHRvcDogNTAlO1xyXG4gICAgbGVmdDogNTAlO1xyXG4gICAgdHJhbnNmb3JtOiB0cmFuc2xhdGUoLTUwJSwgLTUwJSk7XHJcbiAgICBiYWNrZ3JvdW5kOiAjZmZmZmZmO1xyXG4gICAgb3ZlcmZsb3c6IGhpZGRlbjtcclxuICAgIHRleHQtYWxpZ246IGNlbnRlcjtcclxufVxyXG5cclxuLmRlZmF1bHRQb3B1cCAuZGVmYXVsdFBvcHVwVGV4dCB7XHJcbiAgICBtYXJnaW4tdG9wOiAwLjkyNXJlbTtcclxuICAgIGxpbmUtaGVpZ2h0OiAwLjMzMzMzMzMzMzMzMzMzMzNyZW07XHJcbiAgICBwYWRkaW5nOiAwIDEuMzMzMzMzMzMzMzMzMzMzM3JlbTtcclxufVxyXG5cclxuLmRlZmF1bHRQb3B1cCAuZGVmYXVsdFBvcHVwQnV0dG9ucyB7XHJcbiAgICBkaXNwbGF5OiBmbGV4O1xyXG4gICAgZmxleC1kaXJlY3Rpb246IHJvdztcclxuICAgIGZsZXgtd3JhcDogbm93cmFwO1xyXG4gICAganVzdGlmeS1jb250ZW50OiBjZW50ZXI7XHJcbiAgICBtYXJnaW4tdG9wOiAwLjU4MzMzMzMzMzMzMzMzMzRyZW07XHJcbn1cclxuXHJcbi5kZWZhdWx0UG9wdXAgLmRlZmF1bHRQb3B1cEJ1dHRvbnMgLmRlZmF1bHRQb3B1cEJ1dHRvbiB7XHJcbiAgICB3aWR0aDogMi4xNjY2NjY2NjY2NjY2NjY1cmVtO1xyXG4gICAgaGVpZ2h0OiAwLjY2NjY2NjY2NjY2NjY2NjZyZW07XHJcbiAgICBib3JkZXI6IDJweCBzb2xpZCAjZTVlNWU1O1xyXG4gICAgbGluZS1oZWlnaHQ6IDAuNjY2NjY2NjY2NjY2NjY2NnJlbTtcclxuICAgIGJvcmRlci1yYWRpdXM6IDAuMDgzMzMzMzMzMzMzMzMzMzNyZW07XHJcbiAgICBtYXJnaW4tbGVmdDogMC4yNXJlbTtcclxufVxyXG5cclxuLmRlZmF1bHRQb3B1cCAuZGVmYXVsdFBvcHVwQnV0dG9ucyAuZGVmYXVsdFBvcHVwQnV0dG9uOmZpcnN0LWNoaWxkIHtcclxuICAgIG1hcmdpbjogMDtcclxufVxyXG5cclxuLmRlZmF1bHRQb3B1cCAuaWNvbiB7XHJcbn1cclxuXHJcbi5wb3B1cENoaWxkQ29tcG9uZW50IHtcclxuICAgIHdpZHRoOiAxMHJlbTtcclxuICAgIGhlaWdodDogNi42NjY2NjY2NjY2NjY2NjdyZW07XHJcbiAgICBiYWNrZ3JvdW5kOiAjZmZmO1xyXG4gICAgYm9yZGVyLXJhZGl1czogMC4wODMzMzMzMzMzMzMzMzMzM3JlbTtcclxuICAgIGxlZnQ6IDUwJTtcclxuICAgIHRvcDogNTAlO1xyXG4gICAgdHJhbnNmb3JtOiB0cmFuc2xhdGUoLTUwJSwgLTUwJSk7XHJcbiAgICBwb3NpdGlvbjogYWJzb2x1dGU7XHJcbiAgICB0ZXh0LWFsaWduOiBjZW50ZXI7XHJcbiAgICBvdmVyZmxvdzogaGlkZGVuO1xyXG59XHJcblxyXG4ucG9wdXBDaGlsZENvbXBvbmVudCAucG9wdXBUaXRsZSB7XHJcbiAgICB3aWR0aDogMTAwJTtcclxuICAgIGJhY2tncm91bmQtY29sb3I6ICNmZjliODc7XHJcbiAgICBoZWlnaHQ6IDAuODMzMzMzMzMzMzMzMzMzNHJlbTtcclxuICAgIGxpbmUtaGVpZ2h0OiAwLjgzMzMzMzMzMzMzMzMzMzRyZW07XHJcbn1cclxuXHJcbi5wb3B1cENoaWxkQ29tcG9uZW50IC5wb3B1cENvbnRlbnQge1xyXG4gICAgd2lkdGg6IDEwMCU7XHJcbn1cclxuIl19 */
\ No newline at end of file
--- a/client/containers/HomePageContainer/HomePageContainer.jsx
+++ b/client/containers/HomePageContainer/HomePageContainer.jsx
 import React from 'react';
 import HeaderComponent from '../../components/CommonComponent/HeaderComponent/HeaderComponent'
 import Button from '../../components/CommonComponent/ButtonComponent/ButtonComponent'
+import PopModel from '../../components/CommonComponent/PopupComponent/PopupChildComponent'
 require('./index.css');
 export default class HomePageContainer extends React.Component{
@@ -9,6 +10,8 @@ export default class HomePageContainer extends React.Component{
        this.state = {
            text : ''
        }
+        this.logout = this.logout.bind(this)
+        this.showLogoutPopup = this.showLogoutPopup.bind(this)
    }
    componentWillMount(){
@@ -33,6 +36,29 @@ export default class HomePageContainer extends React.Component{
        })
    }
+    logout(){
+        this.props.tempLogout()
+    }
+    showLogoutPopup(){
+        let {showPopup,hidePopup} = this.props;
+        let btnDom1 = <Button btnContainer={"headerLogoutBtn backff775c colfff font32 font32 "} key={"headerLogoutBtn1"} text={"确定退出？"} option={this.logout}/>
+        let btnDom2 = <Button btnContainer={"headerLogoutBtn btne5 font32"} key={"headerLogoutBtn2"} text={"取消"} option={hidePopup}/>
+        let popDom =
+            <PopModel popupTitle={"是否退出登录"} classContainer={"headerLogout"}>
+                <div className={"icon iconfont icon-exclamation font150 colf5a623"} />
+                <div className={"text font40 col000"} style={{lineHeight:'1.6'}}>
+                    <p>此步临时添加，可用作测试退出登录</p>
+                    <p>重新扫码开门，不必重启服务</p>
+                </div>
+                <div className={"btn"}>
+                    {btnDom1}
+                    {btnDom2}
+                </div>
+            </PopModel>;
+        showPopup({popupChild:popDom});
+    }
    render(){
        let props = this.props;
        let {headerInfo={}} = props;
@@ -49,6 +75,7 @@ export default class HomePageContainer extends React.Component{
                <HeaderComponent
                    showHeader={CONFIG.headerStatus[1]}
                    headerInfo={headerInfo}
+                    showLogoutPopup={this.showLogoutPopup}
                />
                <div className={"homeContainer"} >
                    <img className={"homeIcon"} style={imgStyle} src={UTILPATH.localImg.homePage} alt=""/>

--- a/client/containers/HomePageContainer/index.css
+++ b/client/containers/HomePageContainer/index.css
@@ -12,4 +12,15 @@
    margin-top: 1.8333333333333333rem;
 }
+.headerLogout .btn{
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: center;
+    transform: translateY(100%);
+}
+.headerLogout .buttonComponent:first-child{
+    margin-right: 10%;
+}
 /*# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LmNzcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTtJQUNJLGFBQWE7SUFDYixjQUFjO0lBQ2Qsa0JBQWtCO0NBQ3JCOztBQUVELGtDQUFrQzs7QUFFbEM7SUFDSSxnQkFBZ0I7SUFDaEIsYUFBYTtJQUNiLGtDQUFrQztDQUNyQyIsImZpbGUiOiJpbmRleC5jc3MiLCJzb3VyY2VzQ29udGVudCI6WyIuaG9tZUNvbnRhaW5lciAuaG9tZUljb24ge1xyXG4gICAgd2lkdGg6IDIxM3B4O1xyXG4gICAgaGVpZ2h0OiAyNDBweDtcclxuICAgIG1hcmdpbi10b3A6IDIyMHB4O1xyXG59XHJcblxyXG4vKi0tLS0tLS0tLXB4IHJlbSDliIblibLnur8tLS0tLS0tLS0tLSovXHJcblxyXG4uaG9tZUNvbnRhaW5lciAuaG9tZUljb24ge1xyXG4gICAgd2lkdGg6IDEuNzc1cmVtO1xyXG4gICAgaGVpZ2h0OiAycmVtO1xyXG4gICAgbWFyZ2luLXRvcDogMS44MzMzMzMzMzMzMzMzMzMzcmVtO1xyXG59XHJcbiJdfQ== */
\ No newline at end of file
--- a/client/containers/PageContainer/PageContainer.jsx
+++ b/client/containers/PageContainer/PageContainer.jsx
@@ -257,7 +257,7 @@ class PageContainer extends React.Component {
    showError(errMsg){
        let className = errMsg.length > 24 ? 'popupExtClass' : '';
        let style = {'width':UTILPATH.getRemByPx(260)}
-        let btnDom = <Button key={"pagecountBack1"} style={style} text={'确定'} option={this.hideError}/>;
+        let btnDom = <Button key={"pagecountBack1"} btnContainer={"btne5"} style={style} text={'确定'} option={this.hideError}/>;
        let showErrorDom = this.getPopDom({
            popupText : errMsg,
            popupButtons:[btnDom],
@@ -501,6 +501,16 @@ class PageContainer extends React.Component {
        })
    }
+    //二期临时退出
+    tempLogout(){
+        let {dispatch} = this.props;
+        dispatch(logout());
+        this.hidePopup();
+        this.setState({
+            showPage : showPage[initPage],
+        });
+    }
    getPages(){
        let pages = null;
        let{state,dispatch} = this.props;
@@ -599,6 +609,9 @@ class PageContainer extends React.Component {
                pages = <HomePage headerInfo={commonInfo}
                                  getTaskList={()=>{dispatch(getTaskList(commonInfo))}}
                                  changePages={(data)=>this.changePages(data)}
+                                  showPopup={(info)=>this.showPopup(info)}
+                                  hidePopup={()=>this.hidePopup()}
+                                  tempLogout={()=>this.tempLogout.bind(this)()}
                                   />;
                break;
            case showPage[6]:

--- a/client/index.js
+++ b/client/index.js
@@ -29,7 +29,7 @@ function renderPage(store) {
 let store = activateVendor();
 // UTILPATH.socket.init(129,17);
-// UTILPATH.socket.testIp(209);
+// UTILPATH.socket.testIp(90);
-UTILPATH.socket.testIp(169);
+UTILPATH.socket.getIp();
 renderPage(store);
\ No newline at end of file
--- a/client/reducers/common.js
+++ b/client/reducers/common.js
@@ -125,7 +125,7 @@ export default function(state={}, action) {
        case actionTypes.SAVECOMMONINFO:
            return saveCommonInfo(state,action.data);
        case actionTypes.EMPTYCOMMONINFO:
-            return emptyCommInfo(state);
+            return emptyCommInfo(state,action.data);
        case actionTypes.STARTALLJOB   :
            return startalljob(state,action.data);
        case actionTypes.GETTASKLIST   :