根据全局样式做调整

dev
Tuzki 3 years ago
parent e6a2b74364
commit 3a3d79902f
  1. 11
      package-lock.json
  2. 5
      package.json
  3. 2
      ruoyi-ui/src/views/demo/demo.vue
  4. 11
      ruoyi-ui/vue.config.js

11
package-lock.json generated

@ -1,11 +0,0 @@
{
"requires": true,
"lockfileVersion": 1,
"dependencies": {
"@amap/amap-jsapi-loader": {
"version": "1.0.1",
"resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz",
"integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw=="
}
}
}

@ -1,5 +0,0 @@
{
"dependencies": {
"@amap/amap-jsapi-loader": "^1.0.1"
}
}

@ -129,6 +129,6 @@ export default {
<style lang="scss" scoped>
.test {
border: 1px solid $--color-primary;
//border: 1px solid $--color-primary;
}
</style>

@ -35,7 +35,8 @@ module.exports = {
proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
target: `http://127.0.0.1:8080/`,//用户名:admin 密码Cjy@123abc
target: `http://localhost:8080/`,//用户名:admin 密码Cjy@123abc
// target: `http://192.168.0.200:8080/`,//用户名:admin 密码Cjy@123abc
changeOrigin: true,
pathRewrite: {
['^' + process.env.VUE_APP_BASE_API]: ''
@ -48,6 +49,7 @@ module.exports = {
loaderOptions: {
sass: {
sassOptions: {outputStyle: "expanded"},
},
}
},
@ -70,7 +72,7 @@ module.exports = {
],
},
chainWebpack(config) {
//全局scss变量定义以供组件内使用
// 全局scss变量定义以供组件内使用
const oneOfsMap = config.module.rule('scss').oneOfs.store
oneOfsMap.forEach(item => {
@ -80,8 +82,6 @@ module.exports = {
.options({
// 要公用的scss的路径
resources: [
// 'src/assets/styles/variables.scss',
// 'src/assets/styles/element-variables.scss',
'src/assets/styles/picture-variables.scss',
]
})
@ -150,5 +150,6 @@ module.exports = {
}
}
)
}
},
}

Loading…
Cancel
Save