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

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

@@ -79,7 +79,7 @@ const BasicInfo: React.FC<BasicInfoProps> = ({
                     <Descriptions.Item label="渠道级别">{channel.level}</Descriptions.Item>
                     <Descriptions.Item label="渠道类型">{channel.type}</Descriptions.Item>
                     <Descriptions.Item label="代理地市">
-                      <Row gutter={[16, 16]}>
+                      <Row gutter={[16, 16]} style={{ flex: 1 }}>
                         {
                           channel.areas ? 
                             channel.areas.map(item => (

src/pages/member/memberMaintain/index.tsx

@@ -254,7 +254,7 @@ const memberMaintain: React.FC<[]> = () => {
         outerStatus = [],
         status = [],
         memberTypes = [],
-        MemberManageRoles = [],
+        memberRoles = [],
         memberLevels = [],
         source = [],
       } = data;
@@ -282,7 +282,7 @@ const memberMaintain: React.FC<[]> = () => {
 
       return {
         memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
-        roleId: MemberManageRoles.map(item => ({ label: item.roleName, value: item.roleId })),
+        roleId: memberRoles.map(item => ({ label: item.roleName, value: item.roleId })),
         level: memberLevels.map(item => ({ label: item.levelTag, value: item.level })),
         source: source.map(item => ({ label: item.text, value: item.id })),
         innerStatus: innerStatus.map(item => ({ label: item.text, value: item.id })),

src/pages/member/memberPr1/index.tsx

@@ -157,7 +157,7 @@ const MemberPr1: React.FC<{}> = props => {
       cancelText: '取消',
       onOk() {
         const members = selectedList.map(item => ({ memberId: item.memberId, validateId: item.validateId }));
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
           PublicApi.postMemberValidateStep1Batch(members)
             .then(res => {
               if (res.code === 1000) {
@@ -184,7 +184,7 @@ const MemberPr1: React.FC<{}> = props => {
       const {
         memberTypes = [],
         status = [],
-        MemberManageRoles = [],
+        memberRoles = [],
         memberLevels = [],
         source = [],
       } = data;
@@ -196,7 +196,7 @@ const MemberPr1: React.FC<{}> = props => {
       return {
         memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
         status: status.map(item => ({ label: item.text, value: item.id })),
-        roleId: MemberManageRoles.map(item => ({ label: item.roleName, value: item.roleId })),
+        roleId: memberRoles.map(item => ({ label: item.roleName, value: item.roleId })),
         level: memberLevels.map(item => ({ label: item.levelTag, value: item.level })),
         source: source.map(item => ({ label: item.text, value: item.id })),
       };

src/pages/member/memberPr2/index.tsx

@@ -157,7 +157,7 @@ const MemberPr2: React.FC<{}> = props => {
       cancelText: '取消',
       onOk() {
         const members = selectedList.map(item => ({ memberId: item.memberId, validateId: item.validateId }));
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
           PublicApi.postMemberValidateStep2Batch(members)
             .then(res => {
               if (res.code === 1000) {
@@ -184,7 +184,7 @@ const MemberPr2: React.FC<{}> = props => {
       const {
         memberTypes = [],
         status = [],
-        MemberManageRoles = [],
+        memberRoles = [],
         memberLevels = [],
         source = [],
       } = data;
@@ -196,7 +196,7 @@ const MemberPr2: React.FC<{}> = props => {
       return {
         memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
         status: status.map(item => ({ label: item.text, value: item.id })),
-        roleId: MemberManageRoles.map(item => ({ label: item.roleName, value: item.roleId })),
+        roleId: memberRoles.map(item => ({ label: item.roleName, value: item.roleId })),
         level: memberLevels.map(item => ({ label: item.levelTag, value: item.level })),
         source: source.map(item => ({ label: item.text, value: item.id })),
       };

src/pages/member/memberPrConfirm/index.tsx

@@ -193,7 +193,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
         innerStatus = [],
         memberTypes = [],
         status = [],
-        MemberManageRoles = [],
+        memberRoles = [],
         memberLevels = [],
         source = [],
       } = data;
@@ -212,7 +212,7 @@ const MemberPrConfirm: React.FC<{}> = props => {
       return {
         memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
         status: status.map(item => ({ label: item.text, value: item.id })),
-        roleId: MemberManageRoles.map(item => ({ label: item.roleName, value: item.roleId })),
+        roleId: memberRoles.map(item => ({ label: item.roleName, value: item.roleId })),
         level: memberLevels.map(item => ({ label: item.levelTag, value: item.level })),
         source: source.map(item => ({ label: item.text, value: item.id })),
         innerStatus: innerStatus.map(item => ({ label: item.text, value: item.id })).filter(item => item.value !== 0),

src/pages/member/memberPrSubmit/index.tsx

@@ -159,7 +159,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
       cancelText: '取消',
       onOk() {
         const members = selectedList.map(item => ({ memberId: item.memberId, validateId: item.validateId }));
-        return new Promise((resolve, reject) => {
+        return new Promise<void>((resolve, reject) => {
           PublicApi.postMemberValidateCommitBatch(members)
             .then(res => {
               if (res.code === 1000) {
@@ -186,7 +186,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
       const {
         memberTypes = [],
         memberStatus = [],
-        MemberManageRoles = [],
+        memberRoles = [],
         memberLevels = [],
         source = [],
         status = [],
@@ -206,7 +206,7 @@ const MemberPrSubmit: React.FC<{}> = props => {
       return {
         memberTypeId: memberTypes.map(item => ({ label: item.memberTypeName, value: item.memberTypeId })),
         status: status.map(item => ({ label: item.text, value: item.id })),
-        roleId: MemberManageRoles.map(item => ({ label: item.roleName, value: item.roleId })),
+        roleId: memberRoles.map(item => ({ label: item.roleName, value: item.roleId })),
         level: memberLevels.map(item => ({ label: item.levelTag, value: item.level })),
         source: source.map(item => ({ label: item.text, value: item.id })),
       };