Parcourir la source

分拆出solution和deploy config, 用来衔接saas

mike il y a 6 ans
Parent
commit
a3d3c2d3dd

+ 23 - 16
src/app/basicVersion/BasicVersion.jsx

@@ -15,6 +15,7 @@ import axios from 'axios';
 import moment from 'moment';
 import 'moment/locale/zh-cn';
 import zhCN from 'antd/lib/locale-provider/zh_CN';
+import Solutions from "./solution/Solutions";
 axios.defaults.withCredentials = true;
 const {Header, Content} = Layout;
 
@@ -30,21 +31,21 @@ class BasicVersion extends Component {
             avatar: ''
         };
         // console.log('BasicVersion props',props);
-        if(props.location) {
-            let tabMenu = props.location.pathname.split('/')[2] || 'example';
-            // console.log('tabMenu',tabMenu);
-            switch(tabMenu) {
-                case 'deploy':
-                    this.state.menuLevel1 = 'my-deploy';
-                    break;
-                case 'contact':
-                    this.state.menuLevel1 = 'contact';
-                    break;
-                default:
-                    this.state.menuLevel1 = 'example';
-                    break;
-            }
-        }
+        // if(props.location) {
+        //     let tabMenu = props.location.pathname.split('/')[2] || 'example';
+        //     // console.log('tabMenu',tabMenu);
+        //     switch(tabMenu) {
+        //         case 'deploy':
+        //             this.state.menuLevel1 = 'my-deploy';
+        //             break;
+        //         case 'contact':
+        //             this.state.menuLevel1 = 'contact';
+        //             break;
+        //         default:
+        //             this.state.menuLevel1 = 'example';
+        //             break;
+        //     }
+        // }
     }
 
     componentWillReceiveProps(props){
@@ -55,6 +56,9 @@ class BasicVersion extends Component {
                 case 'deploy':
                     this.setState({menuLevel1: 'my-deploy'});
                     break;
+                case 'solution':
+                    this.setState({menuLevel1: 'solution'});
+                    break;
                 case 'contact':
                     this.setState({menuLevel1: 'contact'});
                     break;
@@ -169,7 +173,9 @@ class BasicVersion extends Component {
                                 :
                                 ''
                         }
-
+                        <Menu.Item key="solution">
+                            <Link to="/common/solution"><FormattedMessage id="Solution"/></Link>
+                        </Menu.Item>
                         <Menu.Item key="contact">
                             <Link to="/common/contact"><FormattedMessage id="Contact"/></Link>
                         </Menu.Item>
@@ -196,6 +202,7 @@ class BasicVersion extends Component {
                 <Layout style={{marginTop: '64px', zIndex: '0'}}>
                     <Switch>
                         <Route path="/common" exact component={CaseShow}/>
+                        <Route path="/common/solution" exact component={Solutions}/>
                         <Route path="/common/example" exact component={CaseShow}/>
                         <Route path="/common/deploy" component={MyDeploy}/>
                         <Route path="/common/contact" component={Contact}/>

+ 1 - 1
src/app/basicVersion/deployConfig/DeployConfig.js

@@ -8,7 +8,7 @@ import {FormattedMessage} from 'react-intl';
 import {request} from 'graphql-request'
 import {idGen, convert_} from "../../../func";
 import axios from 'axios';
-import './index.css';
+import '../index.css';
 import User from "../../user/User";
 
 const {Content} = Layout;

+ 3 - 23
src/app/basicVersion/solution/Solutions.jsx

@@ -1,12 +1,12 @@
 import React, {Component} from 'react';
 import {Layout, Card, Button, Avatar, Spin, Icon, Row, Col, notification, Tag} from 'antd';
 import lo from '../../../images/lo.png'
-import './index.css'
+import '../index.css'
 import {graphqlUrl} from "../../../config";
 import {SHOW_ALL_CASE, SHOW_CASE, SEARCH_SCHEMA} from "../../../gql";
 import {FormattedMessage} from 'react-intl';
 import {request} from 'graphql-request'
-import UserCustom from "../deployConfig/DeployConfig";
+import DeployConfig from "../deployConfig/DeployConfig";
 import {Query} from "react-apollo";
 import gql from "graphql-tag";
 import {getCookie} from "../../../cookie";
@@ -106,26 +106,6 @@ class Solutions extends Component {
                     {
                         !showCustom ?
                             <div>
-                                <div className={'card card-head'}>
-                                    <Card.Grid className={'card-head-item orange-change'}>
-                                        <p>我们永久无年费 &nbsp;&nbsp;&nbsp;&nbsp; 告别高成本</p>
-                                        <p>省钱、更省心</p>
-                                    </Card.Grid>
-                                    <Card.Grid className={'card-head-item pink-change'}>
-                                        <p>数据完全私有 &nbsp;&nbsp;&nbsp;&nbsp; 安全更可靠</p>
-                                        <p>数据分析图表为您提供更细致的服务</p>
-                                    </Card.Grid>
-                                    <Card.Grid className={'card-head-item blue-change'}>
-                                        <p>模板不满意 &nbsp;&nbsp;&nbsp;&nbsp; 快来定制化吧!</p>
-                                        <p>上手有困难,联系我们即可</p>
-                                        <Button
-                                            onClick={() => {
-                                                this.props.history.push({
-                                                    pathname: `/common/contact`
-                                                })
-                                            }}>立即定制</Button>
-                                    </Card.Grid>
-                                </div>
                                 <div className={'schema-name'}>
                                     <FormattedMessage id='ioobot case'/>
                                 </div>
@@ -209,7 +189,7 @@ class Solutions extends Component {
                                 </div>
                             </div>
                             :
-                            <UserCustom
+                            <DeployConfig
                                 userID={userID}
                                 bucketName={this.schemaIDChangeBucket(chosenSchemaID)}
                                 history={this.props.history}