Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev

src/global/config/global.d.ts

@@ -50,7 +50,7 @@ export interface ShopInfo {
 	type: number;
 	environment: number;
 	logoUrl: string;
-	describe?: any;
+	describe: string;
 	state: number;
 	url: string;
 }

src/pages/member/memberMaintain/index.tsx

@@ -54,12 +54,15 @@ const memberMaintain: React.FC<[]> = () => {
 
   const fetchData = async (params: any) => {
     const { startDate, endDate } = params;
-    const payload = params;
-    const res = await PublicApi.getMemberMaintenancePage({
-      ...params, 
-      startDate: startDate ? +startDate : null, 
-      endDate: endDate ? +endDate : null, 
-    });
+    const payload = { ...params };
+
+    if (startDate) {
+      payload.startDate = moment(+startDate).format('YYYY-MM-DD');
+    }
+    if (endDate) {
+      payload.endDate = moment(+endDate).format('YYYY-MM-DD');
+    }
+    const res = await PublicApi.getMemberMaintenancePage(payload);
     if (res.code === 1000) {
       return res.data;
     }

src/pages/member/memberPr1/index.tsx

@@ -11,6 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { PublicApi } from '@/services/api';
+import moment from 'moment';
 import { auditSchema } from '../schema/auditSchema';
 import { 
   MEMBER_STATUS_TAG_MAP, 
@@ -126,7 +127,16 @@ const MemberPr1: React.FC<{}> = props => {
   };
 
   const fetchListData = async (params: any) => {
-    let res = await PublicApi.getMemberValidateStep1Page(params);
+    const { startDate, endDate } = params;
+    const payload = { ...params };
+
+    if (startDate) {
+      payload.startDate = moment(+startDate).format('YYYY-MM-DD');
+    }
+    if (endDate) {
+      payload.endDate = moment(+endDate).format('YYYY-MM-DD');
+    }
+    let res = await PublicApi.getMemberValidateStep1Page(payload);
     return res.data;
   };
 

src/pages/member/memberPr2/index.tsx

@@ -11,6 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { PublicApi } from '@/services/api';
+import moment from 'moment';
 import { auditSchema } from '../schema/auditSchema';
 import { 
   MEMBER_STATUS_TAG_MAP, 
@@ -126,7 +127,16 @@ const MemberPr2: React.FC<{}> = props => {
   };
 
   const fetchListData = async (params: any) => {
-    let res = await PublicApi.getMemberValidateStep2Page(params);
+    const { startDate, endDate } = params;
+    const payload = { ...params };
+
+    if (startDate) {
+      payload.startDate = moment(+startDate).format('YYYY-MM-DD');
+    }
+    if (endDate) {
+      payload.endDate = moment(+endDate).format('YYYY-MM-DD');
+    }
+    let res = await PublicApi.getMemberValidateStep2Page(payload);
     return res.data;
   };
 

src/pages/member/memberPrConfirm/index.tsx

@@ -11,6 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { PublicApi } from '@/services/api';
+import moment from 'moment';
 import { MEMBER_INNER_STATUS_SUCCESS, MEMBER_INNER_STATUS_FAILED } from '@/constants';
 import { auditSchema } from '../schema/auditSchema';
 import { 
@@ -132,7 +133,16 @@ const MemberPrConfirm: React.FC<{}> = props => {
   };
 
   const fetchListData = async (params: any) => {
-    let res = await PublicApi.getMemberValidateConfirmPage(params);
+    const { startDate, endDate } = params;
+    const payload = { ...params };
+
+    if (startDate) {
+      payload.startDate = moment(+startDate).format('YYYY-MM-DD');
+    }
+    if (endDate) {
+      payload.endDate = moment(+endDate).format('YYYY-MM-DD');
+    }
+    let res = await PublicApi.getMemberValidateConfirmPage(payload);
     return res.data;
   };
 

src/pages/member/memberPrSubmit/index.tsx

@@ -11,6 +11,7 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useAsyncInitSelect } from '@/formSchema/effects/useAsyncInitSelect';
 import { PublicApi } from '@/services/api';
+import moment from 'moment';
 import { auditSchema } from '../schema/auditSchema';
 import { 
   MEMBER_STATUS_TAG_MAP, 
@@ -126,7 +127,16 @@ const MemberPrSubmit: React.FC<{}> = props => {
   };
 
   const fetchListData = async (params: any) => {
-    let res = await PublicApi.getMemberValidateCommitPage(params);
+    const { startDate, endDate } = params;
+    const payload = { ...params };
+
+    if (startDate) {
+      payload.startDate = moment(+startDate).format('YYYY-MM-DD');
+    }
+    if (endDate) {
+      payload.endDate = moment(+endDate).format('YYYY-MM-DD');
+    }
+    let res = await PublicApi.getMemberValidateCommitPage(payload);
     return res.data;
   };
 

src/pages/orderSystem/orderDetail/components/orderDeleveRecord/index.tsx

@@ -241,26 +241,35 @@ const OrderDeleveRecord:React.FC<OrderDeleveRecordProps> = (props) => {
     
   }
   return (
-    <MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
-      <Tabs defaultActiveKey="2" animated={false}>
-        <Tabs.TabPane tab='订单收货统计' key="1">
-          <Table
-            columns={outOrderCols}
-            dataSource={orderReceivingStatisticsResponses}
-            pagination={false}
-            rowKey="productId"
-          />
-        </Tabs.TabPane>
-        <Tabs.TabPane tab='订单收货明细' key="2">
-          <NestTable
-            NestColumns={[sideOrderCols, sideChildrenCols]}
-            rowKey='id'
-            childrenDataKey='orderDeliveryProducts'
-            dataSource={orderDeliveryDetailsResponses}
-          />
-        </Tabs.TabPane>
-      </Tabs>
-    </MellowCard>
+    <>
+      {
+        (orderReceivingStatisticsResponses?.length > 0 || orderDeliveryDetailsResponses?.length > 0) &&
+        <MellowCard style={{marginTop: 24}} bordered={false} id='deleveBox'>
+          <Tabs defaultActiveKey="2" animated={false}>
+            {
+              orderReceivingStatisticsResponses?.length > 0 && <Tabs.TabPane tab='订单收货统计' key="1">
+                <Table
+                  columns={outOrderCols}
+                  dataSource={orderReceivingStatisticsResponses}
+                  pagination={false}
+                  rowKey="productId"
+                />
+              </Tabs.TabPane>
+            }
+            {
+              orderDeliveryDetailsResponses?.length > 0 && <Tabs.TabPane tab='订单收货明细' key="2">
+                <NestTable
+                  NestColumns={[sideOrderCols, sideChildrenCols]}
+                  rowKey='id'
+                  childrenDataKey='orderDeliveryProducts'
+                  dataSource={orderDeliveryDetailsResponses}
+                />
+              </Tabs.TabPane>
+            }
+          </Tabs>
+        </MellowCard>
+      }
+    </>
   )
 }
 

src/pages/orderSystem/orderDetail/components/orderPayTabs/index.tsx

@@ -49,7 +49,7 @@ const OrderPayTabs:React.FC<OrderPayTabsProps> = (props) => {
   const [payList, setPaylist] = useState<any[]>([])
 
   useEffect(() => {
-    PublicApi.getPayPayWayList().then(res => {
+    PublicApi.getPayPayWayList({memberId: data.supplyMembersId}).then(res => {
       const { code, data } = res
       if (code === 1000) {
         setPaylist(data)