Browse Source

样式冲突修改

yuwenjun1997 2 years ago
parent
commit
6ffe6ede0b
3 changed files with 19 additions and 11 deletions
  1. 2 2
      .env.development
  2. 2 0
      src/components/SvgIcon/index.vue
  3. 15 9
      src/styles/index.scss

+ 2 - 2
.env.development

@@ -2,9 +2,9 @@
 ENV = 'development'
 ENV = 'development'
 
 
 # base api
 # base api
-VUE_APP_BASE_API = 'http://192.168.2.67:18015'
+# VUE_APP_BASE_API = 'http://192.168.2.67:18015'
 # VUE_APP_BASE_API = 'http://localhost:18015'
 # VUE_APP_BASE_API = 'http://localhost:18015'
-# VUE_APP_BASE_API = 'https://mapi-b.caimei365.com'
+VUE_APP_BASE_API = 'https://mapi-b.caimei365.com'
 # 图片上传,索引更新等
 # 图片上传,索引更新等
 VUE_APP_CORE_API = 'https://core-b.caimei365.com'
 VUE_APP_CORE_API = 'https://core-b.caimei365.com'
 
 

+ 2 - 0
src/components/SvgIcon/index.vue

@@ -52,6 +52,8 @@ export default {
   vertical-align: -0.15em;
   vertical-align: -0.15em;
   fill: currentColor;
   fill: currentColor;
   overflow: hidden;
   overflow: hidden;
+  display: initial;
+  vertical-align: initial;
 }
 }
 
 
 .svg-external-icon {
 .svg-external-icon {

+ 15 - 9
src/styles/index.scss

@@ -1,12 +1,12 @@
-@import "tailwindcss/base";
-@import "tailwindcss/components";
-@import "tailwindcss/utilities";
 @import './variables.scss';
 @import './variables.scss';
 @import './mixin.scss';
 @import './mixin.scss';
 @import './transition.scss';
 @import './transition.scss';
 @import './element-ui.scss';
 @import './element-ui.scss';
 @import './sidebar.scss';
 @import './sidebar.scss';
 @import './btn.scss';
 @import './btn.scss';
+@import 'tailwindcss/base';
+@import 'tailwindcss/components';
+@import 'tailwindcss/utilities';
 
 
 body {
 body {
   height: 100%;
   height: 100%;
@@ -29,7 +29,7 @@ html {
   height: 100%;
   height: 100%;
 }
 }
 
 
-.app-main{
+.app-main {
   overflow-x: hidden;
   overflow-x: hidden;
 }
 }
 
 
@@ -111,7 +111,8 @@ aside {
   display: block;
   display: block;
   line-height: 32px;
   line-height: 32px;
   font-size: 16px;
   font-size: 16px;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans', 'Droid Sans', 'Helvetica Neue', sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Fira Sans',
+    'Droid Sans', 'Helvetica Neue', sans-serif;
   color: #2c3e50;
   color: #2c3e50;
   -webkit-font-smoothing: antialiased;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   -moz-osx-font-smoothing: grayscale;
@@ -152,7 +153,13 @@ aside {
   text-align: right;
   text-align: right;
   padding-right: 20px;
   padding-right: 20px;
   transition: 600ms ease position;
   transition: 600ms ease position;
-  background: linear-gradient(90deg, rgba(32, 182, 249, 1) 0%, rgba(32, 182, 249, 1) 0%, rgba(33, 120, 241, 1) 100%, rgba(33, 120, 241, 1) 100%);
+  background: linear-gradient(
+    90deg,
+    rgba(32, 182, 249, 1) 0%,
+    rgba(32, 182, 249, 1) 0%,
+    rgba(33, 120, 241, 1) 100%,
+    rgba(33, 120, 241, 1) 100%
+  );
 
 
   .subtitle {
   .subtitle {
     font-size: 20px;
     font-size: 20px;
@@ -208,7 +215,6 @@ aside {
   }
   }
 }
 }
 
 
-
 //refine vue-multiselect plugin
 //refine vue-multiselect plugin
 .multiselect {
 .multiselect {
   line-height: 16px;
   line-height: 16px;
@@ -237,6 +243,6 @@ aside {
   margin: 20px auto;
   margin: 20px auto;
 }
 }
 
 
-.el-submenu [class^=el-icon-]{
+.el-submenu [class^='el-icon-'] {
   font-size: 16px;
   font-size: 16px;
-}
+}