From 35b944f1e4eb3a61ae52404af038a13a08e2cb7f Mon Sep 17 00:00:00 2001 From: sugar1569 Date: Sat, 25 Feb 2023 11:14:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96title=E5=92=8C=E7=BA=BF?= =?UTF-8?q?=E6=9D=A1=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/admin/src/components/main/main.less | 2 +- .../src/pages/division/agent/applyList.vue | 2 +- .../admin/src/pages/division/agent/index.vue | 2 +- .../admin/src/pages/division/list/index.vue | 2 +- .../marketing/channelCode/channelCodeIndex.vue | 2 +- .../src/pages/marketing/recharge/index.vue | 2 +- .../admin/src/pages/marketing/sign/index.vue | 2 +- .../admin/src/pages/setting/devise/list.vue | 2 +- .../pages/setting/membershipLevel/index.vue | 2 +- template/admin/src/pages/system/group/pc.vue | 14 +++++--------- .../src/pages/system/group/visualization.vue | 2 +- template/admin/src/pages/user/label/index.vue | 2 +- template/admin/src/styles/style.css | 18 +++++++++++++++++- 13 files changed, 33 insertions(+), 21 deletions(-) diff --git a/template/admin/src/components/main/main.less b/template/admin/src/components/main/main.less index e07900442..1b6835c8c 100644 --- a/template/admin/src/components/main/main.less +++ b/template/admin/src/components/main/main.less @@ -30,7 +30,7 @@ padding: 0; height: 42px; background: #f0f0f0; - margin-bottom: 3px; + margin-bottom: 14px; } .content-wrapper { padding: 0 16px; diff --git a/template/admin/src/pages/division/agent/applyList.vue b/template/admin/src/pages/division/agent/applyList.vue index 7b7d03f7b..02c90e7af 100644 --- a/template/admin/src/pages/division/agent/applyList.vue +++ b/template/admin/src/pages/division/agent/applyList.vue @@ -341,7 +341,7 @@ export default { .left-wrapper { height: 904px; background: #fff; - border-right: 1px solid #dcdee2; + border-right: 1px solid #f2f2f2; } .menu-item { diff --git a/template/admin/src/pages/division/agent/index.vue b/template/admin/src/pages/division/agent/index.vue index f1ed07710..556e2403b 100644 --- a/template/admin/src/pages/division/agent/index.vue +++ b/template/admin/src/pages/division/agent/index.vue @@ -398,7 +398,7 @@ export default { .left-wrapper { height: 904px; background: #fff; - border-right: 1px solid #dcdee2; + border-right: 1px solid #f2f2f2; } .menu-item { diff --git a/template/admin/src/pages/division/list/index.vue b/template/admin/src/pages/division/list/index.vue index a87354c22..35120389f 100644 --- a/template/admin/src/pages/division/list/index.vue +++ b/template/admin/src/pages/division/list/index.vue @@ -419,7 +419,7 @@ export default { .left-wrapper { height: 904px; background: #fff; - border-right: 1px solid #dcdee2; + border-right: 1px solid #f2f2f2; } .menu-item { diff --git a/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue b/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue index 2bfd5e331..82084aaaa 100644 --- a/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue +++ b/template/admin/src/pages/marketing/channelCode/channelCodeIndex.vue @@ -600,7 +600,7 @@ export default { .left-wrapper { height: 904px; background: #fff; - border-right: 1px solid #dcdee2; + border-right: 1px solid #f2f2f2; } .menu-item { diff --git a/template/admin/src/pages/marketing/recharge/index.vue b/template/admin/src/pages/marketing/recharge/index.vue index 805aa5c15..b6bb198cf 100644 --- a/template/admin/src/pages/marketing/recharge/index.vue +++ b/template/admin/src/pages/marketing/recharge/index.vue @@ -1076,7 +1076,7 @@ export default { .left-wrapper { min-width: 213px; background: #fff; - border-right: 1px solid #dcdee2; + border-right: 1px solid #f2f2f2; } .menu-item { diff --git a/template/admin/src/pages/marketing/sign/index.vue b/template/admin/src/pages/marketing/sign/index.vue index 9f6ae7be2..3f0409bb1 100644 --- a/template/admin/src/pages/marketing/sign/index.vue +++ b/template/admin/src/pages/marketing/sign/index.vue @@ -867,7 +867,7 @@ export default { .left-wrapper { min-width: 213px; background: #fff; - border-right: 1px solid #dcdee2; + border-right: 1px solid #f2f2f2; } .menu-item { diff --git a/template/admin/src/pages/setting/devise/list.vue b/template/admin/src/pages/setting/devise/list.vue index 713df72f9..fb8117345 100644 --- a/template/admin/src/pages/setting/devise/list.vue +++ b/template/admin/src/pages/setting/devise/list.vue @@ -613,7 +613,7 @@ export default { .left-wrapper { background: #fff; - border-right: 1px solid #dcdee2; + border-right: 1px solid #f2f2f2; } .picCon { diff --git a/template/admin/src/pages/setting/membershipLevel/index.vue b/template/admin/src/pages/setting/membershipLevel/index.vue index 4007dfa33..9f5a3034e 100644 --- a/template/admin/src/pages/setting/membershipLevel/index.vue +++ b/template/admin/src/pages/setting/membershipLevel/index.vue @@ -454,7 +454,7 @@ export default { .left-wrapper { height: 904px; background: #fff; - border-right: 1px solid #dcdee2; + border-right: 1px solid #f2f2f2; } .menu-item { diff --git a/template/admin/src/pages/system/group/pc.vue b/template/admin/src/pages/system/group/pc.vue index 61aab4e5f..6f653bfbe 100644 --- a/template/admin/src/pages/system/group/pc.vue +++ b/template/admin/src/pages/system/group/pc.vue @@ -9,8 +9,8 @@ - - + +
网站LOGO
@@ -477,7 +477,9 @@ export default { /deep/ .ivu-menu-vertical.ivu-menu-light:after { display: none; } - +.ivu-mt { + min-height: calc(100vh - 280px); +} .nofonts { text-align: center; line-height: 137px; @@ -622,12 +624,6 @@ export default { } } -.left-wrapper { - // height 904px - background: #fff; - border-right: 1px solid #dcdee2; -} - .on { color: #1890ff; background-color: #f0faff; diff --git a/template/admin/src/pages/system/group/visualization.vue b/template/admin/src/pages/system/group/visualization.vue index b8fd27592..e0a9e113d 100644 --- a/template/admin/src/pages/system/group/visualization.vue +++ b/template/admin/src/pages/system/group/visualization.vue @@ -1491,7 +1491,7 @@ export default { .left-wrapper { min-width: 213px; background: #fff; - border-right: 1px solid #dcdee2; + border-right: 1px solid #f2f2f2; } .menu-item { diff --git a/template/admin/src/pages/user/label/index.vue b/template/admin/src/pages/user/label/index.vue index f01ab1310..4d7092db8 100644 --- a/template/admin/src/pages/user/label/index.vue +++ b/template/admin/src/pages/user/label/index.vue @@ -276,7 +276,7 @@ export default { .left-wrapper { height: 904px; background: #fff; - border-right: 1px solid #dcdee2; + border-right: 1px solid #f2f2f2; } .menu-item { diff --git a/template/admin/src/styles/style.css b/template/admin/src/styles/style.css index e9ebead69..225fc0210 100644 --- a/template/admin/src/styles/style.css +++ b/template/admin/src/styles/style.css @@ -514,9 +514,19 @@ body { padding: 7px 32px 0 32px; } .header-title { - padding: 10px 16px; + padding: 10px 20px; border-bottom: 1px solid #f2f2f2; margin-bottom: 10px; + border-radius:5px; + display: -webkit-box; + display: -ms-flexbox; + display: flex; + -webkit-box-align: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; } .ivu-page-header-title { display: inline-block; @@ -527,6 +537,12 @@ body { .main .content-wrapper { padding-top: 0; } +.left-wrapper{ + height: calc(100vh - 120px); + background: #fff; + border-right: 1px solid #f2f2f2; + +} .ivu-tabs-bar { margin-bottom: 0; }