Merge branch 'master' of gitlab.julyedu.com:baiguangyao/mr-julyedu

src/HOCs/WithTab/index.js

+import React, { Component } from 'react'
+import Menu from '@/menu'
+
+export default function WithTab(WrappedComponent) {
+    return class extends Component {
+        render() {
+            return(
+                <>
+                    <WrappedComponent {...this.props}/>
+                    <Menu/>
+                </>
+                )
+        }
+    }
+}
\ No newline at end of file

src/HOCs/index.js

+export {default as WithTab} from './WithTab'
\ No newline at end of file

src/components/Index/index.js

@@ -3,6 +3,7 @@ import {Course} from '../../common'
 import Scroll from './scroll'
 import Topscroll from './topscroll'
 import './index.scss';
+import {WithTab} from '@/HOCs'
 
 class Index extends Component {
     state = {
@@ -263,4 +264,4 @@ class Index extends Component {
 
 }
 
-export default Index;
+export default WithTab(Index);

src/router.js

@@ -39,7 +39,7 @@ const router = (props) => (
             <Route path='/shopcard' component={ShopCard}></Route>
             <Route path='/bargain-middle-page' component={BargainMiddlePage}></Route>
         </Switch>
-        <Menu/>
+        {/*<Menu/>*/}
     </Router>
 )