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

.history/src/index_20190422171113.js

@@ -15,26 +15,6 @@ import './styles/index.scss';
 // iconfont
 import './font/iconfont.css';
 
-var devTools = window.devToolsExtension ? window.devToolsExtension() : null
-// var store = createStore(reducer,compose(
-//     applyMiddleware(thunk,logger),
-//     devTools
-// ))
-if (window.devToolsExtension) {
-        var store = createStore(reducer, compose(
-                applyMiddleware(thunk, logger),
-                devTools
-        ))
-} else {
-        var store = createStore(reducer, compose(
-                applyMiddleware(thunk, logger)
-        ))
-}
-
-// ReactDOM.render(
-//         <Router />,
-//         document.getElementById('root'));
-
 ReactDOM.render(
         <Provider store={store}>
                 <App />

.history/src/index_20190424103010.js

+import React from 'react';
+import ReactDOM from 'react-dom';
+import { createStore, applyMiddleware, compose } from 'redux'
+import { Provider } from 'react-redux'
+import thunk from 'redux-thunk'
+import { logger } from 'redux-logger'
+// import Router from './router';
+import store from './store'
+import App from './App';
+
+import './index.css'
+// 默认样式
+import './styles/index.scss';
+
+// iconfont
+import './font/iconfont.css';
+
+
+ReactDOM.render(
+        <Provider store={tooltore}>
+                <App />
+        </Provider>,
+        document.getElementById('root'));
\ No newline at end of file

.history/src/index_20190424103102.js

+import React from 'react';
+import ReactDOM from 'react-dom';
+import { createStore, applyMiddleware, compose } from 'redux'
+import { Provider } from 'react-redux'
+import thunk from 'redux-thunk'
+import { logger } from 'redux-logger'
+// import Router from './router';
+import store from './store'
+import App from './App';
+
+import './index.css'
+// 默认样式
+import './styles/index.scss';
+
+// iconfont
+import './font/iconfont.css';
+
+
+var tooltore = createStore(reducer,compose(
+    applyMiddleware(thunk,logger),
+    devTools
+))
+
+
+// ReactDOM.render(
+//         <Router />,
+//         document.getElementById('root'));
+
+ReactDOM.render(
+        <Provider store={tooltore}>
+                <App />
+        </Provider>,
+        document.getElementById('root'));
\ No newline at end of file

.history/src/index_20190424103130.js

+import React from 'react';
+import ReactDOM from 'react-dom';
+import { createStore, applyMiddleware, compose } from 'redux'
+import { Provider } from 'react-redux'
+import thunk from 'redux-thunk'
+import { logger } from 'redux-logger'
+// import Router from './router';
+import store from './store'
+import App from './App';
+
+import './index.css'
+// 默认样式
+import './styles/index.scss';
+
+// iconfont
+import './font/iconfont.css';
+
+
+var tooltore = createStore(store, compose(
+    applyMiddleware(thunk,logger)
+))
+if (window.devToolsExtension) {
+        tooltore = createStore(store, compose(
+                applyMiddleware(thunk, logger),
+                devTools
+        ))
+} else {
+        tooltore = createStore(store, compose(
+                applyMiddleware(thunk, logger)
+        ))
+}
+
+// ReactDOM.render(
+//         <Router />,
+//         document.getElementById('root'));
+
+ReactDOM.render(
+        <Provider store={tooltore}>
+                <App />
+        </Provider>,
+        document.getElementById('root'));
\ No newline at end of file

.history/src/index_20190424103139.js

+import React from 'react';
+import ReactDOM from 'react-dom';
+import { createStore, applyMiddleware, compose } from 'redux'
+import { Provider } from 'react-redux'
+import thunk from 'redux-thunk'
+import { logger } from 'redux-logger'
+// import Router from './router';
+import store from './store'
+import App from './App';
+
+import './index.css'
+// 默认样式
+import './styles/index.scss';
+
+// iconfont
+import './font/iconfont.css';
+
+
+var tooltore = createStore(store, compose(
+    applyMiddleware(thunk,logger)
+))
+
+// ReactDOM.render(
+//         <Router />,
+//         document.getElementById('root'));
+
+ReactDOM.render(
+        <Provider store={tooltore}>
+                <App />
+        </Provider>,
+        document.getElementById('root'));
\ No newline at end of file

src/index.js

@@ -15,22 +15,10 @@ import './styles/index.scss';
 // iconfont
 import './font/iconfont.css';
 
-var devTools = window.devToolsExtension ? window.devToolsExtension() : null;
-var tooltore = '';
-// var store = createStore(reducer,compose(
-//     applyMiddleware(thunk,logger),
-//     devTools
-// ))
-if (window.devToolsExtension) {
-        tooltore = createStore(store, compose(
-                applyMiddleware(thunk, logger),
-                devTools
-        ))
-} else {
-        tooltore = createStore(store, compose(
-                applyMiddleware(thunk, logger)
-        ))
-}
+
+var tooltore = createStore(store, compose(
+    applyMiddleware(thunk,logger)
+))
 
 // ReactDOM.render(
 //         <Router />,