diff --git a/src/layout/components/Header/components/Notice/index.vue b/src/layout/components/Header/components/Notice/index.vue index d77e264..75dfdae 100644 --- a/src/layout/components/Header/components/Notice/index.vue +++ b/src/layout/components/Header/components/Notice/index.vue @@ -64,6 +64,10 @@ const onTab = (key: number) => { } } } +.margin-left-text { + margin-left: $margin-text; +} + // 解决tabs宽度异常的bug :deep(.arco-tabs-content .arco-tabs-content-list) { display: unset; diff --git a/src/layout/components/Header/components/header-right/index.vue b/src/layout/components/Header/components/header-right/index.vue index eeb9c1a..2848811 100644 --- a/src/layout/components/Header/components/header-right/index.vue +++ b/src/layout/components/Header/components/header-right/index.vue @@ -257,4 +257,8 @@ const logOut = () => { transform: rotate(180deg) !important; } } + +.margin-left-text { + margin-left: $margin-text; +} diff --git a/src/router/route.ts b/src/router/route.ts index 38ba3ae..c90a345 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -121,7 +121,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [ iframe: false, roles: ["admin"], icon: "icon-menu", - sort: 2 + sort: 1 } }, { @@ -138,7 +138,7 @@ export const dynamicRoutes: RouteRecordRaw[] = [ iframe: false, roles: ["admin"], icon: "icon-menu", - sort: 1 + sort: 2 } } ] diff --git a/src/style/global-style.scss b/src/style/global-style.scss index 6986551..d3c0586 100644 --- a/src/style/global-style.scss +++ b/src/style/global-style.scss @@ -1,4 +1,6 @@ /* global style scss */ + +// 有背景色的页面 .snow-page { // margin 和 padding 边距一致,是为了保持视觉上的内外统一 margin: $padding; @@ -6,53 +8,7 @@ background: $color-bg-1; } +// 没有背景色的页面 .snow-page-clear { margin: $padding; } - -.border-red { - box-shadow: $shadow-border-1; -} - -// 通用全外边距 -.margin { - margin: $margin; -} - -// 下边距 -.margin-bottom { - margin-bottom: $margin; -} - -// 左间距-行内文字 -.margin-left-text { - margin-left: $margin-text; -} -// 右间距-行内文字 -.margin-right-text { - margin-right: $margin-text; -} - -// 中等卡片大小 -.card-middling { - width: 200px; -} - -// 一行完全居中 -.row-center { - display: flex; - justify-content: center; - align-items: center; -} -// 垂直居中,从左到右 -.row-start-center { - display: flex; - justify-content: start; - align-items: center; -} -// 垂直居中,左右占满 -.flex-row-between-center { - display: flex; - justify-content: space-between; - align-items: center; -} diff --git a/src/style/index.scss b/src/style/index.scss index 0076744..6d7eee0 100644 --- a/src/style/index.scss +++ b/src/style/index.scss @@ -32,3 +32,8 @@ body { background: $color-bg-2; // body背景颜色 color: $color-text-1; // 整体文字的颜色 } + +// 设置nprogress进度条样式 +#nprogress .bar { + background: $color-primary !important; +} diff --git a/src/views/home/components/finance.vue b/src/views/home/components/finance.vue index 06c6b1f..6d74850 100644 --- a/src/views/home/components/finance.vue +++ b/src/views/home/components/finance.vue @@ -99,4 +99,8 @@ const financeData = ref([ font-size: $font-size-body-3; color: $color-text-1; } + +.margin-left-text { + margin-left: $margin-text; +} diff --git a/src/views/home/components/shortcut.vue b/src/views/home/components/shortcut.vue index 4877bb7..5cb4660 100644 --- a/src/views/home/components/shortcut.vue +++ b/src/views/home/components/shortcut.vue @@ -72,6 +72,19 @@ const shortcut = ref([ color: $color-text-2; } } + + .card-middling { + width: 200px; + } + + .row-center { + display: flex; + justify-content: center; + align-items: center; + } +} +.margin-left-text { + margin-left: $margin-text; } .box-title { display: flex;