修改敏感词删除没更新的问题， 修改支付选择会员编辑弹框没选中的问题

src/pages/ruleSettingManage/paySetting/components/payWayTable.tsx

@@ -81,7 +81,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
           <Table
             columns={columns}
             dataSource={payParametersListResponses}
-            rowKey={(record: any, index: number) => index}
+            rowKey={(record: any, index: any) => index}
             pagination={false}
           />
           <Button style={{ marginBottom: 16, marginTop: 24 }} block icon={<PlusOutlined />} onClick={() => { setmodalvisible(true); setType(id); setmodify(false) }} type='dashed'>新增参数配置</Button>
@@ -93,7 +93,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
               <Table
                 columns={columns}
                 dataSource={payParametersList}
-                rowKey={(record: any, index: number) => index}
+                rowKey={(record: any, index: any) => index}
                 pagination={false}
               />
               <Button style={{ marginBottom: 16, marginTop: 24 }} block icon={<PlusOutlined />} onClick={() => { setmodalvisible(true); setType(3); setmodify(false) }} type='dashed'>新增参数配置</Button>
@@ -108,7 +108,7 @@ const PayWayTable: React.FC<payWayTableParams> = (props) => {
         modalvisible={modalvisible}
         edit={edit}
         onOK={(value) => handleOk(value, type)}
-        onCancel={() => setmodalvisible(false)}
+        onCancel={() => { setmodalvisible(false); setedit({}) }}
       />
     </>
   )

src/pages/ruleSettingManage/paySetting/components/setUpModal.tsx

@@ -74,7 +74,7 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => {
       title='新增参数配置'
       visible={modalvisible}
       onOk={handleOk}
-      onCancel={() => onCancel()}
+      onCancel={() => { onCancel();form.resetFields(); }}
     >
       <Form
         form={form}
@@ -90,10 +90,10 @@ const SetUpModal: React.FC<setUpModalParams> = (props) => {
           </Select>
         </Form.Item>
         <Form.Item name='value' label='参数值' rules={[{ required: true, message: '请输入参数值' }]}>
-          <Input />
+          <Input maxLength={200} />
         </Form.Item>
         <Form.Item name='describe' label='参数描述'>
-          <TextArea rows={4} />
+          <TextArea maxLength={200} rows={4} />
         </Form.Item>
       </Form>
     </Modal>

src/pages/ruleSettingManage/paySetting/settingIndex.tsx

@@ -6,7 +6,7 @@
  */
 import React, { useState, useEffect } from 'react';
 import { history } from 'umi';
-import { Button, Card, Tabs, Space, Input } from 'antd';
+import { Button, Card, Tabs, Space, Input, InputNumber,message } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import { PublicApi } from '@/services/api';
 import PayWayRadio from './components/payWayRadio';
@@ -59,7 +59,7 @@ const PayWaySetTemplate: React.FC<{}> = () => {
     console.log(value, type)
     const data = [...payItem];
     if (type === 2) {
-      data[idx].payParametersList.push(value)
+      data[idx].payParametersList = [...data[idx].payParametersList, value]
     } else {
       data[idx].payParametersAddListRequests = [...data[idx].payParametersAddListRequests, value]
     }
@@ -96,32 +96,66 @@ const PayWaySetTemplate: React.FC<{}> = () => {
 
   /**保存更新 */
   const onHnadleSubmit = () => {
-    PublicApi.postPayCollectionParametersAdd({
-      platformPayWays: payItem
-    }).then(res => {
-      if (res.code === 1000) {
-        history.push('/ruleSettingManager/paySetting')
-        // location.reload();
+    let conditions = false;
+    let wayName = '';
+    payItem.forEach(item => {
+      if (item.id === 2 && item.isPitchOn === 1) {
+        if(item.payParametersAddListRequests.length > 0) {
+          conditions = true
+        } else {
+          conditions = false
+          wayName = item.way
+          return
+        }
+      } else if (item.id === 1 && item.isPitchOn === 1) {
+        if(item.payParametersAddListRequests.length > 0 && item.payParametersList.length > 0) {
+          conditions = true
+        } else {
+          conditions = false
+          wayName = item.way
+          return
+        }
+      } else {
+        conditions = true
       }
     })
+    if (conditions) {
+      PublicApi.postPayCollectionParametersAdd({
+        platformPayWays: payItem
+      }).then(res => {
+        if (res.code === 1000) {
+          history.push('/ruleSettingManager/paySetting')
+        }
+      })
+    } else {
+      message.error(`请新增${wayName}的支付参数配置`)
+    }
   }
 
   /** */
   const handleBlur = (e, name, idx) => {
     const data = [...payItem]
     const payParametersAddListRequests = data[idx].payParametersAddListRequests;
-    if(payParametersAddListRequests.length === 0) {
-      payParametersAddListRequests.push({code: '', value: '', describe: ''})
+    if (payParametersAddListRequests.length === 0) {
+      payParametersAddListRequests.push({ code: '', value: '', describe: '' })
     }
     payParametersAddListRequests.map(item => {
-     for(let key in item) {
-       if(key === name) {
-         item[key] = e.target.value
-       }else {
-        item[name] = e.target.value
-       }
-     }
-     item.type = 6;
+      for (let key in item) {
+        if (key === name) {
+          if (name === 'value') {
+            item[key] = e
+          } else {
+            item[key] = e.target.value
+          }
+        } else {
+          if (name === 'value') {
+            item[name] = e
+          } else {
+            item[name] = e.target.value
+          }
+        }
+      }
+      item.type = 6;
     })
     data[idx].payParametersAddListRequests = [...payParametersAddListRequests]
     console.log(payParametersAddListRequests, 10086)
@@ -164,8 +198,8 @@ const PayWaySetTemplate: React.FC<{}> = () => {
                         <Space direction="horizontal" size={16}>
                           初始申请额度不超过
                             <Input onChange={(e) => handleBlur(e, 'code', idx)} value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].code : undefined} addonBefore="￥" />
-                            允许满<Input onChange={(e) => handleBlur(e, 'value', idx)}  value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].value : undefined} />
-                            天后申请上调<Input onChange={(e) => handleBlur(e, 'describe', idx)}  value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].describe : undefined} addonAfter="%" />
+                            允许满<InputNumber min={1} onChange={(e) => handleBlur(e, 'value', idx)} value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].value : undefined} />
+                            天后申请上调<Input onChange={(e) => handleBlur(e, 'describe', idx)} value={payItem[idx].payParametersAddListRequests.length > 0 ? payItem[idx].payParametersAddListRequests[0].describe : undefined} addonAfter="%" />
                         </Space>
                       </div>
                     }

src/pages/ruleSettingManage/payStrategy/detail.tsx

@@ -61,7 +61,7 @@ const PaySetting: React.FC<{}> = () => {
     levelList: [],
     roleList: []
   })
-  const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'id' })
+  const [memberRowSelection, memberRowCtl] = useRowSelectionTable({ customKey: 'memberId' })
   const [optionType, setoptionType] = useState(0)
   const { preview, pageStatus } = usePageStatus()
   // const initValue = useInitValue(PublicApi.getPayPayMemberTacticsDetails)
@@ -155,7 +155,7 @@ const PaySetting: React.FC<{}> = () => {
   const tableAddButton = <Button style={{ marginBottom: 16 }} disabled={pageStatus === PageStatus.PREVIEW} block icon={<PlusOutlined />} onClick={() => handleAddMemberBtn()} type='dashed'>选择指定会员</Button>
   const tableColumns = [
     { dataIndex: 'memberId', title: 'ID', align: 'center' },
-    { dataIndex: 'name', title: '会员名称', key: 'name', align: 'left', render: (_, record) => <EyePreview url={`?id=${record.memberId}&preview=1`}>{_}</EyePreview> },
+    { dataIndex: 'name', title: '会员名称', key: 'name', align: 'left' }, , // render: (_, record) => <EyePreview url={`?id=${record.memberId}&preview=1`}>{_}</EyePreview>
     { dataIndex: 'memberTypeName', key: 'memberTypeName', align: 'center', title: '会员类型' },
     { dataIndex: 'roleName', key: 'roleName', title: '会员角色', align: 'center' },
     { dataIndex: 'levelTag', key: 'levelTag', title: '会员等级', align: 'center' },
@@ -495,7 +495,7 @@ const PaySetting: React.FC<{}> = () => {
           }
         }
         tableProps={{
-          rowKey: 'id'
+          rowKey: 'memberId'
         }}
       />
     </PageHeaderWrapper>

src/pages/ruleSettingManage/payStrategy/index.tsx

@@ -134,6 +134,7 @@ const List: React.FC<{}> = () => {
           },
           children:
           <Button
+            style={{ marginBottom: '24px' }}
             type="primary"
             onClick={handleToAdd}
             icon={<PlusOutlined />}

src/pages/systemManage/sensitiveWords/index.tsx

@@ -14,6 +14,7 @@ const SensitiveWords: React.FC<{}> = () => {
   const [selectedRowKeys, setSelectedRowKeys] = useState<number[]>([]);
   // 删除
   const confirmCancel = (ids: number[], type: boolean) => {
+    console.log(ids)
     if (ids.length > 0) {
       PublicApi.postManageSensitiveWordDelete({ ids }).then(res => {
         if (res.code === 1000) {
@@ -22,7 +23,8 @@ const SensitiveWords: React.FC<{}> = () => {
           } else {
             message.success('删除成功')
           }
-          ref.current.Reload()
+          ref.current.reload()
+          setSelectedRowKeys([])
         }
       })
     } else {
@@ -128,7 +130,7 @@ const SensitiveWords: React.FC<{}> = () => {
                       name: {
                         type: 'string',
                         'x-component-props': {
-                          placeholder: '属性名称',
+                          placeholder: '敏感词名称',
                         },
                         'x-component': 'Search'
                       }