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

src/pages/ruleSettingManage/payStrategy/detail.tsx

@@ -61,7 +61,7 @@ const PaySetting: React.FC<{}> = () => {
     levelList: [],
     roleList: []
   })
-  const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'memberId' })
+  const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'id' })
   const [optionType, setoptionType] = useState(0)
   const { preview, pageStatus } = usePageStatus()
   // const initValue = useInitValue(PublicApi.getPayPayMemberTacticsDetails)
@@ -172,14 +172,14 @@ const PaySetting: React.FC<{}> = () => {
       PublicApi.getPayPayMemberTacticsDetails({ id: usePageStatus().id }).then(res => {
         if (res.code === 1000) {
           let { data } = res
-          console.log('结果', res.data)
           payActions.setFieldValue('paymentPolicyName', data.paymentPolicyName)
           data.paymentPolicyPayWayRequests.forEach((item: any, index) => {
             payActions.setFieldValue(`id-${index}`, item.id)
             payActions.setFieldValue(`ruleConfigurationId-${index}`, item.ruleConfigurationId)
-            // payActions.setFieldValue(`payWayIds-${index}`,item.payWayIds)
-            item.payWays.forEach((v) => {
-              payActions.setFieldValue(`payWayIds-${index}`, v.id)
+            const payWayIds: any = [];
+            item.payWays.forEach((v, idx) => {
+              payWayIds.push(v.id)
+              payActions.setFieldValue(`payWayIds-${index}`, payWayIds)
             })
           })
           payActions.setFieldValue('isSelected', data.isSelected)
@@ -495,7 +495,7 @@ const PaySetting: React.FC<{}> = () => {
           }
         }
         tableProps={{
-          rowKey: 'memberId'
+          rowKey: 'id'
         }}
       />
     </PageHeaderWrapper>