Merge branch 'master' into permission-control

src/main.js

@@ -17,12 +17,16 @@ import '@/permission' // permission control
 
 /**
  * If you don't want to use mock-server
- * you want to use mockjs for request interception
- * you can execute:
+ * you want to use MockJs for mock api
+ * you can execute: mockXHR()
  *
- * import { mockXHR } from '../mock'
- * mockXHR()
+ * Currently MockJs will be used in the production environment,
+ * please remove it before going online! ! !
  */
+import { mockXHR } from '../mock'
+if (process.env.NODE_ENV === 'production') {
+  mockXHR()
+}
 
 // set ElementUI lang to EN
 Vue.use(ElementUI, { locale })

src/styles/sidebar.scss

@@ -95,10 +95,6 @@
       margin-left: 54px;
     }
 
-    .svg-icon {
-      margin-right: 0px;
-    }
-
     .submenu-title-noDropdown {
       padding: 0 !important;
       position: relative;