注册成功后跳转到首页

.idea/workspace.xml

@@ -499,7 +499,6 @@
         <option value="$PROJECT_DIR$/src/forge/Main/Detail.js" />
         <option value="$PROJECT_DIR$/src/forge/Main/CoderRootCommit.js" />
         <option value="$PROJECT_DIR$/src/forge/Activity/ActivityItem.js" />
-        <option value="$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js" />
         <option value="$PROJECT_DIR$/src/forge/Branch/CloneAddress.js" />
         <option value="$PROJECT_DIR$/src/forge/Version/version.js" />
         <option value="$PROJECT_DIR$/public/css/css_min_all.css" />
@@ -1020,16 +1019,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/forge/Main/CoderRootDirectory.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="153">
-          <caret line="9" column="50" lean-forward="true" selection-start-line="9" selection-start-column="50" selection-end-line="9" selection-end-column="50" />
-          <folding>
-            <element signature="n#CoderRootDirectory#0" />
-          </folding>
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/src/modules/user/usersInfo/InfosBanner.js">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="192">

src/App.js

@@ -10,7 +10,7 @@ import {
 import axios from 'axios';
 import LoginDialog from './modules/login/LoginDialog';
 import 'babel-polyfill';
-import Loading from './Loading'
+import Loading from './Loading';
 
 import Loadable from 'react-loadable';
 import marked from './common/marked';

src/AppConfig.js

@@ -27,7 +27,7 @@ if (isDev) {
   }
   debugType = window.location.search.indexOf('debug=t') !== -1 ? 'teacher' :
     window.location.search.indexOf('debug=s') !== -1 ? 'student' :
-      window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || 'admin'
+      window.location.search.indexOf('debug=a') !== -1 ? 'admin' : parsed.debug || ''
 }                 
 function clearAllCookie() {
   cookie.remove('_educoder_session', { path: '/' });
@@ -56,7 +56,7 @@ window._debugType = debugType;
 export function initAxiosInterceptors(props) {
   initOnlineOfflineListener();
   var proxy = "http://localhost:3000";
-    proxy = "https://testforgeplus.trustie.net";
+    proxy = "http://192.168.1.37:3000";
 
   const requestMap = {};
   window.setfalseInRequestMap = function (keyName) {

src/forge/Head/Header.js

@@ -403,39 +403,13 @@ class NewHeader extends Component {
       visiblemyss: boll,
     })
   }
-
-  getAppdata = () => {
-    try {
-      var chromesettingArray = JSON.parse(localStorage.getItem('chromesetting'));
-      var chromesettingresponseArray = JSON.parse(localStorage.getItem('chromesettingresponse'));
-      this.setState({
-        settings: chromesettingArray
-      });
-      if (chromesettingArray.tab_logo_url) {
-        this.gettablogourldata(chromesettingresponseArray);
-      } else {
-        this.gettablogourlnull();
-      }
-    } catch (e) {
-      this.geturlsdata();
-    }
-  };
-
   geturlsdata = () => {
     let url = "/setting.json";
     axios.get(url).then((response) => {
       if (response && response.data) {
         this.setState({ settings: response.data.setting });
-        // localStorage.setItem('chromesetting', JSON.stringify(response.data.setting));
-        // localStorage.setItem('chromesettingresponse', JSON.stringify(response));
-        try {
         if (response.data.setting.tab_logo_url) {
           this.gettablogourldata(response);
-          } else {
-            this.gettablogourlnull();
-          }
-        } catch (e) {
-          this.gettablogourlnull();
         }
       } else {
         this.gettablogourlnull();
@@ -484,17 +458,12 @@ class NewHeader extends Component {
   render() {
     const { match } = this.props;
     let current_user = this.props.user;
-    let { Addcoursestypes,
+    let { 
-      tojoinitemtype,
-      tojoinclasstitle,
-      code_notice,
-      checked_notice,
       AccountProfiletype,
       submitapplications,
       submitapplicationsvalue,
       user,
       isRender,
-      showSearchOpentype,
       headtypesonClickbool,
       headtypess,
       settings,
@@ -696,8 +665,8 @@ class NewHeader extends Component {
             <span className="font-15 ml30">
               <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
               {
-                settings && settings.new_course && settings.new_course.register_url &&
+                settings && settings.common && settings.common.register &&
-                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${settings.new_course.register_url}`} target="_blank">注册</a></span>
+                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${settings.common.register}`} target="_blank">注册</a></span>
               }
             </span>
             :

src/forge/Main/CoderRootCommit.js

@@ -74,6 +74,7 @@ class CoderRootCommit extends Component{
           array.push({
             name:item.author && item.author.name,
             login: item.author && item.author.login,
+            id: item.author && item.author.id,
             image_url:item.author && item.author.image_url,
             sha:item.sha,
             time_from_now:item.time_from_now,
@@ -136,10 +137,18 @@ class CoderRootCommit extends Component{
                           <Link to={`/projects/${owner}/${projectsId}/commits/${truncateCommitId(`${item.sha}`)}`} className="flex1 ml20 font-16 color-grey-3">{item.message}</Link>
                         </p>
                         <p className="f-wrap-alignCenter mt15">
+                          {
+                            item.id ?
                             <Link to={`/users/${item.login}`} className="show-user-link">
                               {item.image_url?<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
                               <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
-                          </Link>
+                            </Link>:
+                            <span className="show-user-link">
+                              {item.image_url?<img src={getImageUrl(`images/${item.image_url}`)} alt="" width="28px" height="28px" className="mr15 radius"/>:""}
+                              <label className="font-14 color-grey-6" style={{verticalAlign:'middle'}}>{item.name ?`${item.name}:`:""}提交于 {item.time_from_now}</label>
+                            </span>
+                          }
+                          
                         </p> 
                       </div>
                     )

src/forge/Main/CoderRootIndex.js

@@ -13,10 +13,6 @@ const UploadFile = Loadable({
   loader: () => import('../Newfile/upload_file'),
   loading: Loading,
 })
-const CoderRootDirectory = Loadable({
-	loader: () => import('./CoderRootDirectory'),
-	loading: Loading,
-})
 const CoderRootCommit = Loadable({
 	loader: () => import('./CoderRootCommit'),
 	loading: Loading,

src/forge/Source/Index.jsx

@@ -1,16 +1,121 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import './Index.scss';
 import { Blueback , FlexAJ } from '../Component/layout';
+import { Dropdown, Input , Menu , Pagination } from 'antd';
+import { Link } from 'react-router-dom';
+import UploadSource from './UploadSource';
 
+const { Search } = Input;
+const sort = [
+  "按上传时间排序",
+  "按下载次数排序",
+  "按引用排序"
+]
+const limit = 15;
 function Index(props){
+  const [ sortValue , setSortValue ] = useState(0);
+  const [ page , setPage ] = useState(1);
+  const [ total , setTotal ] = useState(0);
+  const [ search , setSearch ] = useState(undefined);
+
+  const [ visible , setVisible ] = useState(false);
+
+  useEffect(()=>{
+
+  },[search,sort,page])
+
+  // 搜索
+  function onSearch(value){
+    setSearch(value);
+  }
+
+  // 切换排序方式
+  function changeSort(e,index){
+    setSortValue(index);
+  }
+
+
+  const menu=(
+    <Menu>
+      {
+        sort && sort.map((item,key)=>{
+          return(
+            <Menu.Item onClick={(e)=>changeSort(e,key)} value={key} className={key === sortValue ?"color-blue":""}>{item}</Menu.Item>     
+          )
+        })
+      }
+    </Menu>
+  )
+
+  const listmenu=(
+    <Menu>
+      <Menu.Item>更新版本</Menu.Item>
+      <Menu.Item>设为私有</Menu.Item>
+      <Menu.Item>删除资源</Menu.Item>
+    </Menu>
+  )
+
+  function onOk(){
+
+  }
   return(
     <div className="sourcePanel">
+      <UploadSource visible={visible} onCancel={()=>setVisible(false)} onOk={onOk}/>
       <div className="headtitle">
         <FlexAJ>
-          <span className="font-18">资源库</span>
+          <span className="font-18">资源库(18)</span>
-          <Blueback>上传资源</Blueback>
+          <Blueback onClick={()=>setVisible(true)}>上传资源</Blueback>
         </FlexAJ>
       </div>
+      <FlexAJ className="subHeadtitle">
+        <Search 
+          placeholder="在项目内搜索资源" 
+          onSearch={onSearch} 
+          allowClear 
+          enterButton="搜索"
+          width="220px"
+        />
+        <Dropdown overlay={menu} placement="bottomRight">
+          <span className="color-grey-9">{sort[sortValue]}<i className="iconfont icon-sanjiaoxing-down font-16 color-grey-9 ml3"></i></span>
+        </Dropdown>
+      </FlexAJ>
+      <div className="bodycontent">
+        <ul className="bodycontentul">
+          <li>
+            <Link to= {`/users/`} className="infoImg"><img src={`https://testforgeplus.trustie.net/images/avatars/User/b`} alt="" /></Link>
+            <div style={{flex:'1',width:"0"}}>
+              <FlexAJ>
+                <a href={``} className="infoname">DaVinci.fdb</a>
+                <Dropdown overlay={listmenu} placement={'bottomRight'}>
+                  <i className="iconfont icon-gengduo1 color-grey-6"></i>
+                </Dropdown>
+              </FlexAJ>
+              <p className="infos">
+                <span>上传时间：<span>2021-03-30</span></span>
+                <span>上传类型：<span>软件版本</span></span>
+                <span>文件大小：<span>10KB</span></span>
+                <span>下载：<span>111</span></span>
+              </p>
+              <p className="infodesc task-hide-2">资源描述资源描述资源描述资源描述资源描述资源描述资源描述</p>
+              <div className="infotag">
+                <span>软件版本<i className="iconfont icon-guanbi font-12 ml2"></i></span>
+              </div>
+            </div>
+          </li>
+        </ul>
+        {
+          total > limit && 
+          <div className="pt20 pb20 edu-txt-center">
+            <Pagination 
+              simple
+              current={page}
+              pageSize={limit}
+              total={total}
+              onChange={(p)=>{setPage(p)}}
+            />
+          </div>
+        }
+      </div>
     </div>
   )
 }

src/forge/Source/Index.scss

@@ -8,4 +8,69 @@
     padding:15px 20px;
     border-bottom: 1px solid #eee;
   }
+  .subHeadtitle{
+    padding:15px 20px;
+    border-bottom: 1px solid #eee;
+    .ant-input-group-wrapper{
+      width:320px;
+      .ant-btn.ant-input-search-button{
+        margin: 0px;
+        margin-top: -1px;
+      }
+    }
+  }
+  .bodycontent{
+    padding:0px 20px;
+    & > ul.bodycontentul > li{
+      display: flex;
+      border-bottom: 1px solid #eee;
+      padding:20px 0px;
+      align-items: flex-start;
+      &:last-child{
+        border-bottom: none;
+      }
+      .infoImg{
+        img{
+          width: 50px;
+          height: 50px;
+          border-radius: 50%;
+        }
+        margin-right: 15px;        
+      }
+      .infoname{
+        font-size: 16px;
+      }
+      .infos{
+        & > span{
+          margin-right: 20px;
+          color: #999;
+          & >span{
+            color: #666;
+          }
+        }
+      }
+      .infodesc{
+        color: #666;
+        line-height: 20px;
+        margin:5px 0px!important;
+      }
+      .infotag{
+        display: flex;
+        flex-wrap: wrap;
+        span{
+          display: block;
+          padding:0px 4px;
+          height: 20px;
+          line-height: 20px;
+          font-size: 12px;
+          margin-right: 10px;
+          border: 1px solid #f8df8c;
+          background: #fffce6;
+          color: #0d90c3;
+          border-radius: 2px;
+          cursor: pointer;
+        }
+      }
+    }
+  }
 }

src/forge/Source/UploadSource.jsx

@@ -0,0 +1,22 @@
+import React from 'react';
+import { Modal } from 'antd';
+
+
+function UploadSource({ visible , onCancel , onOk }){
+  return(
+    <Modal 
+      title={"上传资源"}
+      closable={false}
+      visible={visible}
+      onCancel={onCancel}
+      onOk={onOk}
+      cancelText="取消"
+      okText="确定"
+      width="600px"
+      centered
+    >
+      <div></div>
+    </Modal>
+  )
+}
+export default UploadSource;

src/modules/login/EducoderLogin.js

@@ -1,34 +1,13 @@
 import React, { Component } from "react";
 import moment from 'moment';
-import { SnackbarHOC,getImageUrl } from 'educoder';
+import { getImageUrl } from 'educoder';
 import '../courses/css/members.css';
 import "../courses/common/formCommon.css"
 import '../courses/css/Courses.css';
 import beijintulogontwo from '../../../src/images/login/beijintulogontwo.png';
-import educodernet from '../../../src/images/login/educodernet.png';
+import educodernet from '../../../src/images/login/logo.png';
 import LoginRegisterComponent from '../user/LoginRegisterComponent';
 import FindPasswordComponent from '../user/FindPasswordComponent';
-import passopen from "../../images/login/passopen.png";
-//educoder登入页面
-var sectionStyle = {
-    "height": "100%",
-    "width": "100%",
-    "min-width": "1000px",
-// makesure here is String确保这里是一个字符串，以下是es6写法
-
-
-};
-var imgback = {
-   " background-size":"cover",
-"background-repeat":"no-repeat",
-    backgroundImage: `url(${beijintulogontwo})`,
-}
-var imgmian ={
-     width: "100%",
-     background: `url(${beijintulogontwo})`,
-     position: "relative",
-
-}
 
 var newContainer={
     background: `url(${beijintulogontwo})`,
@@ -67,7 +46,6 @@ class EducoderLogin extends Component {
 
                 }
             }else if(props.match.url === "/register"){
-                // showbool: 1,
                   this.state = {
                     showbool: 1,
                     loginstatus:false,
@@ -84,23 +62,12 @@ class EducoderLogin extends Component {
                     loginstatus:true,
                 }
             }
-
         }
-
     }
-
-    componentDidMount() {
-     // console.log("EducoderLogin");
-     // console.log(this.props);
-    }
-
     Setlogins=(i)=>{
-        console.log("96ye");
-        console.log(i)
         this.setState({
             logini:i
         })
-
     }
     gohome=()=>{
         window.location.href="/"
@@ -119,32 +86,18 @@ class EducoderLogin extends Component {
 
 
     render() {
-        let {showbool,loginstatus,logini} = this.state;
+        let { showbool } = this.state;
-        // console.log("EducoderLogingetHelmetapi");
+        const { settings } = this.props;
-        // console.log(this.props);
-        // console.log(this.props.mygetHelmetapi);
         return (
             <div style={newContainer} className=" clearfix" >
-
+                <div style={{"justify-content": "center","align-items": "center","width": "100%",textAlign:"center"}}>
-                <div >
-                    <div style={{
-                        "display": "flex",
-                        "justify-content": "center",
-                        "align-items": "center",
-                        "width": "100%"
-                    }}>
                     <div style={{cursor:"pointer"}}>
-                            {this.props.mygetHelmetapi === null ? ""
+                        {
+                            settings && settings.login_logo_url ?
+                            <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} width="80px" src={getImageUrl(settings.login_logo_url)}/>
                             :
-                                this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.login_logo_url===null|| this.props.mygetHelmetapi.login_logo_url===undefined?
+                            <img style={{cursor:"pointer"}} alt="" onClick={()=>this.gohome()} src={educodernet} width="80px"/>
-                                  <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={educodernet}/>
-                                  :
-                                  <img style={{cursor:"pointer"}} onClick={()=>this.gohome()} src={getImageUrl(this.props.mygetHelmetapi.login_logo_url)}/>
                         }
-
-                        </div>
-
-
                     </div>
                     {
                         showbool === 1 ?
@@ -155,51 +108,17 @@ class EducoderLogin extends Component {
                             marginTop: "25px",
                         }}>
                             <div>
-
+                                <LoginRegisterComponent {...this.props} {...this.state} Setshowbool={(e)=>this.Setshowbool(e)} ></LoginRegisterComponent>
-                                    <LoginRegisterComponent {...this.props} {...this.state}
-                                                            Setshowbool={(e)=>this.Setshowbool(e)} ></LoginRegisterComponent>
-
                             </div>
-
                         </div>
                         :
-                          <div style={{
+                        <div style={{display: "flex",justifyContent: "center",width: "100%",marginTop: "25px",}}>
-                              display: "flex",
-                              justifyContent: "center",
-                              width: "100%",
-                              marginTop: "25px",
-                          }}>
                             <div>
-                                  <FindPasswordComponent {...this.props} {...this.state}
+                                <FindPasswordComponent {...this.props} {...this.state} Setshowbool={(e)=>this.Setshowbool(e)}></FindPasswordComponent>
-                                                         Setshowbool={(e)=>this.Setshowbool(e)}></FindPasswordComponent>
-
                             </div>
                         </div>
                     }
-									{this.props.mygetHelmetapi === null ? 	<div style={{
+                    <div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;Trustie<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
-										display: "flex",
-										justifyContent: "center",
-										width: "100%",
-									}}>
-										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
-									</div>:
-									this.props.mygetHelmetapi===undefined||this.props.mygetHelmetapi.main_site===null|| this.props.mygetHelmetapi.main_site===undefined?	<div style={{
-										display: "flex",
-										justifyContent: "center",
-										width: "100%",
-									}}>
-										<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
-									</div>:this.props.mygetHelmetapi.main_site===true?
-										<div style={{
-											display: "flex",
-											justifyContent: "center",
-											width: "100%",
-										}}>
-											<div className="font-14 color-grey-9 " style={{marginTop:"20px"}}><span className="font-18">©</span>&nbsp;{moment().year()}&nbsp;EduCoder<span className="ml15 mr15">湘ICP备17009477号</span><a href="https://team.trustie.net" style={{"color":"#888"}} target="_blank">Trustie</a>&nbsp;&nbsp;&nbsp;&amp;&nbsp;&nbsp;&nbsp;IntelliDE inside.</div>
-										</div>
-										:""
-									}
-
                 </div>
             </div>
         )

src/modules/login/LoginDialog.js

@@ -1,13 +1,7 @@
 import React, { Component } from 'react';
-import { Redirect } from 'react-router';
 
-import Dialog, {
+import Dialog from 'material-ui/Dialog';
-  DialogActions,
+import { notification } from 'antd';
-  DialogContent,
-  DialogContentText,
-  DialogTitle,
-} from 'material-ui/Dialog';
-import { notification, Modal } from 'antd';
 
 import axios from 'axios';
 
@@ -329,6 +323,7 @@ class LoginDialog extends Component {
     return flag;
   }
   componentDidMount() {
+
     let flag = this.IsPC(); //true为PC端，false为手机端
     this.setState({
       isphone: flag
@@ -478,6 +473,7 @@ class LoginDialog extends Component {
     let { qqlogin, login, isGoing, isGoingValue, disabled, bottonclass, Phonenumberisnotco,
       dialogBox, isRender, weixinlogin } = this.state;
 
+    let { settings } = this.props;
     if (isRender === undefined) {
       isRender = false
     }
@@ -580,9 +576,9 @@ class LoginDialog extends Component {
                       <label htmlFor="p_autolog" style={{ top: '0px' }}>下次自动登录</label>
                     </span>
                     <span className="fr">
-                      <a onClick={(url) => this.getloginurl("https://www.trustie.net/account/lost_password")}
+                      <a onClick={(url) => this.getloginurl(`${settings && settings.common && settings.common.lost_password}`)} className="mr3 color-grey-9">找回密码</a>
-                        className="mr3 color-grey-9">找回密码</a><em className="vertical-line"></em>
+                      <em className="vertical-line"></em>
-                      <a onClick={(url) => this.getloginurl("https://www.trustie.net/login?login=false")} className="color-grey-9">注册</a>
+                      <a onClick={(url) => this.getloginurl(`${settings && settings.common && settings.common.register}`)} className="color-grey-9">注册</a>
                     </span>
                   </p>
 

src/modules/tpm/NewHeader.js

@@ -812,16 +812,16 @@ class NewHeader extends Component {
             <span className="font-15">
               <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
               {
-                settings && settings.new_course && settings.new_course.register_url &&
+                settings && settings.common && settings.common.register &&
-                <span><em className="vertical-line"></em><a className="ml5 color-grey-6" href={`${settings.new_course.register_url}`} target="_blank">注册</a></span>
+                <span><em className="vertical-line"></em><a className="ml5 color-grey-6 3333" href={`${settings.common.register}`} target="_blank">注册</a></span>
               }
             </span>
             : user.login === "" ?
             <span className="font-15">
               <a onClick={() => this.educoderlogin()} className="mr5 color-grey-6">登录</a>
               {
-                settings && settings.new_course && settings.new_course.register_url &&
+                settings && settings.common && settings.common.register &&
-                <span><em className="vertical-line"></em><a className="color-grey-6 ml5" href={`${settings.new_course.register_url}`} target="_blank">注册</a></span>
+                <span><em className="vertical-line"></em><a className="color-grey-6 ml5 111" href={`${settings.common.register}`} target="_blank">注册</a></span>
               }
             </span>
             :

src/modules/user/LoginRegisterComponent.js

@@ -24,13 +24,7 @@ class LoginRegisterComponent extends Component {
     constructor(props) {
         super(props)
 
-
-        //
-        // console.log("LoginRegisterComponent");
-        // console.log("29");
-        // console.log(props.loginstatus);
         if (props.loginstatus === true) {
-            // console.log(props.loginstatus);
             this.state = {
                 tab: ["0"],
                 classpass: "text",
@@ -147,24 +141,14 @@ class LoginRegisterComponent extends Component {
         this.setState({
             isphone: flag
         })
-        // console.log("componentDidUpdate");
-        // console.log(this.props);
         let pcipns = this.IsPC();
         if (this.props.match.url === "/login") {
 
-            // this.state = {
-            //     tab:["0"],
-            //
-            // }
             this.setState({
                 tab: ["0"]
             })
         } else if (this.props.match.url === "/register") {
 
-            // this.state = {
-            //     tab:["1"],
-            //
-            // }
             this.setState({
                 tab: ["1"]
             })
@@ -198,8 +182,6 @@ class LoginRegisterComponent extends Component {
 
 
     StudyMakeMoney = () => { // 调用父组件方法
-
-        // this.props.Setlogins(3);
         this.setState({
             login: "",
             password: "",
@@ -400,11 +382,6 @@ class LoginRegisterComponent extends Component {
 
             }
 
-            // if(response.data.profile_completed !== null || response.data.profile_completed === false){
-            //     this.setMyEduCoderModals();
-            //     return;
-            // }
-
             if (response.status === 200) {
                 if (response.data.status === 402) {
                     window.location.href = response.data.url;
@@ -435,23 +412,6 @@ class LoginRegisterComponent extends Component {
     }
     //注册接口
     postregistered = () => {
-        // if (this.state.logins === undefined || this.state.logins === "") {
-        //     this.openNotification(`请输入登录手机号码或邮箱`,2);
-        //
-        //     return
-        // } else if (this.state.dragOk === false) {
-        //     this.openNotification(`请拖动滑块验证`,2);
-        //     return
-        // } else if (this.state.codes === undefined || this.state.codes == "") {
-        //     this.openNotification(`请输入验证码`,2);
-        //     return
-        // } else if (this.state.passwords === undefined || this.state.passwords == "") {
-        //     this.openNotification(`请输入密码`,2);
-        //     return
-        // } else if (this.state.Agreetotheterms === false) {
-        //     this.openNotification(`请同意服务协议条款`,2);
-        //     return;
-        // }
         if (this.state.logins === undefined || this.state.logins === "" || this.state.logins.length === 0) {
             this.setState({
                 Phonenumberisnotcos: "账号不能为空",
@@ -461,25 +421,8 @@ class LoginRegisterComponent extends Component {
             })
             return
         }
-        if(this.state.pciphone===true){
-            if (this.state.dragOk === false) {
-                // this.openNotification(`请拖动滑块完成验证`,2);
-                this.setState({
-                    Phonenumberisnotcosytdhk:"请拖动滑块完成验证",
-                    dragOk:false,
-                    Whethertoverify:this.state.Whethertoverify===true?false:true,
-                })
-                return
-            }
-        }
 
-        if (this.state.codes === undefined || this.state.codes == ""||this.state.codes.length===0) {
+        if (this.state.passwords === undefined || this.state.passwords == "" || this.state.passwords.length === 0) {
-            // this.openNotification(`请输入验证码`,2);
-            this.setState({
-                Phonenumberisnotcosyzm:"验证码不能为空",
-            })
-            return
-        } else if (this.state.passwords === undefined || this.state.passwords == "" ||this.state.passwords.length===0) {
             this.setState({
                 Phonenumberisnotcosymmm: "密码不能为空",
             })
@@ -494,9 +437,6 @@ class LoginRegisterComponent extends Component {
                 Phonenumberisnotcosymmm: "密码不能超过16位",
             })
             return
-        } else if (this.state.Agreetotheterms === false) {
-            this.openNotification(`请同意服务协议条款`,2);
-            return;
         }
 
         let url;
@@ -511,34 +451,9 @@ class LoginRegisterComponent extends Component {
             password: this.state.passwords,
             code: this.state.codes,
         }).then((result) => {
-            if(result){
+            if (result && result.data) {
-                if(result.data.status===-2){
+                this.openNotification("注册成功！");
-                    if(result.data.message==="验证码不正确"){
+                this.props.history.push('/');
-                        this.setState({
-                            Phonenumberisnotcosyzm:"验证码不正确",
-                        })
-
-                        return;
-                    }else if(result.data.message==="验证码已失效"){
-                        this.setState({
-                            Phonenumberisnotcosyzm:"验证码不正确",
-                        })
-
-                        return;
-                    }else {
-                        this.openNotification(result.data.message);
-                        return;
-                    }
-                }else {
-                    // this.setState({
-                    //     logins: "",
-                    //     dragOk: false,
-                    //     codes: "",
-                    //     passwords: "",
-                    //     Agreetotheterms: "",
-                    // })
-                    this.setMyEduCoderModals();
-                }
             }
         }).catch((error) => {
 
@@ -758,12 +673,9 @@ class LoginRegisterComponent extends Component {
             })
             return;
         }
-        // var telephone = $("#telephoneAdd.tianjia_phone").val();
         var regph = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
-        // var email = $("#add_email.tianjia_email").val();
         var regemail = /^\w+((-\w+)|(\.\w+))*\@[A-Za-z0-9]+((\.|-)[A-Za-z0-9]+)*\.[A-Za-z0-9]+$/;
 
-        // [1]手机号开头必须是1    [3,4,5,6,7,8] 第二位是3-8中的一个 [0-9]{9} 后边9位可以是0-9的任意数字。
         var stringdata = undefined;
         if (!regph.test(e.target.value)) {
             stringdata = "手机号格式不正确";
@@ -809,7 +721,6 @@ class LoginRegisterComponent extends Component {
     }
     //获取登入密码
     passwordonChange = (e) => {
-        // console.log(e.target.value);
         var stirngt;
         if (e.target.value.length > 0) {
             var str = e.target.value.replace(/\s*/g, "")
@@ -822,9 +733,6 @@ class LoginRegisterComponent extends Component {
             Phonenumberisnotcodmm: undefined,
             Phonenumberisnotcodmms: undefined,
         })
-        // this.setState({
-        //     password: e.target.value
-        // })
     }
     //获取注册登入
     loginInputonChanges = (e) => {
@@ -881,7 +789,6 @@ class LoginRegisterComponent extends Component {
         this.setState({
             tab: e.key
         })
-
         if (e.key === 0) {
             this.setState({
                 Phonenumberisnotcos: undefined
@@ -890,26 +797,8 @@ class LoginRegisterComponent extends Component {
             this.setState({
                 Phonenumberisnotco: undefined
             })
-
         }
-
-        // this.props.history.push(`/classrooms/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/student_exercise_list?tab=`+e.key)
-
     }
-    loginonkeyup =(e)=>{
-        if(e.keyCode==32){
-
-            return false;
-        }
-    };
-    setNotcompleteds=()=>{
-        this.setState({
-            Notcompleteds:true,
-            MyEduCoderModals:false,
-            registered:undefined,
-
-        })
-    };
     setMyEduCoderModals = () => {
         this.setState({
             MyEduCoderModals: true,
@@ -917,70 +806,10 @@ class LoginRegisterComponent extends Component {
         })
     };
 
-	openweixinlogin=()=>{
-		this.setState({
-			weixinlogin:true
-		})
-	}
-	hideweixinlogin=()=>{
-		this.setState({
-			weixinlogin:false,
-			qqlogin:false,
-        tab:["0"]
-		})
-	}
-
-	openqqlogin=()=>{
-		this.setState({
-			qqlogin:true
-		})
-		//window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2f${window.location.host}%2otherloginqq&response_type=code`
-		window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code`
-		// window.location.href=`https://graph.qq.com/oauth2.0/show?which=Login&display=pc&client_id=101508858&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&tp=qq&response_type=code`
-	}
-
-	openphoneqqlogin=()=>{
-		window.open(
-			`https://xui.ptlogin2.qq.com/cgi-bin/xlogin?appid=716027609&pt_3rd_aid=101508858&daid=383&pt_skey_valid=0&style=35&s_url=http%3A%2F%2Fconnect.qq.com&refer_cgi=authorize&which=&client_id=101508858&response_type=code&scope=get_user_info&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginqq&state=null,${window.location.host}&response_type=code`
-		)
-	}
     render() {
-        const {
+        const {passopens,Agreetotheterms,Phonenumberisnotcos,tab,classpassbool,Phonenumberisnotcosymmm} = this.state
-            // 登录
-            autoLogin,
-            classpass,
-            passopens,
-            seconds,
-            getverificationcodes,
-            Agreetotheterms,
-            Phonenumberisnotco,
-            Phonenumberisnotcos,
-            codes,
-            tab,
-            dragOk,
-            Whethertoverify,
-            classpassbool,
-            Phonenumberisnotcosytdhk,
-            Phonenumberisnotcosyzm,
-            Phonenumberisnotcosymmm,
-            Phonenumberisnotcodmm,
-            // 注册
-            readAgreement,
-            pciphone,
-            Phonenumberisnotcodmms,
-				  	weixinlogin
-        } = this.state
-        // height: 346px;
-        if (this.state.seconds === 0) {
-            // window.location.href='http://www.cnblogs.com/a-cat/';
-        }
-
-
         return (
-
+            <div className={"login_register_content login_register_contents"}>
-          <div className={this.props.weixinlogin?"weixinregister":"login_register_content login_register_contents"}
-							 // style={  parseInt(tab[0])==0?{height: "366px"} :{height: "510px"}}
-					>
                 <style>
                     {
                         `
@@ -993,134 +822,16 @@ class LoginRegisterComponent extends Component {
                 </style>
 
                 <div>
-								{weixinlogin===false&&this.props.weixinlogin===undefined?<Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab} className="mt20">
+                    <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab} className="mt20">
-                      <Menu.Item key="0" className={tab===0?"active font-18":"font-18"}   > 登录</Menu.Item>
+                        <Menu.Item key="1" className={"active font-18"} style={{ marginLeft: "10px" }}  >注册</Menu.Item>
-                      <Menu.Item key="1" className={tab===1?"active font-18 ":"font-18 "} style={{marginLeft:"10px"}}  >注册</Menu.Item>
+                    </Menu>
-                  </Menu>:""}
                     
-								{
-										weixinlogin===false&&parseInt(tab[0])==0 &&
                     <div style={{ width: '340px' }}>
-                          <style>
+                        <Input placeholder="请输入邮箱账号进行注册"
-                              {
-                                  `
-														.ant-input {
-																		font-family: "Monospaced Number", "Chinese Quote", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, sans-serif;
-																		-webkit-box-sizing: border-box;
-																		box-sizing: border-box;
-																		margin: 0;
-																		padding: 0;
-																		list-style: none;
-																		position: relative;
-																		display: inline-block;
-																		padding: 4px 11px;
-																		width: 100%;
-																		height: 38px;
-																		font-size: 14px;
-																		line-height: 1.5;
-																		color: rgba(0, 0, 0, 0.65);
-																		background-color: #fff;
-																		background-image: none;
-																		border: 1px solid #d9d9d9;
-																		border-radius: 4px;
-																		-webkit-transition: all .3s;
-																		-o-transition: all .3s;
-																		transition: all .3s;
-																}
-														  .loginInputzhuche{
-																	width: 100%;
-																	background-color: #fff!important;
-																	height: 45px !important;
-																	padding: 5px;
-
-																}
-
-                                `
-                              }
-                          </style>
-
-                          <Input placeholder="请输入登录手机号码或邮箱" value={this.state.login}
-                                 onChange={this.loginInputonChange}
-                                 name="username"
-                                 className={Phonenumberisnotco && Phonenumberisnotco !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"}
-                                 onBlur={(e) => this.inputOnBlur(e, 1)}
-                                 style={{marginTop: '30px', height: '38px'}}
-                                 onPressEnter={() => this.postLogin()}
-                          ></Input>
-
-                          {
-                              Phonenumberisnotco && Phonenumberisnotco != "" ?
-                                <p className="color-red  mt5 mb5" style={{width: " 100%", height: "20px"}}>
-                                    <span className="fl" style={{textAlign:"left",width: " 100%"}}>{Phonenumberisnotco}</span>
-                                </p>
-                                : <div style={{height:"25px"}}></div>
-                          }
-
-                          <Input type="password" name="password" id="password" value={this.state.password}
-                                 onChange={this.passwordonChange}
-                                 onPressEnter={() => this.postLogin()}
-                                 className={Phonenumberisnotcodmm && Phonenumberisnotcodmm !== "" ?" color-grey-9 loginInputzhucheyslass bor-reds":" color-grey-9 loginInputzhuche"}
-                                 placeholder="密码"></Input>
-                          {
-                              Phonenumberisnotcodmm && Phonenumberisnotcodmm != "" ?
-                                <p className="color-red  mt5 mb5" style={{width: " 100%", height: "20px"}}>
-                                    <span className="fl" style={{textAlign:"left",width: " 100%"}}>{Phonenumberisnotcodmm}</span>
-                                </p>
-                                : (Phonenumberisnotcodmms=== undefined?<div style={{height:"25px"}}></div>:"")
-                          }
-                          {
-                              Phonenumberisnotcodmms && Phonenumberisnotcodmms != "" ?
-                                <p className="color-red  mt5 mb5" style={{width: " 100%", height: "20px"}}>
-                                    <span className="fl" style={{textAlign:"left",width: " 100%"}}>{Phonenumberisnotcodmms}</span>
-                                </p>
-                                : ""
-                          }
-
-                          <div className="left_right  font-12 " style={{color: '#676767'}}>
-                              <Checkbox onChange={this.onAutoLoginChange} checked={autoLogin}>下次自动登录</Checkbox>
-
-                              <a onClick={()=>this.StudyMakeMoney()}
-                                 className="mr3 color-grey-9 mt3 font-12">找回密码</a>
-                          </div>
-
-                          <Button className="login_btn font-16" type="primary" style={{height:"46px"}} onClick={() => this.postLogin()}
-                                  size={"large"}>登录</Button>
-												{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?this.state.isphone===true?<p className="clearfix mb10 textcenter">
-
-												<span className={"startlogin"}>————————  快速登录  ————————</span>
-													<div className={"mt10"}>
-														<a onClick={()=>this.openweixinlogin()}>
-															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
-														</a>
-														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
-														</a>
-													</div>
-												</p>:<p className="clearfix mb10 textcenter">
-													<span className={"startlogin"}>————————  快速登录  ————————</span>
-													<div className={"mt10"}>
-														{/*<a onClick={()=>this.openweixinlogin()}>*/}
-														{/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
-														{/*</a>*/}
-														<a onClick={()=>this.openphoneqqlogin()}>
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
-														</a>
-													</div>
-												</p>:""}
-                      </div>
-                  }
-
-
-
-                  {
-										weixinlogin===false&&parseInt(tab[0])==1 &&
-                      <div style={{width: '340px'}}>
-                          <Input  placeholder="请使用手机号/邮箱账号进行注册"
                             className={Phonenumberisnotcos && Phonenumberisnotcos !== "" ? " color-grey-9 loginInputzhucheyslass bor-reds" : " color-grey-9 loginInputzhuche"}
                             value={this.state.logins}
                             type="text" autoComplete="off"
                             onChange={this.loginInputonChanges}
-                            // onBlur={(e) => this.inputOnBlurzhuche(e, 2)}
                             style={{ marginTop: '30px', height: '38px', color: '#999999', fontSize: "14px" }}></Input>
                         {
                             Phonenumberisnotcos && Phonenumberisnotcos !== "" ?
@@ -1130,88 +841,6 @@ class LoginRegisterComponent extends Component {
                                 : <div style={{ height: "25px" }}></div>
 
                         }
-                          {this.state.MyEduCoderModals===true? <Notcompletedysl
-                            modalsType={this.state.MyEduCoderModals}
-                            registered={this.state.registered}
-                            setNotcompleteds={()=>{this.setNotcompleteds()}}
-                          />:""}
-
-                          {
-                              Whethertoverify===false&&pciphone===true?
-                                <CheckInputysl1
-                                  dragOkCallback={this.dragOkCallback}
-                                >
-                                </CheckInputysl1>
-                                :
-                                ""
-
-                          }
-                          {
-                              Whethertoverify===true&&pciphone===true?
-                                <CheckInputysl2
-                                  dragOkCallback={this.dragOkCallback}
-                                >
-                                </CheckInputysl2>
-                                :
-                                ""
-                          }
-
-                          <div>
-                              {
-                                  pciphone===true?
-                                    (
-                                      Phonenumberisnotcosytdhk && Phonenumberisnotcosytdhk !== "" ?
-                                        <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px"}}>
-                                            <span className="fl" style={{textAlign:"left",width: " 100%"}}>{Phonenumberisnotcosytdhk}</span>
-                                        </p>
-                                        : <div style={{height:"25px"}}></div>
-
-                                    )
-                                    :""
-                              }
-                          </div>
-
-
-
-                          <div className="yslbutondls">
-
-                              <Input
-                                className={Phonenumberisnotcosyzm && Phonenumberisnotcosyzm !== "" ?" mr5 font-14 color-grey-9 loginInputzhucheyslass bor-reds":" mr5 font-14 color-grey-9 loginInputzhuche"}
-                                name="codes" type="text" autoComplete="off" readonly
-                                onfocus="this.removeAttribute('readonly')" style={{
-                                  width:'210px',
-                                  height:'38px',
-                              }} placeholder="请输入验证码"
-                                onChange={this.codesonChange}
-                                value={codes}
-                              >
-                              </Input>
-                              {
-                                  getverificationcodes === undefined ?
-                                    <Button className=" ml5 font-14" disabled style={{"width": "120px","text-align":"center", "height": "45px",}}
-                                            size={"large"}>重新发送{seconds}s</Button>
-                                    : getverificationcodes === true ?
-                                    <Button className=" ml5 font-14" type="primary" style={{"width": "120px","text-align":"center", "height": "45px",}}
-                                            onClick={() => this.getverificationcode()} size={"large"}>获取验证码</Button>
-                                    :
-                                    <Button className=" ml5 font-14 " type="primary" style={{"width": "120px","text-align":"center", "height": "45px",}}
-                                            onClick={() => this.getverificationcode()} size={"large"}>重新发送</Button>
-                              }
-
-                          </div>
-                          <div>
-                              {
-                                  Phonenumberisnotcosyzm && Phonenumberisnotcosyzm !== "" ?
-                                    <p className="color-red  mt5 mb5  " style={{width: " 100%", height: "20px"}}>
-                                        <span className="fl" style={{textAlign:"left",width: " 100%"}}>{Phonenumberisnotcosyzm}</span>
-                                    </p>
-                                    : <div style={{height:"25px"}}></div>
-
-                              }
-                          </div>
-
-
-
                         <style>
                             {
                                 `
@@ -1249,57 +878,10 @@ class LoginRegisterComponent extends Component {
                                 : <div style={{ height: "25px" }}></div>
 
                         }
-												{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?<Checkbox onChange={this.onChange}
+                        <Button className=" font-16 mb20" type="primary" style={this.props.settings && this.props.settings.main_site === true ? { height: "46px", width: "100%", marginTop: "26px" } : { height: "46px", width: "100%" }} onClick={() => this.postregistered()}
-                                    checked={Agreetotheterms}
-                          ><span className="font-14 "  style={{
-                              color: '#676767',
-                          }}>我已阅读并同意
-															<span>
-																<a href={'https://forge.educoder.net/help?index=4'} target="_blank" className={"color-blue"}>《服务协议条款》</a>
-															</span></span></Checkbox>:""}
-                          <Button className=" font-16 mb20" type="primary" style={this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?{height:"46px", width: "100%",marginTop:"26px"}:{height:"46px", width: "100%"}} onClick={() => this.postregistered()}
                             size={"large"}>{this.props.weixinlogin ? "注册并绑定" : "注册"}</Button>
-
-												{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?this.state.isphone===true?<p className="clearfix mb10 textcenter">
-
-													<span className={"startlogin"}>————————  快速登录  ————————</span>
-													<div className={"mt10"}>
-														<a onClick={()=>this.openweixinlogin()}>
-															<img src={require('./img/WeChat.png')}  alt="微信登录"/>
-														</a>
-														<a onClick={()=>this.openqqlogin()} className={"ml10"}>
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
-														</a>
                     </div>
-												</p>:<p className="clearfix mb10 textcenter">
-													<span className={"startlogin"}>————————  快速登录  ————————</span>
-													<div className={"mt10"}>
-														{/*<a onClick={()=>this.openweixinlogin()}>*/}
-														{/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
-														{/*</a>*/}
-														<a onClick={()=>this.openphoneqqlogin()}>
-															<img src={require('./img/qq.png')}  alt="qq登录"/>
-														</a>
                 </div>
-												</p>:""
-												}
-                      </div>
-                  }
-
-
-
-
-								{weixinlogin===true?<iframe
-									className={"weixinheight390 mt20"}
-									frameBorder="0"
-									sandbox="allow-scripts allow-same-origin allow-top-navigation"
-									scrolling="no"
-									src={`https://open.weixin.qq.com/connect/qrconnect?appid=wx6b119e2d829c13fa&redirect_uri=https%3a%2f%2fwww.educoder.net%2fotherloginstart&response_type=code&scope=snsapi_login&state=null,${window.location.host}#wechat_redirect`}></iframe>:""}
-								{weixinlogin===true?<p className="clearfix mb20 textcenter">
-									<a className={"startlogin color-blue"} onClick={()=>this.hideweixinlogin()}>返回登录注册</a>
-								</p>:""}
-              </div>
-
             </div>
         );
     }