xy 7 роки тому
батько
коміт
552fedabbb

+ 24 - 5
src/app/App.jsx

@@ -1,5 +1,5 @@
 import React, {Component} from 'react';
-import {Layout, Menu, Button, Spin, Icon, LocaleProvider, Dropdown} from 'antd';
+import {Layout, Menu, Button, Spin, Icon, LocaleProvider, Dropdown, Avatar, Badge} from 'antd';
 import {BrowserRouter as Router, Route, Link, Switch, Redirect} from "react-router-dom";
 import {Query} from "react-apollo";
 import gql from "graphql-tag";
@@ -15,12 +15,13 @@ import UserCreate from "./graphqlService/UserCreate";
 import WxTrialCase from "./wechatService/WxTrialCase";
 import WxUserCreate from "./wechatService/WxUserCreate";
 import Login from "../login/Login";
+import Ticket from '../ticket/Ticket';
 import './graphqlService/component/graphql/index.css';
 import './index.css'
 import Create from "./graphqlService/component/schema/Create";
 import WxCreate from "./wechatService/wxCreate/WxCreate";
 
-import {SHOW_ALL_SCHEMA, SHOW_CASE_SCHEMA, SHOW_PROJECT, CASE_AND_PROJECT, GET_USER} from "../gql";
+import {CASE_AND_PROJECT, GET_USER} from "../gql";
 import axios from 'axios';
 import {getCookie, setCookie} from "../cookie";
 
@@ -43,7 +44,8 @@ class App extends Component {
             languageButton: props.language === "中文" ? "English" : "中文",
             visible: false,
             wxVisible: false,
-            userID: ''
+            userID: '',
+            avatar: ''
         };
     }
 
@@ -320,6 +322,10 @@ class App extends Component {
                                         </Menu>
                                     </Sider>
                                 );
+                            case 'ticket':
+                                return (
+                                    ''
+                                );
                             default:
                                 return (
                                     <Sider
@@ -351,6 +357,7 @@ class App extends Component {
                                 <Route path="/quant-service/:sidebar/:case" component={QuantService}/>
                                 <Route path="/login/:setting" component={Login}/>
                                 <Route path="/login" component={Login}/>
+                                <Route path="/ticket" component={Ticket}/>
                                 <Redirect path="*" to="/"/>
                             </Switch>
                         </Layout>
@@ -632,7 +639,16 @@ class User extends Component {
                                     </Menu.Item>
                                     <Menu.Item>
                                         <Link to="/login">
-                                            <div onClick={() => this.props.switchMenuLevel('menuLevel1', 'user')}><FormattedMessage id="Account center"/></div>
+                                            <div onClick={() => this.props.switchMenuLevel('menuLevel1', 'user')}>
+                                                <FormattedMessage id="Account center"/>
+                                            </div>
+                                        </Link>
+                                    </Menu.Item>
+                                    <Menu.Item>
+                                        <Link to="/ticket">
+                                            <div onClick={() => this.props.switchMenuLevel('menuLevel1', 'ticket')}>
+                                                <FormattedMessage id="Submit Support Ticket"/>
+                                            </div>
                                         </Link>
                                     </Menu.Item>
                                     <Menu.Item className={'login-out'}>
@@ -646,7 +662,10 @@ class User extends Component {
                                 <div className='login-nickname' onClick={()=>{}}>
                                     <Dropdown overlay={menu} placement="bottomRight" trigger={['click']}>
                                         <div>
-                                            {user.nickname} <Icon type="down" />
+                                            <span style={{ marginRight: 5 }}>
+                                                <Badge dot><Avatar shape="user" icon="user" /></Badge>
+                                            </span>
+                                            {/*<Icon type="down" />*/}
                                         </div>
                                     </Dropdown>
                                 </div>

+ 7 - 0
src/app/index.css

@@ -18,6 +18,13 @@
     float: right;
 }
 
+.login-button {
+     position: absolute;
+     top: 15px;
+     right: 20px;
+     float: right;
+ }
+
 .login-nickname {
     position: absolute;
     top: 0;

+ 2 - 0
src/language/en_US.js

@@ -153,5 +153,7 @@ const en_US = {
 
     'previous-step': 'previous',
     "next-step":"next",
+
+    'Submit Support Ticket': 'Submit Support Ticket'
 };
 export default en_US;

+ 2 - 0
src/language/zh_CN.js

@@ -154,5 +154,7 @@ const zh_CN = {
 
     'previous-step': '上一步',
     "next-step":"下一步",
+
+    'Submit Support Ticket': '提交工单'
 };
 export default zh_CN;

+ 0 - 1
src/login/LoginInput.js

@@ -92,7 +92,6 @@ class LoginInput extends Component {
                                         // antd 获取不到 target,百度来的下面这句代码
                                         e.persist();
                                         this.setState({register_username: e.target.value});
-
                                     }}
                                     style={{width: 200}}
                                 />

+ 0 - 1
src/login/index.css

@@ -34,7 +34,6 @@
   padding-right: 50px;
 }
 
-
 .modify {
   font-weight: normal;
   font-size: 16px;

+ 26 - 0
src/ticket/Ticket.js

@@ -0,0 +1,26 @@
+import React, {Component} from 'react';
+import {Layout} from 'antd';
+
+const {Content} = Layout;
+
+class Ticket extends Component {
+    constructor() {
+        super();
+        this.state = {
+            kind: '工单'
+        }
+    }
+
+    render() {
+        return (
+            <Layout style={{padding: '24px', zIndex: '0'}}>
+                <Content style={{padding: '24px', minHeight: 280, background: '#fff'}}>
+                    <div>Ticket</div>
+                </Content>
+            </Layout>
+        )
+    }
+}
+
+export default Ticket;
+