Skip to content

J
jinfa-admin
Commit 58f5555f authored by GuanHua's avatar GuanHua
Browse files
Options

feat:字体颜色修改和装修广告图片大小上传限制

parent 9828d35c
Hide whitespace changes
Inline Side-by-side
Showing with 318 additions and 313 deletions
config/theme.config.ts
View file @ 58f5555f
const MAIN_COLOR = '#00B37A'
const MAIN_FONT_BOLD_COLOR = '#172B4D'
const MAIN_FONT_TINY_COLOR = '#6B778C'
const MAIN_FONT_BOLD_COLOR = '#303133'
const MAIN_FONT_TINY_COLOR = '#909399'
/**
* 定制antd主题样式
......
src/components/AvatarWrap/index.less
View file @ 58f5555f
......@@ -16,7 +16,7 @@
}
&-name {
color: #172B4D;
color: #303133;
margin: 0 8px 0 12px;
}
}
src/components/DetailPage/index.less
View file @ 58f5555f
......@@ -12,12 +12,12 @@
.title {
margin-left: 16px;
font-size: 20px;
color: #172B4D;
color: #303133;
font-weight: 500;
}
.back_btn {
color: #6B778C;
color: #909399;
margin-left: 27px;
font-size: 16px;
cursor: pointer;
......
src/components/NiceForm/components/CardCheckBox.tsx
View file @ 58f5555f
......@@ -52,7 +52,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
}
.card-checkbox-title {
font-size: 14px;
color: #42526E;
color: #606266;
}
`
......@@ -83,7 +83,7 @@ const CardCheckBox = (props) => {
dataSource.map((v, i) => {
return (
<Col key={v.id} className={cx('card-checkbox-item', isChecked(v.id) ? 'active' : '')} onClick={() => handleChange(v.id)}>
{ v.logoUrl ? <img className='card-logo' src={v.logoUrl}/> : <div className='card-logo default'>logo</div> }
{v.logoUrl ? <img className='card-logo' src={v.logoUrl} /> : <div className='card-logo default'>logo</div>}
<span className='card-checkbox-title'>{v.name}</span>
</Col>
)
......
src/components/NiceForm/components/CustomRelevance.tsx
View file @ 58f5555f
......@@ -14,8 +14,8 @@ const formActions = createFormActions();
const RowStyleLayout = styled(props => <div {...props} />)`
width: 100%;
.relevance {
border-color: #6b778c;
background-color: #6b778c;
border-color: #909399;
background-color: #909399;
}
`;
......@@ -66,7 +66,7 @@ const Relevance = props => {
const rowSelection = {
selectedRowKeys: selectedRowKeys,
onChange: (selectedRowKeys: any, selectedRows: any) => {},
onChange: (selectedRowKeys: any, selectedRows: any) => { },
};
const handleSubmit = type => {
......
src/components/RequireItem/index.less
View file @ 58f5555f
.require_item {
display: inline-block;
width: 180px;
color: #6B778C;
color: #909399;
&.require {
&::after {
......
src/components/ReturnEle/index.tsx
View file @ 58f5555f
......@@ -8,11 +8,11 @@ interface IProps {
logoSrc?: string;
}
const ReutrnEle:React.FC<IProps> = (props) => {
const ReutrnEle: React.FC<IProps> = (props) => {
const { description, logoSrc } = props
return <>
<span style={{fontSize:15,color:'#6B778CFF'}}><ArrowLeftOutlined /> {logoSrc?<img src={logoSrc} style={{width:48,height:48,margin:'0 0 0 14px'}}/>:description}</span>
<span style={{ fontSize: 15, color: '#909399FF' }}><ArrowLeftOutlined /> {logoSrc ? <img src={logoSrc} style={{ width: 48, height: 48, margin: '0 0 0 14px' }} /> : description}</span>
</>
}
......
src/components/StatusTag/index.less
View file @ 58f5555f
......@@ -18,7 +18,7 @@
}
&__default {
color: #42526E;
color: #606266;
background: #F4F5F7;
}
......
src/components/UploadImage/index.less
View file @ 58f5555f
......@@ -3,7 +3,7 @@
align-items: center;
.size_require {
color: #97A0AF;
color: #C0C4CC;
margin-left: 24px;
}
......@@ -14,7 +14,7 @@
display: flex;
align-items: center;
justify-content: center;
color: #6B778C;
color: #909399;
flex-direction: column;
background: rgba(250, 251, 252, 1);
border-radius: 2px;
......
src/components/UploadModal/index.less
View file @ 58f5555f
......@@ -4,7 +4,7 @@
margin: 0 auto;
list-style-type: decimal;
li{
color: #6B778C;
color: #909399;
font-size: 14px;
}
}
......
src/constants/styles/_var.less
View file @ 58f5555f
// global
@main-color: #00B37A;
@main-font-bold-color: #172B4D;
@main-font-bold-color: #303133;
// layout
@header-global-nav-bg: #38414A;
......
src/global.less
View file @ 58f5555f
......@@ -26,7 +26,7 @@ body,
width: 80px;
height: 32px;
line-height: 32px;
background: #6B778C;
background: #909399;
color: #fff;
text-align: center;
cursor: pointer;
......
src/global/styles/global.less
View file @ 58f5555f
......@@ -31,7 +31,7 @@ h3,
h4,
h5,
h6 {
color: #6B778C;
color: #909399;
}
.@{prefix}-margin_content {
......
src/layouts/index.less
View file @ 58f5555f
......@@ -46,7 +46,7 @@
line-height: 64px;
font-size: 20px;
font-weight: bold;
color: #172B4D;
color: #303133;
}
.lx-page-content {
......
src/pages/classAndProperty/attribute/index.less
View file @ 58f5555f
.commonSearchBtn {
border-left: none;
border-radius: 0 2px 2px 0;
background-color: #EBECF0FF;
background-color: #EEF0F3FF;
&:hover, &:focus, &:active{
text-decoration: none;
color: rgba(0, 0, 0, 0.65);
background: #EBECF0FF;
background: #EEF0F3FF;
border-color: #d9d9d9;
}
}
\ No newline at end of file
src/pages/commodity/productWillCheck/index.less
View file @ 58f5555f
......@@ -4,7 +4,7 @@
margin: 0 auto;
list-style-type: decimal;
li{
color: #6B778C;
color: #909399;
font-size: 14px;
}
}
......@@ -42,7 +42,7 @@
text-align: center;
height: 24px;
line-height: 24px;
color: #6B778C;
color: #909399;
}
}
.card-box{
......@@ -118,7 +118,7 @@
width:36px;
height:36px;
background:rgba(250,251,252,1);
border-color: #ebecf0;
border-color: #EEF0F3;
border-radius: 0px;
border-top: none;
border-right: none;
......
src/pages/commodity/products/index.less
View file @ 58f5555f
......@@ -4,7 +4,7 @@
margin: 0 auto;
list-style-type: decimal;
li{
color: #6B778C;
color: #909399;
font-size: 14px;
}
}
......@@ -42,7 +42,7 @@
text-align: center;
height: 24px;
line-height: 24px;
color: #6B778C;
color: #909399;
}
}
.card-box{
......@@ -118,7 +118,7 @@
width:36px;
height:36px;
background:rgba(250,251,252,1);
border-color: #ebecf0;
border-color: #EEF0F3;
border-radius: 0px;
border-top: none;
border-right: none;
......
src/pages/logistics/components/index.less
View file @ 58f5555f
@import "../../member/components/index.less";
.count{
font-size: 24px;
color: #172B4D;
color: #303133;
font-weight: 500;
}
.add-btn{
......@@ -48,7 +48,7 @@
font-size : 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color : #172B4D;
color : #303133;
padding : 20px 0;
}
......@@ -71,13 +71,13 @@
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #6B778C;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #172B4D;
color : #303133;
}
}
}
......@@ -103,13 +103,13 @@
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #6B778C;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #172B4D;
color : #303133;
}
}
}
......
src/pages/logistics/list/addCompany.tsx
View file @ 58f5555f
......@@ -7,7 +7,7 @@ import { ColumnType } from 'antd/lib/table/interface'
import { StandardTable } from 'god'
import { history } from 'umi'
import ReutrnEle from '@/components/ReturnEle';
import {PublicApi,CustomApi} from '@/services/api'
import { PublicApi, CustomApi } from '@/services/api'
import { addCompany, updateCompany, getCompanyDetail } from '@/services/logistics/index'
import style from "./addCompany.less"
export interface companyProps {
......@@ -81,10 +81,10 @@ const company: React.FC<{}> = () => {
const [selectRow, setSelectRow] = useState<Item[]>([]) // 模态框选择的行数据
const [selectedRowKeys, setSelectedRowKeys] = useState<Array<string>>([])
useEffect(() => {
let _title = history.location.query.id == 0? '新建':
history.location.query.isSee ? '查看': '编辑'
let _title = history.location.query.id == 0 ? '新建' :
history.location.query.isSee ? '查看' : '编辑'
setHeaderTitle(`${_title}物流公司`)
if (id !== '0') {
if (id !== '0') {
PublicApi.getLogisticsCompanyGet({ id: id }).then(res => {
const data = res.data
menuForm.setFieldsValue(data)
......@@ -165,7 +165,7 @@ const company: React.FC<{}> = () => {
}
}
const selectBtn = (
<Button style={{ backgroundColor: '#6B778C', borderColor: '#6B778C',color:'white' }} onClick={handleLink}>
<Button style={{ backgroundColor: '#909399', borderColor: '#909399', color: 'white' }} onClick={handleLink}>
<LinkOutlined />选择
</Button>
......@@ -201,7 +201,7 @@ const company: React.FC<{}> = () => {
message: '合作类型为必须项!',
},
]}
// initialValue={}
// initialValue={}
>
<Select placeholder="请选择合作类型" value={companyType} onChange={onChangeType}>
<Option value={1}>平台物流服务商</Option>
......@@ -224,7 +224,7 @@ const company: React.FC<{}> = () => {
}
]}
>
<Input className="input_addonAfter" disabled maxLength={20} addonAfter={selectBtn}/>
<Input className="input_addonAfter" disabled maxLength={20} addonAfter={selectBtn} />
</Form.Item>
:
<Form.Item
......@@ -300,7 +300,7 @@ const company: React.FC<{}> = () => {
columns={columns}
currentRef={ref}
rowSelection={{
type:'radio',
type: 'radio',
...rowSelection
}}
fetchTableData={(params: any) => fetchData(params)}
......
src/pages/member/components/FlowRecords/index.tsx
View file @ 58f5555f
import React from 'react';
import {
Tabs,
Badge,
import {
Tabs,
Badge,
} from 'antd';
import { STATUS_COLOR_MAP, STATUS_COLOR_TXT } from '../../constant';
import PolymericTable from '@/components/PolymericTable';
import { EditableColumns } from '@/components/PolymericTable/interface';
import MellowCard from '@/components/MellowCard';
import {
MEMBER_STATUS_TAG_MAP,
MEMBER_INNER_STATUS_BADGE_COLOR,
MEMBER_OUTER_STATUS_BADGE_COLOR,
MEMBER_OUTER_STATUS_TYPE,
import {
MEMBER_STATUS_TAG_MAP,
MEMBER_INNER_STATUS_BADGE_COLOR,
MEMBER_OUTER_STATUS_BADGE_COLOR,
MEMBER_OUTER_STATUS_TYPE,
} from '../../constant';
import styles from './index.less';
export interface InnerHistoryItem {
createTime?: string,
createTime?: string,
id?: number;
operator?: string;
org?: string;
......@@ -39,7 +39,7 @@ export interface OuterHistoryItem {
};
interface FlowRecordsProps {
outerHistory?: OuterHistoryItem[];
outerHistory?: OuterHistoryItem[];
innerHistory?: InnerHistoryItem[];
};
......@@ -60,9 +60,9 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHisto
{
title: '状态',
dataIndex: 'statusName',
align: 'center',
align: 'center',
render: (text, record) => (
<Badge color={MEMBER_OUTER_STATUS_BADGE_COLOR[record.status] || '#999999'} text={text} />
<Badge color={MEMBER_OUTER_STATUS_BADGE_COLOR[record.status] || '#909399'} text={text} />
),
},
{
......@@ -74,13 +74,13 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHisto
title: '操作时间',
dataIndex: 'operateTime',
align: 'center',
ellipsis: true,
ellipsis: true,
},
{
title: '审核意见',
dataIndex: 'reason',
align: 'center',
ellipsis: true,
ellipsis: true,
},
];
......@@ -109,9 +109,9 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHisto
{
title: '状态',
dataIndex: 'innerStatusName',
align: 'center',
align: 'center',
render: (text, record) => (
<Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus] || '#999999'} text={text} />
<Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[record.innerStatus] || '#909399'} text={text} />
),
},
{
......@@ -123,19 +123,19 @@ const FlowRecords: React.FC<FlowRecordsProps> = ({ outerHistory = [], innerHisto
title: '操作时间',
dataIndex: 'operateTime',
align: 'center',
ellipsis: true,
ellipsis: true,
},
{
title: '审核意见',
dataIndex: 'reason',
align: 'center',
ellipsis: true,
ellipsis: true,
},
];
return (
<MellowCard>
<Tabs onChange={() => {}}>
<Tabs onChange={() => { }}>
<Tabs.TabPane tab="流转记录" key="1">
<PolymericTable
dataSource={outerHistory}
......
src/pages/member/components/HeadInfo/index.less
View file @ 58f5555f
......@@ -16,7 +16,7 @@
}
&-name {
color: #172B4D;
color: #303133;
margin: 0 8px 0 12px;
}
}
src/pages/member/components/LevelInfo/index.tsx
View file @ 58f5555f
import React, { useState, useEffect } from 'react';
import {
Row,
Col,
Progress,
import {
Row,
Col,
Progress,
} from 'antd';
import classNames from 'classnames';
import { MiniArea } from '@/components/Charts';
......@@ -14,7 +14,7 @@ import styles from './index.less';
const PAGE_SIZE = 8;
export interface DataProps {
id?: number;
id?: number;
createTime?: string;
ruleName?: string;
score?: number;
......@@ -28,26 +28,26 @@ export interface FetchParams {
export interface LevelInfoProps {
levelInfo?: {
level?: string,
score?: number,
nextLevel?: string,
nextScore?: number,
level?: string,
score?: number,
nextLevel?: string,
nextScore?: number,
};
chartData?: {
x: React.ReactText,
y: number,
}[];
fetchList?: (params: FetchParams) => Promise<{ data: DataProps[] , totalCount: number }>;
fetchList?: (params: FetchParams) => Promise<{ data: DataProps[], totalCount: number }>;
}
const LevelInfo: React.FC<LevelInfoProps> = ({
levelInfo = {},
chartData = [],
fetchList,
levelInfo = {},
chartData = [],
fetchList,
}) => {
const score = levelInfo.score || 0;
const nextScore = levelInfo.nextScore || 0;
const score = levelInfo.score || 0;
const nextScore = levelInfo.nextScore || 0;
const [page, setPage] = useState(1);
const [size, setSize] = useState(PAGE_SIZE);
const [total, setTotal] = useState(0);
......@@ -79,16 +79,16 @@ const LevelInfo: React.FC<LevelInfoProps> = ({
title: '备注',
dataIndex: 'remark',
align: 'center',
ellipsis: true,
ellipsis: true,
},
];
const getHistoryList = () => {
if (fetchList) {
setListLoading(true);
fetchList({
current: page,
pageSize: size,
fetchList({
current: page,
pageSize: size,
}).then(res => {
const { data = [], totalCount = 0 } = (res || {});
setList(data);
......@@ -125,11 +125,11 @@ const LevelInfo: React.FC<LevelInfoProps> = ({
<div className={styles['card-name']}>{levelInfo?.level}</div>
<div className={styles['card-progress']}>
<Progress
<Progress
strokeWidth={4}
strokeLinecap="square"
showInfo={false}
percent={nextScore? (score / levelInfo.nextScore) * 100 : 100}
percent={nextScore ? (score / levelInfo.nextScore) * 100 : 100}
/>
</div>
......@@ -159,35 +159,35 @@ const LevelInfo: React.FC<LevelInfoProps> = ({
alias: `${new Date().getFullYear()}年`, // 别名
},
y: {
tickCount: 5,
tickCount: 5,
alias: '活跃分', // 别名
},
}}
xAxis={{
tickLine: undefined,
tickLine: undefined,
label: undefined,
title: {
style: {
fontSize: 12,
fill: '#97A0AF',
fill: '#C0C4CC',
fontWeight: 400,
rotate: 90,
},
},
rotate: 90,
},
},
}}
yAxis={{
tickLine: undefined,
label: {
offset: 10,
offset: 10,
},
title: {
style: {
fontSize: 12,
fill: '#97A0AF',
fill: '#C0C4CC',
fontWeight: 400,
rotate: 90,
},
},
rotate: 90,
},
},
grid: {
line: {
type: 'line',
......@@ -211,7 +211,7 @@ const LevelInfo: React.FC<LevelInfoProps> = ({
<MellowCard
title="活跃分获取记录"
headStyle={{
borderBottom: 'none',
borderBottom: 'none',
}}
>
<PolymericTable
......@@ -219,7 +219,7 @@ const LevelInfo: React.FC<LevelInfoProps> = ({
columns={columns}
loading={listLoading}
pagination={{
pageSize: size,
pageSize: size,
total,
}}
onPaginationChange={handlePaginationChange}
......
src/pages/member/components/StatusTag/index.less
View file @ 58f5555f
......@@ -18,7 +18,7 @@
}
&__default {
color: #42526E;
color: #606266;
background: #F4F5F7;
}
......
src/pages/member/components/auditList.tsx
View file @ 58f5555f
......@@ -25,10 +25,10 @@ const auditList: React.FC<PageProps> = props => {
pageType === '1'
? 'auditPrSubmit'
: pageType === '2'
? 'auditPr1'
: pageType === '3'
? 'auditPr2'
: 'auditPrComfirm';
? 'auditPr1'
: pageType === '3'
? 'auditPr2'
: 'auditPrComfirm';
const ref = useRef<any>({});
const [searchItems, setSearchItems] = useState<any>({});
const [filteredInfo, setFilteredInfo] = useState<any>({});
......@@ -94,7 +94,7 @@ const auditList: React.FC<PageProps> = props => {
render: (text: any, record: any) => (
<span
style={
record.status === 1 ? { color: '#00B37A' } : { color: '#42526E' }
record.status === 1 ? { color: '#00B37A' } : { color: '#606266' }
}
>
{text}
......@@ -134,8 +134,8 @@ const auditList: React.FC<PageProps> = props => {
{pageType === '1'
? '提交审核'
: pageType === '2'
? '审核'
: '确认审核'}
? '审核'
: '确认审核'}
</Button>
),
},
......@@ -275,10 +275,10 @@ const auditList: React.FC<PageProps> = props => {
{pageType === '1'
? '批量提交'
: pageType === '2'
? '批量审核通过(一级)'
: pageType === '3'
? '批量审核通过(二级)'
: '批量确认审核通过'}
? '批量审核通过(一级)'
: pageType === '3'
? '批量审核通过(二级)'
: '批量确认审核通过'}
</Button>
</Popconfirm>
</Space>
......
src/pages/member/components/index.less
View file @ 58f5555f
......@@ -31,7 +31,7 @@
font-size : 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color : #172B4D;
color : #303133;
padding : 20px 0;
}
......@@ -54,13 +54,13 @@
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #6B778C;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #172B4D;
color : #303133;
}
}
}
......@@ -86,13 +86,13 @@
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #6B778C;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #172B4D;
color : #303133;
}
}
}
......@@ -157,7 +157,7 @@
}
&-name {
color : #172B4D;
color : #303133;
margin: 0 8px 0 12px;
}
}
......@@ -178,7 +178,7 @@
font-size : 14px;
font-family : PingFangSC-Regular, PingFang SC;
font-weight : 400;
color : #6B778C;
color : #909399;
padding-right: 20px;
&:nth-of-type(n + 4) {
......
src/pages/member/constant.tsx
View file @ 58f5555f
import {
MEMBER_STATUS_NORMAL,
MEMBER_STATUS_FROZEN,
import {
MEMBER_STATUS_NORMAL,
MEMBER_STATUS_FROZEN,
MEMBER_INNER_STATUS_REGISTERED,
MEMBER_INNER_STATUS_UNCOMMITTED,
MEMBER_INNER_STATUS_UNREVIEWED_1,
MEMBER_INNER_STATUS_UNREVIEWED_2,
MEMBER_INNER_STATUS_FAILED,
MEMBER_INNER_STATUS_SUCCESS,
MEMBER_INNER_STATUS_REGISTERED,
MEMBER_INNER_STATUS_UNCOMMITTED,
MEMBER_INNER_STATUS_UNREVIEWED_1,
MEMBER_INNER_STATUS_UNREVIEWED_2,
MEMBER_INNER_STATUS_FAILED,
MEMBER_INNER_STATUS_SUCCESS,
MEMBER_OUTER_STATUS_UNCOMMITTED,
MEMBER_OUTER_STATUS_UNREVIEWED,
MEMBER_OUTER_STATUS_FAILED,
MEMBER_OUTER_STATUS_SUCCESS,
MEMBER_OUTER_STATUS_UNCOMMITTED,
MEMBER_OUTER_STATUS_UNREVIEWED,
MEMBER_OUTER_STATUS_FAILED,
MEMBER_OUTER_STATUS_SUCCESS,
} from '@/constants';
export const STATUS_COLOR_MAP = {
0: '#669EDE',
1: '#41CC9E',
2: '#EF6260',
0: '#669EDE',
1: '#41CC9E',
2: '#EF6260',
};
export const STATUS_COLOR_TXT = {
0: '待审核',
1: '审核通过',
2: '冻结',
0: '待审核',
1: '审核通过',
2: '冻结',
};
// 会员状态 StatusTag map
export const MEMBER_STATUS_TAG_MAP = {
[MEMBER_STATUS_NORMAL]: 'success',
[MEMBER_STATUS_NORMAL]: 'success',
[MEMBER_STATUS_FROZEN]: 'default'
};
// 会员内部状态 StatusTag map
export const MEMBER_INNER_STATUS_TYPE = {
[MEMBER_INNER_STATUS_REGISTERED]: 'default',
[MEMBER_INNER_STATUS_UNCOMMITTED]: 'primary',
[MEMBER_INNER_STATUS_UNREVIEWED_1]: 'warnning',
[MEMBER_INNER_STATUS_UNREVIEWED_2]: 'warnning',
[MEMBER_INNER_STATUS_FAILED]: 'danger',
[MEMBER_INNER_STATUS_SUCCESS]: 'success',
[MEMBER_INNER_STATUS_REGISTERED]: 'default',
[MEMBER_INNER_STATUS_UNCOMMITTED]: 'primary',
[MEMBER_INNER_STATUS_UNREVIEWED_1]: 'warnning',
[MEMBER_INNER_STATUS_UNREVIEWED_2]: 'warnning',
[MEMBER_INNER_STATUS_FAILED]: 'danger',
[MEMBER_INNER_STATUS_SUCCESS]: 'success',
};
// 会员外部状态 StatusTag map
export const MEMBER_OUTER_STATUS_TYPE = {
[MEMBER_OUTER_STATUS_UNCOMMITTED]: 'primary',
[MEMBER_OUTER_STATUS_UNREVIEWED]: 'warnning',
[MEMBER_OUTER_STATUS_FAILED]: 'danger',
[MEMBER_OUTER_STATUS_SUCCESS]: 'success',
[MEMBER_OUTER_STATUS_UNCOMMITTED]: 'primary',
[MEMBER_OUTER_STATUS_UNREVIEWED]: 'warnning',
[MEMBER_OUTER_STATUS_FAILED]: 'danger',
[MEMBER_OUTER_STATUS_SUCCESS]: 'success',
};
// 会员内部状态 Tag badge map
export const MEMBER_INNER_STATUS_BADGE_COLOR = {
[MEMBER_INNER_STATUS_REGISTERED]: '#42526E',
[MEMBER_INNER_STATUS_UNCOMMITTED]: '#669EDE',
[MEMBER_INNER_STATUS_UNREVIEWED_1]: '#FFC400',
[MEMBER_INNER_STATUS_UNREVIEWED_2]: '#FFC400',
[MEMBER_INNER_STATUS_FAILED]: '#EF6260',
[MEMBER_INNER_STATUS_SUCCESS]: '#41CC9E',
[MEMBER_INNER_STATUS_REGISTERED]: '#606266',
[MEMBER_INNER_STATUS_UNCOMMITTED]: '#669EDE',
[MEMBER_INNER_STATUS_UNREVIEWED_1]: '#FFC400',
[MEMBER_INNER_STATUS_UNREVIEWED_2]: '#FFC400',
[MEMBER_INNER_STATUS_FAILED]: '#EF6260',
[MEMBER_INNER_STATUS_SUCCESS]: '#41CC9E',
};
// 会员外部状态 Tag badge map
export const MEMBER_OUTER_STATUS_BADGE_COLOR = {
[MEMBER_OUTER_STATUS_UNCOMMITTED]: '#669EDE',
[MEMBER_OUTER_STATUS_UNREVIEWED]: '#FFC400',
[MEMBER_OUTER_STATUS_FAILED]: '#EF6260',
[MEMBER_OUTER_STATUS_SUCCESS]: '#41CC9E',
[MEMBER_OUTER_STATUS_UNCOMMITTED]: '#669EDE',
[MEMBER_OUTER_STATUS_UNREVIEWED]: '#FFC400',
[MEMBER_OUTER_STATUS_FAILED]: '#EF6260',
[MEMBER_OUTER_STATUS_SUCCESS]: '#41CC9E',
};
\ No newline at end of file
src/pages/member/memberLevel/addEquity.less
View file @ 58f5555f
......@@ -17,7 +17,7 @@
}
&-level {
color: #172B4D;
color: #303133;
margin: 0 8px 0 12px;
}
......@@ -50,7 +50,7 @@
font-size: 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #6B778C;
color: #909399;
padding-right: 20px;
&:nth-of-type(n + 4) {
......@@ -101,7 +101,7 @@
width: 72px;
height: 24px;
color: #fff;
background-color: #42526E;
background-color: #606266;
border-radius: 4px 0px 4px 0px;
text-align: center;
}
......@@ -142,7 +142,7 @@
background-color: rgba(0, 0, 0, 0);
font-size: 32px;
font-weight: 500;
color: #172B4D;
color: #303133;
&:focus {
border: none;
......
src/pages/member/memberMaintain/frozen.tsx
View file @ 58f5555f
......@@ -8,17 +8,17 @@ import { STATUS_COLOR_MAP, STATUS_COLOR_TXT } from '../constant';
import { usePageStatus } from '@/hooks/usePageStatus';
import { PublicApi } from '@/services/api';
import { GetMemberMaintenanceDetailBasicResponse } from '@/services/MemberApi';
import {
MEMBER_STATUS_NORMAL,
MEMBER_STATUS_FROZEN,
MEMBER_OUTER_STATUS,
import {
MEMBER_STATUS_NORMAL,
MEMBER_STATUS_FROZEN,
MEMBER_OUTER_STATUS,
} from '@/constants';
import NiceForm from '@/components/NiceForm';
import { auditModalSchema } from './schema';
import {
MEMBER_STATUS_TAG_MAP,
MEMBER_INNER_STATUS_BADGE_COLOR,
MEMBER_OUTER_STATUS_TYPE,
import {
MEMBER_STATUS_TAG_MAP,
MEMBER_INNER_STATUS_BADGE_COLOR,
MEMBER_OUTER_STATUS_TYPE,
} from '../constant';
import { normalizeInnerHistory, normalizeOuterHistory } from '../utils';
import HeadInfo from '../components/HeadInfo';
......@@ -42,15 +42,15 @@ const Frozen: React.FC<{}> = () => {
}
setInfoLoaading(true);
PublicApi.getMemberMaintenanceDetailBasic({
memberId: id,
memberId: id,
validateId,
}).then(res => {
if (res.code === 1000) {
const { outerHistory = [], innerHistory = [] } = res.data;
setBasicInfo({
...res.data,
outerHistory: normalizeOuterHistory(outerHistory),
innerHistory: normalizeInnerHistory(innerHistory),
...res.data,
outerHistory: normalizeOuterHistory(outerHistory),
innerHistory: normalizeInnerHistory(innerHistory),
});
}
}).finally(() => {
......@@ -90,11 +90,11 @@ const Frozen: React.FC<{}> = () => {
style={{ padding: '0' }}
onBack={() => history.goBack()}
title={
<HeadInfo
<HeadInfo
info={{
name: basicInfo?.name,
name: basicInfo?.name,
level: 1,
}}
}}
/>
}
extra={(
......@@ -108,23 +108,23 @@ const Frozen: React.FC<{}> = () => {
冻结
</Button>
) : (
<Button
type="primary"
icon={<SettingOutlined />}
onClick={() => setModalVisible(true)}
>
解冻
</Button>
)
<Button
type="primary"
icon={<SettingOutlined />}
onClick={() => setModalVisible(true)}
>
解冻
</Button>
)
)}
</>
)}
>
<Descriptions
size="small"
column={3}
style={{
padding: '0 32px',
<Descriptions
size="small"
column={3}
style={{
padding: '0 32px',
}}
>
<Descriptions.Item label="会员类型">{basicInfo?.memberTypeName}</Descriptions.Item>
......@@ -136,7 +136,7 @@ const Frozen: React.FC<{}> = () => {
<StatusTag type={MEMBER_OUTER_STATUS_TYPE[basicInfo?.outerStatus]} title={basicInfo?.outerStatusName} />
</Descriptions.Item>
<Descriptions.Item label="内部状态">
<Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[basicInfo?.innerStatus] || '#999999'} text={basicInfo?.innerStatusName} />
<Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[basicInfo?.innerStatus] || '#909399'} text={basicInfo?.innerStatusName} />
</Descriptions.Item>
</Descriptions>
</PageHeader>
......@@ -145,26 +145,26 @@ const Frozen: React.FC<{}> = () => {
>
<div
style={{
marginBottom: 24,
marginBottom: 24,
}}
>
<AuditProcess
<AuditProcess
outerVerifyCurrent={basicInfo?.currentOuterStep}
innerVerifyCurrent={basicInfo?.currentInnerStep}
outerVerifySteps={basicInfo?.outerVerifySteps}
outerVerifySteps={basicInfo?.outerVerifySteps}
innerVerifySteps={basicInfo?.innerVerifySteps}
/>
</div>
<BasicInfo
<BasicInfo
basic={{
account: basicInfo?.account,
phone: basicInfo?.phone,
email: basicInfo?.email,
created: basicInfo?.createTime,
account: basicInfo?.account,
phone: basicInfo?.phone,
email: basicInfo?.email,
created: basicInfo?.createTime,
}}
channel={{
memberType: undefined,
memberType: undefined,
}}
extra={basicInfo?.groups}
outerHistory={basicInfo?.outerHistory}
......
src/pages/member/memberMaintain/index.less
View file @ 58f5555f
......@@ -58,7 +58,7 @@
}
&-name {
color : #172B4D;
color : #303133;
margin: 0 8px 0 12px;
}
}
......@@ -73,7 +73,7 @@
font-size : 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color : #172B4D;
color : #303133;
padding : 20px 0;
}
......@@ -96,13 +96,13 @@
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #6B778C;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #172B4D;
color : #303133;
}
}
}
......@@ -128,13 +128,13 @@
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #6B778C;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #172B4D;
color : #303133;
}
}
}
......@@ -304,7 +304,7 @@
&:nth-last-of-type(1) {
font-size : 20px;
font-weight: 500;
color : #172B4D;
color : #303133;
margin-left: 16px;
}
}
......
src/pages/member/memberPrConfirm/auditPrComfirm.tsx
View file @ 58f5555f
import React, { useState, useEffect, useRef } from 'react';
import { history } from 'umi';
import { PageHeaderWrapper } from '@ant-design/pro-layout';
import {
PageHeader,
Descriptions,
Badge,
Row,
Col,
Modal,
Button,
Spin,
import {
PageHeader,
Descriptions,
Badge,
Row,
Col,
Modal,
Button,
Spin,
} from 'antd';
import { FormOutlined } from '@ant-design/icons';
import { usePageStatus, PageStatus } from '@/hooks/usePageStatus';
......@@ -22,10 +22,10 @@ import NiceForm from '@/components/NiceForm';
import { createAsyncFormActions, FormEffectHooks, FormPath } from '@formily/antd';
import { useTreeTabs, FormState } from '@/hooks/useTreeTabs';
import { MEMBER_INNER_STATUS_SUCCESS } from '@/constants';
import {
MEMBER_STATUS_TAG_MAP,
MEMBER_INNER_STATUS_BADGE_COLOR,
MEMBER_OUTER_STATUS_TYPE,
import {
MEMBER_STATUS_TAG_MAP,
MEMBER_INNER_STATUS_BADGE_COLOR,
MEMBER_OUTER_STATUS_TYPE,
} from '../constant';
import { auditModalSchema } from './schema';
import HeadInfo from '../components/HeadInfo';
......@@ -37,10 +37,10 @@ import { values } from 'mobx';
const treeActions = createTreeActions();
const modalFormActions = createAsyncFormActions();
const {
onFieldValueChange$,
onFieldInputChange$,
onFieldInit$,
const {
onFieldValueChange$,
onFieldInputChange$,
onFieldInit$,
} = FormEffectHooks;
interface QueryProps {
......@@ -59,8 +59,8 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
const [basicInfo, setBasicInfo] = useState<GetMemberValidateCommitDetailResponse>();
const [modalVisible, setModalVisible] = useState(false);
const [buttonInfos, setButtonInfos] = useState<any>([]);
const [infoLoading, setInfoLoading] = useState(false);
const [powerLoading, setPowerLoading] = useState(false);
const [infoLoading, setInfoLoading] = useState(false);
const [powerLoading, setPowerLoading] = useState(false);
const [confirmLoading, setConfirmLoading] = useState(false);
const infoRef = useRef<any>({});
......@@ -71,14 +71,14 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
}
setInfoLoading(true);
PublicApi.getMemberValidateConfirmDetail({
memberId: id,
memberId: id,
validateId,
}).then(res => {
if (res.code !== 1000) {
return;
}
setBasicInfo(res.data);
infoRef.current.info = res.data;
infoRef.current.info = res.data;
}).finally(() => {
setInfoLoading(false);
});
......@@ -89,7 +89,7 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
useEffect(() => {
getBasicInfo();
}, []);
const tabList = [
{
key: 'basicInfo',
......@@ -119,7 +119,7 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
}
return {
data: {
ids: [],
ids: [],
},
};
};
......@@ -223,7 +223,7 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
const updateMenu = () => {
const menuIds: any = treeActions.getSelectKeys();
return PublicApi.postMemberValidateCommitUpdatemenu({
memberId: id,
memberId: id,
validateId,
menuIds,
}, {
......@@ -236,8 +236,8 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
const promises = [
// updateMenu(),
PublicApi.postMemberValidateConfirmSubmit({
memberId: id,
validateId,
memberId: id,
validateId,
...values,
}),
];
......@@ -264,11 +264,11 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
style={{ padding: '0' }}
onBack={() => history.goBack()}
title={
<HeadInfo
<HeadInfo
info={{
name: basicInfo?.name,
name: basicInfo?.name,
level: 1,
}}
}}
/>
}
extra={(
......@@ -285,11 +285,11 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
</>
)}
>
<Descriptions
size="small"
column={3}
style={{
padding: '0 32px',
<Descriptions
size="small"
column={3}
style={{
padding: '0 32px',
}}
>
<Descriptions.Item label="会员类型">{basicInfo?.memberTypeName}</Descriptions.Item>
......@@ -298,7 +298,7 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
<StatusTag type={MEMBER_OUTER_STATUS_TYPE[basicInfo?.outerStatus]} title={basicInfo?.outerStatusName} />
</Descriptions.Item>
<Descriptions.Item label="内部状态">
<Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[basicInfo?.innerStatus] || '#999999'} text={basicInfo?.innerStatusName} />
<Badge color={MEMBER_INNER_STATUS_BADGE_COLOR[basicInfo?.innerStatus] || '#909399'} text={basicInfo?.innerStatusName} />
</Descriptions.Item>
</Descriptions>
</PageHeader>
......@@ -312,26 +312,26 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
<>
<div
style={{
marginBottom: 24,
marginBottom: 24,
}}
>
<AuditProcess
<AuditProcess
outerVerifyCurrent={basicInfo?.currentOuterStep}
innerVerifyCurrent={basicInfo?.currentInnerStep}
outerVerifySteps={basicInfo?.outerVerifySteps}
outerVerifySteps={basicInfo?.outerVerifySteps}
innerVerifySteps={basicInfo?.innerVerifySteps}
/>
</div>
<BasicInfo
<BasicInfo
basic={{
account: basicInfo?.account,
phone: basicInfo?.phone,
email: basicInfo?.email,
created: basicInfo?.createTime,
account: basicInfo?.account,
phone: basicInfo?.phone,
email: basicInfo?.email,
created: basicInfo?.createTime,
}}
channel={{
memberType: undefined,
memberType: undefined,
}}
extra={basicInfo?.groups}
outerHistory={basicInfo?.history}
......@@ -389,11 +389,11 @@ const AuditPrComfirm: React.FC<QueryProps> = props => {
// 内部状态为 审核通过 才能选择 审核通过选项
if (infoRef.current.info.innerStatus !== MEMBER_INNER_STATUS_SUCCESS) {
modalFormActions.setFieldState('agree', (state: any) => {
const newEnum =
const newEnum =
state.props.enum.map(
(item: { label: string, value: any }) => ({
...item,
disabled: item.value === 1,
(item: { label: string, value: any }) => ({
...item,
disabled: item.value === 1,
})
);
FormPath.setIn(state, 'props.enum', newEnum);
......
src/pages/pageCustomized/channelTemplate/index.less
View file @ 58f5555f
......@@ -25,11 +25,11 @@
border-radius: 50%;
margin-bottom: 24px;
font-size: 22px;
color: #97A0AF;
color: #C0C4CC;
}
&>p {
color: #6B778C;
color: #909399;
}
}
......
src/pages/pageCustomized/components/templateItem/index.less
View file @ 58f5555f
......@@ -84,7 +84,7 @@
.template_info_name {
display: flex;
align-items: center;
color: #172B4D;
color: #303133;
font-weight: bold;
line-height: 24px;
padding: 16px 0;
......@@ -95,7 +95,7 @@
background: rgba(244, 245, 247, 1);
border-radius: 4px;
margin-left: 8px;
color: #42526E;
color: #606266;
font-weight: 400;
}
......@@ -121,12 +121,12 @@
}
&>label {
color: #6B778C;
color: #909399;
margin-right: 8px;
}
&>span {
color: #172B4D;
color: #303133;
}
}
}
......@@ -140,7 +140,7 @@
background: rgba(250, 251, 252, 1);
border: 1px solid rgba(235, 236, 240, 1);
cursor: pointer;
color: #42526E;
color: #606266;
font-size: 14px;
// margin-top: auto;
margin-left: auto;
......
src/pages/pageCustomized/components/toolBar/index.less
View file @ 58f5555f
......@@ -4,7 +4,7 @@
background-color: #FFF;
display: flex;
align-items: center;
border-bottom: 1px solid #42526E;
border-bottom: 1px solid #606266;
&_back_btn {
......@@ -12,19 +12,19 @@
height: 64px;
text-align: center;
line-height: 64px;
background-color: #42526E;
background-color: #606266;
color: #FFF;
cursor: pointer;
}
&_title {
color: #6B778C;
color: #909399;
padding-left: 12px;
font-size: 14px;
&>label {
color: #172B4D;
color: #303133;
font-size: 20px;
margin-left: 4px;
}
......
src/pages/pageCustomized/components/useModal/index.less
View file @ 58f5555f
......@@ -6,12 +6,12 @@
margin-bottom: 8px;
&>span {
color: #6B778C;
color: #909399;
}
&>label {
color: #172B4D;
color: #303133;
margin: 0 3px;
}
}
\ No newline at end of file
src/pages/pageCustomized/mallEdit/index.less
View file @ 58f5555f
......@@ -18,7 +18,7 @@
display: flex;
flex: 1;
justify-content: center;
background-color: #F5F5F5;
background-color: #F4F5F7;
height: calc(@content-height + 50px);
overflow: hidden;
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/AdvertSetting/index.tsx
View file @ 58f5555f
......@@ -291,6 +291,7 @@ const AdvertSetting: React.FC<AdvertSettingPropsType> = forwardRef((props, ref)
<UploadImage
imgUrl={item.picUrl}
size={getImgSize()}
fileMaxSize={500}
onChange={(val) => handleKeyChange(val, item.sort, 'picUrl')}
/>
</div>
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/BrandSetting/index.less
View file @ 58f5555f
......@@ -39,7 +39,7 @@
text-overflow: ellipsis;
white-space: nowrap;
font-size: 14px;
color: #172B4D;
color: #303133;
}
&_price {
......@@ -56,7 +56,7 @@
}
&_brief {
color: #6B778C;
color: #909399;
margin-top: 2px;
}
}
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/CategoryreCommendSetting/index.less
View file @ 58f5555f
......@@ -5,7 +5,7 @@
position: relative;
padding: 8px;
border-bottom: 1px solid #F4F5F7;
color: #42526E;
color: #606266;
font-size: 14px;
&::before {
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/GoodsSetting/index.less
View file @ 58f5555f
......@@ -24,7 +24,7 @@
text-overflow: ellipsis;
white-space: nowrap;
font-size: 14px;
color: #172B4D;
color: #303133;
}
&_price {
......@@ -41,7 +41,7 @@
}
&_brief {
color: #6B778C;
color: #909399;
margin-top: 2px;
}
}
......
src/pages/pageCustomized/settingsPanel/propsSettings/components/ShopSetting/index.less
View file @ 58f5555f
......@@ -26,7 +26,7 @@
text-overflow: ellipsis;
white-space: nowrap;
font-size: 14px;
color: #172B4D;
color: #303133;
}
&_price {
......@@ -43,7 +43,7 @@
}
&_brief {
color: #6B778C;
color: #909399;
margin-top: 2px;
}
}
......
src/pages/pageCustomized/shopCenterTemplate/index.less
View file @ 58f5555f
......@@ -25,11 +25,11 @@
border-radius: 50%;
margin-bottom: 24px;
font-size: 22px;
color: #97A0AF;
color: #C0C4CC;
}
&>p {
color: #6B778C;
color: #909399;
}
}
......
src/pages/pageCustomized/shopTemplate/index.less
View file @ 58f5555f
......@@ -25,11 +25,11 @@
border-radius: 50%;
margin-bottom: 24px;
font-size: 22px;
color: #97A0AF;
color: #C0C4CC;
}
&>p {
color: #6B778C;
color: #909399;
}
}
......
src/pages/pageCustomized/templateDetail/index.less
View file @ 58f5555f
......@@ -6,7 +6,7 @@
align-items: center;
.back_btn {
color: #6B778C;
color: #909399;
margin-left: 27px;
font-size: 16px;
margin-top: 40px;
......@@ -64,12 +64,12 @@
}
&>label {
color: #6B778C;
color: #909399;
}
&>span {
color: #172B4D;
color: #303133;
}
}
}
......@@ -82,7 +82,7 @@
height: 40px;
background: rgba(250, 251, 252, 1);
border: 1px solid rgba(235, 236, 240, 1);
color: #42526E;
color: #606266;
cursor: pointer;
line-height: 38px;
text-align: center;
......@@ -92,7 +92,7 @@
}
&.renovation {
background: #6B778C;
background: #909399;
color: #ffffff;
}
......
src/pages/requisition/components/index.less
View file @ 58f5555f
......@@ -51,7 +51,7 @@
}
&-name {
color : #172B4D;
color : #303133;
margin: 0 8px 0 12px;
}
}
......@@ -72,7 +72,7 @@
font-size : 14px;
font-family : PingFangSC-Regular, PingFang SC;
font-weight : 400;
color : #6B778C;
color : #909399;
padding-right: 20px;
// &:nth-of-type(n + 4) {
......@@ -106,7 +106,7 @@
}
.count{
font-size: 24px;
color: #172B4D;
color: #303133;
font-weight: 500;
}
.add-btn{
......@@ -153,7 +153,7 @@
font-size : 16px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color : #172B4D;
color : #303133;
padding : 20px 0;
}
......@@ -176,13 +176,13 @@
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #6B778C;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #172B4D;
color : #303133;
}
}
}
......@@ -208,13 +208,13 @@
font-size : 14px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color : #6B778C;
color : #909399;
&:nth-last-of-type(1) {
flex : 3;
padding-right: 20px;
box-sizing : border-box;
color : #172B4D;
color : #303133;
}
}
}
......
src/pages/ruleSettingManage/transactionRules/components/selectProcesss/index.tsx
View file @ 58f5555f
......@@ -9,7 +9,7 @@ import { findItemAndDelete } from '@/utils'
const SelectStyles = styled((props) => <div className='select-list' {...props}></div>)`
.select_style_border {
border: 1px solid #EBECF0;
border: 1px solid #EEF0F3;
margin-top: 20px;
display: flex;
align-items: center;
......@@ -71,7 +71,7 @@ const SelectProcesss = (props: ISchemaFieldComponentProps) => {
})
}, [])
const showDataSource = showMore ? dataSource : [...dataSource].splice(0, 3)
const showDataSource = showMore ? dataSource : [...dataSource].splice(0, 3)
const handleCheck = (id) => {
// if (editable) {
......@@ -102,33 +102,33 @@ const SelectProcesss = (props: ISchemaFieldComponentProps) => {
}
const renderProcessType = (v: any) => {
return <Tag color={ProcessTagColor[v.type-1]}>
{ProcessTagType[v.type-1]}
</Tag>
return <Tag color={ProcessTagColor[v.type - 1]}>
{ProcessTagType[v.type - 1]}
</Tag>
}
return (
<div style={{width: '100%'}}>
<div style={{ width: '100%' }}>
<SelectStyles>
{
showDataSource.map(v => <div key={v.id} onClick={() => handleCheck(v.id)} className={cx('select_style_border', isChecked(v.id) ? 'active' : '')}>
showDataSource.map(v => <div key={v.id} onClick={() => handleCheck(v.id)} className={cx('select_style_border', isChecked(v.id) ? 'active' : '')}>
<div>
<Row style={{color: '#172B4D'}}>
<Row style={{ color: '#303133' }}>
<Col>{v.name}</Col>
<Col style={{marginLeft: 6}}>
{
renderProcessType(v)
}
<Col style={{ marginLeft: 6 }}>
{
renderProcessType(v)
}
</Col>
</Row>
<div style={{color: '#6B778C'}}>{v.explain}</div>
<div style={{ color: '#909399' }}>{v.explain}</div>
</div>
</div>)
}
</SelectStyles>
{ dataSource.length > 3 &&
<div onClick={toogleMore} style={{textAlign: 'center', cursor: 'pointer'}}>
显示更多{showMore ? <CaretDownOutlined /> : <CaretUpOutlined/>}
{dataSource.length > 3 &&
<div onClick={toogleMore} style={{ textAlign: 'center', cursor: 'pointer' }}>
显示更多{showMore ? <CaretDownOutlined /> : <CaretUpOutlined />}
</div>
}
</div>
......
src/pages/ruleSettingManage/transactionRules/index.less
View file @ 58f5555f
......@@ -7,7 +7,7 @@
width: 80px;
height: 32px;
line-height: 32px;
background: #6B778C;
background: #909399;
color: #fff;
text-align: center;
cursor: pointer;
......
src/theme/style/colors.less
View file @ 58f5555f
......@@ -6,8 +6,8 @@
--mall_sub_color: rgba(211, 47, 47, 0.1);
--category_content_bg: #FFFFFF;
--category_content_title_text: #333333;
--category_content_sub_title_text: #666666;
--category_content_title_text: #303133;
--category_content_sub_title_text: #606266;
}
......@@ -27,6 +27,6 @@
--mall_sub_color: rgba(211, 47, 47, 0.1);
--category_content_bg: #FFFFFF;
--category_content_title_text: #333333;
--category_content_sub_title_text: #666666;
--category_content_title_text: #303133;
--category_content_sub_title_text: #606266;
}
\ No newline at end of file
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