Skip to content

X
xiaomai-cloud-class-web
Commit 601ea1de by zhangleyuan
Options

feat:处理ui验收问题

parent 9532b9dc
Showing with 5 additions and 626 deletions
src/core/antd.less deleted 100644 → 0
/*
* @Author: Michael
* @Date: 2017-09-08 17:38:18
* @Last Modified by: chenshu
* @Last Modified time: 2020-08-31 14:55:30
*/
@import './variables.less';
@active-color: #ffb000;
// 消息提示框
.ant-message {
&>span {
display: block !important;
}
}
.ant-drawer-content {
.ant-drawer-title {
font-weight: normal;
}
}
.ant-steps-item .ant-steps-item-icon>.ant-steps-icon {
top: -6%;
}
.ant-calendar-month-panel {
.ant-calendar-month-panel-header {
.ant-calendar-month-panel-next-year-btn,
.ant-calendar-month-panel-prev-year-btn {
height: auto;
}
}
}
.ant-form-item-children {
display: block;
}
.ant-btn-primary {
i {
color: #fff !important;
}
span {
color: #fff !important;
}
}
.ant-switch-small:after {
top: 0.3px;
}
.ant-pagination {
display: inline !important;
.ant-pagination-jump-next {
color: #f3f3f3 !important;
}
.ant-pagination-jump-next:after {
display: inherit !important;
}
.ant-pagination-jump-prev {
color: #f3f3f3 !important;
}
.ant-pagination-jump-prev:after {
display: inherit !important;
}
}
.ant-form-item {
margin-bottom: 16px !important;
}
.ant-form-item-margin0 {
margin-bottom: 0 !important;
}
.ant-radio {
// .ant-radio-inner {
// width: 14px !important;
// height: 14px !important;
// }
.ant-radio-inner:after {
height: 8px !important;
width: 8px !important;
left: 3px !important;
top: 3px !important;
}
}
.ant-dropdown-link {
color: #5D5D5E !important;
}
.ant-table-fixed-header {
.ant-table-scroll {
.ant-table-header {
// padding-bottom: 0 !important;
}
}
}
.ant-table-bordered {
.ant-table-thead {
tr {
th {
border-bottom: none;
border-right: none !important;
}
}
}
.ant-table-tbody {
tr {
td {
border-bottom: none;
border-right: none !important;
}
td:last-child {
&.table-no-right-border {
border-right: none !important;
}
}
}
tr:last-child {
border-bottom: 1px solid #e8e8e8 !important;
}
}
}
.ant-input {
font-size: 14px !important;
}
.ant-dropdown-link {
line-height: 20px !important;
}
.ant-table-thead {
tr {
.center {
text-align: center !important;
}
}
}
.ant-time-picker-panel-select-option-disabled {
display: none;
}
.ant-select-auto-complete.ant-select .ant-select-selection--single {
height: 32px !important;
}
.ant-table {
tr {
th {
background: @xm-table-header;
color: @xm-table-head-color;
}
}
tbody {
.ant-table-row-hover {
td {
background: @xm-table-body-active !important;
}
}
tr {
background: transparent;
td {
color: @xm-table-tbody-color;
}
&:nth-child(even) {
background: @xm-table-body-even;
}
&:hover {
td {
background: @xm-table-body-active !important;
}
}
}
}
}
.ant-table-bordered {
.ant-table-body {
border: 1px solid #e8e8e8;
}
.ant-table-header>table,.ant-table-body>table {
border: none !important;
border-radius: 3px;
.icon {
color: #bfbfbf;
}
}
}
.ant-table-fixed-right .ant-table-fixed {
border-left: none !important;
border-right: 1px solid #e8e8e8 !important;
}
/* 按钮padding改成8px */
.ant-btn {
height: 28px !important;
line-height:20px !important;
font-weight: 400 !important;
border: 1px solid #e8e8e8;
&:focus,
:active {
border: 1px solid #ffb000 !important;
color: #ffb000 !important;
}
}
.ant-input-search-button {
height: 32px !important;
}
.ant-btn-loading {
padding-left:18px !important;
}
.ant-avatar {
width: 35px;
height: 35px;
line-height: 35px;
border-radius: 25px;
}
/* tab选择 */
.ant-tabs-nav .ant-tabs-tab {
padding: 8px 20px 12px !important;
font-size: 16px !important;
>span {
font-size: 16px !important;
}
}
.ant-tabs-nav .ant-tabs-tab-active {
color: @active-color !important;
}
.ant-tabs-nav.ant-tabs-nav-animated {
.ant-tabs-tab {
&:hover {
color: @active-color !important;
}
}
}
.ant-tabs-ink-bar.ant-tabs-ink-bar-animated {
background-color: inherit !important;
}
// 修改ant tab 底部滚动条
.ant-tabs-bottom .ant-tabs-ink-bar-animated,
.ant-tabs-top .ant-tabs-ink-bar-animated {
//display: none!important;
&:after {
content: '';
display: inline-block;
position: absolute;
width: 30px;
height: 2px;
background: #ffb000 !important;
left: 50%;
transform: translateX(-50%);
}
}
// 当只有一个tab的时候特殊处理
.ant-tabs.single-tab {
.ant-tabs-ink-bar {
width: 100% !important;
}
}
.ant-checkbox-wrapper+.ant-checkbox-wrapper {
margin-left: 0 !important;
}
.ant-menu {
.iconfont {
transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
}
}
.ant-menu-inline,
.ant-menu-vertical {
border-right: none;
}
.ant-menu-inline .ant-menu-item:after,
.ant-menu-vertical .ant-menu-item:after {
display: none;
}
.ant-menu-inline .ant-menu-item,
.ant-menu-vertical .ant-menu-item {
left: 0px;
}
.ml16 {
margin-left: 16px !important;
}
.mr16 {
margin-right: 16px !important;
}
ml0 {
margin-left: 0 !important;
}
mr0 {
margin-right: 0 !important;
}
// 下拉框颜色
.ant-dropdown-menu-item-active.ant-dropdown-menu-item:hover {
background-color: @xm-select-item-hover !important;
}
// ant badge改小
.ant-badge {
transform: translate(-8px, -8px) scale(0.7) !important;
}
.ant-input,
.ant-btn {
border-color: @xm-color-border;
}
.ant-select-selection {
border-color: @xm-color-border !important;
}
.ant-select-dropdown-menu-item-active:not(.ant-select-dropdown-menu-item-disabled) {
background: #F3F6FA;
.ant-select-selected-icon {
color:#ffb000 !important;
}
}
.ant-select-dropdown-menu-item-selected {
background: none;
font-weight: 400 !important;
color:#ffb000;
}
.ant-btn-primary.ant-btn {
background-color: @xm-color-text-select-primary !important;
border-color: @xm-color-text-select-primary !important;
&:hover {
background-color: #fdb089 !important;
border-color: #fdb089 !important;
}
&:focus,
:active {
border: 1px solid @xm-color-text-select-primary !important;
background-color: @xm-color-text-select-primary !important;
}
span {
color: #fff !important;
}
}
.ant-select-open .ant-select-selection {
box-shadow: none;
}
.ant-tabs-bar {
border-color: @xm-color-border !important;
}
// 日历今天不要加粗
.ant-calendar-today .ant-calendar-date {
font-weight: normal !important;
}
.ant-modal-wrap {
display: flex;
align-items: center;
.ant-modal {
padding-bottom: 0;
height: auto;
top: auto;
.ant-modal-body {
max-height: 70vh;
overflow-y: auto;
padding: 24px;
}
}
}
::-webkit-scrollbar {
width: 6px;
height: 6px;
display: block;
}
::-webkit-scrollbar-thumb {
/*滚动条里面小方块*/
border-radius: 3px; // background:rgba(204,204,204,1);
background: rgba(204, 204, 204, 1);
}
.ant-modal-footer {
.ant-btn {
font-weight: normal !important;
}
}
.ant-avatar {
background: #e8e8e8;
}
.ant-table-small {
border-radius: 0 !important;
}
.ant-table-small>.ant-table-content>.ant-table-body {
margin: 0px;
}
.ant-table-filter-dropdown .ant-dropdown-menu-without-submenu {
max-height: 300px;
overflow-x: hidden;
}
.ant-table-body {
position: relative;
.list {
padding: 24px;
box-sizing: content-box;
display: flex;
.item {
margin-right: 24px;
}
}
}
.no-scrollbar {
.ant-table-body {
&::-webkit-scrollbar {
display: none;
}
}
}
.table-no-scrollbar {
::-webkit-scrollbar {
width: 0;
}
}
.ant-table-small>.ant-table-content>.ant-table-body {
margin: 0 0px !important;
}
.right-container,
.ant-modal {
.ant-input {
&:focus {
border: 1px solid #ffb000 !important;
}
}
}
.ant-dropdown:before {
display: none !important;
}
.ant-calendar-picker-container {
.ant-calendar-footer-extra {
.ant-tag-blue {
background: #fff;
color: #ffb000;
border-color: #ffb000;
}
}
}
.ant-table-filter-dropdown {
.ant-dropdown-menu-item-selected {
background: #f3f6fa;
}
}
.ant-select-selection__rendered {
margin: 0 12px;
}
.ant-btn-danger:hover,
.ant-btn-danger:focus {
color: #fff !important;
background-color: #ffb000 !important;
border-color: #ffb000 !important;
}
.ant-modal-confirm-info .ant-modal-confirm-body > .anticon {
color: #ffb000!important;
}
.ant-breadcrumb > span:last-child .ant-breadcrumb-separator {
display: none;
}
.ant-input-affix-wrapper .ant-input:not(:last-child) {
padding-right: 30px !important;
}
.ant-input-affix-wrapper .ant-input:not(:first-child) {
padding-left: 24px !important;
}
.ant-input-affix-wrapper .ant-input {
min-height: 100% !important;
position: relative !important;
text-align: inherit !important;
}
.ant-modal-confirm-info .ant-modal-confirm-body>.anticon {
color: #FFBB54 !important;
}
.ant-modal-confirm-info .ant-modal-confirm-body>.default-confirm-icon {
font-size: 22px !important;
line-height: 22px !important;
float: left !important;
color:#ffb000 !important;
margin-right: 16px !important;
&.blue {
color: #5CBAFF !important;
}
}
// 气泡
.ant-tooltip {
.ant-tooltip-content {
.ant-tooltip-inner {
padding: 6px 12px !important;
}
}
}
// confirm弹窗自定义图标 相关样式调整
.ant-modal-body .ant-modal-confirm-body-wrapper .ant-modal-confirm-body {
>.solid-icon {
color: #faad14;
font-size: 22px;
line-height: 22px;
float: left;
margin-right: 16px;
}
>.confirm-icon{
color: #ffb000;
}
.ant-modal-confirm-content {
margin-left: 38px;
>.solid-icon-content {
margin-left: 40px;
}
}
}
.take-name-modal {
.ant-modal-body {
padding: 20px 24px !important;
.ant-form-item {
margin-bottom: 16px !important;
}
}
}
.ant-select-selection__clear {
width: 16px;
height: 16px;
}
.ant-select-dropdown--empty .ant-select-dropdown-menu-item-disabled {
cursor: default !important;
}
.batch-class-list {
.ant-modal-body {
padding: 16px 24px !important;
}
}
src/modules/personalInfo/index.tsx
......@@ -2,7 +2,7 @@
* @Author: zhangleyuan
* @Date: 2020-11-27 15:06:31
* @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-22 15:28:00
* @LastEditTime: 2020-12-22 15:29:22
* @Description: 描述一下
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
......@@ -88,7 +88,7 @@ function PersonalInfoPage() {
};
StoreService.editEmployee(params).then((res) => {
getStoreGroupAndStoreList();
message.success("编辑成功");
message.success("保存成功");
});
}
function getStoreGroupAndStoreList() {
......
src/modules/store-manage/modal/CatalogAddOrEditModal.tsx
/*
* @Author: wufan
* @Date: 2020-11-27 16:21:49
* @LastEditors: wufan
* @LastEditTime: 2020-12-08 19:42:39
* @LastEditors: zhangleyuan
* @LastEditTime: 2020-12-14 19:46:51
* @Description: Description
* @@Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
*/
......@@ -84,7 +84,7 @@ function CatalogAddOrEditModal(props: CatalogAddOrEditModalProps) {
name="分类名称"
rules={[{ required: true}]}
>
<Input type="text" placeholder="请输入子分类名称，最多10个字" maxLength={10} style={{ width: 240 }}
<Input type="text" placeholder="请输入分类名称，最多10个字" maxLength={10} style={{ width: 240 }}
defaultValue={catalogName}
onChange={(e) => {
setCatalogName(e.target.value);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment