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

src/pages/ruleSettingManage/payStrategy/detail.tsx

@@ -41,8 +41,8 @@ import {
 const payActions = createFormActions()
 /**
  * @description: 会员弹窗列表
- * @param {type} 
- * @return {type} 
+ * @param {type}
+ * @return {type}
  */
 const fetchMemberList = async (params) => {
   const res = await PublicApi.getMemberManageAllProviderPage(params)
@@ -178,7 +178,6 @@ const PaySetting: React.FC<{}> = () => {
             payActions.setFieldValue(`id-${index}`, item.id)
             payActions.setFieldValue(`ruleConfigurationId-${index}`, item.ruleConfigurationId)
             // payActions.setFieldValue(`payWayIds-${index}`,item.payWayIds)
-            const ids: any = [];
             item.payWays.forEach((v) => {
               payActions.setFieldValue(`payWayIds-${index}`, v.id)
             })
@@ -192,6 +191,8 @@ const PaySetting: React.FC<{}> = () => {
       }).then(res => {
         if (res.code === 1000) {
           let { data } = res.data
+          memberRowCtl.setSelectedRowKeys(data.map(v => v.memberId))
+          memberRowCtl.setSelectRow(data)
           payActions.setFieldValue('applyMember', data)
         }
       })
@@ -416,6 +417,7 @@ const PaySetting: React.FC<{}> = () => {
       }
     }
     //新增
+    console.log(param, 10086)
     if (param.memberIdRoleIds.length === 0 && values.isSelected === 0) {
       message.error('请选择指定的会员');
       return
@@ -499,4 +501,4 @@ const PaySetting: React.FC<{}> = () => {
     </PageHeaderWrapper>
   )
 }
-export default PaySetting
\ No newline at end of file
+export default PaySetting