Merge branch 'master' of git.quantgroup.cn:ui/merchant-manage-ui into...

Merge branch 'master' of git.quantgroup.cn:ui/merchant-manage-ui into feature/multiLogistics20221104

src/pages/Admin/index.jsx

@@ -36,7 +36,7 @@ const Admin = props => {
         </div>
         <div style={{ marginTop: '20px' }}>
           <Row className={style.orderContent}>
-            {showPendingDeliveryOrderList || showCancelBillList ? (
+            {showPendingDeliveryOrderList || showAfterSaleList ? (
               <Col span={2} className="titleOne">
                 <div>
                   <FileTextOutlined />
@@ -74,7 +74,7 @@ const Admin = props => {
             ) : (
               ''
             )}
-            {showCancelBillList ? (
+            {showAfterSaleList ? (
               <Col span={4}>
                 <Link
                   to={{

src/pages/orderManage/pendingDeliveryOrder/index.less

 @import '~antd/es/style/themes/default.less';
 
+.protable {
+  :global {
+    .tableContent {
+      display: flex;
+      align-items: center;
+      height: 60px;
+      padding: 16px;
+    }
+    .border {
+      border-bottom: 1px solid #e8e8e8;
+    }
+    tbody .colStyle {
+      padding: 0;
+    }
+    .ant-popover-title {
+      max-width: 300px;
+      overflow: hidden;
+    }
+  }
+}
+.tabpane {
+  :global {
+    .ant-tabs-content {
+      min-height: 200px;
+      max-height: 700px;
+      overflow: auto;
+    }
+  }
+}
+.btnWarning {
+  background-color: rgb(247, 143, 74);
+  border-color: rgb(247, 143, 74);
+}
+.btnWarning:hover,
+.btnWarning:focus {
+  background-color: rgb(253, 168, 111);
+  border-color: rgb(253, 168, 111);
+}
+
 .tableList {
   .tableListOperator {
     margin-bottom: 16px;

src/pages/orderManage/pendingDeliveryOrder/styles.less

-.protable {
-  :global {
-    .tableContent {
-      display: flex;
-      align-items: center;
-      height: 60px;
-      padding: 16px;
-    }
-    .border {
-      border-bottom: 1px solid #e8e8e8;
-    }
-    tbody .colStyle {
-      padding: 0;
-    }
-    .ant-popover-title {
-      max-width: 300px;
-      overflow: hidden;
-    }
-  }
-}
-.tabpane {
-  :global {
-    .ant-tabs-content {
-      min-height: 200px;
-      max-height: 700px;
-      overflow: auto;
-    }
-  }
-}
-.btnWarning {
-  background-color: rgb(247, 143, 74);
-  border-color: rgb(247, 143, 74);
-}
-.btnWarning:hover,
-.btnWarning:focus {
-  background-color: rgb(253, 168, 111);
-  border-color: rgb(253, 168, 111);
-}