Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

config/routes.js

@@ -140,6 +140,11 @@ export default [
                 name: '积分获取',
                 component: './integralMall/achieve',
               },
+              {
+                path: '/integralMall/editAchieve',
+                name: '积分获取',
+                component: './integralMall/editAchieve',
+              },
               {
                 path: '/integralMall/editGoods',
                 name: '商品编辑',

src/pages/integralMall/achieve.jsx

@@ -58,6 +58,15 @@ const changePageNum = (pageNumber) => {
     })
   }
 
+  const updateRules = (row) => () => {
+    router.push({
+      pathname: '/integralMall/editAchieve',
+      query: {
+        ruleId: row.ruleId
+      },
+    });
+  }
+
 const columns = [
     {
       title: '类型',
@@ -71,6 +80,12 @@ const columns = [
       key: 'pointsAmount',
       align: 'center',
     },
+    {
+      title: '说明',
+      dataIndex: 'remark',
+      key: 'remark',
+      align: 'center',
+    },
     {
       title: '状态',
       dataIndex: 'status',
@@ -98,8 +113,8 @@ const columns = [
             </span>
           </AuthButton>
           <AuthButton name="admin.tdPointsRules.put" noRight={null}>
-            <span style={{ color: '#FF925C',cursor: 'pointer' }}>
-              {row.buildingId != null ? '编辑'`${<Icon type="form" className={styles.edit} />}` : ''}
+            <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={updateRules(row)}>
+                编辑{<Icon type="form" className={styles.edit} />} 
             </span>
           </AuthButton>
         </>

src/pages/integralMall/editAchieve.jsx

@@ -0,0 +1,73 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from '../channel/channelList.less';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import router from 'umi/router';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+const header = props => {
+  const ruleId = props.location.query.ruleId
+  const [ ruleData, setRuleData ] = useState({})
+  if(ruleId){
+    useEffect(() => {
+      getRuleData(ruleId);
+    },[])
+
+  // 查询列表
+  const getRuleData = (ruleId) => {
+    request({ ...apis.integralMall.rulesDetail, urlData: { id: ruleId },}).then((data) => {
+        console.log(data)
+        setRuleData(data)
+    })
+  }
+  }
+
+  const fields = [
+    {
+      label: '获取积分',
+      name: 'pointsAmount',
+      type: FieldTypes.Text,
+      value: ruleData.pointsAmount,
+    },
+    {
+      label: '说明',
+      name: 'remark',
+      type: FieldTypes.Text,
+      value: ruleData.remark,
+    }
+  ]
+
+   
+  const handleSubmit = (values) => {
+    if(ruleId){
+      values.ruleId = ruleId
+      request({ ...apis.integralMall.rulesUpdate, data: values,}).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }else{
+       
+      }
+  }
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/integralMall/achieve',
+    });
+  }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

src/services/apis.js

@@ -427,6 +427,16 @@ export default {
       method: 'GET',
       action: 'admin.tdPointsRules.get',
     },
+    rulesDetail: {
+      url: `${prefix}/tdPointsRules/:id`,
+      method: 'GET',
+      action: 'admin.tdPointsRules.id.get',
+    },
+    rulesUpdate: {
+      url: `${prefix}/tdPointsRules`,
+      method: 'PUT',
+      action: 'admin.tdPointsRules.put',
+    },
     change: {
       url: `${prefix}/tdPointsRules/change`,
       method: 'PUT',