kulley hace 7 años
padre
commit
4b3ad9e0c1

+ 0 - 2
src/app/basicVersion/caseShow/CaseDetail.js

@@ -142,8 +142,6 @@ class CaseDetail extends Component {
                                                             <Icon type="left" style={{color: '#3187FA'}}/>
                                                             <FormattedMessage id="back to all case show"/>
                                                         </div>
-
-
                                                         <Row>
                                                             <Col span={18} style={{
                                                                 borderRight: '1px dashed #dcdadb',

+ 4 - 0
src/app/developVersion/DevelopVersion.jsx

@@ -205,6 +205,7 @@ class DevelopVersion extends Component {
                                 languageButton={this.state.languageButton}
                                 changeLocale={this.changeLocale}
                                 switchMenuLevel={this.switchMenuLevel}
+                                history={this.props.history}
                             />
                     }
 
@@ -663,6 +664,9 @@ class User extends Component {
                                         <a href='https://www.ioobot.com' onClick={(e) => {
                                             e.preventDefault();
                                             this.logout();
+                                            this.props.history.push({
+                                                pathname: '/'
+                                            })
                                         }}><FormattedMessage id="exit"/></a>
                                     </Menu.Item>
                                 </Menu>

+ 3 - 2
src/app/developVersion/graphqlService/component/generateJs/GenerateJs.jsx

@@ -59,9 +59,10 @@ class GenerateJs extends Component {
         this._isMounted = true;
         let _this = this;
         let {schemaID} = this.state;
-        axios.get(`${genJsUrl}?schema=${'onlineSchema'}`)
+        // axios.get(`${genJsUrl}?schema=${'onlineSchema'}`)
+        // axios.get(`${genJsUrl}?schema=${'commentsSchema'}`)
         // axios.get(`${genJsUrl}?schema=${'order_schemaID'}`)
-        // axios.get(`${genJsUrl}?schema=${schemaID}`)
+        axios.get(`${genJsUrl}?schema=${schemaID}`)
             .then((res) => {
                 if (this._isMounted) {
                     if (res.data !== '') {

+ 15 - 1
src/login/LoginInput.js

@@ -11,7 +11,7 @@ import gql from "graphql-tag";
 import _ from 'lodash';
 import {idGen} from "../func";
 import {setCookie} from "../cookie";
-import {loginUrl, registerUrl, getIdUrl} from '../config'
+import {loginUrl, registerUrl, getIdUrl, logoutUrl} from '../config'
 import {graphqlUrl} from "../config";
 
 axios.defaults.withCredentials = true;
@@ -220,6 +220,17 @@ class LoginInput extends Component {
         this._isMounted = false
     }
 
+    logout = () => {
+
+        axios.get(logoutUrl)
+            .then((res) => {
+                console.log('logout success',res);
+                setCookie("user_id", '');
+            })
+            .catch((err) => {
+            });
+    };
+
     render() {
         return (
             <div>
@@ -277,6 +288,9 @@ class LoginInput extends Component {
                                         loginStatus: '',
                                         loginOnce: true
                                     });
+
+                                    this.logout();
+
                                     // cookie.remove('ring-session')
                                 }}><FormattedMessage id="exit"/></Button>
                                 <div style={{marginTop: 20}}>