Commit 296f2b01 authored by 许佳敏's avatar 许佳敏

Merge branch 'fix-0418-style' into 'v2-220418'

fix: 修复进货单代客下单页面样式问题 See merge request linkseeks-design/pro-platform!576 (cherry picked from commit 60888b07) d0202160 fix: 修复进货单代客下单页面样式问题 7aee21b1 style: 修改商品列表分页的样式
parent 5221faa8
......@@ -6,6 +6,13 @@
// background-color: #F7F8FA;
:global {
.mall_search_box {
overflow: hidden;
.ant-input {
background-color: #ffffff!important;
}
}
.image_box {
position: relative;
display: inline-block;
......@@ -50,6 +57,12 @@
max-width: 1200px;
// margin: 0 auto;
:global {
.filter_category .ant-tree-title a {
color: #303133!important;
}
}
.commodity_main {
flex: 1;
margin-left: 16px;
......@@ -60,6 +73,7 @@
:global {
.ant-pagination-item {
background-color: #FFF!important;
&:hover,
&:active {
......@@ -72,17 +86,17 @@
}
.ant-pagination-item-active {
background-color: @mainColor;
background-color: @mainColor!important;
border-color: @mainColor;
&:hover {
&>a {
color: #ffffff !important;
color: #ffffff!important;
}
}
&>a {
color: #ffffff;
color: #ffffff!important;
}
}
}
......
......@@ -232,8 +232,6 @@
justify-content: center;
align-items: center;
font-size: 14px;
color: @mainColor;
background-color: #EBF9F6;
cursor: pointer;
border-radius: 4px;
border: none;
......@@ -248,7 +246,7 @@
}
&.buy {
background-color: @mainColor;
background-color: @mainColor!important;
color: #FFF;
}
......
......@@ -489,11 +489,11 @@ const CommodityDetail: React.FC = (props: any) => {
if (currentSku && currentSku.stockNum > 0) {
return (
<>
<Button disabled={!inAreaState} className={cx(styles.product_info_btn_item, styles.buy)} onClick={() => handleAddToPurchase()}>
<Button type="primary" disabled={!inAreaState} className={cx(styles.product_info_btn_item)} onClick={() => handleAddToPurchase()}>
<IconFont type="icon-xiadan" />
<span>{getMessage('commodityDetail.index.AddPurchaseOrder')}</span>
</Button>
<Button disabled={!inAreaState} className={cx(styles.product_info_btn_item, styles.add)} onClick={() => history.push('/memberCenter/order/saleOrder/agentPurchaseOrder/commodity')}>
<Button className={cx(styles.product_info_btn_item, styles.add)} onClick={() => history.push('/memberCenter/order/saleOrder/agentPurchaseOrder/commodity')}>
<span>{getMessage('commodityDetail.index.selectCommodity')}</span>
</Button>
</>
......
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