dialogbox

public/react/src/components/dialog/index.jsx

@@ -0,0 +1,13 @@
+import React from 'react'
+import './index.less'
+
+export default ({ children, style = {} }) => {
+
+  return (
+    <div className="dialog-container-wrapper">
+      <div className="dialog-body" style={style}>
+        {children}
+      </div>
+    </div>
+  )
+}

public/react/src/components/dialog/index.less

@@ -0,0 +1,21 @@
+.dialog-container-wrapper {
+  display: flex;
+  position: fixed;
+  bottom: 0;
+  right: 0;
+  top: 0;
+  left: 0;
+  z-index: 300;
+  background: rgba(0, 0, 0, .7);
+
+  flex-flow: column nowrap;
+  justify-content: center;
+  align-items: center;
+}
+
+.dialog-body {
+  width: 405px;
+  height: auto;
+  background: #fff;
+  position: relative;
+}

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

@@ -1,10 +1,11 @@
 
-import React, { Component } from 'react';
+import React, { Component, Fragment } from 'react';
 import { notification } from 'antd';
 
 import axios from 'axios';
 import './LoginDialog.css';
 import { Modal } from 'antd'
+import Dialog from '../../components/dialog'
 import { broadcastChannelPostMessage } from 'educoder'
 import Notcompletedysl from "../user/Notcompletedysl";
 
@@ -457,9 +458,7 @@ class LoginDialog extends Component {
     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 = () => {
@@ -485,30 +484,17 @@ class LoginDialog extends Component {
       isRender = false
     }
     return (
-      <Modal visible={isRender} id="DialogID"
+      <Fragment>
-        className="zindextest"
+        {
-        onCancel={() => this.handleDialogClose()}
+          isRender ? <Dialog>
-        footer={null}
+
-      >
+            < Notcompletedysl
-        <Notcompletedysl
               modalsType={this.state.MyEduCoderModals}
-          setNotcompleteds={() => { this.setNotcompleteds() }}
+              setNotcompleteds={() => { this.setNotcompleteds() }
+              }
             />
+            < div className={dialogBox} >
 
-        <style>
-          {
-            `
-						  #DialogID .dialogBox {
-									width: 405px !important;
-							}
-							.dialogBox {
-									height: 290px !important;
-							}
-						`
-          }
-        </style>
-        {isRender === true ?
-          <div className={dialogBox}>
               <div id="closeIcon" className={"logincloseIcon"} onClick={() => { this.handleDialogClose() }}>
                 <i className="iconfont icon-shanchudiao"></i>
               </div>
@@ -536,9 +522,7 @@ class LoginDialog extends Component {
                       onInput={this.loginChange}
                       onBlur={(e) => this.inputOnBlur(e, 1)}
                       onPressEnter={disabled === false ?
-                      this.loginEDU : () => {
+                        this.loginEDU : () => { }
-                      }
-                      // console.log(1)
                       }
                       value={this.state.loginValue}
                       name="username"
@@ -568,19 +552,11 @@ class LoginDialog extends Component {
                       </div>
                     </div>
 
-
-                  {/*<button className={bottonclass} id="psd_login_btn"  onClick={this.loginEDU} disabled={disabled}>*/}
-
-                  {/*</button>*/}
-
                     <div className={disabled === false ? "bluebutton  edu-back-blue" : "bluebutton"}
                       onClick={disabled === false ?
                         this.loginEDU : () => { }
-                      // console.log(1)
                       }
-                  >
+                    > 登录 </div>
-                    登录
-                            </div>
 
                     <p className="clearfix mt20">
 
@@ -618,9 +594,6 @@ class LoginDialog extends Component {
 
                         <span className={"startlogin"}>————————  快速登录  ————————</span>
                         <div className={"mt10"}>
-                        {/*<a onClick={()=>this.openweixinlogin()}>*/}
-                        {/*<img src={require('./WeChat.png')}  alt="微信登录"/>*/}
-                        {/*</a>*/}
                           <a onClick={() => this.openphoneqqlogin()} className={"ml10"}>
                             <img src={require('./qq.png')} alt="qq登录" />
                           </a>
@@ -648,9 +621,12 @@ class LoginDialog extends Component {
 
 
               </div>
-          </div>
+
-          : ""}
+            </div >
-      </Modal>
+          </Dialog > : null
+        }
+      </Fragment>
+
 
     );
   }

public/react/src/modules/tpm/TPMIndexHOC.js

@@ -49,7 +49,7 @@ export default function TPMIndexHOC(WrappedComponent) {
 				Footerdown: undefined,
 				coursedata: {},
 
-				isRender: true,
+				isRender: false,
 				AccountProfiletype: false,
 				AccountPhoneemailtype: false,
 				globalLoading: false,