修改项目结构以及.gitignore

.gitignore

@@ -10,6 +10,7 @@
 
 # production
 /build
+/.history
 .idea/
 # misc
 .DS_Store

.history/config/webpack.config_20190418152450.js

@@ -423,7 +423,7 @@ module.exports = function(webpackEnv) {
                 {
                   importLoaders: 2,
                   sourceMap: isEnvProduction && shouldUseSourceMap,
-                  resources: '../src/styles/variable.scss',
+                  resources: '../src/assets/css/variable.scss',
                   modules: false
                 },
                 'sass-loader'

config/webpack.config.js

@@ -114,7 +114,7 @@ module.exports = function(webpackEnv) {
         loaders.push({
           loader: require.resolve('sass-resources-loader'),
           options: {
-            resources: [require.resolve('../src/styles/variable.scss')]
+            resources: [require.resolve('../src/assets/css/variable.scss')]
           }
         })
       }

src/App.js

@@ -3,7 +3,6 @@ import { connect } from 'react-redux'
 import { LocaleProvider } from 'antd-mobile'
 import { HashRouter } from 'react-router-dom'
 import Routes from './router'
-// import '@/common/styles/common.scss'
 
 class App extends Component {
     render() {

src/App.test.js

-import React from 'react';
-import ReactDOM from 'react-dom';
-import App from './App';
-
-it('renders without crashing', () => {
-  const div = document.createElement('div');
-  ReactDOM.render(<App />, div);
-  ReactDOM.unmountComponentAtNode(div);
-});

src/components/search/index.js

 import React, { Component } from 'react';
 import SearchHead from './searchHead'
-import Tag from '@base/Tag/index.js'
+import Tag from '@common/Tag/index.js'
 
 import './index.scss';
 

src/components/shopCard/index.js

@@ -3,7 +3,7 @@ import { connect } from 'react-redux'
 import { Checkbox, NavBar } from 'antd-mobile'
 //组件
 import ShopCard  from './cardList.js'
-import Loading from '@base/Loading'
+import Loading from '@common/Loading'
 
 //css
 import './card.scss'

src/index.css

-html,
-body {
-  height: 100%;
-  margin: 0;
-  padding: 0;
-  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
-    "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-#root{
-  height: 100%;
-}
-
-code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, "Courier New",
-    monospace;
-}
\ No newline at end of file

src/index.js

@@ -8,22 +8,17 @@ import { logger } from 'redux-logger'
 import store from './store'
 import App from './App';
 
-import './index.css'
 // 默认样式
-import './styles/index.scss';
+import './assets/css/index.scss';
 
 // iconfont
-import './font/iconfont.css';
+import './assets/font/iconfont.css';
 
 
 var tooltore = createStore(store, compose(
     applyMiddleware(thunk,logger)
 ))
 
-// ReactDOM.render(
-//         <Router />,
-//         document.getElementById('root'));
-
 ReactDOM.render(
         <Provider store={tooltore}>
                 <App />