Merge branch 'develop' of http://gitlab.91isoft.com:90/car-test/web into mengzixuan

src/components/Page/standardOption.vue

@@ -101,6 +101,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+@import "~@/assets/styles/element-variables.scss";
 .page-box {
   padding: 1.5rem 2rem;
   font-size: 16px;

vue.config.js

@@ -54,15 +54,15 @@ module.exports = {
   css: {
     loaderOptions: {
       sass: {
-        sassOptions: { outputStyle: "expanded" },
-        additionalData(content, loaderContext) {
-          const { resourcePath, rootContext } = loaderContext
-          const relativePath = path.relative(rootContext, resourcePath)
-          if (relativePath.replace(/\\/g, '/') !== 'src/assets/styles/element-variables.scss') {
-            return `@import "~@/assets/styles/element-variables.scss";${content}`
-          }
-          return content
-        },
+        sassOptions: { outputStyle: "expanded" }
+        // additionalData(content, loaderContext) {
+        //   const { resourcePath, rootContext } = loaderContext
+        //   const relativePath = path.relative(rootContext, resourcePath)
+        //   if (relativePath.replace(/\\/g, '/') !== 'src/assets/styles/element-variables.scss') {
+        //     return `@import "~@/assets/styles/element-variables.scss";${content}`
+        //   }
+        //   return content
+        // },
       }
     }
   },