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

src/pages/transaction/saleOrder/agentPurchaseOrder/commodity/index.less

@@ -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;
             }
           }
         }

src/pages/transaction/saleOrder/agentPurchaseOrder/commodityDetail/index.less

@@ -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;
               }
 

src/pages/transaction/saleOrder/agentPurchaseOrder/commodityDetail/index.tsx

@@ -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>
               </>