Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

src/pages/member/components/AreaSelect/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-06-10 14:27:37
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-06-10 16:00:07
+ * @LastEditTime: 2021-07-30 10:24:06
  * @Description: 区域选择
  */
 import React, { useState, useEffect } from 'react';
@@ -53,7 +53,7 @@ const AreaSelect  = (props) => {
     setProvinceLoading(true);
     const res = await PublicApi.getMemberAreaProvince();
     if (res.code === 1000) {
-      setProvinceList(res.data.map((item) => ({ label: item.name, value: item.code })));
+      setProvinceList(res.data?.map((item) => ({ label: item.name, value: item.code })));
     }
     setProvinceLoading(false);
   };
@@ -65,7 +65,7 @@ const AreaSelect  = (props) => {
     setCityLoading(true);
     const res = await PublicApi.getMemberAreaCity({ code });
     if (res.code === 1000) {
-      setCityList(res.data.map((item) => ({ label: item.name, value: item.code })));
+      setCityList(res.data?.map((item) => ({ label: item.name, value: item.code })));
     }
     setCityLoading(false);
   };
@@ -77,7 +77,7 @@ const AreaSelect  = (props) => {
     setDistrictLoading(true);
     const res = await PublicApi.getMemberAreaDistrict({ code });
     if (res.code === 1000) {
-      setDistrictList(res.data.map((item) => ({ label: item.name, value: item.code })));
+      setDistrictList(res.data?.map((item) => ({ label: item.name, value: item.code })));
     }
     setDistrictLoading(false);
   };

src/pages/member/components/MemberChannelInfo/index.tsx

@@ -49,7 +49,7 @@ export type ChannelInfoProps = MellowCardProps & {
 const MemberChannelInfo: React.FC<ChannelInfoProps> = (props: ChannelInfoProps) => {
   const { dataSource, validateId, onModifyAfter, ...rest } = props;
   const [visibleDrawer, setVisibleDrawer] = useState(false);
-  const [channelInfo, setChannerlInfo] = useState<GetMemberAbilityMaintenanceDetailBasicChannelResponse>();
+  const [channelInfo, setChannelInfo] = useState<GetMemberAbilityMaintenanceDetailBasicChannelResponse>();
   const [infoLoading, setInfoLoading] = useState(false);
   const [submitLoading, setSubmitLoading] = useState(false);
 
@@ -66,9 +66,11 @@ const MemberChannelInfo: React.FC<ChannelInfoProps> = (props: ChannelInfoProps)
       validateId,
     }).then(res => {
       if (res.code === 1000) {
-        setChannerlInfo(res.data);
+        setChannelInfo(res.data);
         handleVisibleDrawer(true);
       }
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoading(false);
     });

src/pages/member/components/MemberChannelInfoForm/index.tsx

@@ -199,6 +199,8 @@ const MemberChannelInfoForm: React.ForwardRefRenderFunction<ChannelRefHandle, IP
             FormPath.setIn(state, 'props.enum', options);
           });
         }
+      }).catch((err) => {
+        console.warn(err);
       });
     });
 
@@ -241,6 +243,8 @@ const MemberChannelInfoForm: React.ForwardRefRenderFunction<ChannelRefHandle, IP
             }
           );
         }
+      }).catch((err) => {
+        console.warn(err);
       }).finally(() => {
         formActions.setFieldState(
           FormPath.transform(fieldState.name, /\d/, $1 => `areaCodes.${$1}.cityCode`),

src/pages/member/components/MemberDocCategory/index.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-21 16:10:47
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-09 15:50:58
+ * @LastEditTime: 2021-07-30 10:28:19
  * @Description: 会员分类信息
  */
 import React, { useState } from 'react';
@@ -101,23 +101,25 @@ const MemberDocCategory: React.FC<DocCategoryProps> = (props: DocCategoryProps)
     }).then(res => {
       if (res.code === 1000) {
         setClassifyInfo({
-          code: res.data.code,
-          partnerType: res.data.partnerType,
-          maxAmount: res.data.maxAmount,
-          areaCodes: res.data.areaCodes,
-          categories: res.data.categories.map(({ names, paymentDay, taxPoint, ...rest }) => ({
+          code: res.data?.code,
+          partnerType: res.data?.partnerType,
+          maxAmount: res.data?.maxAmount,
+          areaCodes: res.data?.areaCodes,
+          categories: res.data?.categories.map(({ names, paymentDay, taxPoint, ...rest }) => ({
             category: names,
             paymentDay: `${paymentDay}`,
             taxPoint: +taxPoint,
             ...rest
           })),
         });
-        setPartnerTypes(res.data.partnerTypes.map((item) => ({
+        setPartnerTypes(res.data?.partnerTypes.map((item) => ({
           value: item.id,
           label: item.text,
         })));
         handleVisibleDrawer(true);
       }
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoading(false);
     });
@@ -141,6 +143,8 @@ const MemberDocCategory: React.FC<DocCategoryProps> = (props: DocCategoryProps)
       }
       handleVisibleDrawer(false);
       onModifyAfter?.();
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       msg();
       setSubmitLoading(false);

src/pages/member/components/MemberEvaluation/index.tsx

@@ -22,8 +22,8 @@ import styles from './index.less';
 const PAGE_SIZE = 5;
 
 export interface EstimateSumItems {
-  id: number,
-  title: JSX.Element,
+  id?: number,
+  title?: JSX.Element,
   star?: number,
   last7days?: number,
   last30days?: number,
@@ -38,13 +38,13 @@ export interface FetchParams {
 };
 
 export interface ListItem {
-  id: number; 
+  id?: number; 
   createTime: string;
   star: number;
   comment: string;
   product: string;
   byMemberName: string;
-  remark: string;
+  remark?: string;
 };
 
 interface IProps extends MellowCardProps {

src/pages/member/components/MemberRightsRecords/index.tsx

@@ -29,7 +29,7 @@ export interface ReceivedData {
   /**
    * 获取的数量（返现金额、积分）
    */
-  point: number
+  point: string
   /**
    * 备注
    */

src/pages/member/components/ModifyChannelDrawer/index.tsx

@@ -211,6 +211,8 @@ const VerifyComingDataDrawer: React.FC<IProps> = (props: IProps) => {
             FormPath.setIn(state, 'props.enum', options);
           });
         }
+      }).catch((err) => {
+        console.warn(err);
       });
     });
 
@@ -253,6 +255,8 @@ const VerifyComingDataDrawer: React.FC<IProps> = (props: IProps) => {
             }
           );
         }
+      }).catch((err) => {
+        console.warn(err);
       }).finally(() => {
         formActions.setFieldState(
           FormPath.transform(fieldState.name, /\d/, $1 => `areaCodes.${$1}.cityCode`),

src/pages/member/components/ModifyClassifyDrawer/index.tsx

@@ -282,6 +282,8 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
             }
           );
         }
+      }).catch((err) => {
+        console.warn(err);
       }).finally(() => {
         formActions.setFieldState(
           FormPath.transform(fieldState.name, /\d/, $1 => `areaCodes.${$1}.cityCode`),
@@ -342,6 +344,8 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
                   FormPath.setIn(state, 'props.enum', options);
                 });
               }
+            }).catch((err) => {
+              console.warn(err);
             });
             
             // 请求会员品类数据
@@ -352,6 +356,8 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
                   FormPath.setIn(state, 'props.x-component-props.options', data);
                 });
               }
+            }).catch((err) => {
+              console.warn(err);
             });
           });
         }}

src/pages/member/memberFlowRule/components/FlowRuleForm/components/ComingCtl/index.tsx

@@ -89,7 +89,7 @@ const ComingCtl = (props: IProps) => {
     if (res.code === 1000) {
       return res.data;
     }
-    return {};
+    return { data: [], totalCount: 0 };
   };
 
   useEffect(() => {

src/pages/member/memberFlowRule/components/FlowRuleForm/components/MemberRoleFormItem/index.tsx

@@ -46,6 +46,7 @@ const fetchListData = async (params: any) => {
   if (res.code === 1000) {
     return res.data;
   }
+  return { data: [], totalCount: 0 };
 };
 
 const MemberRoleFormItem = (props) => {

src/pages/member/memberFlowRule/components/FlowRuleForm/effects/index.ts

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-05-31 16:24:44
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-05-31 16:24:45
+ * @LastEditTime: 2021-07-30 10:51:43
  * @Description: 
  */
 import { useBusinessEffects } from './useBusinessEffects';
@@ -23,5 +23,7 @@ export const createEffects = (context, actions) => {
         state.props['x-component-props'].dataSource = res.data.filter((item) => item.processType === 2);
       });
     }
+  }).catch((err) => {
+    console.warn(err);
   });
 };
\ No newline at end of file

src/pages/member/memberFlowRule/components/FlowRuleForm/index.tsx

@@ -40,11 +40,22 @@ interface MemberFormProps {
   isEdit?: boolean,
 };
 
+type RuleInfoType = Omit<GetMemberProcessRuleGetResponse, 'roleName' | 'businessTypeName' | 'memberTypeName' | 'roleId' | 'roleTypeName'> & {
+  memberRole: {
+    roleName: string,
+    businessTypeName: string,
+    memberTypeName: string,
+    roleId: number,
+    roleTypeName: string,
+  },
+  configIds: any[],
+}
+
 const FlowRuleForm: React.FC<MemberFormProps> = ({
   id,
   isEdit = false,
 }) => {
-  const [ruleInfo, setRuleInfo] = useState<GetMemberProcessRuleGetResponse>();
+  const [ruleInfo, setRuleInfo] = useState<RuleInfoType>();
   const [submitLoading, setSubmitLoading] = useState(false);
   const [infoLoading, setInfoLoading] = useState(false);
   const [unsaved, setUnsaved] = useState(false);
@@ -69,7 +80,7 @@ const FlowRuleForm: React.FC<MemberFormProps> = ({
       businessTypeName,
       details,
       ...rest
-    } = res.data;
+    } = res.data as any;
     setRuleInfo({
       memberRole: {
         roleName,
@@ -97,8 +108,6 @@ const FlowRuleForm: React.FC<MemberFormProps> = ({
       ...rest
     } = values;
 
-    console.log('values', values);
-
     if (!id && isEdit) {
       setSubmitLoading(true);
       const msg = message.loading({

src/pages/member/memberFlowRule/index.tsx

@@ -44,7 +44,7 @@ const fetchListData = async (params: any) => {
   if (res.code === 1000) {
     return res.data;
   }
-  return [];
+  return { data: [], totalCount: 0 };
 };
 
 const MemberFlowRule: React.FC<[]> = () => {

src/pages/member/memberImport/components/MemberForm/index.tsx

@@ -26,11 +26,11 @@ type MemberInfoType = {
   roleId: number,
   level: number,
   countryCodeId: number,
-  phone: number,
-  email: number,
-  upperRelationId: number,
-  channelLevel: string,
-  areas: {
+  phone: string | number,
+  email: string,
+  upperRelationId?: number,
+  channelLevel?: string,
+  areas?: {
     /**
      * 省编码
      */
@@ -40,7 +40,7 @@ type MemberInfoType = {
      */
     cityCode: string
   }[],
-  remark: string,
+  remark?: string,
 } & { [key: string]: any }
 
 interface MemberFormProps {
@@ -244,7 +244,7 @@ const MemberForm: React.FC<MemberFormProps> = ({
           validateMsg: null,
           validateStatus: 1,
           validateStatusDesc: '待审核',
-        });
+        } as any);
         setUnsaved(false);
         setTimeout(() => {
           history.push('/memberCenter/home');
@@ -343,6 +343,8 @@ const MemberForm: React.FC<MemberFormProps> = ({
           const options = data.map(item => ({ label: item.roleName, value: item.roleId }));
           linkage.enum('roleId', options);
         }
+      }).catch((err) => {
+        console.warn(err);
       }).finally(() => {
         linkage.loaded('roleId');
       });
@@ -406,6 +408,8 @@ const MemberForm: React.FC<MemberFormProps> = ({
         formActions.setFieldState('channelTypeId', state => {
           FormPath.setIn(state, 'props.enum', channelType);
         });
+      }).catch((err) => {
+        console.warn(err);
       });
     });
 
@@ -422,6 +426,8 @@ const MemberForm: React.FC<MemberFormProps> = ({
           const { data = [] } = res;
           setMemberItems(data);
         }
+      }).catch((err) => {
+        console.warn(err);
       });
     });
 
@@ -454,6 +460,8 @@ const MemberForm: React.FC<MemberFormProps> = ({
               const options = data.map(item => ({ label: item.levelTag, value: item.level }));
               linkage.enum('level', options);
             }
+          }).catch((err) => {
+            console.warn(err);
           }).finally(() => {
             linkage.loaded('level');
           });
@@ -483,6 +491,8 @@ const MemberForm: React.FC<MemberFormProps> = ({
             FormPath.setIn(state, 'props.enum', options);
           });
         }
+      }).catch((err) => {
+        console.warn(err);
       });
     });
 
@@ -525,6 +535,8 @@ const MemberForm: React.FC<MemberFormProps> = ({
             }
           );
         }
+      }).catch((err) => {
+        console.warn(err);
       }).finally(() => {
         formActions.setFieldState(
           FormPath.transform(fieldState.name, /\d/, $1 => `areas.${$1}.cityCode`),

src/pages/member/memberImport/index.tsx

@@ -46,7 +46,7 @@ const fetchListData = async (params: any) => {
   if (res.code === 1000) {
     return res.data;
   }
-  return [];
+  return { data: {}, totalCount: 0 };
 };
 
 const MemberMaintain: React.FC<[]> = () => {

src/pages/member/memberLevel/components/DetailInfo/index.tsx

@@ -49,6 +49,8 @@ const DetailInfo: React.FC<DetailInfoProps> = ({
         setLevelInfo(res.data);
         setThresholdValue(point);
       }
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoading(false);
     });

src/pages/member/memberLevel/index.tsx

@@ -22,7 +22,7 @@ const fetchData = async (params: any) => {
   if (res.code === 1000) {
     return res.data;
   }
-  return {};
+  return { data: [], totalCount: 0 };
 };
 
 const MemberLevel: React.FC<[]> = () => {

src/pages/member/memberMaintain/black/index.tsx

@@ -74,6 +74,8 @@ const MemberMaintainBlack: React.FC<{}> = () => {
       if (res.code === 1000) {
         setMemberInfo(res.data);
       }
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoaading(false);
     });

src/pages/member/memberMaintain/correct/index.tsx

@@ -74,6 +74,8 @@ const MemberMaintainCorrect: React.FC<{}> = () => {
       if (res.code === 1000) {
         setMemberInfo(res.data);
       }
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoaading(false);
     });

src/pages/member/memberMaintain/detailed/archiveInfo.tsx

@@ -110,6 +110,8 @@ const MemberArchiveInfo = () => {
       if (res.code === 1000) {
         setArchiveInfo(res.data);
       }
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setLoading(false);
     });

src/pages/member/memberMaintain/detailed/basicInfo.tsx

@@ -54,6 +54,8 @@ const MemberBasicInfo: React.FC<MemberBasicInfoProps> = ({
         return;
       }
       MemberStore.setMemberInfo(res.data);
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoading(false);
     });

src/pages/member/memberMaintain/detailed/equityInfo.tsx

@@ -29,6 +29,8 @@ const MemberRightsInfo: React.FC<{}> = () => {
         return;
       }
       setEquityInfo(res.data);
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoading(false);
     });

src/pages/member/memberMaintain/detailed/index.tsx

@@ -60,6 +60,8 @@ const MemberMaintainDetailed: React.FC<QueryProps> = props => {
       }
       setMemberInfo(res.data);
       MemberStore.setMemberInfo(res.data);
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoading(false);
     });

src/pages/member/memberMaintain/detailed/levelInfo.tsx

@@ -32,6 +32,8 @@ const MemberLevelInfo: React.FC<{}> = () => {
       }
       setLevelInfo(res.data);
 
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoading(false);
     });

src/pages/member/memberMaintain/detailed/sincerityInfo.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-01-06 11:36:35
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-05-26 16:08:41
+ * @LastEditTime: 2021-07-30 11:08:08
  * @Description: 会员信用信息详情
  */
 import React, { useEffect, useState } from 'react';
@@ -82,6 +82,8 @@ const MemberSincerityInfo: React.FC<{}> = () => {
         pieData, 
         items: configs,
       });
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setBasicInfoLoading(false);
     });
@@ -99,6 +101,8 @@ const MemberSincerityInfo: React.FC<{}> = () => {
       }
       const { rows = [] } = (res.data || {});
       setOrderEstimateSum(rows);
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setOrderEstimateSumLoading(false);
     });
@@ -116,6 +120,8 @@ const MemberSincerityInfo: React.FC<{}> = () => {
       }
       const { rows = [] } = (res.data || {});
       setAfterServiceEstimateSum(rows);
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setAfterServiceEstimateSumLoading(false);
     });
@@ -131,6 +137,8 @@ const MemberSincerityInfo: React.FC<{}> = () => {
         return;
       }
       setFeedbackSum(res.data);
+    }).catch((err) => {
+      console.warn(err);
     });
   };
 

src/pages/member/memberMaintain/eliminate/index.tsx

@@ -74,6 +74,8 @@ const MemberMaintainEliminate: React.FC<{}> = () => {
       if (res.code === 1000) {
         setMemberInfo(res.data);
       }
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoaading(false);
     });

src/pages/member/memberMaintain/freeze/index.tsx

@@ -68,6 +68,8 @@ const MemberFrozen: React.FC<{}> = () => {
       if (res.code === 1000) {
         setMemberInfo(res.data);
       }
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoaading(false);
     });

src/pages/member/memberMaintain/index.tsx

@@ -43,7 +43,7 @@ const fetchData = async (params: any) => {
   if (res.code === 1000) {
     return res.data;
   }
-  return [];
+  return { data: [], totalCount: 0 };
 };
 
 const MemberMaintain: React.FC<[]> = () => {

src/pages/member/memberMaintain/unfreeze/index.tsx

@@ -68,6 +68,8 @@ const MemberMaintainUnfreeze: React.FC<{}> = () => {
       if (res.code === 1000) {
         setMemberInfo(res.data);
       }
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoaading(false);
     });

src/pages/member/memberPrComingClassify/components/ComingClassifyDrawer/index.tsx

@@ -288,6 +288,8 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
             }
           );
         }
+      }).catch((err) => {
+        console.warn(err);
       }).finally(() => {
         formActions.setFieldState(
           FormPath.transform(fieldState.name, /\d/, $1 => `areaCodes.${$1}.cityCode`),
@@ -347,6 +349,8 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
                   FormPath.setIn(state, 'props.enum', options);
                 });
               }
+            }).catch((err) => {
+              console.warn(err);
             });
             
             // 请求会员品类数据
@@ -357,6 +361,8 @@ const ComingClassifyDrawer: React.FC<IProps> = (props: IProps) => {
                   FormPath.setIn(state, 'props.x-component-props.options', data);
                 });
               }
+            }).catch((err) => {
+              console.warn(err);
             });
           });
 

src/pages/member/memberPrComingClassify/index.tsx

@@ -63,7 +63,7 @@ const MemberPrComingClassify: React.FC<{}> = props => {
     if (res.code === 1000) {
       return res.data;
     }
-    return [];
+    return { data: [], totalCount: 0 };
   };
 
   // 初始化高级筛选选项

src/pages/member/memberPrComingInvestigate/index.tsx

@@ -63,7 +63,7 @@ const MemberPrComingInvestigate: React.FC<{}> = props => {
     if (res.code === 1000) {
       return res.data;
     }
-    return [];
+    return { data: [], totalCount: 0 };
   };
 
   // 初始化高级筛选选项

src/pages/member/memberPrVerifyChange1/index.tsx

@@ -74,7 +74,7 @@ const MemberPrVerifyChange1: React.FC<{}> = props => {
     if (res.code === 1000) {
       return res.data;
     }
-    return [];
+    return { data: [], totalCount: 0 };
   };
 
   const handleBatch = () => {

src/pages/member/memberPrVerifyChange2/index.tsx

@@ -74,7 +74,7 @@ const MemberPrVerifyChange2: React.FC<{}> = props => {
     if (res.code === 1000) {
       return res.data;
     }
-    return [];
+    return { data: [], totalCount: 0 };
   };
 
   const handleBatch = () => {

src/pages/member/memberPrVerifyChangeConfirm/index.tsx

@@ -74,7 +74,7 @@ const MemberPrVerifyChangeConfrim: React.FC<{}> = props => {
     if (res.code === 1000) {
       return res.data;
     }
-    return [];
+    return { data: [], totalCount: 0 };
   };
 
   const handleBatch = () => {

src/pages/member/memberPrVerifyComing1/index.tsx

@@ -74,7 +74,7 @@ const MemberPrVerifyComing1: React.FC<{}> = props => {
     if (res.code === 1000) {
       return res.data;
     }
-    return [];
+    return { data: [], totalCount: 0 };
   };
 
   const handleBatch = () => {

src/pages/member/memberPrVerifyComing2/index.tsx

@@ -74,7 +74,7 @@ const MemberPrVerifyComing2: React.FC<{}> = props => {
     if (res.code === 1000) {
       return res.data;
     }
-    return [];
+    return { data: [], totalCount: 0 };
   };
 
   const handleBatch = () => {

src/pages/member/memberPrVerifyComingConfirm/index.tsx

@@ -74,7 +74,7 @@ const MemberPrVerifyComingConfirm: React.FC<{}> = props => {
     if (res.code === 1000) {
       return res.data;
     }
-    return [];
+    return { data: [], totalCount: 0 };
   };
 
   const handleBatch = () => {

src/pages/member/memberPrVerifyComingData/index.tsx

@@ -74,7 +74,7 @@ const MemberPrVerifyComingData: React.FC<{}> = props => {
     if (res.code === 1000) {
       return res.data;
     }
-    return [];
+    return { data: [], totalCount: 0 };
   };
 
   const handleBatch = () => {

src/pages/member/memberPrVerifyComingQualifications/index.tsx

@@ -74,7 +74,7 @@ const memberPrVerifyComingQualifications: React.FC<{}> = props => {
     if (res.code === 1000) {
       return res.data;
     }
-    return [];
+    return { data: [], totalCount: 0 };
   };
 
   const handleBatch = () => {

src/pages/member/memberQuery/detailed/archiveInfo.tsx

@@ -109,6 +109,8 @@ const MemberArchiveInfo = () => {
       if (res.code === 1000) {
         setArchiveInfo(res.data);
       }
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setLoading(false);
     });

src/pages/member/memberQuery/detailed/equityInfo.tsx

@@ -28,6 +28,8 @@ const MemberRightsInfo: React.FC<{}> = () => {
         return;
       }
       setEquityInfo(res.data);
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoading(false);
     });

src/pages/member/memberQuery/detailed/index.tsx

@@ -53,6 +53,8 @@ const MemberQueryDetailed: React.FC<QueryProps> = props => {
       }
       setMemberInfo(res.data);
       MemberStore.setMemberInfo(res.data);
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoading(false);
     });

src/pages/member/memberQuery/detailed/levelInfo.tsx

@@ -31,6 +31,8 @@ const MemberLevelInfo: React.FC<{}> = () => {
       }
       setLevelInfo(res.data);
 
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setInfoLoading(false);
     });

src/pages/member/memberQuery/detailed/sincerityInfo.tsx

@@ -81,6 +81,8 @@ const MemberSincerityInfo: React.FC<{}> = () => {
         pieData, 
         items: configs,
       });
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setBasicInfoLoading(false);
     });
@@ -97,6 +99,8 @@ const MemberSincerityInfo: React.FC<{}> = () => {
       }
       const { rows = [] } = (res.data || {});
       setOrderEstimateSum(rows);
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setOrderEstimateSumLoading(false);
     });
@@ -113,6 +117,8 @@ const MemberSincerityInfo: React.FC<{}> = () => {
       }
       const { rows = [] } = (res.data || {});
       setAfterServiceEstimateSum(rows);
+    }).catch((err) => {
+      console.warn(err);
     }).finally(() => {
       setAfterServiceEstimateSumLoading(false);
     });
@@ -127,6 +133,8 @@ const MemberSincerityInfo: React.FC<{}> = () => {
         return;
       }
       setFeedbackSum(res.data);
+    }).catch((err) => {
+      console.warn(err);
     });
   };
 

src/pages/member/memberQuery/index.tsx

@@ -43,7 +43,10 @@ const fetchData = async (params: any) => {
     payload.endDate = moment(+endDate).format('YYYY-MM-DD');
   }
   let res = await PublicApi.getMemberAbilityInfoPage(payload);
-  return res.data;
+  if (res.code === 1000) {
+    return res.data;
+  }
+  return { data: [], totalCount: 0 };
 };
 
 const MemberQuery: React.FC<{}> = () => {

src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponUnsubmitted/components/GoodsDrawer/index.tsx

@@ -2,20 +2,27 @@
  * @Author: XieZhiXiong
  * @Date: 2021-06-24 16:11:55
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-28 14:13:43
+ * @LastEditTime: 2021-07-30 10:10:15
  * @Description: 商品选择抽屉
  */
 import React, { useEffect } from 'react';
 import { Drawer, Button, message } from 'antd';
+import { FormEffectHooks } from '@formily/antd';
 import { PublicApi } from '@/services/api';
 import { FORM_FILTER_PATH } from '@/formSchema/const';
 import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilterSearch';
 import { useRowSelectionTable } from '@/hooks/useRowSelectionTable';
+import { useLinkageUtils } from '@/utils/formEffectUtils';
+import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
 import PolymericTable, { EditableColumns, FetchParamsType } from '@/components/PolymericTable';
 import { normalizeUnitPrice } from '../../../utils';
 import { querySchema } from './schema';
 import styles from './index.less';
 
+const { 
+  onFormInit$,
+} = FormEffectHooks;
+
 export type ProductItemType = {
   /**
    * 数据id
@@ -78,9 +85,17 @@ interface IProps {
 
 type ExtraFetchType = FetchParamsType & {
   /**
-   * 商城id
+   * 商品名称
+   */
+  commodityName?: string,
+  /**
+   * 会员品类id
    */
-  shopId: number,
+  customerCategoryId?: number,
+  /**
+   * 品牌id
+   */
+  brandId?: number,
 }
 
 const GoodsDrawer: React.FC<IProps> = (props) => {
@@ -101,11 +116,14 @@ const GoodsDrawer: React.FC<IProps> = (props) => {
   }, [checkeds]);
 
   const fetchData = async (params: ExtraFetchType) => {
-    const res = await PublicApi.getProductCommodityGetCommoditySkuListByShopId({
+    if (!shopIds || !shopIds.length) {
+      return;
+    }
+    const res = await PublicApi.postProductCommodityGetCommoditySkuListByShopId({
       ...params,
-      current: `${params.current}`,
-      pageSize: `${params.pageSize}`,
-      shopId: `${shopIds[0] || ''}`,
+      shopIdList: shopIds,
+    }, {
+      ctlType: 'none',
     });
     if (res.code === 1000) {
       return res.data;
@@ -174,6 +192,26 @@ const GoodsDrawer: React.FC<IProps> = (props) => {
     }
   };
 
+  // 获取品牌
+  const fetchBrand = async (name = '') => {
+    const res = await PublicApi.getProductSelectGetSelectBrand({
+      name, 
+    });
+    if (res.code === 1000) {
+      return res.data;
+    }
+    return [];
+  }
+  
+  // 获取会员品类
+  const fetchCustomerCategory = async () => {
+    const res = await PublicApi.getProductCustomerGetCustomerCategoryTree();
+    if (res.code === 1000) {
+      return res.data;
+    }
+    return [];
+  }
+
   return (
     <Drawer
       title="选择适用商品"
@@ -205,12 +243,25 @@ const GoodsDrawer: React.FC<IProps> = (props) => {
         searchFormProps={{
           schema: querySchema,
           effects: ($, actions) => {
+            const linkage = useLinkageUtils();
+
             useStateFilterSearchLinkageEffect(
               $,
               actions,
               'name',
               FORM_FILTER_PATH,
             );
+
+            useAsyncSelect('brandId', fetchBrand, ['name', 'id']);
+
+            onFormInit$().subscribe(() => {
+              // 初始化远程检索逻辑
+              fetchCustomerCategory().then(res => {
+                linkage.componentProps('customerCategoryId', {
+                  dataoption: res, 
+                });
+              });
+            });
           },
         }}
         full

src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponUnsubmitted/components/GoodsDrawer/schema.tsx

@@ -2,7 +2,7 @@
  * @Author: XieZhiXiong
  * @Date: 2021-06-24 16:19:18
  * @LastEditors: XieZhiXiong
- * @LastEditTime: 2021-07-28 10:54:23
+ * @LastEditTime: 2021-07-30 10:06:32
  * @Description: 
  */
 import { ISchema } from '@formily/antd';
@@ -34,20 +34,36 @@ export const querySchema: ISchema = {
             columns: 6,
           },
           properties: {
-            category: {
+            customerCategoryId: {
               type: 'string',
+              'x-component': 'CustomCategorySearch',
               'x-component-props': {
                 placeholder: '商品品类',
-                allowClear: true,
+                showSearch: true,
+                notFoundContent: null,
+                dataoption: [],
+                fieldNames: { label: 'title', value: 'id', children: 'children' },
+                changeOnSelect: true,
+                expandTrigger: 'hover',
               },
             },
-            brand: {
+            brandId: {
               type: 'string',
               'x-component-props': {
                 placeholder: '商品品牌',
                 allowClear: true, 
               },
             },
+            submit: {
+              type: 'string',
+              'x-component': 'Submit',
+              'x-mega-props': {
+                span: 1,
+              },
+              'x-component-props': {
+                children: '查询',
+              },
+            },
           },
         },
       },