Merge branch 'dev' into test

src/pages/home/components/LatestAnnounces/index.tsx

@@ -56,15 +56,22 @@ const LatestAnnouces: React.FC = () => {
     setVisible(true)
     setCurrnetNotice(row)
   }
-
+  const length = data.length;
   return (
     <div className={styles.announces}>
       <div className={styles.header}>
         <div className={styles.title}>最新公告</div>
-        <div className={styles.nextOrPreview}>
-          <Button onClick={handlePrev} icon={<LeftOutlined/>} className={styles.prev} disabled={pagination.current <= 1}></Button>
-          <Button onClick={handleNext} icon={<RightOutlined/>} disabled={pagination.current * 5 >= totalCount}></Button>
-        </div>
+        {
+          length >= 6
+          ? (
+            <div className={styles.nextOrPreview}>
+              <Button onClick={handlePrev} icon={<LeftOutlined/>} className={styles.prev} disabled={pagination.current <= 1}></Button>
+              <Button onClick={handleNext} icon={<RightOutlined/>} disabled={pagination.current * 5 >= totalCount}></Button>
+            </div>
+          )
+          : null
+        }
+
       </div>
       <div className={styles.body}>
         {

src/pages/lxMall/purchaseOnline/list.less

@@ -66,7 +66,7 @@
       .quoted_price_btn {
         width: 140px;
         height: 32px;
-        background-color: #D32F2F;
+        background-color: var(--mall_main_color);
         color: #ffffff;
         font-size: 14px;
         text-align: center;
@@ -183,4 +183,4 @@
     }
   }
 
-}
+}
\ No newline at end of file