Merge branch 'master' of http://git.huaml.com/zhh/front-end

ghs/package.json

@@ -45,9 +45,9 @@
     "eslint": "^5.16.0",
     "eslint-plugin-prettier": "^3.1.1",
     "eslint-plugin-vue": "^5.0.0",
-    "node-sass": "^4.14.1",
+    "node-sass": "^6.0.1",
     "prettier": "^1.19.1",
-    "sass-loader": "^8.0.2",
+    "sass-loader": "^10.0.1",
     "stylus": "^0.54.7",
     "stylus-loader": "^3.0.2",
     "svg-sprite-loader": "^4.1.6",

ghs/vue.config.js

@@ -65,7 +65,7 @@ module.exports = {
 				import: '~@/assets/css/common.styl'
 			},
 			sass: {
-				prependData: `@import "~@/assets/css/base.scss";`
+				additionalData: `@import "~@/assets/css/base.scss";`
 			}
 		}
 	},