diff --git a/react-materials/scaffolds/ice-yunqi-homepage/package.json b/react-materials/scaffolds/ice-yunqi-homepage/package.json
index 1e06f8ffc7..2a5cca5309 100644
--- a/react-materials/scaffolds/ice-yunqi-homepage/package.json
+++ b/react-materials/scaffolds/ice-yunqi-homepage/package.json
@@ -1,6 +1,6 @@
{
"name": "@icedesign/yunqi-homepage-scaffold",
- "version": "1.0.0",
+ "version": "1.0.1",
"description": "云栖大会官方首页模板,适用于信息展示类的场景",
"homepage": "https://alibaba.github.io/ice/scaffold-preview/ice-yunqi-homepage/index.html",
"keywords": [
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/components/BasicNotFound/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/components/BasicNotFound/index.js
deleted file mode 100644
index d918a75fa3..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/components/BasicNotFound/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import BasicNotFound from './BasicNotFound';
-
-export default BasicNotFound;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/components/Footer/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/components/Footer/index.js
deleted file mode 100644
index 6a67aecded..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/components/Footer/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './Footer';
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/components/Footer/Footer.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/components/Footer/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/components/Footer/Footer.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/components/Footer/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/index.js
deleted file mode 100644
index a9ce1058c3..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Header from './Header';
-
-export default Header;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/Header.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/index.jsx
similarity index 99%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/Header.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/index.jsx
index 2544789020..c69a37e129 100644
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/Header.jsx
+++ b/react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/index.jsx
@@ -3,7 +3,7 @@ import { Link, withRouter } from 'react-router-dom';
import Menu, { SubMenu, Item as MenuItem } from '@icedesign/menu';
import { headerMenuConfig } from '../../menuConfig';
import Logo from '../Logo';
-import './Header.scss';
+import './index.scss';
@withRouter
export default class Header extends Component {
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/Header.scss b/react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/index.scss
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/Header.scss
rename to react-materials/scaffolds/ice-yunqi-homepage/src/components/Header/index.scss
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/components/Logo/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/components/Logo/index.js
deleted file mode 100644
index 0a77052102..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/components/Logo/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export default from './Logo';
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/components/Logo/Logo.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/components/Logo/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/components/Logo/Logo.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/components/Logo/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/components/BasicNotFound/images/notFound.png b/react-materials/scaffolds/ice-yunqi-homepage/src/components/NotFound/images/notFound.png
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/components/BasicNotFound/images/notFound.png
rename to react-materials/scaffolds/ice-yunqi-homepage/src/components/NotFound/images/notFound.png
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/components/BasicNotFound/BasicNotFound.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/components/NotFound/index.jsx
similarity index 97%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/components/BasicNotFound/BasicNotFound.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/components/NotFound/index.jsx
index bd52ac5474..360064b4a1 100644
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/components/BasicNotFound/BasicNotFound.jsx
+++ b/react-materials/scaffolds/ice-yunqi-homepage/src/components/NotFound/index.jsx
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import { Link } from 'react-router-dom';
import IceContainer from '@icedesign/container';
-import './BasicNotFound.scss';
+import './index.scss';
export default class BasicNotFound extends Component {
static displayName = 'BasicNotFound';
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/components/BasicNotFound/BasicNotFound.scss b/react-materials/scaffolds/ice-yunqi-homepage/src/components/NotFound/index.scss
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/components/BasicNotFound/BasicNotFound.scss
rename to react-materials/scaffolds/ice-yunqi-homepage/src/components/NotFound/index.scss
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/index.js
index 081b022a7d..315d865a37 100644
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/index.js
+++ b/react-materials/scaffolds/ice-yunqi-homepage/src/index.js
@@ -1,5 +1,5 @@
import ReactDOM from 'react-dom';
-// 载入默认全局样式 normalize 、.clearfix 和一些 mixin 方法等
+// 载入默认全局样式 normalize
import '@icedesign/base/reset.scss';
import router from './router';
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/layouts/HeaderFooterLayout/HeaderFooterLayout.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/layouts/HeaderFooterLayout/HeaderFooterLayout.jsx
deleted file mode 100644
index e3bc8fa099..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/layouts/HeaderFooterLayout/HeaderFooterLayout.jsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import React, { Component } from 'react';
-import Layout from '@icedesign/layout';
-import Header from '../../components/Header';
-import Footer from '../../components/Footer';
-
-export default class HeaderFooterLayout extends Component {
- static propTypes = {};
-
- static defaultProps = {};
-
- render() {
- return (
-
-
- {this.props.children}
-
-
- );
- }
-}
-
-const styles = {
- container: {
- minWidth: '1200px',
- background: '#fff',
- },
-};
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/layouts/HeaderFooterLayout/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/layouts/HeaderFooterLayout/index.js
deleted file mode 100644
index 8cbac4d396..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/layouts/HeaderFooterLayout/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import HeaderFooterLayout from './HeaderFooterLayout';
-
-export default HeaderFooterLayout;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/layouts/HeaderFooterLayout/index.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/layouts/HeaderFooterLayout/index.jsx
new file mode 100644
index 0000000000..a33a3e7a5c
--- /dev/null
+++ b/react-materials/scaffolds/ice-yunqi-homepage/src/layouts/HeaderFooterLayout/index.jsx
@@ -0,0 +1,43 @@
+import React, { Component } from 'react';
+import { Switch, Route } from 'react-router-dom';
+import Layout from '@icedesign/layout';
+import Header from '../../components/Header';
+import Footer from '../../components/Footer';
+import routerData from '../../routerConfig';
+import NotFound from '../../components/NotFound';
+
+export default class HeaderFooterLayout extends Component {
+ static propTypes = {};
+
+ static defaultProps = {};
+
+ render() {
+ return (
+
+
+
+ {routerData.map((item, index) => {
+ return item.component ? (
+
+ ) : null;
+ })}
+
+ {/* 未匹配到的路由重定向到 NotFound */}
+
+
+
+
+ );
+ }
+}
+
+const styles = {
+ container: {
+ minWidth: '1200px',
+ background: '#fff',
+ },
+};
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Guests/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Guests/index.js
deleted file mode 100644
index f96af9ce90..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Guests/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Guests from './Guests';
-
-export default Guests;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Guests/Guests.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Guests/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Guests/Guests.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Guests/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/About/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/About/index.js
deleted file mode 100644
index 19a87da88c..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/About/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import About from './About';
-
-export default About;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/About/About.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/About/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/About/About.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/About/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Address/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Address/index.js
deleted file mode 100644
index 58ab27bf88..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Address/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Address from './Address';
-
-export default Address;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Address/Address.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Address/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Address/Address.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Address/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Banner/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Banner/index.js
deleted file mode 100644
index b0c13faa0a..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Banner/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Banner from './Banner';
-
-export default Banner;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Banner/Banner.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Banner/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Banner/Banner.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Banner/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Events/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Events/index.js
deleted file mode 100644
index 0b2163770f..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Events/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Events from './Events';
-
-export default Events;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Events/Events.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Events/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Events/Events.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Events/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Exhibition/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Exhibition/index.js
deleted file mode 100644
index e80676705b..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Exhibition/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Exhibition from './Exhibition';
-
-export default Exhibition;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Exhibition/Exhibition.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Exhibition/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Exhibition/Exhibition.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Exhibition/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/FrontierContent/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/FrontierContent/index.js
deleted file mode 100644
index b343f98cb6..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/FrontierContent/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import FrontierContent from './FrontierContent';
-
-export default FrontierContent;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/FrontierContent/FrontierContent.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/FrontierContent/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/FrontierContent/FrontierContent.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/FrontierContent/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/GreatVideo/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/GreatVideo/index.js
deleted file mode 100644
index 3ae5100a1c..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/GreatVideo/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import GreatVideo from './GreatVideo';
-
-export default GreatVideo;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/GreatVideo/GreatVideo.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/GreatVideo/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/GreatVideo/GreatVideo.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/GreatVideo/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Speakers/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Speakers/index.js
deleted file mode 100644
index 50f2557686..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Speakers/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Speakers from './Speakers';
-
-export default Speakers;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Speakers/Speakers.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Speakers/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Speakers/Speakers.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Speakers/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Sponsor/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Sponsor/index.js
deleted file mode 100644
index c5bd88bec4..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Sponsor/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Sponsor from './Sponsor';
-
-export default Sponsor;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Sponsor/Sponsor.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Sponsor/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Sponsor/Sponsor.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Sponsor/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Tickets/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Tickets/index.js
deleted file mode 100644
index 4cecbe72d6..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Tickets/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Tickets from './Tickets';
-
-export default Tickets;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Tickets/Tickets.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Tickets/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Tickets/Tickets.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/components/Tickets/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/index.js
deleted file mode 100644
index fbe3fed6bf..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Home from './Home';
-
-export default Home;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/Home.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/Home.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Home/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/NotFound/NotFound.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/NotFound/NotFound.jsx
deleted file mode 100644
index f1f003d9b0..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/NotFound/NotFound.jsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import React, { Component } from 'react';
-import BasicNotFound from '../../components/BasicNotFound';
-
-export default class NotFound extends Component {
- static displayName = 'NotFound';
-
- constructor(props) {
- super(props);
- this.state = {};
- }
-
- render() {
- return (
-
-
-
- );
- }
-}
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/NotFound/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/NotFound/index.js
deleted file mode 100644
index 2d0c485533..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/NotFound/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import NotFound from './NotFound';
-
-export default NotFound;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/components/Partner/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/components/Partner/index.js
deleted file mode 100644
index 1854cf8057..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/components/Partner/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Partner from './Partner';
-
-export default Partner;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/components/Partner/Partner.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/components/Partner/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/components/Partner/Partner.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/components/Partner/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/index.js b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/index.js
deleted file mode 100644
index 1854cf8057..0000000000
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import Partner from './Partner';
-
-export default Partner;
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/Partner.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/index.jsx
similarity index 100%
rename from react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/Partner.jsx
rename to react-materials/scaffolds/ice-yunqi-homepage/src/pages/Partner/index.jsx
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/router.jsx b/react-materials/scaffolds/ice-yunqi-homepage/src/router.jsx
index 8140b9b718..ee0fcecc71 100644
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/router.jsx
+++ b/react-materials/scaffolds/ice-yunqi-homepage/src/router.jsx
@@ -1,119 +1,18 @@
/**
- * 定义应用路
+ * 定义应用路由
*/
-import { HashRouter as Router, Switch, Route } from 'react-router-dom';
import React from 'react';
-
-import routerConfig from './routerConfig';
-
-/**
- * 将路由信息扁平化,继承上一级路由的 path
- * @param {Array} config 路由配置
- */
-function recursiveRouterConfigV4(config = []) {
- const routeMap = [];
- config.forEach((item) => {
- const route = {
- path: item.path,
- layout: item.layout,
- component: item.component,
- };
- if (Array.isArray(item.children)) {
- route.childRoutes = recursiveRouterConfigV4(item.children);
- }
- routeMap.push(route);
- });
- return routeMap;
-}
-
-/**
- * 将扁平化后的路由信息生成 Route 节点
- *
- * @param {Element} container 路由容器
- * @param {object} router 路由对象
- * @param {string} contextPath 上层路由地址
- * @return {Route}
- * @example
- *
- *
- *
- *
- *
- *
- *
- */
-function renderRouterConfigV4(container, router, contextPath) {
- const routeChildren = [];
- const renderRoute = (routeContainer, routeItem, routeContextPath) => {
- let routePath;
- if (!routeItem.path) {
- // eslint-disable-next-line
- console.error('route must has `path`');
- } else if (routeItem.path === '/' || routeItem.path === '*') {
- routePath = routeItem.path;
- } else {
- routePath = `/${routeContextPath}/${routeItem.path}`.replace(/\/+/g, '/');
- }
-
- // 优先使用当前定义的 layout
- if (routeItem.layout && routeItem.component) {
- routeChildren.push(
- {
- return React.createElement(
- routeItem.layout,
- props,
- React.createElement(routeItem.component, props)
- );
- }}
- />
- );
- } else if (routeContainer && routeItem.component) {
- // 使用上层节点作为 container
- routeChildren.push(
- {
- return React.createElement(
- routeContainer,
- props,
- React.createElement(routeItem.component, props)
- );
- }}
- />
- );
- } else {
- routeChildren.push(
-
- );
- }
-
- // 存在子路由,递归当前路径,并添加到路由中
- if (Array.isArray(routeItem.childRoutes)) {
- routeItem.childRoutes.forEach((r) => {
- // 递归传递当前 route.component 作为子节点的 container
- renderRoute(routeItem.component, r, routePath);
- });
- }
- };
-
- router.forEach((r) => {
- renderRoute(container, r, contextPath);
- });
-
- return {routeChildren};
-}
-
-const routerWithReactRouter4 = recursiveRouterConfigV4(routerConfig);
-const routeChildren = renderRouterConfigV4(null, routerWithReactRouter4, '/');
-export default {routeChildren};
+import { HashRouter, Switch, Route } from 'react-router-dom';
+import HeaderFooterLayout from './layouts/HeaderFooterLayout';
+
+const router = () => {
+ return (
+
+
+
+
+
+ );
+};
+
+export default router();
diff --git a/react-materials/scaffolds/ice-yunqi-homepage/src/routerConfig.js b/react-materials/scaffolds/ice-yunqi-homepage/src/routerConfig.js
index a0b732c616..1f14ba9284 100644
--- a/react-materials/scaffolds/ice-yunqi-homepage/src/routerConfig.js
+++ b/react-materials/scaffolds/ice-yunqi-homepage/src/routerConfig.js
@@ -2,32 +2,22 @@
// 你可以调整 routerConfig 里的内容
// 变量名 routerConfig 为 iceworks 检测关键字,请不要修改名称
-import HeaderFooterLayout from './layouts/HeaderFooterLayout';
import Home from './pages/Home';
import Guests from './pages/Guests';
import Partner from './pages/Partner';
-import NotFound from './pages/NotFound';
const routerConfig = [
- {
- path: '/',
- layout: HeaderFooterLayout,
- component: Home,
- },
{
path: '/guests',
- layout: HeaderFooterLayout,
component: Guests,
},
{
path: '/partner',
- layout: HeaderFooterLayout,
component: Partner,
},
{
- path: '*',
- layout: HeaderFooterLayout,
- component: NotFound,
+ path: '/',
+ component: Home,
},
];