Commit b1f6a656 authored by Bill's avatar Bill

Merge branch 'dev' into test

parents 1509e360 7f395123
...@@ -56,15 +56,22 @@ const LatestAnnouces: React.FC = () => { ...@@ -56,15 +56,22 @@ const LatestAnnouces: React.FC = () => {
setVisible(true) setVisible(true)
setCurrnetNotice(row) setCurrnetNotice(row)
} }
const length = data.length;
return ( return (
<div className={styles.announces}> <div className={styles.announces}>
<div className={styles.header}> <div className={styles.header}>
<div className={styles.title}>最新公告</div> <div className={styles.title}>最新公告</div>
{
length >= 6
? (
<div className={styles.nextOrPreview}> <div className={styles.nextOrPreview}>
<Button onClick={handlePrev} icon={<LeftOutlined/>} className={styles.prev} disabled={pagination.current <= 1}></Button> <Button onClick={handlePrev} icon={<LeftOutlined/>} className={styles.prev} disabled={pagination.current <= 1}></Button>
<Button onClick={handleNext} icon={<RightOutlined/>} disabled={pagination.current * 5 >= totalCount}></Button> <Button onClick={handleNext} icon={<RightOutlined/>} disabled={pagination.current * 5 >= totalCount}></Button>
</div> </div>
)
: null
}
</div> </div>
<div className={styles.body}> <div className={styles.body}>
{ {
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
.quoted_price_btn { .quoted_price_btn {
width: 140px; width: 140px;
height: 32px; height: 32px;
background-color: #D32F2F; background-color: var(--mall_main_color);
color: #ffffff; color: #ffffff;
font-size: 14px; font-size: 14px;
text-align: center; text-align: center;
......
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