Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

public/react/src/modules/login/LoginDialog.js

@@ -13,6 +13,7 @@ import axios from 'axios';
 
 import './LoginDialog.css';
 import { broadcastChannelPostMessage } from 'educoder'
+import Notcompletedysl from "../user/Notcompletedysl";
 
 const $ = window.$;
 var wait = 60;
@@ -100,6 +101,7 @@ class LoginDialog extends Component {
         authCodeType:true,
         authCodeclass:'log-botton mt5',
         isRender: false,
+        MyEduCoderModals:false,
 
       };
     }
@@ -365,10 +367,11 @@ class LoginDialog extends Component {
 										description:response.data.message,
 									});
 								}else{
-                  if(response.data.identity === null || response.data.identity === undefined){
+                  if(response.data.profile_completed !== null || response.data.profile_completed === false){
-                    this.props.history.push("/interesse");
+                    this.setMyEduCoderModals();
                     return;
                   }
+
                   broadcastChannelPostMessage('refreshPage')
                     this.setState({
                         isRender:false
@@ -388,17 +391,28 @@ class LoginDialog extends Component {
             console.log(error)
         })
 
-    }
+    };
+  setNotcompleteds=()=>{
+    this.setState({
+      Notcompleteds:true,
+      MyEduCoderModals:false
+    })
+  };
+  setMyEduCoderModals=()=>{
+    this.setState({
+      MyEduCoderModals:true
+    })
+  };
     onKeydowns=(e)=>{
         let {disabled}=this.state;
         if( disabled===false&& e.keyCode === 13){
             this.loginEDU()
             console.log(1)
         }
-    }
+    };
   getloginurl=(url)=>{
     window.location.href = url;
-  }
+  };
     render() {
       let{open,login,speedy,loginValue,regular,isGoing,isGoingValue,disabled,bottonclass,
         dialogBox,shortcutnum,disabledType,gaincode,authCodeType,authCodeclass, isRender}=this.state;
@@ -414,6 +428,10 @@ class LoginDialog extends Component {
 							disableBackdropClick={true}
               onClose={() => this.handleDialogClose()}
             >
+        <Notcompletedysl
+          modalsType={this.state.MyEduCoderModals}
+          setNotcompleteds={()=>{this.setNotcompleteds()}}
+        />
 				{isRender===true?
             <div className={dialogBox}>
                   <div id="closeIcon" onClick={()=>{this.handleDialogClose()}}>

public/react/src/modules/user/LoginRegisterComponent.js

@@ -340,8 +340,8 @@ class LoginRegisterComponent extends Component {
 
             }
 
-            if(response.data.identity === null || response.data.identity === undefined){
+            if(response.data.profile_completed !== null || response.data.profile_completed === false){
-                this.props.history.push("/interesse");
+                this.setMyEduCoderModals();
                 return;
             }