Merge branch 'master' of gitlab.maxrocky.com:hanjixin/MeteorologicalBureau

dva/.webpackrc.js

@@ -13,7 +13,7 @@ export default {
     //         '@': resolve('src'),
     //     }
     // },
-    "disableCSSModules": true,
+    // "disableCSSModules": true,
     define: {
         'process.env': env,
     }

dva/src/components/SideBar.js

 import React from 'react';
+import styles from './SideBar.less';
+import { NavLink } from 'dva/router';
 
-import { NavLink } from 'dva/router'
+console.log(styles);
 const SideBar = (props) => {
   return (
     <div className="layout-sidebar">

dva/src/components/SideBar.less

+.head {
+  background: none;
+  border: 1px solid red;
+}
\ No newline at end of file