diff --git a/client/Application.js b/client/Application.js
index faaf8053..11d5477e 100644
--- a/client/Application.js
+++ b/client/Application.js
@@ -1,10 +1,11 @@
import React, { Component } from 'react'
import { connect } from 'react-redux'
import PropTypes from 'prop-types'
-import { Route, HashRouter } from 'react-router-dom'
+import { Route, HashRouter, Redirect, Switch } from 'react-router-dom'
import { Home, ProjectGroups, Interface, News, AddInterface } from './containers/index'
import User from './containers/User/User.js'
import Header from './components/Header/Header'
+import Footer from './components/Footer/Footer'
import Loading from './components/Loading/Loading'
import { checkLoginState } from './actions/login'
import { requireAuthentication } from './components/AuthenticatedComponent';
@@ -46,13 +47,16 @@ export default class App extends Component {
-
-
-
+ {/**/}
+
+
+
+
+
)
diff --git a/client/components/Header/Header.js b/client/components/Header/Header.js
index 2bf2bab5..970ae864 100644
--- a/client/components/Header/Header.js
+++ b/client/components/Header/Header.js
@@ -16,9 +16,6 @@ const MenuUser = (props) => (
{ props.user }
- { props.msg }
-
-
退出
@@ -122,7 +119,6 @@ class HeaderCom extends Component {
}
render () {
const { login, user, msg, uid, curKey } = this.props;
- console.log(curKey);
return (
diff --git a/client/components/Intro/Intro.js b/client/components/Intro/Intro.js
index 731f2675..898b1156 100644
--- a/client/components/Intro/Intro.js
+++ b/client/components/Intro/Intro.js
@@ -9,7 +9,7 @@ import QueueAnim from 'rc-queue-anim';
const IntroPart = (props) =>(
-
+
{props.title}
@@ -20,7 +20,8 @@ const IntroPart = (props) =>(
IntroPart.propTypes = {
title : PropTypes.string,
- des : PropTypes.string
+ des : PropTypes.string,
+ iconType : PropTypes.string
}
class Intro extends React.Component{
@@ -81,7 +82,7 @@ class Intro extends React.Component{
{intro.detail.map(function(item,i){
- return()
+ return()
})}
diff --git a/client/containers/Home/Home.js b/client/containers/Home/Home.js
index e35355ee..b7aac9b0 100644
--- a/client/containers/Home/Home.js
+++ b/client/containers/Home/Home.js
@@ -9,10 +9,10 @@ import Intro from '../../components/Intro/Intro'
import { changeMenuItem } from '../../actions/menu'
import { OverPack } from 'rc-scroll-anim'
import TweenOne from 'rc-tween-one'
+import QueueAnim from 'rc-queue-anim';
const oneAnim = { y: '+=30', opacity: 0, type: 'from', ease: 'easeOutQuad' };
-const queueAnim = { y: '+=30', opacity: 0, type: 'from', ease: 'easeOutQuad','delay':200 };
const HomeGuest = (props) => (
@@ -43,18 +43,22 @@ const HomeGuest = (props) => (
playScale="0.3"
>
特性
-
-
-
+
+
+
@@ -62,7 +66,7 @@ const HomeGuest = (props) => (
接口管理
-
+
@@ -70,7 +74,7 @@ const HomeGuest = (props) => (
支持Mock
-
+
@@ -78,8 +82,8 @@ const HomeGuest = (props) => (
团队协作
-
-
+
+
@@ -117,7 +121,7 @@ class Home extends Component {
changeMenuItem : PropTypes.func
}
toStart = () =>{
- this.props.changeMenuItem('/ProjectGroups');
+ this.props.changeMenuItem('/group');
}
render () {
const { login } = this.props;
@@ -131,7 +135,7 @@ class Home extends Component {
一个高效,易用,功能强大的api管理系统
@@ -148,17 +152,17 @@ Home.defaultProps={
title:"接口管理",
des:"yapi将满足你的所有接口管理需求。不再需要 为每个项目搭建独立的接口管理平台和编写离线的接口文档",
detail:[
- {title:"接口管理",des:"强大的接口文档"},
- {title:"接口管理",des:"强大的接口文档"},
- {title:"接口管理",des:"强大的接口文档"}
+ {title:"接口管理",des:"强大的接口文档",iconType:"smile-o"},
+ {title:"接口管理",des:"强大的接口文档",iconType:"smile-o"},
+ {title:"接口管理",des:"强大的接口文档",iconType:"smile-o"}
],
img:"./image/demo-img.png"
},{
title:"接口管理",
des:"yapi将满足你的所有接口管理需求。不再需要 为每个项目搭建独立的接口管理平台和编写离线的接口文档",
detail:[
- {title:"接口管理",des:"强大的接口文档"},
- {title:"接口管理",des:"强大的接口文档"}
+ {title:"接口管理",des:"强大的接口文档",iconType:"smile-o"},
+ {title:"接口管理",des:"强大的接口文档",iconType:"smile-o"}
],
img:"./image/demo-img.png"
}
diff --git a/client/containers/Home/Home.scss b/client/containers/Home/Home.scss
index 630b12d0..3048ad6c 100644
--- a/client/containers/Home/Home.scss
+++ b/client/containers/Home/Home.scss
@@ -9,16 +9,14 @@ $color-black-lighter: #404040;
.home-main {
- min-height:calc(100% - 2.23rem);
+ min-height:calc(100% - 2.47rem);
display: -webkit-box;
-webkit-box-orient: vertical;
background: $color-blue-grey-lighter;
.main-one{
padding: .5rem .5rem 0 .5rem;
- //height: 7.16rem;
//background: radial-gradient(ellipse at center,#45484d 0%,#000 100%);
.home-des{
- padding: 0 .3rem .3rem 0;
.title{
font-size: .6rem;
}
@@ -39,6 +37,7 @@ $color-black-lighter: #404040;
}
.main-one-left{
padding-right: .15rem;
+ margin-top: .2rem;
}
.main-one-right{
padding-left: .15rem;
diff --git a/client/reducer/menu/menu.js b/client/reducer/menu/menu.js
index 298bb322..71837078 100644
--- a/client/reducer/menu/menu.js
+++ b/client/reducer/menu/menu.js
@@ -3,7 +3,7 @@ import {
} from '../../constants/action-types.js'
const initialState = {
- curKey: window.location.hash.split("#")[1] || ''
+ curKey: '/'+window.location.hash.split("/")[1]
}
export default (state = initialState, action) => {
diff --git a/client/styles/common.scss b/client/styles/common.scss
index 069d979c..46647f23 100644
--- a/client/styles/common.scss
+++ b/client/styles/common.scss
@@ -3,7 +3,6 @@
html {
font-size:625%;
- background: #f1f3f6;
}
html, body {
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto,
@@ -12,6 +11,7 @@ html, body {
margin: 0;
padding: 0;
height: 100%;
+ background: #f1f3f6;
}
div, article, p, table, tr, td, th, ul, ol, li, h1, h2, h3, form, dl, dt, dd {
@@ -44,5 +44,4 @@ em {
display: -webkit-box;
-webkit-box-orient: vertical;
height: 100%;
- background-color: #ececec;
}