Skip to content

J
jinfa-platform
Commit 5e4f227a authored by 前端-许佳敏's avatar 前端-许佳敏
Browse files
Options

Merge branch 'renovation' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into renovation

parents 9d9639da 37d5b721
Hide whitespace changes
Inline Side-by-side
Showing with 153 additions and 124 deletions
config/lingxi.theme.config.ts
View file @ 5e4f227a
......@@ -24,4 +24,15 @@ export default {
'tabs-hover-color': MAIN_FONT_BOLD_COLOR,
'tabs-active-color': MAIN_FONT_BOLD_COLOR,
'tabs-card-head-background': '#fff',
// Font-size
'@font-size-base': '12px',
'@font-size-lg': '14px',
'@font-size-sm': '12px',
// Layout
'@layout-header-height': '48px',
// PageHeader
// '@page-header-padding': '8px 24px', // 这里替换会出现前边拼接了 '6px 8px 24px'这样，所以直接改成修改样式好了
}
src/components/AvatarWrap/index.less
View file @ 5e4f227a
......@@ -16,7 +16,7 @@
&-name {
color: #303133;
margin: 0 8px 0 12px;
font-size: 20px;
font-size: 18px;
font-weight: 500;
}
}
src/components/Charts/Pie/index.less
View file @ 5e4f227a
......@@ -88,7 +88,7 @@
margin-bottom: 8px;
color: @text-color-secondary;
font-weight: normal;
font-size: 14px;
font-size: 12px;
line-height: 22px;
}
......
src/components/CitySelect/index.less
View file @ 5e4f227a
......@@ -14,7 +14,7 @@
display: flex;
align-items: center;
justify-content: center;
font-size: 16px;
font-size: 14px;
margin-right: 16px;
cursor: pointer;
......
src/components/DetailPage/index.less
View file @ 5e4f227a
......@@ -11,19 +11,19 @@
.title {
margin-left: 16px;
font-size: 20px;
font-size: 18px;
color: #303133;
font-weight: 500;
}
.back_btn {
color: #909399;
font-size: 16px;
font-size: 14px;
cursor: pointer;
padding-top: 3px;
&>span {
font-size: 14px;
font-size: 12px;
margin-left: 6px;
}
}
......
src/components/MediaLibrary/index.less
View file @ 5e4f227a
......@@ -34,7 +34,7 @@
line-height: 20px;
text-align: center;
font-weight: bold;
font-size: 16px;
font-size: 14px;
color: #fff;
background: @main-color;
position: absolute;
......
src/components/MellowCard/index.less
View file @ 5e4f227a
......@@ -9,7 +9,7 @@
&-title {
line-height: 24px;
padding-bottom: 0;
font-size: 16px;
font-size: 14px;
font-weight: 500;
color: rgba(23, 43, 77, 1);
}
......
src/components/NiceForm/components/CardCheckBox.tsx
View file @ 5e4f227a
......@@ -51,7 +51,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
font-size: 12px;
}
.card-checkbox-title {
font-size: 14px;
font-size: 12px;
color: #606266;
}
`
......
src/components/NiceForm/index.less
View file @ 5e4f227a
......@@ -5,7 +5,7 @@
background: #fff;
text-align: center;
line-height: 160px;
font-size: 20px;
font-size: 18px;
border-radius: 50%;
}
......@@ -39,12 +39,12 @@
align-items: center;
height: 32px;
color: rgba(0, 0, 0, 0.85);
font-size: 14px;
font-size: 12px;
&::before {
display: inline-block;
margin-right: 4px;
color: #ff4d4f;
font-size: 14px;
font-size: 12px;
font-family: SimSun, sans-serif;
line-height: 1;
content: '*';
......
src/components/RequireItem/index.less
View file @ 5e4f227a
......@@ -12,7 +12,7 @@
display: inline-block;
margin-left: 4px;
color: #ff4d4f;
font-size: 14px;
font-size: 12px;
font-family: SimSun, sans-serif;
line-height: 1;
content: '*';
......
src/components/StatusTag/index.less
View file @ 5e4f227a
.tag {
line-height: 22px;
padding: 0 8px;
font-size: 14px;
font-size: 12px;
font-weight: 400;
color: #00B37A;
background: #EBF7F2;
......
src/components/TabTree/index.less
View file @ 5e4f227a
......@@ -4,7 +4,7 @@
align-items: center;
height: 54px;
background: #fff;
font-size: 18px;
font-size: 16px;
font-weight: 700;
color: @main-font-bold-color;
}
......
src/components/TextLink/index.less
View file @ 5e4f227a
.link {
color: #909399;
font-size: 14px;
font-size: 12px;
cursor: pointer;
}
\ No newline at end of file
src/components/UploadModal/index.less
View file @ 5e4f227a
......@@ -5,20 +5,20 @@
list-style-type: decimal;
li{
color: #909399;
font-size: 14px;
font-size: 12px;
}
}
.step1Description{
h4{
height:22px;
font-size:14px;
font-size: 12px;
font-weight:500;
color:rgba(23,43,77,1);
line-height:22px;
}
p{
height:20px;
font-size:14px;
font-size: 12px;
font-weight:400;
color:rgba(107,119,140,1);
line-height:20px;
......
src/global/styles/global.less
View file @ 5e4f227a
......@@ -239,7 +239,7 @@ h6 {
.ant-tree .ant-tree-switcher .ant-tree-switcher-icon,
.ant-tree .ant-tree-switcher .ant-select-tree-switcher-icon {
font-size: 14px;
font-size: 12px;
}
.black-tabs {
......
src/global/styles/reset.less
View file @ 5e4f227a
......@@ -11,6 +11,10 @@
margin: 8px auto 32px auto;
}
.ant-page-header {
padding: 8px 24px;
}
.common_checkbox {
&:hover,
......@@ -186,7 +190,7 @@
.ant-tree .ant-tree-switcher .ant-tree-switcher-icon,
.ant-tree .ant-tree-switcher .ant-select-tree-switcher-icon {
font-size: 14px;
font-size: 12px;
}
.black-tabs {
......
src/layouts/styles/MenuSlider.less
View file @ 5e4f227a
.logo {
background: rgba(255, 255, 255, 1);
height: 64px;
height: 48px;
display: flex;
align-items: center;
justify-content: center;
position: relative;
overflow: hidden;
&>img {
& > img {
display: block;
margin: 0 auto;
height: 44px;
height: 40px;
max-width: 127px;
}
}
......@@ -32,7 +32,7 @@
.menuTitle {
height: 64px;
font-size: 14px;
font-size: 12px;
color: #909399;
display: flex;
align-items: center;
......
src/layouts/styles/UserLayouts.less
View file @ 5e4f227a
......@@ -29,7 +29,7 @@
// footer
.@{prefix}-user-footer {
padding: 32px 0;
font-size: 14px;
font-size: 12px;
color: #C0C4CC;
text-align: center;
&.fixed {
......
src/pages/channel/channelInfo/index.less
View file @ 5e4f227a
......@@ -36,7 +36,7 @@
width: 572px;
color: #909399;
margin-top: 16px;
font-size: 14px;
font-size: 12px;
display: flex;
&>label {
......
src/pages/channel/components/templateItem/index.less
View file @ 5e4f227a
......@@ -62,7 +62,7 @@
color: #ffffff;
text-align: center;
line-height: 24px;
font-size: 14px;
font-size: 12px;
background: #4279DF;
border-radius: 8px 0px 8px 0px;
z-index: 3;
......@@ -112,7 +112,7 @@
.template_info_content_text_wrap {
flex: 1;
font-size: 14px;
font-size: 12px;
line-height: 22px;
.template_info_content_text_line {
......@@ -149,7 +149,7 @@
border: 1px solid rgba(235, 236, 240, 1);
cursor: pointer;
color: #606266;
font-size: 14px;
font-size: 12px;
// margin-top: auto;
margin-left: auto;
......
src/pages/channel/templateDetail/index.less
View file @ 5e4f227a
......@@ -8,7 +8,7 @@
.back_btn {
color: #909399;
margin-left: 27px;
font-size: 16px;
font-size: 14px;
margin-top: 40px;
cursor: pointer;
align-self: flex-start;
......@@ -35,7 +35,7 @@
color: #ffffff;
text-align: center;
line-height: 24px;
font-size: 14px;
font-size: 12px;
background: #4279DF;
border-radius: 8px 0px 8px 0px;
z-index: 3;
......
src/pages/commodity/goods/index.less
View file @ 5e4f227a
......@@ -5,20 +5,20 @@
list-style-type: decimal;
li{
color: #909399;
font-size: 14px;
font-size: 12px;
}
}
.step1Description{
h4{
height:22px;
font-size:14px;
font-size: 12px;
font-weight:500;
color:rgba(23,43,77,1);
line-height:22px;
}
p{
height:20px;
font-size:14px;
font-size: 12px;
font-weight:400;
color:rgba(107,119,140,1);
line-height:20px;
......
src/pages/commodity/products/index.less
View file @ 5e4f227a
......@@ -5,20 +5,20 @@
list-style-type: decimal;
li{
color: #909399;
font-size: 14px;
font-size: 12px;
}
}
.step1Description{
h4{
height:22px;
font-size:14px;
font-size: 12px;
font-weight:500;
color:rgba(23,43,77,1);
line-height:22px;
}
p{
height:20px;
font-size:14px;
font-size: 12px;
font-weight:400;
color:rgba(107,119,140,1);
line-height:20px;
......
src/pages/commodity/products/viewDirectChannel.tsx
View file @ 5e4f227a
......@@ -147,7 +147,7 @@ const ViewDriectChannel: React.FC<{}> = () => {
<Card headStyle={{borderBottom:'none'}} title="商品信息">
<p>
<Avatar size={48} shape="square" src={channelDetails?.channelCommodity?.commodity?.mainPic} />
<span style={{color:'rgba(23,43,77,1)',fontSize:20,fontWeight:500,marginLeft:16}}>{channelDetails?.name}</span>
<span style={{color:'rgba(23,43,77,1)',fontSize:18,fontWeight:500,marginLeft:16}}>{channelDetails?.name}</span>
<span style={{color:'#E63F3B',padding:'2px 5px',background:'rgba(255,235,230,1)',borderRadius:'4px',marginLeft:16,marginRight:16}}>{channelDetails?.channelCommodity?.source === 1 ? "上级渠道" : "渠道自有"}</span>
{/* <a>去查看 &gt;</a> */}
<a
......
src/pages/editor/channelEdit/index.less
View file @ 5e4f227a
......@@ -34,7 +34,7 @@
.loading_text {
margin-top: 16px;
font-size: 16px;
font-size: 14px;
font-weight: bold;
}
}
\ No newline at end of file
src/pages/editor/components/SettingList/index.less
View file @ 5e4f227a
......@@ -71,7 +71,7 @@
line-height: 36px;
background: rgba(0, 0, 0, 0.65);
color: #ffffff;
font-size: 16px;
font-size: 14px;
text-align: center;
cursor: pointer;
}
......
src/pages/editor/components/SettingPanel/index.less
View file @ 5e4f227a
......@@ -10,7 +10,7 @@
flex-grow: 1;
padding: 24px;
overflow: auto;
font-size: 14px;
font-size: 12px;
line-height: 1.5715;
}
......
src/pages/editor/components/templateItem/index.less
View file @ 5e4f227a
......@@ -62,7 +62,7 @@
color: #ffffff;
text-align: center;
line-height: 24px;
font-size: 14px;
font-size: 12px;
background: #4279DF;
border-radius: 8px 0px 8px 0px;
z-index: 3;
......@@ -112,7 +112,7 @@
.template_info_content_text_wrap {
flex: 1;
font-size: 14px;
font-size: 12px;
line-height: 22px;
.template_info_content_text_line {
......@@ -141,7 +141,7 @@
border: 1px solid rgba(235, 236, 240, 1);
cursor: pointer;
color: #606266;
font-size: 14px;
font-size: 12px;
// margin-top: auto;
margin-left: auto;
......
src/pages/editor/components/toolBar/index.less
View file @ 5e4f227a
......@@ -21,11 +21,11 @@
color: #909399;
padding-left: 12px;
font-size: 14px;
font-size: 12px;
&>label {
color: #303133;
font-size: 20px;
font-size: 18px;
margin-left: 4px;
}
}
......
src/pages/editor/settingsPanel/propsSettings/Animate/index.less
View file @ 5e4f227a
......@@ -17,7 +17,7 @@
.select-box, .animate-btn {
height: 24px;
font-family: PingFang-SC-Regular;
font-size: 14px;
font-size: 12px;
letter-spacing: 0.2px;
color: #555;
border-radius: 2px;
......
src/pages/editor/settingsPanel/propsSettings/components/BrandSetting/index.less
View file @ 5e4f227a
......@@ -38,13 +38,13 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 14px;
font-size: 12px;
color: #303133;
}
&_price {
color: #D32F2F;
font-size: 14px;
font-size: 12px;
margin-top: 8px;
margin-bottom: 4px;
......
src/pages/editor/settingsPanel/propsSettings/components/CategoryreCommendSetting/index.less
View file @ 5e4f227a
......@@ -6,7 +6,7 @@
padding: 8px;
border-bottom: 1px solid #F4F5F7;
color: #606266;
font-size: 14px;
font-size: 12px;
&::before {
position: absolute;
......
src/pages/editor/settingsPanel/propsSettings/components/GoodsSetting/index.less
View file @ 5e4f227a
......@@ -23,13 +23,13 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 14px;
font-size: 12px;
color: #303133;
}
&_price {
color: #D32F2F;
font-size: 14px;
font-size: 12px;
margin-top: 8px;
margin-bottom: 4px;
......
src/pages/editor/settingsPanel/propsSettings/components/ShopSetting/index.less
View file @ 5e4f227a
......@@ -25,13 +25,13 @@
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
font-size: 14px;
font-size: 12px;
color: #303133;
}
&_price {
color: #D32F2F;
font-size: 14px;
font-size: 12px;
margin-top: 8px;
margin-bottom: 4px;
......
src/pages/editor/shopEdit/index.less
View file @ 5e4f227a
......@@ -34,7 +34,7 @@
.loading_text {
margin-top: 16px;
font-size: 16px;
font-size: 14px;
font-weight: bold;
}
}
\ No newline at end of file
src/pages/index.tsx
View file @ 5e4f227a
......@@ -5,10 +5,19 @@ import { Modal } from 'antd';
class Index extends Component<{}, {}> {
render() {
return <div>
index
<Link to="/memberCenter/home">会员中心</Link>
</div>
return (
<div
style={{
margin: '-24px',
}}
>
<img
src="https://shushangyun01.oss-cn-shenzhen.aliyuncs.com/a121f49434074532837012acf75e52011601275036112.png"
width="100%"
height="auto"
/>
</div>
)
}
}
......
src/pages/member/components/EquityInfo/index.less
View file @ 5e4f227a
......@@ -13,7 +13,7 @@
&-title {
margin-bottom: 20px;
line-height: 24px;
font-size: 16px;
font-size: 14px;
font-weight: 500;
color: rgba(23, 43, 77, 1);
}
......@@ -50,7 +50,7 @@
&-title {
margin-bottom: 9px;
line-height: 22px;
font-size: 14px;
font-size: 12px;
font-weight: 400;
color: rgba(23, 43, 77, 1);
text-align: center;
......@@ -69,7 +69,7 @@
&-tag {
line-height: 22px;
padding: 0 6px;
font-size: 14px;
font-size: 12px;
font-weight: 400;
text-align: center;
border-radius: 4px;
......@@ -107,7 +107,7 @@
&-title {
line-height: 20px;
margin-bottom: 24px;
font-size: 14px;
font-size: 12px;
font-weight: 400;
color: rgba(107, 119, 140, 1);
}
......
src/pages/member/components/SincerityInfo/index.less
View file @ 5e4f227a
......@@ -39,7 +39,7 @@
.title {
margin-bottom: 20px;
line-height: 20px;
font-size: 14px;
font-size: 12px;
font-weight: 400;
color: rgba(107, 119, 140, 1);
......
src/pages/member/components/StatusTag/index.less
View file @ 5e4f227a
.tag {
line-height: 22px;
padding: 0 8px;
font-size: 14px;
font-size: 12px;
font-weight: 400;
color: #00B37A;
background: #EBF7F2;
......
src/pages/member/memberImport/importDetail.tsx
View file @ 5e4f227a
......@@ -52,7 +52,7 @@ const ImportDetail: React.FC<{}> = () => {
name: memberInfo?.name,
}}
extra={(
<span style={{ fontSize: 14, fontWeight: 'normal' }}>{memberInfo?.levelTag}</span>
<span style={{ fontSize: 12, fontWeight: 'normal' }}>{memberInfo?.levelTag}</span>
)}
/>
}
......
src/pages/member/memberLevel/addEquity.less
View file @ 5e4f227a
.headerTop {
display: flex;
align-items: center;
font-size: 20px;
font-size: 18px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
......@@ -28,7 +28,7 @@
background-color: #FFEBE6;
border-radius: 4px;
color: #E63F3B;
font-size: 14px;
font-size: 12px;
font-weight: 400;
text-align: center;
}
......@@ -47,7 +47,7 @@
display: flex;
width: calc(100% / 3);
margin-bottom: 17px;
font-size: 14px;
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #909399;
......
src/pages/repositories/index.less
View file @ 5e4f227a
......@@ -42,7 +42,7 @@
height: 160px;
line-height: 160px;
text-align: center;
font-size: 20px;
font-size: 18px;
font-weight: bold;
}
}
......
src/pages/shop/components/templateItem/index.less
View file @ 5e4f227a
......@@ -62,7 +62,7 @@
color: #ffffff;
text-align: center;
line-height: 24px;
font-size: 14px;
font-size: 12px;
background: #4279DF;
border-radius: 8px 0px 8px 0px;
z-index: 3;
......@@ -112,7 +112,7 @@
.template_info_content_text_wrap {
flex: 1;
font-size: 14px;
font-size: 12px;
line-height: 22px;
.template_info_content_text_line {
......@@ -149,7 +149,7 @@
border: 1px solid rgba(235, 236, 240, 1);
cursor: pointer;
color: #606266;
font-size: 14px;
font-size: 12px;
// margin-top: auto;
margin-left: auto;
......
src/pages/shop/shopInfo/index.less
View file @ 5e4f227a
......@@ -36,7 +36,7 @@
width: 572px;
color: #909399;
margin-top: 16px;
font-size: 14px;
font-size: 12px;
display: flex;
&>label {
......
src/pages/shop/templateDetail/index.less
View file @ 5e4f227a
......@@ -8,7 +8,7 @@
.back_btn {
color: #909399;
margin-left: 27px;
font-size: 16px;
font-size: 14px;
margin-top: 40px;
cursor: pointer;
align-self: flex-start;
......@@ -35,7 +35,7 @@
color: #ffffff;
text-align: center;
line-height: 24px;
font-size: 14px;
font-size: 12px;
background: #4279DF;
border-radius: 8px 0px 8px 0px;
z-index: 3;
......
src/pages/systemSetting/collection/index.less
View file @ 5e4f227a
......@@ -60,7 +60,7 @@
position: relative;
&_name {
font-size: 14px;
font-size: 12px;
color: #303133;
font-weight: 500;
}
......@@ -76,7 +76,7 @@
margin-right: 16px;
&>span {
font-size: 14px;
font-size: 12px;
color: #303133;
line-height: 20px;
......@@ -116,7 +116,7 @@
}
.collection_state {
font-size: 14px;
font-size: 12px;
color: #00B37A;
cursor: pointer;
......@@ -131,7 +131,7 @@
:global {
.ant-rate {
font-size: 14px;
font-size: 12px;
}
}
}
......@@ -241,7 +241,7 @@
}
&_name {
font-size: 14px;
font-size: 12px;
color: #303133;
font-weight: 500;
}
......@@ -257,7 +257,7 @@
margin-right: 16px;
&>span {
font-size: 14px;
font-size: 12px;
color: #303133;
line-height: 20px;
......@@ -306,7 +306,7 @@
}
.collection_state {
font-size: 14px;
font-size: 12px;
color: #00B37A;
cursor: pointer;
......@@ -321,7 +321,7 @@
:global {
.ant-rate {
font-size: 14px;
font-size: 12px;
}
}
}
......@@ -381,7 +381,7 @@
&_name {
font-size: 14px;
font-size: 12px;
color: #303133;
font-weight: 500;
height: 44px;
......@@ -431,7 +431,7 @@
}
.collection_state {
font-size: 14px;
font-size: 12px;
color: #00B37A;
cursor: pointer;
......
src/pages/transaction/components/OrderDetailHeader/index.less
View file @ 5e4f227a
......@@ -12,7 +12,7 @@
.titleAvatorText {
color: #303133;
font-size: 20px;
font-size: 18px;
line-height: 20px;
}
......
src/pages/transaction/electronicContracts/addContract/index.less
View file @ 5e4f227a
......@@ -32,7 +32,7 @@
:global {
.anticon-file-word {
color: #4279df;
font-size: 20px;
font-size: 18px;
margin-right: 8px;
}
}
......
src/pages/transaction/electronicContracts/apply/index.less
View file @ 5e4f227a
......@@ -9,7 +9,7 @@
.status {
color: #FFFFFF;
font-size: 16px;
font-size: 14px;
width: 195px;
}
......
src/pages/transaction/electronicContracts/components/index.less
View file @ 5e4f227a
......@@ -12,7 +12,7 @@
.info_wran {
color: #909399;
font-size: 14px;
font-size: 12px;
padding-bottom: 8px;
}
......@@ -98,7 +98,7 @@
.info_item_title {
position: relative;
padding: 12px 0px 12px 8px;
font-size: 14px;
font-size: 12px;
color: #606266;
border-bottom: 1px solid #EEF0F3;
......@@ -121,7 +121,7 @@
.item_con {
padding: 12px 0px;
display: flex;
font-size: 14px;
font-size: 12px;
.item_label {
width: 176px;
......
src/pages/transaction/enquiryOffer/components/index.css
View file @ 5e4f227a
......@@ -41,7 +41,7 @@
box-sizing: border-box;
}
.mainCol-title {
font-size: 16px;
font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #303133;
......@@ -62,7 +62,7 @@
}
.mainCol-row-col-option {
flex: 1;
font-size: 14px;
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #909399;
......@@ -89,7 +89,7 @@
}
.mainCol-rows-cols .cols-main-options {
flex: 1;
font-size: 14px;
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #909399;
......
src/pages/transaction/enquiryOffer/toAddSubmit/detail.tsx
View file @ 5e4f227a
......@@ -111,7 +111,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
font-size: 12px;
}
.card-checkbox-title {
font-size: 14px;
font-size: 12px;
color: #606266;
}
`
......
src/pages/transaction/enquiryOfferConfirm/components/index.css
View file @ 5e4f227a
......@@ -41,7 +41,7 @@
box-sizing: border-box;
}
.mainCol-title {
font-size: 16px;
font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #303133;
......@@ -62,7 +62,7 @@
}
.mainCol-row-col-option {
flex: 1;
font-size: 14px;
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #909399;
......@@ -89,7 +89,7 @@
}
.mainCol-rows-cols .cols-main-options {
flex: 1;
font-size: 14px;
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #909399;
......
src/pages/transaction/enquirySubmit/components/index.css
View file @ 5e4f227a
......@@ -41,7 +41,7 @@
box-sizing: border-box;
}
.mainCol-title {
font-size: 16px;
font-size: 14px;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: #303133;
......@@ -62,7 +62,7 @@
}
.mainCol-row-col-option {
flex: 1;
font-size: 14px;
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #909399;
......@@ -89,7 +89,7 @@
}
.mainCol-rows-cols .cols-main-options {
flex: 1;
font-size: 14px;
font-size: 12px;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: #909399;
......
src/pages/transaction/enquirySubmit/toAddSubmit/detail.tsx
View file @ 5e4f227a
......@@ -110,7 +110,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
font-size: 12px;
}
.card-checkbox-title {
font-size: 14px;
font-size: 12px;
color: #606266;
}
`
......
src/pages/transaction/purchaseOrder/orderPreview/components/orderMergeInfo/index.less
View file @ 5e4f227a
.card-list {
font-size: 14px;
font-size: 12px;
line-height: 20px;
margin-top: 24px;
}
.card-list_title {
font-size: 14px;
font-size: 12px;
color: #909399;
}
......
src/pages/transaction/purchaseOrder/orderPreview/components/orderPayModal/index.less
View file @ 5e4f227a
......@@ -3,7 +3,7 @@
padding: 4px 6px;
background: #fff;
text-align: center;
font-size: 14px;
font-size: 12px;
color: #606266;
border:1px solid rgba(235,236,240,1);
cursor: pointer;
......
src/pages/transaction/purchaseOrder/orderPreview/components/orderPayModal/index.tsx
View file @ 5e4f227a
......@@ -140,7 +140,7 @@ const OrderPayModal: React.FC<OrderPayModalProps> = (props) => {
>
{current === 0 &&
transformPayList && Object.entries(transformPayList).map(([key, value]) => <Row key={key} style={{ marginBottom: 24 }}>
<Col span={6} style={{ color: '#909399', fontSize: 14 }}>{payTextList[key]}</Col>
<Col span={6} style={{ color: '#909399', fontSize: 12 }}>{payTextList[key]}</Col>
<Col style={{ flex: 1 }}>
<div className={style.radioBox}>
{
......
src/pages/transaction/purchaseOrder/orderPreview/components/orderPayTabs/index.less
View file @ 5e4f227a
......@@ -11,7 +11,7 @@
}
.smallnumber {
font-size: 16px;
font-size: 14px;
color: #303133;
line-height: 24px;
}
\ No newline at end of file
src/pages/transaction/purchaserEvaluation/components/EvaluationList/index.tsx
View file @ 5e4f227a
......@@ -69,7 +69,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
&-title {
line-height: 14px;
margin-bottom: 18px;
font-size: 14px;
font-size: 12px;
font-weight: 400;
color: #303133;
}
......@@ -84,7 +84,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
&-price {
line-height: 14px;
font-size: 14px;
font-size: 12px;
font-weight: 500;
color: #303133;
}
......
src/pages/transaction/purchaserEvaluation/components/RecordList/index.less
View file @ 5e4f227a
......@@ -18,7 +18,7 @@
&-name {
line-height: 14px;
margin-bottom: 13px;
font-size: 14px;
font-size: 12px;
font-weight: 400;
}
......
src/pages/transaction/purchaserEvaluation/components/Shelves/index.less
View file @ 5e4f227a
......@@ -5,7 +5,7 @@
line-height: 14px;
padding: 12px;
position: relative;
font-size: 14px;
font-size: 12px;
font-weight: 400;
color: #606266;
border-bottom: 1px solid #EEF0F3;
......
src/pages/transaction/saleOrder/orderPreview/components/orderMergeInfo/index.less
View file @ 5e4f227a
.card-list {
font-size: 14px;
font-size: 12px;
line-height: 20px;
margin-top: 24px;
}
.card-list_title {
font-size: 14px;
font-size: 12px;
color: #909399;
}
......
src/pages/transaction/saleOrder/orderPreview/components/orderPayTabs/index.less
View file @ 5e4f227a
......@@ -11,7 +11,7 @@
}
.smallnumber {
font-size: 16px;
font-size: 14px;
color: #303133;
line-height: 24px;
}
\ No newline at end of file
src/pages/transaction/supplierEvaluation/components/EvaluationList/index.tsx
View file @ 5e4f227a
......@@ -69,7 +69,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
&-title {
line-height: 14px;
margin-bottom: 18px;
font-size: 14px;
font-size: 12px;
font-weight: 400;
color: #303133;
}
......@@ -84,7 +84,7 @@ const RowStyleLayout = styled(props => <div {...props} />)`
&-price {
line-height: 14px;
font-size: 14px;
font-size: 12px;
font-weight: 500;
color: #303133;
}
......
src/pages/transaction/supplierEvaluation/components/RecordList/index.less
View file @ 5e4f227a
......@@ -18,7 +18,7 @@
&-name {
line-height: 14px;
margin-bottom: 13px;
font-size: 14px;
font-size: 12px;
font-weight: 400;
}
......
src/pages/transaction/supplierEvaluation/components/Shelves/index.less
View file @ 5e4f227a
......@@ -5,7 +5,7 @@
line-height: 14px;
padding: 12px;
position: relative;
font-size: 14px;
font-size: 12px;
font-weight: 400;
color: #606266;
border-bottom: 1px solid #EEF0F3;
......
src/pages/transaction/supplierEvaluation/unevaluated/evaluate/schema/index.ts
View file @ 5e4f227a
......@@ -2,7 +2,7 @@
* @Author: XieZhiXiong
* @Date: 2020-09-23 17:00:24
* @LastEditors: XieZhiXiong
* @LastEditTime: 2020-09-23 18:06:56
* @LastEditTime: 2020-09-28 14:38:20
* @Description:
*/
import { ISchema } from '@formily/antd';
......@@ -68,7 +68,7 @@ export const evaluateSchema: ISchema = {
'x-component': 'Upload',
'x-component-props': {
listType: 'card',
action: '/api/file/upload/prefix',
action: '/api/file/file/upload/prefix',
data: {
fileType: UPLOAD_TYPE,
prefix: '/test/',
......
src/pages/user/index.less
View file @ 5e4f227a
......@@ -32,7 +32,7 @@
.clickUsernameLogin {
.ab-position(right, top, 8, 8);
font-size: 14px;
font-size: 12px;
color: rgba(107, 119, 140, 1);
}
......@@ -306,7 +306,7 @@
}
p {
font-size: 14px;
font-size: 12px;
color: rgba(66, 82, 110, 1);
line-height: 22px;
}
......
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