diff --git a/src/assets/styles/custom.scss b/src/assets/styles/custom.scss index 6d508e8..197d34e 100644 --- a/src/assets/styles/custom.scss +++ b/src/assets/styles/custom.scss @@ -46,6 +46,10 @@ width: 100px; text-align: right; padding-right: 8px; + .el-button-gry{ + background-color: #25bf82; + border:none + } } .demo-form-inline { @@ -70,6 +74,9 @@ .el-form .el-form-item__label { font-weight: 400; } + .custom-form-inline .el-input { + width: 260px; + } } .table-cont { min-height: 300px; @@ -80,6 +87,16 @@ .el-table__empty-text { width: 200px; } + .el-button-custom{ + font-size: 14px !important; + color: #25bf82; + padding: 0; + } + .el-button-delete{ + font-size: 14px !important; + color: #ff4d4f; + padding: 0; + } } /* 自定义弹窗样式 */ @@ -212,12 +229,13 @@ justify-content: space-between; gap: 10px; padding: 3px 0; + } .el-icon-custom { vertical-align: middle; cursor: pointer; font-size: 16px; - color: #fff; + // color: #fff; } .table-cell-img-box { width: 60px; diff --git a/src/assets/styles/variables.module.scss b/src/assets/styles/variables.module.scss index 8764e13..4edb03c 100644 --- a/src/assets/styles/variables.module.scss +++ b/src/assets/styles/variables.module.scss @@ -9,9 +9,9 @@ $yellow: #FEC171; $panGreen: #30B08F; // 默认主题变量 -$menuText: #bfcbd9; +$menuText: #000; $menuActiveText: #409eff; -$menuBg: #304156; +$menuBg: #fff; $menuHover: #263445; // 浅色主题theme-light @@ -25,11 +25,11 @@ $base-sidebar-width: 200px; $sideBarWidth: 200px; // 菜单暗色变量 -$base-menu-color: #bfcbd9; -$base-menu-color-active: #f4f4f5; -$base-menu-background: #304156; -$base-sub-menu-background: #1f2d3d; -$base-sub-menu-hover: #001528; +$base-menu-color: #000; +$base-menu-color-active: #25bf82; +$base-menu-background: #fff; +$base-sub-menu-background: #fff; +$base-sub-menu-hover: rgba(64, 158, 255, 0.1); // 组件变量 $--color-primary: #409EFF; diff --git a/src/components/tableComponent.vue b/src/components/tableComponent.vue index c99c84d..c377ca1 100644 --- a/src/components/tableComponent.vue +++ b/src/components/tableComponent.vue @@ -36,10 +36,11 @@ - + @@ -50,7 +51,7 @@ :prop="column.prop" :label="column.label" :width="column.width" - :align="column.align || 'left'" + :align="column.align || 'center'" :sortable="column.sortable" :header-class-name="column.headerClassName" > diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 234a702..e9b1f18 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -8,7 +8,7 @@ :background-color="getMenuBackground" :text-color="getMenuTextColor" :unique-opened="true" - :active-text-color="theme" + active-text-color="#25bf82" :collapse-transition="false" mode="vertical" :class="sideTheme" diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue index ad2b8ca..26e98d6 100644 --- a/src/layout/components/TagsView/index.vue +++ b/src/layout/components/TagsView/index.vue @@ -291,7 +291,7 @@ function handleScroll() { } &.active { - background-color: #42b983; + background-color: #42b983 !important; color: #fff; border-color: #42b983; diff --git a/src/views/customer/customerManage.vue b/src/views/customer/customerManage.vue index 02f2fde..594262e 100644 --- a/src/views/customer/customerManage.vue +++ b/src/views/customer/customerManage.vue @@ -66,7 +66,7 @@
- 查询 + 查询 重置
@@ -85,27 +85,9 @@ @@ -179,7 +161,7 @@ const columns = ref([ { prop: "userCategory", label: "用户分类" }, { prop: "unitPrice", label: "客单价" }, { prop: "ordersNums", label: "订单数目" }, - { prop: "action", label: "操作", slotName: "action" }, + { prop: "action", label: "操作", slotName: "action",width: "140",align: "center" }, ]); // 生成食物主题昵称