Merge branch 'master' of http://git.ycjcjy.com/marketing/pc-admin

src/pages/Live/LiveActivity/Edit/components/base.jsx

@@ -22,7 +22,8 @@ import LivePlatSelect from '@/components/SelectButton/LivePlatSelect';
 import CitySelect3 from '@/components/SelectButton/CitySelect3';
 import ImageUpload from '@/components/XForm/ImageUpload';
 import request from '@/utils/request';
-import WxWorkLivingRoom from '@/components/LivingRoom/WxWork'
+import WxWorkLivingRoom from '@/components/LivingRoom/WxWork';
+import AuthButton from '@/components/AuthButton';
 
 const { Option } = Select;
 
@@ -55,7 +56,7 @@ const header = props => {
   };
 
   const cancelPage = () => {
-    router.go('-1')
+    router.go('-1');
   };
 
   //打开新页面
@@ -178,7 +179,7 @@ const header = props => {
           {getFieldDecorator('isNewHouse', {
             valuePropName: 'checked',
             initialValue: liveActivityData.isNewHouse || false,
-          })(<Switch/>)}
+          })(<Switch />)}
         </Form.Item>
         {/* <Form.Item label="直播小程序">
           {getFieldDecorator('liveApp', {
@@ -200,17 +201,12 @@ const header = props => {
           <Navigate onClick={openIndexImg}>不知道怎么填？查看说明</Navigate>
         </Form.Item> */}
         <Form.Item label="选择直播间">
-          {
-            getFieldDecorator('liveRoomParam', {
-              initialValue: liveActivityData.liveRoomParam,
-              rules: [{ required: true, message: '请选择直播间' }],
-            })(<WxWorkLivingRoom placeholder="请选择直播间"/>)
-          }
+          {getFieldDecorator('liveRoomParam', {
+            initialValue: liveActivityData.liveRoomParam,
+            rules: [{ required: true, message: '请选择直播间' }],
+          })(<WxWorkLivingRoom placeholder="请选择直播间" />)}
         </Form.Item>
-        <Form.Item
-          label="封面图"
-          help="建议尺寸：335px*201px，比例5:3，格式：jpg，用于：活动列表"
-        >
+        <Form.Item label="封面图" help="建议尺寸：335px*201px，比例5:3，格式：jpg，用于：活动列表">
           {getFieldDecorator('listImg', {
             initialValue: liveActivityData.listImg,
             rules: [{ required: true, message: '请上传封面图1' }],
@@ -222,7 +218,10 @@ const header = props => {
             rules: [{ required: true, message: '请上传封面图2' }],
           })(<ImageUpload />)}
         </Form.Item> */}
-        <Form.Item label="详情图" help="建议尺寸：750*1456px以上，格式：jpg，用于：直播活动详情页，点击可跳转到直播间">
+        <Form.Item
+          label="详情图"
+          help="建议尺寸：750*1456px以上，格式：jpg，用于：直播活动详情页，点击可跳转到直播间"
+        >
           {getFieldDecorator('detailTypeImg', {
             initialValue: liveActivityData.detailTypeImg,
             rules: [{ required: true, message: '请上传详情图' }],
@@ -246,9 +245,12 @@ const header = props => {
           )}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
-          <Button type="primary" htmlType="submit" style={{ marginRight: '20px' }}>
-            确定
-          </Button>
+          <AuthButton name="live.edit.submit" noRight={null}>
+            <Button type="primary" htmlType="submit" style={{ marginRight: '20px' }}>
+              确定
+            </Button>
+          </AuthButton>
+
           <Button onClick={() => router.go(-1)}>取消</Button>
         </Form.Item>
       </Form>

src/pages/Live/LiveActivity/List/index.jsx

@@ -116,7 +116,11 @@ const header = props => {
       dataIndex: 'liveActivityTitle',
       key: 'liveActivityTitle',
       align: 'center',
-      render: (x, row) => <Navigate onClick={toAddLive(row)}>{row.liveActivityTitle}</Navigate>,
+      render: (x, row) => (
+        <AuthButton name="live.edit" noRight={row.liveActivityTitle}>
+          <Navigate onClick={toAddLive(row)}>{row.liveActivityTitle}</Navigate>
+        </AuthButton>
+      ),
     },
     {
       title: '所属城市',
@@ -212,7 +216,7 @@ const header = props => {
         //   <EditIcon type="record" text="数据记录" onClick={toDataReacord(record)} />
         // </AuthButton>,
 
-        <AuthButton name="admin.live.detail.get" noRight={null}>
+        <AuthButton name="live.edit" noRight={null}>
           <EditIcon type="look" text="查看详情" onClick={toAddLive(record)} />
         </AuthButton>,
       ]),
@@ -305,12 +309,12 @@ const header = props => {
         </Form.Item>
       </Form>
 
-      <AuthButton name="admin.live.add.post" noRight={null}>
+      <AuthButton name="live.add" noRight={null}>
         <Button type="danger" style={{ margin: '20px 0' }} onClick={toAddLive()}>
           新增
         </Button>
       </AuthButton>
-      <AuthButton name="admin.live.del" noRight={null}>
+      <AuthButton name="live.delete" noRight={null}>
         <Button type="primary" onClick={toDelLiveActivity()} style={{ marginLeft: '30px' }}>
           删除
         </Button>

src/pages/Live/LiveActivity/add/index.jsx

@@ -1,48 +1,65 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Radio, Switch, InputNumber, Card } from 'antd';
+import {
+  Form,
+  Input,
+  Button,
+  Icon,
+  Select,
+  message,
+  Table,
+  Divider,
+  Tag,
+  Pagination,
+  Modal,
+  DatePicker,
+  Radio,
+  Switch,
+  InputNumber,
+  Card,
+} from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import XForm, { FieldTypes } from '@/components/XForm';
 import router from 'umi/router';
 import moment from 'moment';
-import SelectCity from '@/components/SelectButton/CitySelect'
-import BuildSelect2 from '@/components/SelectButton/BuildSelect2'
-import LivePlatSelect from '@/components/SelectButton/LivePlatSelect'
-import CitySelect3 from '@/components/SelectButton/CitySelect3'
-import ImageUpload from '@/components/XForm/ImageUpload'
-import Wangedit from '@/components/Wangedit/Wangedit'
+import SelectCity from '@/components/SelectButton/CitySelect';
+import BuildSelect2 from '@/components/SelectButton/BuildSelect2';
+import LivePlatSelect from '@/components/SelectButton/LivePlatSelect';
+import CitySelect3 from '@/components/SelectButton/CitySelect3';
+import ImageUpload from '@/components/XForm/ImageUpload';
+import Wangedit from '@/components/Wangedit/Wangedit';
 import Navigate from '@/components/Navigate';
 import apis from '@/services/apis';
 import request from '@/utils/request';
 import AuthButton from '@/components/AuthButton';
 import Prompt from 'umi/prompt';
-import WxWorkLivingRoom from '@/components/LivingRoom/WxWork'
+import WxWorkLivingRoom from '@/components/LivingRoom/WxWork';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
-let cityId = ''
+let cityId = '';
 
 const header = props => {
-  const { salesBatchId } = props.location.query
-  console.log(salesBatchId)
-  const [ saleBatchData, setSaleBatchData ] = useState({})
-  const [showHelp, setShowHelp] = useState(false)
+  const { salesBatchId } = props.location.query;
+  console.log(salesBatchId);
+  const [saleBatchData, setSaleBatchData] = useState({});
+  const [showHelp, setShowHelp] = useState(false);
 
-  const cancelPage = () =>{
+  const cancelPage = () => {
     router.push({
       pathname: '/activity/liveActivity/list',
     });
-  }
+  };
 
-   //打开新页面
-   const openIndexImg = () => {
-    const newWin=window.open('about:blank');
-    newWin.location.href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%95%99%E7%A8%8B.png"
-  }
+  //打开新页面
+  const openIndexImg = () => {
+    const newWin = window.open('about:blank');
+    newWin.location.href = 'http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%95%99%E7%A8%8B.png';
+  };
 
   function highlightsTypeChange(e) {
-    console.log(e.target.value,"ee")
-    setTypeState(e.target.value)
+    console.log(e.target.value, 'ee');
+    setTypeState(e.target.value);
   }
 
   function disabledDate(current) {
@@ -50,26 +67,30 @@ const header = props => {
     return current && current < moment().endOf('day');
   }
 
-  function handleSubmit (e) {
+  function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
-      if (!err){
-        let {liveTime, ...submitValue} = values
-        submitValue.liveStartDate = moment(submitValue.liveStartDate._d).format('YYYY-MM-DD HH:mm:ss')
-        submitValue.liveEndDate = moment(submitValue.liveEndDate._d).format('YYYY-MM-DD HH:mm:ss')
-        
-        if (values.liveStartDate > values.liveEndDate){
-          message.info("直播结束时间大于开始时间")
+      if (!err) {
+        let { liveTime, ...submitValue } = values;
+        submitValue.liveStartDate = moment(submitValue.liveStartDate._d).format(
+          'YYYY-MM-DD HH:mm:ss',
+        );
+        submitValue.liveEndDate = moment(submitValue.liveEndDate._d).format('YYYY-MM-DD HH:mm:ss');
+
+        if (values.liveStartDate > values.liveEndDate) {
+          message.info('直播结束时间大于开始时间');
           return;
         }
 
-        request({ ...apis.taliveActivity.addTaLiveActivity, data: { ...submitValue },}).then((data) => {
-          message.info("保存成功")
-          console.log(data,"datattttttt")
-          router.go('-1');
-        }).catch((err) => {
-          message.info(err.msg || err.message)
-        })
+        request({ ...apis.taliveActivity.addTaLiveActivity, data: { ...submitValue } })
+          .then(data => {
+            message.info('保存成功');
+            console.log(data, 'datattttttt');
+            router.go('-1');
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
       }
     });
   }
@@ -82,12 +103,12 @@ const header = props => {
         <Form.Item label="所属城市">
           {getFieldDecorator('cityId', {
             rules: [{ required: true, message: ' 请选择所属城市' }],
-          })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
+          })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')} />)}
         </Form.Item>
         <Form.Item label="所属楼盘">
           {getFieldDecorator('buildingId', {
             rules: [{ required: true, message: ' 请选择所属楼盘' }],
-          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
+          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')} />)}
         </Form.Item>
         <Form.Item label="直播活动标题">
           {getFieldDecorator('liveActivityTitle', {
@@ -96,29 +117,44 @@ const header = props => {
         </Form.Item>
         <Form.Item label="直播开始时间">
           {getFieldDecorator('liveStartDate', {
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择直播开始时间',
-                  },
-                ],
-              })(<DatePicker placeholder="预计开始时间"style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+            rules: [
+              {
+                required: true,
+                message: '请选择直播开始时间',
+              },
+            ],
+          })(
+            <DatePicker
+              placeholder="预计开始时间"
+              style={{ width: '500px' }}
+              format="YYYY-MM-DD HH:mm:ss"
+              showTime={{ format: 'HH:mm:ss' }}
+            />,
+          )}
         </Form.Item>
         <Form.Item label="直播结束时间">
           {getFieldDecorator('liveEndDate', {
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择直播结束时间',
-                  },
-                ],
-              })(<DatePicker placeholder="预计结束时间" disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+            rules: [
+              {
+                required: true,
+                message: '请选择直播结束时间',
+              },
+            ],
+          })(
+            <DatePicker
+              placeholder="预计结束时间"
+              disabledDate={disabledDate}
+              style={{ width: '500px' }}
+              format="YYYY-MM-DD HH:mm:ss"
+              showTime={{ format: 'HH:mm:ss' }}
+            />,
+          )}
         </Form.Item>
         <Form.Item label="是否新房">
           {getFieldDecorator('isNewHouse', {
             valuePropName: 'checked',
-            initialValue:  false,
-          })(<Switch defaultChecked={false}/>)}
+            initialValue: false,
+          })(<Switch defaultChecked={false} />)}
         </Form.Item>
 
         {/* <Form.Item label="直播小程序">
@@ -132,19 +168,15 @@ const header = props => {
           })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}<Navigate onClick={openIndexImg}>不知道怎么填？查看说明</Navigate>
         </Form.Item> */}
         <Form.Item label="选择直播间">
-          {
-            getFieldDecorator('liveRoomParam', {
-              rules: [{ required: true, message: '请选择直播间' }],
-            })(<WxWorkLivingRoom placeholder="请选择直播间" />)
-          }
+          {getFieldDecorator('liveRoomParam', {
+            rules: [{ required: true, message: '请选择直播间' }],
+          })(<WxWorkLivingRoom placeholder="请选择直播间" />)}
         </Form.Item>
         <Form.Item label="封面图" help="建议尺寸：335px*201px，比例5:3，格式：jpg，用于：活动列表">
-              {getFieldDecorator('listImg', {
-                  rules: [{ required: true, message: '请上传封面图1' }],
-              })(
-                <ImageUpload />,
-              )}
-        </Form.Item>  
+          {getFieldDecorator('listImg', {
+            rules: [{ required: true, message: '请上传封面图1' }],
+          })(<ImageUpload />)}
+        </Form.Item>
         {/* <Form.Item label="封面图2" help="建议尺寸：750*250px，比例3:1，格式：jpg，用于：项目详情页">
               {getFieldDecorator('detailImg', {
                   rules: [{ required: true, message: '请上传封面图2' }],
@@ -152,41 +184,43 @@ const header = props => {
                 <ImageUpload />,
               )}
         </Form.Item>   */}
-        <Form.Item label="详情图" help="建议尺寸：750*1456px以上，格式：jpg，用于：直播活动详情页，点击可跳转到直播间">
-              {getFieldDecorator('detailTypeImg', {
-                  rules: [{ required: true, message: '请上传详情图' }],
-              })(
-                <ImageUpload />,
-              )}
-        </Form.Item>      
+        <Form.Item
+          label="详情图"
+          help="建议尺寸：750*1456px以上，格式：jpg，用于：直播活动详情页，点击可跳转到直播间"
+        >
+          {getFieldDecorator('detailTypeImg', {
+            rules: [{ required: true, message: '请上传详情图' }],
+          })(<ImageUpload />)}
+        </Form.Item>
         <Form.Item label="权重">
-              {getFieldDecorator('weight', {
-                  rules: [{ required: true, message: '请设置权重' }],
-              })(
-                <InputNumber placeholder="权重越大越靠前" style={{width:'150px'}}/>
-              )}
+          {getFieldDecorator('weight', {
+            rules: [{ required: true, message: '请设置权重' }],
+          })(<InputNumber placeholder="权重越大越靠前" style={{ width: '150px' }} />)}
         </Form.Item>
         <Form.Item label="发布状态">
           {getFieldDecorator('status', {
-              rules: [{ required: true, message: '请选择发布状态' }],
-            })(<Select placeholder="发布状态" style={{ width: '300px' }}>
-            <Option value="0">否</Option>
-            <Option value="1">是</Option>
-          </Select>)}
+            rules: [{ required: true, message: '请选择发布状态' }],
+          })(
+            <Select placeholder="发布状态" style={{ width: '300px' }}>
+              <Option value="0">否</Option>
+              <Option value="1">是</Option>
+            </Select>,
+          )}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
-          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
-            确定
-          </Button>
-          <Button onClick={() => router.go(-1)}>
-            取消
-          </Button>
+          <AuthButton name="live.add.submit" noRight={null}>
+            <Button type="primary" htmlType="submit" style={{ marginRight: '20px' }}>
+              确定
+            </Button>
+          </AuthButton>
+
+          <Button onClick={() => router.go(-1)}>取消</Button>
         </Form.Item>
       </Form>
     </Card>
-  )
-}
+  );
+};
 
 const WrappedHeader = Form.create({ name: 'header' })(header);
 
-export default WrappedHeader
+export default WrappedHeader;

src/pages/Live/video/Edit/index.jsx

@@ -24,6 +24,7 @@ import CitySelect3 from '@/components/SelectButton/CitySelect3';
 import ImageUpload from '@/components/XForm/ImageUpload';
 import request from '@/utils/request';
 import Navigate from '@/components/Navigate';
+import AuthButton from '@/components/AuthButton';
 
 const header = props => {
   console.log(props);
@@ -168,9 +169,12 @@ const header = props => {
         </Form.Item>
 
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
-          <Button type="primary" htmlType="submit" style={{ marginRight: '20px' }}>
-            确定
-          </Button>
+          <AuthButton name="video.submit" noRight={null}>
+            <Button type="primary" htmlType="submit" style={{ marginRight: '20px' }}>
+              确定
+            </Button>
+          </AuthButton>
+
           <Button onClick={() => router.go(-1)}>取消</Button>
         </Form.Item>
       </Form>

src/pages/Live/video/List/index.jsx

@@ -37,32 +37,29 @@ const Video = props => {
     });
   };
 
-
   const onPublish = row => {
-   
     request({ ...apis.video.publish, urlData: { id: row.videoId } })
       .then(() => {
-        message.success( '操作成功');
+        message.success('操作成功');
         // setLoading(false);
         ref.current.reload();
       })
       .catch(err => {
         console.error(err);
-        message.error( '操作失败');
+        message.error('操作失败');
       });
   };
 
   const onDelete = row => {
-
     request({ ...apis.video.delete, urlData: { id: row.videoId } })
       .then(() => {
-        message.success( '删除成功');
+        message.success('删除成功');
         // setLoading(false);
         ref.current.reload();
       })
       .catch(err => {
         console.error(err);
-        message.error( '操作失败');
+        message.error('操作失败');
       });
   };
 
@@ -82,9 +79,11 @@ const Video = props => {
       align: 'center',
       width: '20%',
       render: (x, row) => (
-        <Navigate onClick={() => toVideoEdit(row)}>
-          <Typography.Text ellipsis>{x}</Typography.Text>
-        </Navigate>
+        <AuthButton name="video.publish" noRight={x}>
+          <Navigate onClick={() => toVideoEdit(row)}>
+            <Typography.Text ellipsis>{x}</Typography.Text>
+          </Navigate>
+        </AuthButton>
       ),
     },
     {
@@ -102,7 +101,7 @@ const Video = props => {
       dataIndex: 'lookNum',
       key: 'lookNum',
       align: 'center',
-      render: (x, row) =>x||0
+      render: (x, row) => x || 0,
     },
     {
       title: '归属楼盘',
@@ -123,7 +122,7 @@ const Video = props => {
       key: 'handle',
       align: 'center',
       render: withActions((x, row) => [
-        <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+        <AuthButton name="video.edit" noRight={null}>
           <OperButton onClick={() => toVideoEdit(row)}>编辑</OperButton>
           {/* <EditIcon
         type="edit"
@@ -132,7 +131,7 @@ const Video = props => {
       /> */}
         </AuthButton>,
 
-        <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+        <AuthButton name="video.publish" noRight={null}>
           <OperButton onClick={() => onPublish(row)}>
             {row.isPublish ? '取消发布' : '发布'}
           </OperButton>
@@ -143,7 +142,7 @@ const Video = props => {
           /> */}
         </AuthButton>,
 
-        <AuthButton name="admin.building.delete" noRight={null}>
+        <AuthButton name="video.delete" noRight={null}>
           <OperButton.Confirm
             title="确认删除?"
             content="删除之后不可恢复"
@@ -158,9 +157,11 @@ const Video = props => {
 
   const actionRender = () => {
     return (
-      <Button type="primary" icon="plus" onClick={() => toVideoEdit()}>
-        新增
-      </Button>
+      <AuthButton name="video.add" noRight={null}>
+        <Button type="primary" icon="plus" onClick={() => toVideoEdit()}>
+          新增
+        </Button>
+      </AuthButton>
     );
   };
 

src/pages/activity/SignupActivity/edit/Basic.jsx

@@ -7,6 +7,7 @@ import BuildSelect from '@/components/SelectButton/BuildSelect2';
 import Wangedit from '@/components/Wangedit/Wangedit';
 import request from '@/utils/request';
 import ImageUploader from '@/components/XForm/ImageUpload';
+import AuthButton from '@/components/AuthButton';
 
 const { RangePicker } = DatePicker;
 
@@ -30,7 +31,7 @@ const BasicForm = props => {
     setIsEnlist(e.target.value);
   };
 
-  const { dynamicId,type } = props;
+  const { dynamicId, type } = props;
 
   // 查询详情
   const getDynamicData = dynamicId => {
@@ -90,7 +91,7 @@ const BasicForm = props => {
           values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
         }
 
-        values.type = type
+        values.type = type;
         if (dynamicId) {
           const checks = checkTime();
           if (checks != true) {
@@ -103,7 +104,7 @@ const BasicForm = props => {
             message.info('活动人数必须大于已报名人数');
             return;
           }
-          
+
           values.dynamicId = dynamicId;
           request({ ...apis.activity.update, data: values })
             .then(data => {
@@ -117,7 +118,7 @@ const BasicForm = props => {
           request({ ...apis.activity.add, data: { ...values } })
             .then(data => {
               message.info('保存成功');
-              router.go(-1)
+              router.go(-1);
             })
             .catch(err => {
               message.info(err.msg || err.message);
@@ -133,7 +134,7 @@ const BasicForm = props => {
   const { getFieldDecorator } = props.form;
   return (
     <>
-      <Form {...formItemLayout} onSubmit={handleSubmit} style={{maxWidth: '1000px'}}>
+      <Form {...formItemLayout} onSubmit={handleSubmit} style={{ maxWidth: '1000px' }}>
         <Form.Item label="所属项目">
           {getFieldDecorator('buildingId', {
             rules: [
@@ -144,10 +145,7 @@ const BasicForm = props => {
             ],
           })(<BuildSelect disabled={disable} />)}
         </Form.Item>
-        <Form.Item
-          label="活动封面图"
-          help="建议图片尺寸：690px*388px，比例16:9,格式：jpg"
-        >
+        <Form.Item label="活动封面图" help="建议图片尺寸：690px*388px，比例16:9,格式：jpg">
           {getFieldDecorator('listImgUrl', {
             rules: [
               {
@@ -271,9 +269,11 @@ const BasicForm = props => {
           <span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
         </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
-          <Button type="primary" htmlType="submit">
-            确认
-          </Button>
+          <AuthButton name="activity.enroll.submit" noRight={null}>
+            <Button type="primary" htmlType="submit">
+              确认
+            </Button>
+          </AuthButton>
           &nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => cancelPage()}>取消</Button>
         </Form.Item>

src/pages/activity/SignupActivity/index.jsx

@@ -24,7 +24,7 @@ import apis from '@/services/apis';
 import request from '@/utils/request';
 import QueryTable from '@/components/QueryTable';
 
-const type= 'dymic'
+const type = 'dymic';
 
 const SignupActivity = props => {
   const ref = useRef();
@@ -190,9 +190,11 @@ const SignupActivity = props => {
       align: 'center',
       width: '20%',
       render: (x, row) => (
-        <Navigate onClick={toSignupActivityDetail(row.dynamicId)}>
-          <Typography.Text ellipsis>{row.title}</Typography.Text>
-        </Navigate>
+        <AuthButton name="activity.enroll.detail" noRight={null}>
+          <Navigate onClick={toSignupActivityDetail(row.dynamicId)}>
+            <Typography.Text ellipsis>{row.title}</Typography.Text>
+          </Navigate>
+        </AuthButton>
       ),
     },
     {
@@ -258,7 +260,7 @@ const SignupActivity = props => {
       key: 'handle',
       align: 'center',
       render: withActions((x, row) => [
-        <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+        <AuthButton name="activity.enroll.publish" noRight={null}>
           <EditIcon
             type={row.status === 1 ? 'cancel' : 'publish'}
             text={row.status === 1 ? '取消发布' : '发布'}
@@ -269,19 +271,21 @@ const SignupActivity = props => {
         // //   <EditIcon type="look" text="查看详情" onClick={toSignupActivityDetail(row.dynamicId)} />,
 
         row.activityStatus === 0 ? (
-          <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+          <AuthButton name="activity.enroll.finish" noRight={null}>
             <EditIcon type="end" text="结束活动" onClick={finishDynamic.bind(this, row)} />
           </AuthButton>
         ) : null,
 
-        <EditIcon
-          type={row.home === 1 ? 'cancel' : 'top'}
-          text={row.home === 1 ? '取消推首页' : '推荐首页'}
-          onClick={homeDynamic(row)}
-        />,
+        <AuthButton name="activity.enroll.index" noRight={null}>
+          <EditIcon
+            type={row.home === 1 ? 'cancel' : 'top'}
+            text={row.home === 1 ? '取消推首页' : '推荐首页'}
+            onClick={homeDynamic(row)}
+          />
+        </AuthButton>,
 
         row.activityStatus === 0 || row.activityStatus === 1 ? (
-          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+          <AuthButton name="activity.enroll.edit" noRight={null}>
             <EditIcon
               type="edit"
               text="编辑"
@@ -295,9 +299,11 @@ const SignupActivity = props => {
 
   const actionRender = () => {
     return (
-      <Button type="primary" icon="plus" onClick={() => toSignupActivityEdit()}>
-        新增
-      </Button>
+      <AuthButton name="activity.enroll.add" noRight={null}>
+        <Button type="primary" icon="plus" onClick={() => toSignupActivityEdit()}>
+          新增
+        </Button>
+      </AuthButton>
     );
   };
 
@@ -310,7 +316,7 @@ const SignupActivity = props => {
       columns={columns}
       postData={data => {
         data.time && (data.time = `${moment(data.time).format('YYYY-MM-DDT00:00:00.000')}Z`);
-        data.type=type
+        data.type = type;
         return data;
       }}
       actionRender={actionRender}

src/pages/activity/SignupActivity/registrationRecord.jsx

@@ -200,7 +200,7 @@ const header = props => {
         columns={columns}
         pagination={{ total: data.total, onChange: changePageNum }}
         loading={loading}
-        rowKey="activity"
+        rowKey="enlistId"
       />
       {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>

src/pages/activity/groupRoomActivity/edit/Basic.jsx

@@ -7,6 +7,7 @@ import BuildSelect from '@/components/SelectButton/BuildSelect2';
 import Wangedit from '@/components/Wangedit/Wangedit';
 import request from '@/utils/request';
 import ImageUploader from '@/components/XForm/ImageUpload';
+import AuthButton from '@/components/AuthButton';
 
 const { RangePicker } = DatePicker;
 
@@ -253,10 +254,7 @@ const BasicForm = props => {
             ],
           })(<Input type="number" min={1} />)}
         </Form.Item> */}
-        <Form.Item label="团房价">
-          {getFieldDecorator('groupBuyPrice', {
-          })(<Input />)}
-        </Form.Item>
+        <Form.Item label="团房价">{getFieldDecorator('groupBuyPrice', {})(<Input />)}</Form.Item>
 
         <Form.Item label="活动详情">{getFieldDecorator('desc')(<Wangedit />)}</Form.Item>
         <Form.Item label="报名时间">
@@ -281,9 +279,12 @@ const BasicForm = props => {
           <span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
         </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
-          <Button type="primary" htmlType="submit">
-            确认
-          </Button>
+          <AuthButton name="activity.group.submit" noRight={null}>
+            <Button type="primary" htmlType="submit">
+              确认
+            </Button>
+           
+          </AuthButton>
           &nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => cancelPage()}>取消</Button>
         </Form.Item>

src/pages/activity/groupRoomActivity/index.jsx

@@ -24,7 +24,7 @@ import apis from '@/services/apis';
 import request from '@/utils/request';
 import QueryTable from '@/components/QueryTable';
 
-const type= 'house'
+const type = 'house';
 
 const GroupRoomActivity = props => {
   const ref = useRef();
@@ -190,9 +190,11 @@ const GroupRoomActivity = props => {
       align: 'center',
       width: '20%',
       render: (x, row) => (
-        <Navigate onClick={toSignupActivityDetail(row.dynamicId)}>
-          <Typography.Text ellipsis>{row.title}</Typography.Text>
-        </Navigate>
+        <AuthButton name="activity.group.detail" noRight={row.title}>
+          <Navigate onClick={toSignupActivityDetail(row.dynamicId)}>
+            <Typography.Text ellipsis>{row.title}</Typography.Text>
+          </Navigate>
+        </AuthButton>
       ),
     },
     {
@@ -258,7 +260,7 @@ const GroupRoomActivity = props => {
       key: 'handle',
       align: 'center',
       render: withActions((x, row) => [
-        <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+        <AuthButton name="activity.group.publish" noRight={null}>
           <EditIcon
             type={row.status === 1 ? 'cancel' : 'publish'}
             text={row.status === 1 ? '取消发布' : '发布'}
@@ -269,7 +271,7 @@ const GroupRoomActivity = props => {
         // //   <EditIcon type="look" text="查看详情" onClick={toSignupActivityDetail(row.dynamicId)} />,
 
         row.activityStatus === 0 ? (
-          <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+          <AuthButton name="activity.group.finish" noRight={null}>
             <EditIcon type="end" text="结束活动" onClick={finishDynamic.bind(this, row)} />
           </AuthButton>
         ) : null,
@@ -282,18 +284,20 @@ const GroupRoomActivity = props => {
         //   />
         // </AuthButton>,
 
-        <EditIcon
-          type={row.home === 1 ? 'cancel' : 'top'}
-          text={row.home === 1 ? '取消推首页' : '推荐首页'}
-          onClick={homeDynamic(row)}
-        />,
+        <AuthButton name="activity.group.index" noRight={null}>
+          <EditIcon
+            type={row.home === 1 ? 'cancel' : 'top'}
+            text={row.home === 1 ? '取消推首页' : '推荐首页'}
+            onClick={homeDynamic(row)}
+          />
+        </AuthButton>,
 
         //   <AuthButton name="admin.buildingDynamic.dataRecord" noRight={null}>
         //     <EditIcon type="record" text="数据记录" onClick={toDataReacord(row.dynamicId)} />
         //   </AuthButton>,
 
         row.activityStatus === 0 || row.activityStatus === 1 ? (
-          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+          <AuthButton name="activity.group.edit" noRight={null}>
             <EditIcon
               type="edit"
               text="编辑"
@@ -307,9 +311,11 @@ const GroupRoomActivity = props => {
 
   const actionRender = () => {
     return (
-      <Button type="primary" icon="plus" onClick={() => toSignupActivityEdit()}>
-        新增
-      </Button>
+      <AuthButton name="activity.group.add" noRight={null}>
+        <Button type="primary" icon="plus" onClick={() => toSignupActivityEdit()}>
+          新增
+        </Button>
+      </AuthButton>
     );
   };
 
@@ -322,7 +328,7 @@ const GroupRoomActivity = props => {
       columns={columns}
       postData={data => {
         data.time && (data.time = `${moment(data.time).format('YYYY-MM-DDT00:00:00.000')}Z`);
-        data.type=type
+        data.type = type;
         return data;
       }}
       actionRender={actionRender}

src/pages/activity/groupRoomActivity/registrationRecord.jsx

@@ -195,13 +195,13 @@ const header = props => {
           导出
         </Button>
       </div>
-      {/* <Table
+      <Table
         dataSource={data.list.data}
         columns={columns}
         pagination={{ total: data.total, onChange: changePageNum }}
         loading={loading}
-        rowKey="activity"
-      /> */}
+        rowKey="enlistId"
+      />
       {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
       </div> */}

src/pages/activity/lookHouseActivity/edit/Basic.jsx

@@ -7,6 +7,7 @@ import BuildSelect from '@/components/SelectButton/BuildSelect2';
 import Wangedit from '@/components/Wangedit/Wangedit';
 import request from '@/utils/request';
 import ImageUploader from '@/components/XForm/ImageUpload';
+import AuthButton from '@/components/AuthButton';
 
 const { RangePicker } = DatePicker;
 const type = 'look'
@@ -280,9 +281,12 @@ const BasicForm = props => {
           <span style={{ marginLeft: 30, color: 'grey' }}>数字越大越靠前</span>
         </Form.Item>
         <Form.Item wrapperCol={{ span: 12, offset: 8 }}>
-          <Button type="primary" htmlType="submit">
-            确认
-          </Button>
+        <AuthButton name="activity.look.submit" noRight={null}>
+            <Button type="primary" htmlType="submit">
+              确认
+            </Button>
+           
+          </AuthButton>
           &nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => cancelPage()}>取消</Button>
         </Form.Item>

src/pages/activity/lookHouseActivity/index.jsx

@@ -24,7 +24,7 @@ import apis from '@/services/apis';
 import request from '@/utils/request';
 import QueryTable from '@/components/QueryTable';
 
-const type= 'look'
+const type = 'look';
 
 const LookHouseActivity = props => {
   const ref = useRef();
@@ -75,7 +75,6 @@ const LookHouseActivity = props => {
     });
   };
 
-
   //   推首页
   const homeDynamic = row => () => {
     const home = Math.abs(row.home - 1);
@@ -177,9 +176,11 @@ const LookHouseActivity = props => {
       align: 'center',
       width: '20%',
       render: (x, row) => (
-        <Navigate onClick={toSignupActivityDetail(row.dynamicId)}>
-          <Typography.Text ellipsis>{row.title}</Typography.Text>
-        </Navigate>
+        <AuthButton name="activity.look.detail" noRight={row.title}>
+          <Navigate onClick={toSignupActivityDetail(row.dynamicId)}>
+            <Typography.Text ellipsis>{row.title}</Typography.Text>
+          </Navigate>
+        </AuthButton>
       ),
     },
     {
@@ -245,7 +246,7 @@ const LookHouseActivity = props => {
       key: 'handle',
       align: 'center',
       render: withActions((x, row) => [
-        <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+        <AuthButton name="activity.look.publish" noRight={null}>
           <EditIcon
             type={row.status === 1 ? 'cancel' : 'publish'}
             text={row.status === 1 ? '取消发布' : '发布'}
@@ -254,13 +255,13 @@ const LookHouseActivity = props => {
         </AuthButton>,
 
         row.activityStatus === 0 ? (
-          <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+          <AuthButton name="activity.look.finish" noRight={null}>
             <EditIcon type="end" text="结束活动" onClick={finishDynamic.bind(this, row)} />
           </AuthButton>
         ) : null,
 
         row.activityStatus === 0 || row.activityStatus === 1 ? (
-          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+          <AuthButton name="activity.look.edit" noRight={null}>
             <EditIcon
               type="edit"
               text="编辑"
@@ -274,9 +275,11 @@ const LookHouseActivity = props => {
 
   const actionRender = () => {
     return (
-      <Button type="primary" icon="plus" onClick={() => toSignupActivityEdit()}>
-        新增
-      </Button>
+      <AuthButton name="activity.look.add" noRight={null}>
+        <Button type="primary" icon="plus" onClick={() => toSignupActivityEdit()}>
+          新增
+        </Button>
+      </AuthButton>
     );
   };
 
@@ -289,7 +292,7 @@ const LookHouseActivity = props => {
       columns={columns}
       postData={data => {
         data.time && (data.time = `${moment(data.time).format('YYYY-MM-DDT00:00:00.000')}Z`);
-        data.type=type
+        data.type = type;
         return data;
       }}
       actionRender={actionRender}

src/pages/activity/lookHouseActivity/registrationRecord.jsx

@@ -200,7 +200,7 @@ const header = props => {
         columns={columns}
         pagination={{ total: data.total, onChange: changePageNum }}
         loading={loading}
-        rowKey="activity"
+        rowKey="enlistId"
       />
       {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>

src/pages/carouselFigure/advertisingList.jsx

@@ -97,13 +97,13 @@ const header = (props) => {
       key: 'handle',
       align: 'center',
       render: withActions((x, row) => [
-        <AuthButton name="admin.advert.publish" noRight={null}>
+        <AuthButton name="ad.screen.publish" noRight={null}>
           <EditIcon text={row.status === 1 ? '下架' : '上架'} type={row.status === 1 ? 'down' : 'up'}  onClick={changeStatus(row)} />
         </AuthButton>,
-        <AuthButton name="admin.advert.put" noRight={null}>
+        <AuthButton name="ad.screen.edit" noRight={null}>
           <EditIcon text="编辑" type="edit" onClick={toEdit(row.contentId)} />
         </AuthButton>,
-        <AuthButton name="admin.advert.delete" noRight={null}>
+        <AuthButton name="ad.screen.delete" noRight={null}>
           <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)}/>
         </AuthButton>,
       ])
@@ -270,7 +270,7 @@ const header = (props) => {
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.advert.post" noRight={null}>
+      <AuthButton name="ad.screen.add" noRight={null}>
         <Button type='primary' onClick={toEdit()} style={{margin:'20px 0'}}>新增</Button>
       </AuthButton>
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList" />

src/pages/carouselFigure/carouselFigureList.jsx

@@ -140,7 +140,7 @@ const header = props => {
       key: 'handle',
       align: 'center',
       render: withActions((x, row) => [
-        <AuthButton name="admin.extendContent.publish" noRight={null}>
+        <AuthButton name="ad.carousel.publish" noRight={null}>
           <EditIcon
             type={row.status === 1 ? 'down' : 'up'}
             text={row.status === 1 ? '下架' : '上架'}
@@ -148,11 +148,11 @@ const header = props => {
           />
         </AuthButton>,
 
-        <AuthButton name="admin.extendContent.id.put" noRight={null}>
+        <AuthButton name="ad.carousel.edit" noRight={null}>
           <EditIcon text="编辑" type="edit" onClick={toEditCarouse(row.contentId)} />
         </AuthButton>,
 
-        <AuthButton name="admin.extendContent.delete" noRight={null}>
+        <AuthButton name="ad.carousel.deletee" noRight={null}>
           <EditIcon text="删除" type="delete" onClick={deleteCarouse(row.contentId)} />
         </AuthButton>,
       ]),
@@ -325,7 +325,7 @@ const header = props => {
         </Form.Item>
       </Form>
       <div style={{textAlign:'right'}}>
-        <AuthButton name="admin.extendContent.post" noRight={null}>
+        <AuthButton name="ad.carousel.add" noRight={null}>
           <Button type="primary" onClick={toEditCarouse()} style={{ margin: '20px 0' }}>
             新增
           </Button>

src/pages/carouselFigure/customImg/list.jsx

@@ -65,7 +65,7 @@ function header(props) {
           dataIndex="handle"
           key="handle"
           render={withActions((text, record) => [
-            <AuthButton name="admin.custom.put" noRight={null}>
+            <AuthButton name="ad.other.edit" noRight={null}>
               <EditIcon text="编辑" type="edit" onClick={toEditCustom(record.imgId, record.imgType)}></EditIcon>
             </AuthButton>,
           ])}

src/pages/carouselFigure/editAdvertising.jsx

@@ -14,6 +14,7 @@ import SelectGroup from './SelectGroup';
 import SelectH5 from './SelectH5';
 import SalesBatchGroup from './SalesBatchGroup';
 import LiveGroup from './LiveGroup';
+import InstitutionSelect from '@/components/SelectButton/InstitutionSelect';
 /**
  *
  *
@@ -203,6 +204,14 @@ const createEditor = () => {
         value: data.cityId,
         rules: [{ required: true, message: '请选择展示城市' }],
       },
+      {
+        label: '城市公司',
+        name: 'institutionId',
+        render: <InstitutionSelect />,
+        // hidden: () => isHaveActive,
+        value: data.institutionId,
+        rules: [{ required: true, message: '请选择城市公司' }],
+      },
       {
         label: '开屏广告',
         name: 'image',

src/pages/channel/Channel/Edit/index.jsx

@@ -1,114 +1,125 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Card, Select, Form, Alert } from 'antd';
+import {
+  Input,
+  Menu,
+  Dropdown,
+  Button,
+  Icon,
+  message,
+  Table,
+  Divider,
+  Card,
+  Select,
+  Form,
+  Alert,
+} from 'antd';
 import router from 'umi/router';
 import apis from '@/services/apis';
-import request from '@/utils/request'
-import InstitutionSelect from '@/components/SelectButton/InstitutionSelect'
+import request from '@/utils/request';
+import InstitutionSelect from '@/components/SelectButton/InstitutionSelect';
 
 const { TextArea } = Input;
 const { Option } = Select;
 
 const header = props => {
-   const {id} = props.location.query
+  const { id } = props.location.query;
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-      if(id){
-        getById()
-      }
-    
-  }, [])
-
+    if (id) {
+      getById();
+    }
+  }, []);
 
   // 查询当前信息
   function getById(params) {
-    request({ ...apis.channelList.getById, urlData: { id: id } }).then((data) => {
-      props.form.setFieldsValue(data)
-    }).catch((err) => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
+    request({ ...apis.channelList.getById, urlData: { id: id } })
+      .then(data => {
+        props.form.setFieldsValue(data);
+      })
+      .catch(err => {
+        console.log(err);
+        message.info(err.msg || err.message);
+      });
   }
 
   // 编辑
   function editChannel(data) {
-      if(id){
-        request({ ...apis.channelList.editChannel, urlData: { id: id }, data: { ...data } }).then((data) => {
-            message.info('修改成功')
-            router.go(-1)
-          }).catch((err) => {
-            console.log(err)
-            message.info(err.msg || err.message)
-          })
-      }else{
-        request({ ...apis.channelList.addChannel, data: { ...data } }).then((data) => {
-            message.info('添加成功')
-            router.go(-1)
-          }).catch((err) => {
-            console.log(err)
-            message.info(err.msg || err.message)
-          })
-      }
-  
+    if (id) {
+      request({ ...apis.channelList.editChannel, urlData: { id: id }, data: { ...data } })
+        .then(data => {
+          message.info('修改成功');
+          router.go(-1);
+        })
+        .catch(err => {
+          console.log(err);
+          message.info(err.msg || err.message);
+        });
+    } else {
+      request({ ...apis.channelList.addChannel, data: { ...data } })
+        .then(data => {
+          message.info('添加成功');
+          router.go(-1);
+        })
+        .catch(err => {
+          console.log(err);
+          message.info(err.msg || err.message);
+        });
+    }
   }
 
-
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        console.log('values', values)
-        editChannel({ ...values })
+        console.log('values', values);
+        editChannel({ ...values });
       }
     });
   }
 
-
   const { getFieldDecorator } = props.form;
 
   return (
     <Card>
       <Form labelCol={{ span: 6 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
-
         <Form.Item label="城市公司">
-          {getFieldDecorator('institutionId',{
+          {getFieldDecorator('institutionId', {
             rules: [{ required: true, message: '请选择城市公司' }],
-          })(
-            <InstitutionSelect />
-          )}
+          })(<InstitutionSelect />)}
         </Form.Item>
         <Form.Item label="渠道名称">
           {getFieldDecorator('channelName', {
             rules: [{ required: true, message: '请输入渠道名称' }],
-          })(<Input  />)}
+          })(<Input />)}
         </Form.Item>
         <Form.Item label="联系人">
           {getFieldDecorator('channelContact', {
             rules: [{ required: true, message: ' 请输入联系人' }],
-          })(<Input  />)}
+          })(<Input />)}
         </Form.Item>
         <Form.Item label="联系电话">
           {getFieldDecorator('contactTel', {
             rules: [{ required: true, message: '请输入联系电话' }],
-          })(<Input  />)}
+          })(<Input />)}
         </Form.Item>
         <Form.Item label="说明描述">
-          {getFieldDecorator('explain', {
-          })(<TextArea  rows={8} />)}
+          {getFieldDecorator('explain', {})(<TextArea rows={8} />)}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 6 }}>
-       
+          <AuthButton name="channel.submit" noRight={null}>
             <Button type="primary" htmlType="submit">
               保存
+            </Button>
+          </AuthButton>
+
+          <Button onClick={() => router.go(-1)} style={{ marginLeft: '20px' }}>
+            取消
           </Button>
-            <Button  onClick={()=>router.go(-1)} style={{marginLeft:'20px'}}>
-              取消
-          </Button>
- 
         </Form.Item>
       </Form>
     </Card>
-  )
-}
+  );
+};
 const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
-export default WrappedNormalLoginForm
+export default WrappedNormalLoginForm;

src/pages/channel/Channel/List/index.jsx

@@ -59,7 +59,6 @@ function toNewCustomer(record) {
 }
 
 export default function ChannelList(props) {
-
   const ref = useRef();
 
   // 跳编辑页面
@@ -72,16 +71,16 @@ export default function ChannelList(props) {
     });
   }
 
- const  onDelete =(row)=> {
-  request({ ...apis.channelList.deleteChannel, urlData: { id: row.channelId } })
+  const onDelete = row => {
+    request({ ...apis.channelList.deleteChannel, urlData: { id: row.channelId } })
       .then(response => {
         message.info('删除成功');
         ref.current.reload();
         // getList({ pageNum: pageNum, pageSize: 10, ...fieldsValue });
       })
       .catch(error => {});
- }
- 
+  };
+
   const searchFields = [
     {
       name: 'channelId',
@@ -112,7 +111,9 @@ export default function ChannelList(props) {
       key: 'channelName',
       align: 'center',
       render: (text, record) => (
-        <Navigate to={`/channel/Channel/Edit?id=${record.channelId}`}>{text}</Navigate>
+        <AuthButton name="channel.edit" noRight={text}>
+          <Navigate to={`/channel/Channel/Edit?id=${record.channelId}`}>{text}</Navigate>
+        </AuthButton>
       ),
     },
     {
@@ -151,23 +152,29 @@ export default function ChannelList(props) {
       dataIndex: 'edit',
       key: 'edit',
       align: 'center',
-      render: (text, record) =>  <Button type='link' onClick={()=>onDelete(record)}>删除</Button>
-
-
+      render: (text, record) => (
+        <AuthButton name="channel.delete" noRight={null}>
+          <Button type="link" onClick={() => onDelete(record)}>
+            删除
+          </Button>
+        </AuthButton>
+      ),
     },
   ];
- 
+
   const actionRender = () => {
     return (
-      <Button type="primary" icon="plus" onClick={() => toedit()}>
-        新增
-      </Button>
+      <AuthButton name="channel.add" noRight={null}>
+        <Button type="primary" icon="plus" onClick={() => toedit()}>
+          新增
+        </Button>
+      </AuthButton>
     );
   };
 
   return (
     <QueryTable
-    ref={ref}
+      ref={ref}
       rowKey="channelList"
       api={apis.channelList.getList}
       searchFields={searchFields}

src/pages/channel/independentList/index.jsx

@@ -143,44 +143,24 @@ class ModalTable extends React.Component {
         title: '状态',
         // eslint-disable-next-line consistent-return
         render: (text, records) => {
-          console.log('retrun', records);
-          //     if (records.status === 1) { return '报备' }
-          // if (records.status === 2) { return '推荐' }
-          // if (records.status === 3) { return '认购' }
-          // if (records.status === 4) { return '签约' }
-          // if (records.verifyStatus === 1) { return '待审核' }
-          // if (records.verifyStatus === 2) { return '审核同意' }
-          // if (records.verifyStatus === 3) { return '签约' }
-          // if (records.status === 1) { if(records.reportRecommendStatus === 1) {return '报备'} if(records.reportRecommendStatus === 2) {return '推荐'}  }
-          // if (records.status === 2) { return '到访' }
-          // if (records.status === 3) { return '认购' }
-          // if (records.status === 4) { return '签约' }
-          // if (records.verifyStatus === 1) { return '待审核' }
-          // if (records.verifyStatus === 2) { return '审核同意' }
-          // if (records.verifyStatus === 3) { return '签约' }
           if (records.status === 1) {
-            if (records.verifyStatus === 0) {
-              return '待审核';
-            }
-            if (records.verifyStatus === 1) {
-              return '报备';
-            }
-            // if (records.reportRecommendStatus === 1) { return '报备' }
-            // if (records.reportRecommendStatus === 2) { return '推荐' }}
-            if (records.verifyStatus === 2) {
-              return '审核驳回';
-            }
+            return '报备';
           }
           if (records.status === 2) {
             return '到访';
           }
           if (records.status === 3) {
-            return '认购';
+            return '认筹';
           }
           if (records.status === 4) {
             return '签约';
           }
-          // reportRecommendStatus
+          if (records.status === 5) {
+            return '结佣';
+          }
+          // if (records.status === 6) {
+          //   return '报废';
+          // }
         },
       },
     ];
@@ -537,16 +517,16 @@ function body(props) {
                 <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => Invite(record)}>邀请经纪人</a>
               </AuthButton> */}
               {/* &nbsp;&nbsp;&nbsp;&nbsp; */}
-              {/* <AuthButton name="admin.customer.recommend.id.get" noRight={null}> */}
-              <Button type="link" onClick={() => gM(record)}>
-                推荐客户
-              </Button>
-              {/* </AuthButton> */}
-              {/* <AuthButton name="admin.customer.recommend.id.get" noRight={null}> */}
-              <Button type="link" onClick={() => onDelete(record)}>
-                删除
-              </Button>
-              {/* </AuthButton> */}
+              <AuthButton name="channel.customer.list" noRight={null}>
+                <Button type="link" onClick={() => gM(record)}>
+                  推荐客户
+                </Button>
+              </AuthButton>
+              <AuthButton name="channel.disable" noRight={null}>
+                <Button type="link" onClick={() => onDelete(record)}>
+                  删除
+                </Button>
+              </AuthButton>
             </>
           }
         </>
@@ -571,7 +551,7 @@ function body(props) {
       <Form
         layout="inline"
         onSubmit={e => handleSubmit(e, props)}
-        style={{ display: 'flex', alignItems: 'center',marginBottom:'20px' }}
+        style={{ display: 'flex', alignItems: 'center', marginBottom: '20px' }}
       >
         <Form.Item>
           {getFieldDecorator('channelId')(
@@ -602,11 +582,11 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item style={{ position: 'absolute', right: '38px' }}>
-          <AuthButton name="admin.major.search" noRight={null}>
+          {/* <AuthButton name="admin.major.search" noRight={null}> */}
             <Button type="primary" htmlType="submit">
               搜索
             </Button>
-          </AuthButton>
+          {/* </AuthButton> */}
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
           </Button>

src/pages/course/Edit/index.jsx

@@ -5,6 +5,7 @@ import FileUpload from '@/components/XForm/FileUpload';
 import Wangedit from '@/components/Wangedit/Wangedit';
 import router from 'umi/router';
 import { fetch, apis } from '@/utils/request';
+import AuthButton from '@/components/AuthButton';
 
 const FormItem = Form.Item;
 const Option = Select.Option;
@@ -14,18 +15,17 @@ const updateCurriculumData = fetch(apis.course.alterCourse);
 const goBack = () => router.goBack(-1);
 
 const CurriculumForm = React.forwardRef((props, ref) => {
-  const [loading, setLoading] = useState(false);//防止多次点击 定义loadind
+  const [loading, setLoading] = useState(false); //防止多次点击 定义loadind
   // const [formData, setFormData] = useState({});//提交表单的数据
-  const [contentType, setContentType] = useState(0);//单选。初始默认显示0 富文本框。点击视频， 渲染1
+  const [contentType, setContentType] = useState(0); //单选。初始默认显示0 富文本框。点击视频， 渲染1
   const { form, history } = props;
-  const { getFieldDecorator, setFieldsValue, validateFields,getFieldValue } = form;
-  const { curriculumId } = history.location.query || {}
-  
+  const { getFieldDecorator, setFieldsValue, validateFields, getFieldValue } = form;
+  const { curriculumId } = history.location.query || {};
+
   const formItemLayout = {
     //布局
     labelCol: { span: 6 },
     wrapperCol: { span: 14 },
-
   };
 
   const fileUploadBeforeUpload = (file, fileList) => {
@@ -40,7 +40,7 @@ const CurriculumForm = React.forwardRef((props, ref) => {
     });
   };
 
-  const handleSubmit = (e) => {
+  const handleSubmit = e => {
     e.preventDefault();
     validateFields((err, values) => {
       if (err) {
@@ -48,7 +48,7 @@ const CurriculumForm = React.forwardRef((props, ref) => {
         //字符验证未填写---返回
       }
 
-      setLoading(true);//loading开始
+      setLoading(true); //loading开始
       if (values.curriculumUrl) {
         values.curriculumUrl = values.curriculumUrl[0];
       }
@@ -57,123 +57,101 @@ const CurriculumForm = React.forwardRef((props, ref) => {
         updateCurriculumData({
           data: {
             ...values,
-            curriculumId
+            curriculumId,
           },
-          urlData: { id: curriculumId }
-        }).then(() => {
-          setLoading(false);
-          message.success('数据更新成功');
-          goBack()
-        }).catch((err) => {
-          setLoading(false);//loading消失
-          message.error(err.message || err);
+          urlData: { id: curriculumId },
         })
+          .then(() => {
+            setLoading(false);
+            message.success('数据更新成功');
+            goBack();
+          })
+          .catch(err => {
+            setLoading(false); //loading消失
+            message.error(err.message || err);
+          });
       } else {
-        saveCurriculumData({ data: values }).then(() => {
-          setLoading(false);
-          message.success('数据保存成功');
-          goBack()
-        }).catch((err) => {
-          setLoading(false);//loading消失
-          message.error(err.message || err);
-        })
+        saveCurriculumData({ data: values })
+          .then(() => {
+            setLoading(false);
+            message.success('数据保存成功');
+            goBack();
+          })
+          .catch(err => {
+            setLoading(false); //loading消失
+            message.error(err.message || err);
+          });
       }
     });
-  }
+  };
 
-  const getCourseData = useCallback(({ curriculumId }) => {//函数结果存 初始化运行一次，等待调用。
-    getCurriculumData({urlData: { id: curriculumId }}).then((res) => {
-      if(res.curriculumUrl){
+  const getCourseData = useCallback(({ curriculumId }) => {
+    //函数结果存 初始化运行一次，等待调用。
+    getCurriculumData({ urlData: { id: curriculumId } }).then(res => {
+      if (res.curriculumUrl) {
         res.curriculumUrl = [res.curriculumUrl];
       }
-      setFieldsValue(res)
+      setFieldsValue(res);
       // setFormData(res)
       // setContentType(res.type)
-    })
-  }, [])
+    });
+  }, []);
 
   useEffect(() => {
     if (curriculumId) {
-      getCourseData({curriculumId})//第一次渲染前//获取id
+      getCourseData({ curriculumId }); //第一次渲染前//获取id
     }
-  }, [curriculumId])//第二次id一样不执行
+  }, [curriculumId]); //第二次id一样不执行
 
   // useEffect(() => {
   //   if (formData) {//1.form表单数据{2} 执行。无变更不执行
   //     setFieldsValue(formData)
   //   }
   // }, [formData])//2.有变更跟的话
-  
 
   return (
-  <Card>
-    <Form {...formItemLayout} onSubmit={handleSubmit}>
-      {/* 布局提交表单 */}
-      <FormItem label="参与对象">
-        {
-          getFieldDecorator('roleId', {
-            rules: [
-              { required: true, message: '请选择参与对象' }
-            ]
+    <Card>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        {/* 布局提交表单 */}
+        <FormItem label="参与对象">
+          {getFieldDecorator('roleId', {
+            rules: [{ required: true, message: '请选择参与对象' }],
           })(
-            <Select style={{width:'500px'}}>
+            <Select style={{ width: '500px' }}>
               <Option value="1">经纪人</Option>
               <Option value="2">置业顾问</Option>
               <Option value="3">{`置业顾问&经纪人`}</Option>
-            </Select>
-          )
-        }
-      </FormItem>
-      <FormItem label="主图" help="建议尺寸：750px*600px，比例5:4，格式：jpg，用于：列表和详情">
-        {
-          getFieldDecorator('curriculumImg', {
-            rules: [
-              { required: true, message: '请上传主图' }
-            ]
-          })(
-            <ImageUpload  />
-          )
-        }
-      </FormItem>
-      <FormItem label="课程标题">
-        {
-          getFieldDecorator('name', {
-            rules: [
-              { required: true, message: '请输入课程标题' }
-            ]
+            </Select>,
+          )}
+        </FormItem>
+        <FormItem label="主图" help="建议尺寸：750px*600px，比例5:4，格式：jpg，用于：列表和详情">
+          {getFieldDecorator('curriculumImg', {
+            rules: [{ required: true, message: '请上传主图' }],
+          })(<ImageUpload />)}
+        </FormItem>
+        <FormItem label="课程标题">
+          {getFieldDecorator('name', {
+            rules: [{ required: true, message: '请输入课程标题' }],
+          })(<Input style={{ width: '500px' }} />)}
+        </FormItem>
+        <FormItem label="简介">
+          {getFieldDecorator('remark', {
+            rules: [{ required: true, message: '请填写简介' }],
+          })(<Input.TextArea rows="5" style={{ width: '500px' }} />)}
+        </FormItem>
+
+        <FormItem label="详情">
+          {getFieldDecorator('type', {
+            initialValue: 0,
+            rules: [{ required: true, message: '请选择详情类型' }],
           })(
-            <Input style={{width:'500px'}} />
-          )
-        }
-      </FormItem>
-      <FormItem label="简介">
-        {
-          getFieldDecorator('remark', {
-            rules: [
-              { required: true, message: '请填写简介' }
-            ]
-          })(
-            <Input.TextArea  rows='5'  style={{width:'500px'}}/>
-          )
-        }
-      </FormItem>
-
-      <FormItem label="详情">
-        {
-          getFieldDecorator('type', {
-            initialValue:0,
-            rules: [
-              { required: true, message: '请选择详情类型' }
-            ]
-          })(
-              <Radio.Group style={{width:'500px'}} >
-                <Radio value={0}>图文</Radio>
-                <Radio value={1}>视频</Radio>
-              </Radio.Group>
-          )
-        }
-      </FormItem>
-{/*       
+            <Radio.Group style={{ width: '500px' }}>
+              <Radio value={0}>图文</Radio>
+              <Radio value={1}>视频</Radio>
+            </Radio.Group>,
+          )}
+        </FormItem>
+        {/*       
       <FormItem label="详情">
         {
         getFieldDecorator('type'),{
@@ -189,51 +167,32 @@ const CurriculumForm = React.forwardRef((props, ref) => {
         }
 
       </FormItem> */}
-  <FormItem label="图文" style={{display:getFieldValue('type')==0?'block':'none'}}>
-        {
-          getFieldDecorator('content', {
-            rules: [
-              { required: getFieldValue('type')==0, message: '请输入详情内容' }
-            ]
-          })(
-           <Wangedit style={{width:'500px'}}  /> 
-          )
-        }
-      </FormItem>
-       <FormItem label="视频" style={{display:getFieldValue('type')==1?'block':'none'}}>
-       {
-         getFieldDecorator('curriculumUrl', {
-           rules: [
-             { required: getFieldValue('type')==1, message: '请上传视频文件' }
-           ]
-         })(
-          <FileUpload accept=".mp4"  label="上传视频" size={1} />,
-         )
-       }
-     </FormItem>
-
-     
-      <FormItem label="权重" >
-        {
-          getFieldDecorator('weight', 
-            )(
-            <InputNumber min='0'   />
-          )
-        }
-      </FormItem>
-
-      <FormItem wrapperCol={{ span: 12, offset: 6 }}>
-        <Button loading={loading} type="primary" htmlType="submit">
-          保存
-        </Button>
-        <Button style={{marginLeft: '2em'}} onClick={goBack}>
-          取消
-        </Button>
-      </FormItem>
-    </Form>
+        <FormItem label="图文" style={{ display: getFieldValue('type') == 0 ? 'block' : 'none' }}>
+          {getFieldDecorator('content', {
+            rules: [{ required: getFieldValue('type') == 0, message: '请输入详情内容' }],
+          })(<Wangedit style={{ width: '500px' }} />)}
+        </FormItem>
+        <FormItem label="视频" style={{ display: getFieldValue('type') == 1 ? 'block' : 'none' }}>
+          {getFieldDecorator('curriculumUrl', {
+            rules: [{ required: getFieldValue('type') == 1, message: '请上传视频文件' }],
+          })(<FileUpload accept=".mp4" label="上传视频" size={1} />)}
+        </FormItem>
+
+        <FormItem label="权重">{getFieldDecorator('weight')(<InputNumber min="0" />)}</FormItem>
+
+        <FormItem wrapperCol={{ span: 12, offset: 6 }}>
+          <AuthButton name="course.submit" noRight={null}>
+            <Button loading={loading} type="primary" htmlType="submit">
+              保存
+            </Button>
+          </AuthButton>
+          <Button style={{ marginLeft: '2em' }} onClick={goBack}>
+            取消
+          </Button>
+        </FormItem>
+      </Form>
     </Card>
-  
-  )
-})
+  );
+});
 
 export default Form.create({})(CurriculumForm);

src/pages/course/list/index.jsx

@@ -24,7 +24,7 @@ export default props => {
     });
   }, []);
 
-  const onDelete = (data)=>{
+  const onDelete = data => {
     request({
       ...apis.course.deleteCourse,
       urlData: { id: data.curriculumId },
@@ -33,7 +33,7 @@ export default props => {
       message.info('删除成功');
       ref.current.reload(); //
     });
-  }
+  };
 
   onDelete;
 
@@ -147,13 +147,16 @@ export default props => {
       align: 'center',
       render: withActions(
         (_, row) => [
-          <OperButton onClick={() => confirm(row)}>
-            {row.isPublish === 0 ? '发布' : '取消发布'}
-          </OperButton>,
-          <AuthButton name="admin.building.delete" noRight={null}>
+          <AuthButton name="course.publish" noRight={null}>
+            <OperButton onClick={() => confirm(row)}>
+              {row.isPublish === 0 ? '发布' : '取消发布'}
+            </OperButton>
+          </AuthButton>,
+
+          <AuthButton name="course.edit" noRight={null}>
             <OperButton onClick={() => toEdit(row)}>编辑</OperButton>
           </AuthButton>,
-          <AuthButton name="admin.building.delete" noRight={null}>
+          <AuthButton name="courseg.delete" noRight={null}>
             <OperButton.Confirm
               title="确认删除?"
               content="删除之后不可恢复"
@@ -169,7 +172,7 @@ export default props => {
   ];
   const actionRender = () => {
     return (
-      <AuthButton name="admin.newclassType.add" noRight={null}>
+      <AuthButton name="course.add" noRight={null}>
         <Button type="primary" icon="plus" onClick={() => toEdit()}>
           新增
         </Button>

src/pages/customer/Customer/PrivateCustomer/index.jsx

@@ -235,7 +235,7 @@ const PrivateCustomer = () => {
 
   const actionRender = () => {
     return (
-      <Button type="danger" loading={exportLoding} onClick={() => exportCustomer()}>
+      <Button type='primary' loading={exportLoding} onClick={() => exportCustomer()}>
         导出
       </Button>
     );

src/pages/customer/Customer/PublicCustomer/index.jsx

@@ -195,7 +195,7 @@ const PublicCustomer = () => {
   const actionRender = () => {
     return (
       <>
-      <Button type="danger" loading={exportLoding} onClick={() => exportCustomer()}>
+      <Button type="primary" loading={exportLoding} onClick={() => exportCustomer()}>
           导出
         </Button>
         {/* <AuthButton name="admin.customer.import" noRight={null}>

src/pages/findRoom/addedValueService/audit.jsx

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Card, Radio, notification, Select,Checkbox  } from 'antd';
+import { Form, Input, Button, Card, Radio, notification, Select, Checkbox } from 'antd';
 import moment from 'moment';
 import request from '@/utils/request';
 import apis from '@/services/apis';
 // import Styles from './style.less';
 import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
 
 const { TextArea } = Input;
 const { Option } = Select;
@@ -41,8 +42,8 @@ function body(props) {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [dataSource, setDataSource] = useState({ picture: '' });
 
-  const { id,type } = props.location.query;
-  const disabled= true
+  const { id, type } = props.location.query;
+  const disabled = true;
 
   useEffect(() => {
     if (id !== '') {
@@ -56,8 +57,7 @@ function body(props) {
       if (res) {
         const b = {};
         JSON.parse(res?.questionnaire)?.map(x => {
-          
-          // if (x.key === 'important' ||x.key === 'special' ||x.key === 'style'||x.key === 'mostImportant') { 
+          // if (x.key === 'important' ||x.key === 'special' ||x.key === 'style'||x.key === 'mostImportant') {
           //   b[x.key] = [x.resultId];
           //   return;
           // }
@@ -121,7 +121,7 @@ function body(props) {
         onSubmit={e => handleSubmit(e)}
         style={{ width: '800px', margin: 'auto' }}
       >
-       <Form.Item label="客户姓名">
+        <Form.Item label="客户姓名">
           {getFieldDecorator('nickname')(<Input placeholder="客户姓名" disabled />)}
         </Form.Item>
         <Form.Item label="客户电话">
@@ -159,9 +159,9 @@ function body(props) {
               <Option value={3}>70~90m²</Option>
               <Option value={4}>90~110m²</Option>
               <Option value={5}>110~130m²</Option>
-              <Option value={6}>130~150m²</Option>  
-              <Option value={7}>150~200m²</Option>  
-              <Option value={8}>200m²以上</Option>     
+              <Option value={6}>130~150m²</Option>
+              <Option value={7}>150~200m²</Option>
+              <Option value={8}>200m²以上</Option>
             </Select>,
           )}
         </Form.Item>
@@ -174,7 +174,6 @@ function body(props) {
               <Option value={3}>包工不包料</Option>
               <Option value={4}>施工包辅材不包主材</Option>
               <Option value={5}>全包</Option>
-             
             </Select>,
           )}
         </Form.Item>
@@ -182,29 +181,29 @@ function body(props) {
         <Form.Item label="家装侧重点">
           {getFieldDecorator('important')(
             <Checkbox.Group disabled={disabled}>
-              <Checkbox value='家装价格'>家装价格</Checkbox>
-              <Checkbox value='施工品质'>施工品质</Checkbox>
-              <Checkbox value='设计感'>设计感</Checkbox>
-              <Checkbox value='环保'>环保</Checkbox>
-              <Checkbox value='舒适度'>舒适度</Checkbox>
-              <Checkbox value='实用度'>实用度</Checkbox>
+              <Checkbox value="家装价格">家装价格</Checkbox>
+              <Checkbox value="施工品质">施工品质</Checkbox>
+              <Checkbox value="设计感">设计感</Checkbox>
+              <Checkbox value="环保">环保</Checkbox>
+              <Checkbox value="舒适度">舒适度</Checkbox>
+              <Checkbox value="实用度">实用度</Checkbox>
             </Checkbox.Group>,
           )}
         </Form.Item>
-         <Form.Item label="家装风格">
+        <Form.Item label="家装风格">
           {getFieldDecorator('style')(
             <Checkbox.Group disabled={disabled}>
-              <Checkbox value='北欧风格'>北欧风格</Checkbox>
-              <Checkbox value='简欧风格'>简欧风格</Checkbox>
-              <Checkbox value='欧式古典'>欧式古典</Checkbox>
-              <Checkbox value='现代简约'>现代简约</Checkbox>
-              <Checkbox value='田园风格'>田园风格</Checkbox>
-              <Checkbox value='新中式风格'>新中式风格</Checkbox>
-              <Checkbox value='地中海风格'>地中海风格</Checkbox>
-              <Checkbox value='东南亚风格'>东南亚风格</Checkbox>
-              <Checkbox value='美式风格'>美式风格</Checkbox>
-              <Checkbox value='日式风格'>日式风格</Checkbox>
-              <Checkbox value='混搭风格'>混搭风格</Checkbox>
+              <Checkbox value="北欧风格">北欧风格</Checkbox>
+              <Checkbox value="简欧风格">简欧风格</Checkbox>
+              <Checkbox value="欧式古典">欧式古典</Checkbox>
+              <Checkbox value="现代简约">现代简约</Checkbox>
+              <Checkbox value="田园风格">田园风格</Checkbox>
+              <Checkbox value="新中式风格">新中式风格</Checkbox>
+              <Checkbox value="地中海风格">地中海风格</Checkbox>
+              <Checkbox value="东南亚风格">东南亚风格</Checkbox>
+              <Checkbox value="美式风格">美式风格</Checkbox>
+              <Checkbox value="日式风格">日式风格</Checkbox>
+              <Checkbox value="混搭风格">混搭风格</Checkbox>
             </Checkbox.Group>,
           )}
         </Form.Item>
@@ -219,7 +218,6 @@ function body(props) {
               <Checkbox value={'温馨舒适'}>温馨舒适</Checkbox>
               <Checkbox value={'品质生活'}>品质生活</Checkbox>
               <Checkbox value={'其他'}>其他</Checkbox>
-            
             </Checkbox.Group>,
           )}
         </Form.Item>
@@ -269,21 +267,32 @@ function body(props) {
             </Checkbox.Group>,
           )}
         </Form.Item> */}
-  
-      
+
         <Form.Item label="回访备注">
           {getFieldDecorator('auditRemark', {
             rules: [{ required: true, message: '请输入回访备注！' }], //v3x必填
           })(<TextArea placeholder="回访备注" disabled={type === 'detail'} rows={7} />)}
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-         {type === 'detail'?<Button onClick={()=>{router.go('-1')}}>
+          <AuthButton name="house.added.reply.submit" noRight={null}>
+            {type !== 'detail' && (
+              <>
+                <Button type="primary" htmlType="submit">
+                  有效
+                </Button>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <Button onClick={() => submitDate({ status: '2' })}>无效</Button>
+              </>
+            )}
+          </AuthButton>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button
+            onClick={() => {
+              router.go('-1');
+            }}
+          >
             返回
-          </Button>:<> <Button type="primary" htmlType="submit">
-            有效
           </Button>
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => submitDate({ status: '2' })}>无效</Button></>}
         </Form.Item>
       </Form>
     </Card>

src/pages/findRoom/addedValueService/index.jsx

@@ -3,9 +3,9 @@ import { Avatar, Button } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
-import QueryTable from '@/components/QueryTable'
+import QueryTable from '@/components/QueryTable';
 import { router } from 'umi';
-
+import AuthButton from '@/components/AuthButton';
 
 /**
  *
@@ -14,62 +14,57 @@ import { router } from 'umi';
  * @returns
  */
 
-
-
-
 function Recommend() {
-  const [exportLoding, setExportLoding] = useState(false)
+  const [exportLoding, setExportLoding] = useState(false);
   //详情页面弹窗配置
-  function toAudit(row,type) {
+  function toAudit(row, type) {
     router.push({
       pathname: '/findRoom/addedValueService/audit',
       query: {
         id: row.id,
-        type:type
+        type: type,
       },
-    })
-
+    });
   }
-//   function toSee(cuurentId) {
-//     router.push({
-//       pathname: '/home/recommend/auditCopy',
-//       query: {
-//         id: cuurentId,
-//       },
-//     })
-
-//   }
+  //   function toSee(cuurentId) {
+  //     router.push({
+  //       pathname: '/home/recommend/auditCopy',
+  //       query: {
+  //         id: cuurentId,
+  //       },
+  //     })
 
+  //   }
 
   /**
    *导出数据（推荐用户）
    *
    */
   function exportRecommendCustomer() {
-    setExportLoding(true)
+    setExportLoding(true);
     request({
       ...apis.customer.customerRecommendRecommenderExport,
       responseType: 'blob',
-    }).then(response => {
-      console.log('exportRecommendCustomer: ', response)
-      download(response)
-    }).catch(error => {
-
     })
+      .then(response => {
+        console.log('exportRecommendCustomer: ', response);
+        download(response);
+      })
+      .catch(error => {});
   }
 
   function download(data) {
     if (!data) {
-      return
+      return;
     }
-    const url = window.URL.createObjectURL(new Blob([data]))
-    const link = document.createElement('a')
-    link.style.display = 'none'
-    link.href = url
-    link.setAttribute('download', '找房需求.xlsx')
-    document.body.append(link)
-    link.click()
-    setExportLoding(false)
+    const url = window.URL.createObjectURL(new Blob([data]));
+    const link = document.createElement('a');
+    link.style.display = 'none';
+    link.href = url;
+    link.setAttribute('download', '找房需求.xlsx');
+    document.body.append(link);
+    link.click();
+    setExportLoding(false);
   }
   const columns = [
     {
@@ -98,37 +93,63 @@ function Recommend() {
       key: 'gender',
       align: 'center',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
+      render: (_, record) => (
+        <>
+          <span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span>
+        </>
+      ),
     },
     {
       title: '房屋现状',
-      dataIndex: 'intentArea',//意向区域
+      dataIndex: 'intentArea', //意向区域
       key: 'intentArea',
       align: 'center',
       // render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
-      render: (_, record) => <><span>{JSON.parse(record.questionnaire)?.filter(x=>x.key=='houseStatus')[0]?.result}</span></>,
-
+      render: (_, record) => (
+        <>
+          <span>
+            {JSON.parse(record.questionnaire)?.filter(x => x.key == 'houseStatus')[0]?.result}
+          </span>
+        </>
+      ),
     },
     {
       title: '装修预算',
       dataIndex: 'maxPrice',
       key: 'maxPrice',
       align: 'center',
-     
     },
     {
       title: '提交时间',
       dataIndex: 'createdTime',
       key: 'createdTime',
       align: 'center',
-      render: (_, record) => <><span>{record.createdTime && moment(record.createdTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+      render: (_, record) => (
+        <>
+          <span>
+            {record.createdTime && moment(record.createdTime).format('YYYY-MM-DD HH:mm:ss')}
+          </span>
+        </>
+      ),
     },
     {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (_, record) => <><span>{record.status == '0' ? '待回访' : record.status == '1' ? '已回访' : record.status == '2' ? '无效' : ''}</span></>,
+      render: (_, record) => (
+        <>
+          <span>
+            {record.status == '0'
+              ? '待回访'
+              : record.status == '1'
+              ? '已回访'
+              : record.status == '2'
+              ? '无效'
+              : ''}
+          </span>
+        </>
+      ),
     },
     {
       title: '操作',
@@ -137,13 +158,24 @@ function Recommend() {
       align: 'center',
 
       render: (_, record) => (
-        <>{record.status == '0'?<Button type='link' onClick={() => toAudit(record,'edit')}>审核</Button>:
-        <Button type='link' onClick={() => toAudit(record,'detail')}>查看详情</Button>}
+        <>
+          {record.status == '0' ? (
+            <AuthButton name="house.added.reply" noRight={null}>
+              <Button type="link" onClick={() => toAudit(record, 'edit')}>
+                审核
+              </Button>
+            </AuthButton>
+          ) : (
+            <AuthButton name="house.added.detail" noRight={null}>
+              <Button type="link" onClick={() => toAudit(record, 'detail')}>
+                查看详情
+              </Button>
+            </AuthButton>
+          )}
         </>
       ),
     },
-  ]
-
+  ];
 
   const searchFields = [
     {
@@ -173,15 +205,15 @@ function Recommend() {
       label: '状态',
       placeholder: '请选择状态',
       type: 'select',
-      placeholder: '全部',//错误
+      placeholder: '全部', //错误
       options: [
         { label: '全部', value: '' },
         { label: '待回访', value: '0' },
         { label: '已回访', value: '1' },
-        { label: '无效', value: '2' }
-      ]
+        { label: '无效', value: '2' },
+      ],
     },
-  ]
+  ];
   const actionRender = () => {
     return (
       <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
@@ -199,15 +231,13 @@ function Recommend() {
         searchFields={searchFields}
         columns={columns}
         postData={data => {
-        
-          data.type='4'
+          data.type = '4';
           return data;
         }}
         // actionRender={actionRender}
       />
-
     </>
   );
 }
 
-export default Recommend
+export default Recommend;

src/pages/findRoom/buyRoom/audit.jsx

@@ -5,6 +5,7 @@ import request from '@/utils/request';
 import apis from '@/services/apis';
 // import Styles from './style.less';
 import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
 
 const { TextArea } = Input;
 const { Option } = Select;
@@ -54,11 +55,9 @@ function body(props) {
     request({ ...apis.searchHouse.IdHouse, urlData: { id: currentId } }).then(res => {
       // res.reportDate = moment(res.reportDate)
       if (res) {
-
         const b = {};
         JSON.parse(res?.questionnaire)?.map(x => {
           if (x.key === 'intentArea') {
-          
             return;
           }
           if (x.key === 'maxPrice') {
@@ -172,7 +171,7 @@ function body(props) {
             </Select>,
           )}
         </Form.Item>
- 
+
         <Form.Item label="购房目的">
           {getFieldDecorator('purpose')(
             <Select placeholder="购房目的" disabled={disabled}>
@@ -268,18 +267,31 @@ function body(props) {
           })(<TextArea placeholder="回访备注" disabled={type === 'detail'} rows={7} />)}
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-         {type === 'detail'?<Button onClick={()=>{router.go('-1')}}>
+          <AuthButton name="house.seach.reply.submit" noRight={null}>
+            {type !== 'detail' && (
+              <>
+                <Button type="primary" htmlType="submit">
+                  有效
+                </Button>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <Button onClick={() => submitDate({ status: '2' })}>无效</Button>
+              </>
+            )}
+          </AuthButton>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button
+            onClick={() => {
+              router.go('-1');
+            }}
+          >
             返回
-          </Button>:<> <Button type="primary" htmlType="submit">
-            有效
           </Button>
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => submitDate({ status: '2' })}>无效</Button></>}
         </Form.Item>
       </Form>
     </Card>
   );
 }
+
 const HouseCopm = Form.create({ name: 'body' })(body);
 
 export default HouseCopm;

src/pages/findRoom/buyRoom/index.jsx

@@ -3,9 +3,9 @@ import { Avatar, Button } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
-import QueryTable from '@/components/QueryTable'
+import QueryTable from '@/components/QueryTable';
 import { router } from 'umi';
-
+import AuthButton from '@/components/AuthButton';
 
 /**
  *
@@ -14,62 +14,57 @@ import { router } from 'umi';
  * @returns
  */
 
-
-
-
 function Recommend() {
-  const [exportLoding, setExportLoding] = useState(false)
+  const [exportLoding, setExportLoding] = useState(false);
   //详情页面弹窗配置
-  function toAudit(row,type) {
+  function toAudit(row, type) {
     router.push({
       pathname: '/findRoom/buyRoom/audit',
       query: {
         id: row.id,
-        type:type
+        type: type,
       },
-    })
-
+    });
   }
-//   function toSee(cuurentId) {
-//     router.push({
-//       pathname: '/home/recommend/auditCopy',
-//       query: {
-//         id: cuurentId,
-//       },
-//     })
-
-//   }
+  //   function toSee(cuurentId) {
+  //     router.push({
+  //       pathname: '/home/recommend/auditCopy',
+  //       query: {
+  //         id: cuurentId,
+  //       },
+  //     })
 
+  //   }
 
   /**
    *导出数据（推荐用户）
    *
    */
   function exportRecommendCustomer() {
-    setExportLoding(true)
+    setExportLoding(true);
     request({
       ...apis.customer.customerRecommendRecommenderExport,
       responseType: 'blob',
-    }).then(response => {
-      console.log('exportRecommendCustomer: ', response)
-      download(response)
-    }).catch(error => {
-
     })
+      .then(response => {
+        console.log('exportRecommendCustomer: ', response);
+        download(response);
+      })
+      .catch(error => {});
   }
 
   function download(data) {
     if (!data) {
-      return
+      return;
     }
-    const url = window.URL.createObjectURL(new Blob([data]))
-    const link = document.createElement('a')
-    link.style.display = 'none'
-    link.href = url
-    link.setAttribute('download', '找房需求.xlsx')
-    document.body.append(link)
-    link.click()
-    setExportLoding(false)
+    const url = window.URL.createObjectURL(new Blob([data]));
+    const link = document.createElement('a');
+    link.style.display = 'none';
+    link.href = url;
+    link.setAttribute('download', '找房需求.xlsx');
+    document.body.append(link);
+    link.click();
+    setExportLoding(false);
   }
   const columns = [
     {
@@ -98,37 +93,57 @@ function Recommend() {
       key: 'gender',
       align: 'center',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
+      render: (_, record) => (
+        <>
+          <span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span>
+        </>
+      ),
     },
     {
       title: '意向区域',
-      dataIndex: 'name',//意向区域
+      dataIndex: 'name', //意向区域
       key: 'name',
       align: 'center',
       // render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
-
     },
     {
       title: '购房预算',
       dataIndex: 'maxPrice',
       key: 'maxPrice',
       align: 'center',
-      render:(x)=>x&&<span>{x/10000}万</span>
-
+      render: x => x && <span>{x / 10000}万</span>,
     },
     {
       title: '提交时间',
       dataIndex: 'createdTime',
       key: 'createdTime',
       align: 'center',
-      render: (_, record) => <><span>{record.createdTime && moment(record.createdTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+      render: (_, record) => (
+        <>
+          <span>
+            {record.createdTime && moment(record.createdTime).format('YYYY-MM-DD HH:mm:ss')}
+          </span>
+        </>
+      ),
     },
     {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (_, record) => <><span>{record.status == '0' ? '待回访' : record.status == '1' ? '已回访' : record.status == '2' ? '无效' : ''}</span></>,
+      render: (_, record) => (
+        <>
+          <span>
+            {record.status == '0'
+              ? '待回访'
+              : record.status == '1'
+              ? '已回访'
+              : record.status == '2'
+              ? '无效'
+              : ''}
+          </span>
+        </>
+      ),
     },
     {
       title: '操作',
@@ -137,13 +152,24 @@ function Recommend() {
       align: 'center',
 
       render: (_, record) => (
-        <>{record.status == '0'?<Button type='link' onClick={() => toAudit(record,'edit')}>审核</Button>:
-        <Button type='link' onClick={() => toAudit(record,'detail')}>查看详情</Button>}
+        <>
+          {record.status == '0' ? (
+            <AuthButton name="house.seach.reply" noRight={null}>
+              <Button type="link" onClick={() => toAudit(record, 'edit')}>
+                审核
+              </Button>
+            </AuthButton>
+          ) : (
+            <AuthButton name="house.seach.detail" noRight={null}>
+              <Button type="link" onClick={() => toAudit(record, 'detail')}>
+                查看详情
+              </Button>
+            </AuthButton>
+          )}
         </>
       ),
     },
-  ]
-
+  ];
 
   const searchFields = [
     {
@@ -173,15 +199,15 @@ function Recommend() {
       label: '状态',
       placeholder: '请选择状态',
       type: 'select',
-      placeholder: '全部',//错误
+      placeholder: '全部', //错误
       options: [
         { label: '全部', value: '' },
         { label: '待回访', value: '0' },
         { label: '已回访', value: '1' },
-        { label: '无效', value: '2' }
-      ]
+        { label: '无效', value: '2' },
+      ],
     },
-  ]
+  ];
   const actionRender = () => {
     return (
       <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
@@ -197,22 +223,19 @@ function Recommend() {
         // recommendCustomer
         api={apis.searchHouse.list}
         searchFields={searchFields}
-        
         postData={data => {
-        
-          data.type='1'
+          data.type = '1';
           return data;
         }}
         columns={columns}
         // actionRender={actionRender}
       />
-
     </>
   );
 }
 
-export default Recommend
+export default Recommend;
 /**
-     * 帮我找房类型 1买房2租房3海外置业4增值服务
-     */
-//  private Integer type;
+ * 帮我找房类型 1买房2租房3海外置业4增值服务
+ */
+//  private Integer type;

src/pages/findRoom/overseas/audit.jsx

@@ -5,6 +5,7 @@ import request from '@/utils/request';
 import apis from '@/services/apis';
 // import Styles from './style.less';
 import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
 
 const { TextArea } = Input;
 const { Option } = Select;
@@ -56,7 +57,6 @@ function body(props) {
       if (res) {
         const b = {};
         JSON.parse(res?.questionnaire)?.map(x => {
-         
           if (x.key === 'maxPrice') {
             b[x.key] = x.result / 10000;
             return;
@@ -68,7 +68,6 @@ function body(props) {
           }
         });
 
-        
         props.form.setFieldsValue({
           ...res,
           reportDate: moment(res.reportDate),
@@ -176,23 +175,25 @@ function body(props) {
           })(<TextArea placeholder="回访备注" disabled={type === 'detail'} rows={7} />)}
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          {type === 'detail' ? (
-            <Button
-              onClick={() => {
-                router.go('-1');
-              }}
-            >
-              返回
-            </Button>
-          ) : (
-            <>
-              <Button type="primary" htmlType="submit">
-                有效
-              </Button>
-              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-              <Button onClick={() => submitDate({ status: '2' })}>无效</Button>
-            </>
-          )}
+          <AuthButton name="house.abroad.reply.submit" noRight={null}>
+            {type !== 'detail' && (
+              <>
+                <Button type="primary" htmlType="submit">
+                  有效
+                </Button>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <Button onClick={() => submitDate({ status: '2' })}>无效</Button>
+              </>
+            )}
+          </AuthButton>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button
+            onClick={() => {
+              router.go('-1');
+            }}
+          >
+            返回
+          </Button>
         </Form.Item>
       </Form>
     </Card>

src/pages/findRoom/overseas/index.jsx

@@ -5,7 +5,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import QueryTable from '@/components/QueryTable'
 import { router } from 'umi';
-
+import AuthButton from '@/components/AuthButton';
 
 /**
  *
@@ -137,8 +137,20 @@ function Recommend() {
       align: 'center',
 
       render: (_, record) => (
-        <>{record.status == '0'?<Button type='link' onClick={() => toAudit(record,'edit')}>审核</Button>:
-        <Button type='link' onClick={() => toAudit(record,'detail')}>查看详情</Button>}
+        <>
+          {record.status == '0' ? (
+            <AuthButton name="house.abroad.reply" noRight={null}>
+              <Button type="link" onClick={() => toAudit(record, 'edit')}>
+                审核
+              </Button>
+            </AuthButton>
+          ) : (
+            <AuthButton name="house.abroad.detail" noRight={null}>
+              <Button type="link" onClick={() => toAudit(record, 'detail')}>
+                查看详情
+              </Button>
+            </AuthButton>
+          )}
         </>
       ),
     },

src/pages/findRoom/rent/audit.jsx

@@ -5,6 +5,7 @@ import request from '@/utils/request';
 import apis from '@/services/apis';
 // import Styles from './style.less';
 import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
 
 const { TextArea } = Input;
 const { Option } = Select;
@@ -201,17 +202,29 @@ function body(props) {
         </Form.Item>
         <Form.Item label="回访备注">
           {getFieldDecorator('auditRemark', {
-            rules: [{ required: true, message: '请输入回访备注！' }], //v3x必填
+            rules: [{ required: true, message: '请输入回访备注！' }], 
           })(<TextArea placeholder="回访备注" disabled={type === 'detail'} rows={7} />)}
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-         {type === 'detail'?<Button onClick={()=>{router.go('-1')}}>
+        <AuthButton name="house.rent.reply.submit" noRight={null}>
+            {type !== 'detail' && (
+              <>
+                <Button type="primary" htmlType="submit">
+                  有效
+                </Button>
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <Button onClick={() => submitDate({ status: '2' })}>无效</Button>
+              </>
+            )}
+          </AuthButton>
+          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+          <Button
+            onClick={() => {
+              router.go('-1');
+            }}
+          >
             返回
-          </Button>:<> <Button type="primary" htmlType="submit">
-            有效
           </Button>
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => submitDate({ status: '2' })}>无效</Button></>}
         </Form.Item>
       </Form>
     </Card>

src/pages/findRoom/rent/index.jsx

@@ -5,7 +5,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import QueryTable from '@/components/QueryTable'
 import { router } from 'umi';
-
+import AuthButton from '@/components/AuthButton';
 
 /**
  *
@@ -137,9 +137,21 @@ function Recommend() {
       align: 'center',
 
       render: (_, record) => (
-        <>{record.status == '0'?<Button type='link' onClick={() => toAudit(record,'edit')}>审核</Button>:
-        <Button type='link' onClick={() => toAudit(record,'detail')}>查看详情</Button>}
-        </>
+        <>
+        {record.status == '0' ? (
+          <AuthButton name="house.rent.reply" noRight={null}>
+            <Button type="link" onClick={() => toAudit(record, 'edit')}>
+              审核
+            </Button>
+          </AuthButton>
+        ) : (
+          <AuthButton name="house.rent.detail" noRight={null}>
+            <Button type="link" onClick={() => toAudit(record, 'detail')}>
+              查看详情
+            </Button>
+          </AuthButton>
+        )}
+      </>
       ),
     },
   ]

src/pages/news/list/List.jsx

@@ -226,7 +226,7 @@ export default props => {
       align: 'center',
       render: withActions(
         (_, row) => [
-          <AuthButton name="admin.taNews.publish" noRight={null}>
+          <AuthButton name="news.publish" noRight={null}>
             <OperButton
               onClick={() =>
                 cancelRelease(
@@ -244,18 +244,18 @@ export default props => {
           //   <span style={{ position: 'absolute', right: '83px', top: '16px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer' }} onClick={topNews(data.weight, data.newsId)}>{data.weight === 1 ? '取消置顶' : '置顶'}</span>
           // </AuthButton>
           row.newsStatus === 0 && (
-            <AuthButton name="admin.taNews.top" noRight={null}>
+            <AuthButton name="news.add" noRight={null}>
               <OperButton onClick={() => topNews(row.weight, row.newsId)}>
                 {row.weight === 1 ? '取消置顶' : '置顶'}
               </OperButton>
             </AuthButton>
           ),
 
-          <AuthButton name="admin.taNews.id.put" noRight={null}>
+          <AuthButton name="news.edit" noRight={null}>
             <OperButton onClick={() => toEditList(row.newsId)}>编辑</OperButton>
           </AuthButton>,
 
-          <AuthButton name="admin.taNews.id.delete" noRight={null}>
+          <AuthButton name="news.delete" noRight={null}>
             <OperButton.Confirm
               title="确认删除?"
               content="删除之后不可恢复"
@@ -271,9 +271,11 @@ export default props => {
   ];
   const actionRender = () => {
     return (
-      <Button type="primary" icon="plus" onClick={() => toEditList()}>
-        新增
-      </Button>
+      <AuthButton name="news.add" noRight={null}>
+        <Button type="primary" icon="plus" onClick={() => toEditList()}>
+          新增
+        </Button>
+      </AuthButton>
     );
   };
 

src/pages/news/type/NewsType.jsx

@@ -86,7 +86,7 @@ function NewsType(props) {
       dataIndex: 'newsTypeName',
       key: 'newsTypeName',
       align: 'center',
-      render: (text, record) => <Navigate to={`/news/type/editNews?id=${record.newsTypeId}`}>{text}</Navigate>
+      // render: (text, record) => <Navigate to={`/news/type/editNews?id=${record.newsTypeId}`}>{text}</Navigate>
     },
     {
       title: '操作',
@@ -94,12 +94,12 @@ function NewsType(props) {
       key: 'handle',
       align: 'center',
       render: withActions((x, row) => [
-        <AuthButton name="admin.taNewsType.id.delete" noRight={null}>
+        <AuthButton name="news.type.delete" noRight={null}>
           <ConfirmButton type="link" title="确认删除？" onClick={changeNewsStatus(row, row.newsTypeId)}>
             <EditIcon text="删除" type="delete" />
           </ConfirmButton>
         </AuthButton>,
-        <AuthButton name="admin.taNewsType.id.put" noRight={null}>
+        <AuthButton name="news.type.edit" noRight={null}>
           <EditIcon text="编辑" type="edit" onClick={toEditNews(row.newsTypeId)} />
         </AuthButton>,
       ]),
@@ -132,7 +132,7 @@ function NewsType(props) {
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.taNewsType.post" noRight={null}>
+      <AuthButton name="news.type.add" noRight={null}>
         <Button type='primary' style={{margin:'20px 0'}} onClick={toEditNews()}>新增</Button>
       </AuthButton>
       <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />

src/pages/news/type/editNews.jsx

@@ -1,35 +1,50 @@
 import React, { useState, useEffect } from 'react';
-import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import {
+  Input,
+  Menu,
+  Dropdown,
+  Button,
+  Icon,
+  message,
+  Table,
+  Divider,
+  Tag,
+  Select,
+  Form,
+  Card,
+} from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import router from 'umi/router';
 import apis from '../../../services/apis';
-import request from '../../../utils/request'
+import request from '../../../utils/request';
 
 const { TextArea } = Input;
 const { Option } = Select;
 
 const header = props => {
-  const newsId = props.location.query.id
-  console.log("newsId" + newsId);
-  const [ newsData, setNewsData ] = useState({})
-  if(newsId){
+  const newsId = props.location.query.id;
+  console.log('newsId' + newsId);
+  const [newsData, setNewsData] = useState({});
+  if (newsId) {
     useEffect(() => {
       getNewsData(newsId);
-    },[])
+    }, []);
 
-  // 查询列表
-  const getNewsData = (newsId) => {
-    request({
+    // 查询列表
+    const getNewsData = newsId => {
+      request({
         ...apis.newsType.get,
-        urlData: { id: newsId }
-    }).then((data) => {
-        setNewsData(data)
-    }).catch((err) => {
-      message.error(err.msg || err.message)
-    })
-  }
+        urlData: { id: newsId },
+      })
+        .then(data => {
+          setNewsData(data);
+        })
+        .catch(err => {
+          message.error(err.msg || err.message);
+        });
+    };
   }
 
   const fields = [
@@ -38,9 +53,7 @@ const header = props => {
       name: 'buildingId',
       render: <BuildSelect />,
       value: newsData.buildingId,
-      rules: [
-        {required: true, message: '请选择所属项目'},
-      ]
+      rules: [{ required: true, message: '请选择所属项目' }],
     },
     {
       label: '类型图',
@@ -54,40 +67,43 @@ const header = props => {
       name: 'newsTypeName',
       type: FieldTypes.Text,
       value: newsData.newsTypeName,
-      rules: [
-        {required: true, message: '请输入资讯名称'},
-      ]
+      rules: [{ required: true, message: '请输入资讯名称' }],
     },
-  ]
+  ];
 
-   
-  const handleSubmit = (values) => {
-    if(newsId){
-        values.newsTypeId = newsId
-        request({ ...apis.newsType.put, urlData: { id: newsId }, data: { ...values }}).then((data) => {
+  const handleSubmit = values => {
+    if (newsId) {
+      values.newsTypeId = newsId;
+      request({ ...apis.newsType.put, urlData: { id: newsId }, data: { ...values } })
+        .then(data => {
           cancelPage();
-        }).catch((err) => {
-          message.error(err.msg || err.message)
         })
-      }else{
-        request({ ...apis.newsType.post, data: { ...values } }).then((data) => {
+        .catch(err => {
+          message.error(err.msg || err.message);
+        });
+    } else {
+      request({ ...apis.newsType.post, data: { ...values } })
+        .then(data => {
           cancelPage();
-        }).catch((err) => {
-          message.error(err.msg || err.message)
         })
-      }
-  }
+        .catch(err => {
+          message.error(err.msg || err.message);
+        });
+    }
+  };
 
   const cancelPage = () => {
     router.push({
       pathname: '/news/type/NewsType',
     });
-  }
+  };
 
   return (
-    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
-  )
-}
+    <Card>
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+    </Card>
+  );
+};
 
 const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
-export default WrappedNormalLoginForm
+export default WrappedNormalLoginForm;

src/pages/staff/Organization/index.jsx

@@ -21,6 +21,7 @@ import TreedataFrom from './form';
 import TreedataAdd from './addForm';
 import { connect } from 'dva';
 import { add } from 'lodash';
+import AuthButton from '@/components/AuthButton';
 
 const { TreeNode, DirectoryTree } = Tree;
 const FormItem = Form.Item;
@@ -172,25 +173,34 @@ const Organization = props => {
   const getTitle = item => {
     return (
       <>
-        {item.title}{' '}
-        <Icon
-          type="plus"
-          onClick={e => {
-            e.stopPropagation(), add(item);
-          }}
-        />{' '}
-        <Icon
-          type="edit"
-          onClick={e => {
-            e.stopPropagation(), edit(item);
-          }}
-        />{' '}
-        <Icon
-          type="delete"
-          onClick={e => {
-            e.stopPropagation(), onDelete(item);
-          }}
-        />
+        {item.title}
+        <AuthButton name="institution.add" noRight={null}>
+          <Icon
+            type="plus"
+            onClick={e => {
+              e.stopPropagation(), add(item);
+            }}
+            style={{marginLeft:'5px'}}
+          />
+        </AuthButton>
+        <AuthButton name="institution.edit" noRight={null}>
+          <Icon
+            type="edit"
+            onClick={e => {
+              e.stopPropagation(), edit(item);
+            }}
+            style={{marginLeft:'5px'}}
+          />
+        </AuthButton>
+        <AuthButton name="institution.delete" noRight={null}>
+          <Icon
+            type="delete"
+            onClick={e => {
+              e.stopPropagation(), onDelete(item);
+            }}
+            style={{marginLeft:'5px'}}
+          />
+        </AuthButton>
       </>
     );
   };
@@ -209,11 +219,7 @@ const Organization = props => {
   return (
     <>
       <Card style={{ minHeight: '500px' }}>
-        <Tree
-          defaultExpandAll
-        >
-          {renderTreeNodes(getTreeFrom(user.institutionList) || [])}
-        </Tree>
+        <Tree defaultExpandAll>{renderTreeNodes(getTreeFrom(user.institutionList) || [])}</Tree>
       </Card>
       <Modal
         title={type == 'add' ? '新增' : '编辑'}

src/pages/staff/Role/Edit/index.jsx

@@ -6,10 +6,10 @@ import AuthButton from '@/components/AuthButton';
 import request from '@/utils/request';
 import router from 'umi/router';
 import apis from '@/services/apis';
+import AuthButton from '@/components/AuthButton';
 
 const { TextArea } = Input;
 
-
 /**
  *
  *
@@ -19,67 +19,72 @@ const { TextArea } = Input;
 const Poster = props => {
   const userMenus = props.user.currentUser.menus;
   const userBtns = props.user.currentUser.buttons;
-  console.log(userMenus)
+  console.log(userMenus);
   // 获取当前所有菜单
-  const [data, setData] = useState({ data: [] })
-  const [buttonData, setButtonData] = useState([])
+  const [data, setData] = useState({ data: [] });
+  const [buttonData, setButtonData] = useState([]);
 
   // 展示要显示的菜单和按钮----（编辑）
-  const [dataMenuId, setDataMenuId] = useState([])
-  const [dataButtonId, setDataButtonId] = useState([])
+  const [dataMenuId, setDataMenuId] = useState([]);
+  const [dataButtonId, setDataButtonId] = useState([]);
 
   const [loading, setLoading] = useState(false);
 
   useEffect(() => {
     // 新增和编辑用一个页面
     if (props.location.query) {
-      const { id } = props.location.query
+      const { id } = props.location.query;
       if (id) {
-        buttonAndMenuList('', id)
+        buttonAndMenuList('', id);
       }
     }
     // menuList({ pageNum: 1, pageSize: 100 })
-    buttonList({ pageNum: 1, pageSize: 100 })
-  }, [])
+    buttonList({ pageNum: 1, pageSize: 100 });
+  }, []);
   // 当前所有的菜单
   function menuList(params) {
-    request({ ...apis.role.menuList, params: { ...params } }).then((data) => {
-      setData(data)
-  }).catch((err) => {
-      console.log(err)
-      message.info(err.msg || err.message)
-  })
+    request({ ...apis.role.menuList, params: { ...params } })
+      .then(data => {
+        setData(data);
+      })
+      .catch(err => {
+        console.log(err);
+        message.info(err.msg || err.message);
+      });
   }
 
   // 所有按钮
   function buttonList(params) {
-    request({ ...apis.role.buttonList, params: { ...params } }).then((data) => {
-      setButtonData(data)
-  }).catch((err) => {
-      console.log(err)
-  })
+    request({ ...apis.role.buttonList, params: { ...params } })
+      .then(data => {
+        setButtonData(data);
+      })
+      .catch(err => {
+        console.log(err);
+      });
   }
 
-
   // 根据角色id查询当前的菜单及其按钮
   function buttonAndMenuList(params, ids) {
-    setLoading(true)
-    request({ ...apis.role.buttonAndMenuList, urlData: { id: ids }, params: { ...params } }).then(data => {
-      setLoading(false)
-      props.form.setFieldsValue({ roleName: data.roleName })
-      console.log(data)
-      setData(data)
-
-      // 获取所有的权限Id
-      if (data.sysMenuList) {
-        setDataMenuId(data.sysMenuList.map(item => item && item.menuId))
-        // setDataButtonId((data.sysMenuList.map(item => item.sysButtonInMenu && item.sysButtonInMenu.map(btn => btn.btnId).join(',')).filter(f => f !== '').join(',').split(',')).map(a => parseInt(a) ) )
-        setDataButtonId(data.sysButtonInMenu.map(item => item && item.btnId))
-      }
-  }).catch((err) => {
-      console.log(err)
-      message.info(err.msg || err.message)
-  })
+    setLoading(true);
+    request({ ...apis.role.buttonAndMenuList, urlData: { id: ids }, params: { ...params } })
+      .then(data => {
+        setLoading(false);
+        props.form.setFieldsValue({ roleName: data.roleName });
+        console.log(data);
+        setData(data);
+
+        // 获取所有的权限Id
+        if (data.sysMenuList) {
+          setDataMenuId(data.sysMenuList.map(item => item && item.menuId));
+          // setDataButtonId((data.sysMenuList.map(item => item.sysButtonInMenu && item.sysButtonInMenu.map(btn => btn.btnId).join(',')).filter(f => f !== '').join(',').split(',')).map(a => parseInt(a) ) )
+          setDataButtonId(data.sysButtonInMenu.map(item => item && item.btnId));
+        }
+      })
+      .catch(err => {
+        console.log(err);
+        message.info(err.msg || err.message);
+      });
   }
 
   // const [menus, setMenus] = useState([]);
@@ -87,40 +92,42 @@ const Poster = props => {
   const [menus, setMenus] = useState([]);
   const [but, setBut] = useState([]);
 
-  const addMenus = m => setMenus([...menus, m])
+  const addMenus = m => setMenus([...menus, m]);
   const delMenus = m => setMenus(menus.filter(x => x.menuId !== m.menuId));
 
   const handleMenuChange = m => e => {
     // 如果是根菜单, 把子菜单挑出来
-    const isMenuRoot = m.parentCode === '-1'
-    const subMenus = isMenuRoot ? userMenus.filter(x => x.parentCode == m.menuId) : []
+    const isMenuRoot = m.parentCode === '-1';
+    const subMenus = isMenuRoot ? userMenus.filter(x => x.parentCode == m.menuId) : [];
     // 把子菜单与当前对象, 同时作为当前操作对象
-    const currentMenus = [ m, ...subMenus ]
+    const currentMenus = [m, ...subMenus];
     // 先把选中列表中, 当前操作对象去掉
-    const leftCheckedMenusIds = dataMenuId.filter(x => !currentMenus.some(it => it.menuId == x))
+    const leftCheckedMenusIds = dataMenuId.filter(x => !currentMenus.some(it => it.menuId == x));
 
     // 当前选中菜单
-    const currentCheckedMenus = e.target.checked ? currentMenus : []
+    const currentCheckedMenus = e.target.checked ? currentMenus : [];
 
     // 计算所有选中菜单
     let checkedMenus = [
       ...currentCheckedMenus,
       ...userMenus.filter(x => leftCheckedMenusIds.some(it => it == x.menuId)),
-    ]
+    ];
 
     // 如果子菜单全部取消选择, 那么根菜单也取消选择
     // 如果子菜单有一个选中, 那么根菜单也选中
     if (!isMenuRoot) {
-      const children = checkedMenus.filter(x => x.menuRoot === m.menuRoot && x.menuId !== m.menuRoot)
+      const children = checkedMenus.filter(
+        x => x.menuRoot === m.menuRoot && x.menuId !== m.menuRoot,
+      );
       if (!children || children.length < 1) {
-        checkedMenus = checkedMenus.filter(x => x.menuId !== m.menuRoot)
+        checkedMenus = checkedMenus.filter(x => x.menuId !== m.menuRoot);
       } else {
-        const hasRootMenu = checkedMenus.some(x => x.menuId === m.menuRoot)
-  
+        const hasRootMenu = checkedMenus.some(x => x.menuId === m.menuRoot);
+
         if (!hasRootMenu) {
-          const rootMenu = userMenus.filter(x => x.menuId === m.menuRoot)[0]
+          const rootMenu = userMenus.filter(x => x.menuId === m.menuRoot)[0];
           if (rootMenu) {
-            checkedMenus.push(rootMenu)
+            checkedMenus.push(rootMenu);
           }
         }
       }
@@ -128,49 +135,57 @@ const Poster = props => {
 
     // 只要菜单选中, 所属按钮全部选中
     // 菜单取消选择, 所有按钮全部取消选择
-    const currentMenuBtns = currentMenus.reduce((acc, it) => [...acc, ...userBtns.filter(x => x.menuId === it.menuId)], [])
-    const currentCheckedMenuBtns = currentCheckedMenus.reduce((acc, it) => [...acc, ...userBtns.filter(x => x.menuId === it.menuId)], [])
-    const checkedBtns = dataButtonId.filter(x => !currentMenuBtns.some(it => it.btnId === x)).map(x => userBtns.filter(it => x == it.btnId)[0]).concat(...currentCheckedMenuBtns)
-
-    setMenus(checkedMenus)
-    setDataMenuId(checkedMenus.map(x => x.menuId))
-    setDataButtonId(checkedBtns.map(x => x.btnId))
-    setBut(checkedBtns)
-  }
+    const currentMenuBtns = currentMenus.reduce(
+      (acc, it) => [...acc, ...userBtns.filter(x => x.menuId === it.menuId)],
+      [],
+    );
+    const currentCheckedMenuBtns = currentCheckedMenus.reduce(
+      (acc, it) => [...acc, ...userBtns.filter(x => x.menuId === it.menuId)],
+      [],
+    );
+    const checkedBtns = dataButtonId
+      .filter(x => !currentMenuBtns.some(it => it.btnId === x))
+      .map(x => userBtns.filter(it => x == it.btnId)[0])
+      .concat(...currentCheckedMenuBtns);
+
+    setMenus(checkedMenus);
+    setDataMenuId(checkedMenus.map(x => x.menuId));
+    setDataButtonId(checkedBtns.map(x => x.btnId));
+    setBut(checkedBtns);
+  };
 
   // 判断menus是否有值
-  const addBut = m => setBut([...but, m])
+  const addBut = m => setBut([...but, m]);
   const delBut = m => setBut(but.filter(x => x.menuId !== m.menuId));
   const handleButChange = m => e => {
-
     // 如果有一个按钮选中, 那么对应的菜单也需要选中
     // 如果没有一个兄弟节点选中, 不做任何处理
     if (e.target.checked) {
-      const parentMenuId = dataMenuId.filter(x => x === m.menuId)[0]
+      const parentMenuId = dataMenuId.filter(x => x === m.menuId)[0];
 
       if (!parentMenuId) {
-        const parentMenu = userMenus.filter(x => x.menuId === m.menuId)[0]
-        const parentMenuRoot = userMenus.filter(x => x.menuId === parentMenu.menuRoot)[0]
+        const parentMenu = userMenus.filter(x => x.menuId === m.menuId)[0];
+        const parentMenuRoot = userMenus.filter(x => x.menuId === parentMenu.menuRoot)[0];
 
-        const checkedMenus = menus.concat(parentMenu).concat(parentMenuRoot)
-        setMenus(checkedMenus)
-        setDataMenuId(checkedMenus.map(x => x.menuId))
+        const checkedMenus = menus.concat(parentMenu).concat(parentMenuRoot);
+        setMenus(checkedMenus);
+        setDataMenuId(checkedMenus.map(x => x.menuId));
       }
     }
 
     if (e.target.checked) {
-      setDataButtonId(dataButtonId.concat(m.btnId))
-      addBut(m)
+      setDataButtonId(dataButtonId.concat(m.btnId));
+      addBut(m);
     } else {
       setDataButtonId(dataButtonId.filter(item => item !== m.btnId));
-      delBut(m)
+      delBut(m);
     }
-  }
+  };
   const gridStyle1 = {
     width: '20%',
     textAlign: 'left',
     height: '72px',
-    padding:'24px'
+    padding: '24px',
   };
   const gridStyle2 = {
     width: '80%',
@@ -179,99 +194,137 @@ const Poster = props => {
   };
 
   function toRoleList() {
-    router.go('-1')
+    router.go('-1');
   }
 
   function updateAuthMenu(data) {
-    setLoading(true)
-    request({ ...apis.role.updateAuthMenu, data: { ...data } }).then((data) => {
-      setLoading(false)
-      toRoleList()
-  }).catch((err) => {
-      console.log(err)
-  })
+    setLoading(true);
+    request({ ...apis.role.updateAuthMenu, data: { ...data } })
+      .then(data => {
+        setLoading(false);
+        toRoleList();
+      })
+      .catch(err => {
+        console.log(err);
+      });
   }
 
-
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (values.roleName === undefined || values.roleName === '') {
-        message.error('请输入角色名称')
-        return
+        message.error('请输入角色名称');
+        return;
       }
 
       if (props.location.query.id !== undefined) {
-        console.log('menus', menus)
-      
-        const sumitMenu = userMenus.filter(item => dataMenuId.includes(item.menuId))
-        const sumitBtn = buttonData.filter(item => dataButtonId.includes(item.btnId))
-        updateAuthMenu({ sysMenu: sumitMenu, name: values.roleName, id: props.location.query.id, sysButton: sumitBtn })
+        console.log('menus', menus);
+
+        const sumitMenu = userMenus.filter(item => dataMenuId.includes(item.menuId));
+        const sumitBtn = buttonData.filter(item => dataButtonId.includes(item.btnId));
+        updateAuthMenu({
+          sysMenu: sumitMenu,
+          name: values.roleName,
+          id: props.location.query.id,
+          sysButton: sumitBtn,
+        });
       } else {
-        updateAuthMenu({ sysMenu: menus, name: values.roleName, id: props.location.query.id, sysButton: but })
-        }
+        updateAuthMenu({
+          sysMenu: menus,
+          name: values.roleName,
+          id: props.location.query.id,
+          sysButton: but,
+        });
+      }
     });
   }
   const { getFieldDecorator } = props.form;
-  
+
   return (
     <Card>
       <div>
-      <Spin spinning={ loading } size="large">
-        <Form labelCol={{ span: 2 }} wrapperCol={{ span: 18 }} onSubmit={handleSubmit}>
-          <Form.Item label="角色名称">
-            {getFieldDecorator('roleName', {
-              rules: [{ required: true, message: '请输入角色名称' }],
-            })(<Input  />)}
-
-          </Form.Item>
-          {userMenus.map(item => (
-            (item.parentCode === '-1') &&
-            <Row >
-              <Col offset={2} span={18}>
-
-                <Card title={<Checkbox checked={dataMenuId.includes(item.menuId)} onChange={handleMenuChange(item)}>{item.name}</Checkbox>} bordered style={{ width: '100%', alignItems: 'center',margin:'10px 0', boxShadow:'3px 3px 10px  rgba(0,0,0,0.15)',borderRadius:'8px'}} >
-                  {
-                    userMenus.map(menu => (
-
-                      (item.menuId === menu.menuRoot && item.menuId !== menu.menuId) &&
-                      <>
-                        <Card.Grid style={gridStyle1} >
-                          <Checkbox checked={dataMenuId.includes(menu.menuId)} onChange={handleMenuChange(menu)}>{menu.name}</Checkbox>
-                        </Card.Grid>
-                        <Card.Grid style={gridStyle2}>
-                          {buttonData.length > 0 && buttonData.map(btn => (
-                            <>
-                              {
-                                btn.menuId === menu.menuId &&
-                                <Checkbox checked={dataButtonId.includes(btn.btnId)} onChange={handleButChange(btn)}>{btn.name}</Checkbox>
-                              }
-                            </>
-                          ))}
-                        </Card.Grid>
-                      </>
-                    ))
-                  }
-                </Card>
-              </Col>
-
-            </Row>
-          ))}
-          <Form.Item wrapperCol={{ span: 15, offset: 7 }} style={{ marginTop: '10px' }}>
-            <AuthButton name="role.submit">
-              <Button type="primary" htmlType="submit">
-                保存
+        <Spin spinning={loading} size="large">
+          <Form labelCol={{ span: 6 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+            <Form.Item label="角色名称">
+              {getFieldDecorator('roleName', {
+                rules: [{ required: true, message: '请输入角色名称' }],
+              })(<Input />)}
+            </Form.Item>
+            {userMenus.map(
+              item =>
+                item.parentCode === '-1' && (
+                  <Row>
+                    <Col span={6}></Col>
+                    <Col span={18}>
+                      <Card
+                        title={
+                          <Checkbox
+                            checked={dataMenuId.includes(item.menuId)}
+                            onChange={handleMenuChange(item)}
+                          >
+                            {item.name}
+                          </Checkbox>
+                        }
+                        bordered
+                        style={{
+                          width: '100%',
+                          alignItems: 'center',
+                          margin: '10px 0',
+                          boxShadow: '3px 3px 10px  rgba(0,0,0,0.15)',
+                          borderRadius: '8px',
+                        }}
+                      >
+                        {userMenus.map(
+                          menu =>
+                            item.menuId === menu.menuRoot &&
+                            item.menuId !== menu.menuId && (
+                              <>
+                                <Card.Grid style={gridStyle1}>
+                                  <Checkbox
+                                    checked={dataMenuId.includes(menu.menuId)}
+                                    onChange={handleMenuChange(menu)}
+                                  >
+                                    {menu.name}
+                                  </Checkbox>
+                                </Card.Grid>
+                                <Card.Grid style={gridStyle2}>
+                                  {buttonData.length > 0 &&
+                                    buttonData.map(btn => (
+                                      <>
+                                        {btn.menuId === menu.menuId && (
+                                          <Checkbox
+                                            checked={dataButtonId.includes(btn.btnId)}
+                                            onChange={handleButChange(btn)}
+                                          >
+                                            {btn.name}
+                                          </Checkbox>
+                                        )}
+                                      </>
+                                    ))}
+                                </Card.Grid>
+                              </>
+                            ),
+                        )}
+                      </Card>
+                    </Col>
+                  </Row>
+                ),
+            )}
+            <Form.Item wrapperCol={{ span: 15, offset: 7 }} style={{ marginTop: '10px' }}>
+              <AuthButton name="role.submit" noRight={null}>
+                <Button type="primary" htmlType="submit">
+                  保存
+                </Button>
+              </AuthButton>
+              <Button onClick={toRoleList} style={{ marginLeft: '20px' }}>
+                取消
               </Button>
-            </AuthButton>
-            <Button onClick = {toRoleList} style={{ marginLeft: '20px' }}>
-              取消
-          </Button>
-          </Form.Item>
-        </Form>
+            </Form.Item>
+          </Form>
         </Spin>
       </div>
     </Card>
-  )
-}
+  );
+};
 const WrappedNormalLoginForm = Form.create({ name: 'Poster' })(Poster);
 export default connect(({ user }) => ({ user }))(WrappedNormalLoginForm);

src/pages/staff/staff/Edit/index.jsx

@@ -71,9 +71,13 @@ const StaffEdit = props => {
   }, []);
 
   const handleSubmit = val => {
-    console.log(val,userId,'----------111------------')
+    console.log(val, userId, '----------111------------');
     // val.institutionIdLis =  val?.institutionIdLis?.split(',')
     // console.log(val,userId,'----------------------')
+    if (val.loginName) {
+      val.loginName = val.phone;
+    }
+
     if (userId) {
       request({ ...apis.staff.updateTaUser, urlData: { id: userId }, data: val })
         .then(data => {
@@ -156,7 +160,7 @@ const StaffEdit = props => {
           message: '请输入正确的电话号码',
         },
       ],
-      help: '登录账号为手机号  默认密码：12345',
+      help: '登录账号为手机号  默认密码：123456',
     },
 
     {
@@ -206,7 +210,7 @@ const StaffEdit = props => {
     {
       label: '组织机构',
       name: 'institutionIdLis',
-      render: <InstitutionSelect multiple/>,
+      render: <InstitutionSelect multiple />,
       value: userData.institutionIdLis,
       rules: [{ required: true, message: '组织机构' }],
     },
@@ -221,26 +225,27 @@ const StaffEdit = props => {
     {
       label: '授权项目',
       name: 'buildingIds',
-      render: <Select
-        mode="multiple"
-        showSearch
-        style={{ width: '100%' }}
-        placeholder="请选择授权项目"
-        filterOption={(input, option) =>
-          option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        }
+      render: (
+        <Select
+          mode="multiple"
+          showSearch
+          style={{ width: '100%' }}
+          placeholder="请选择授权项目"
+          filterOption={(input, option) =>
+            option.props.children &&
+            option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+          }
         >
-        {buildData.map(item => (
-          <Select.Option key={item.buildingId} value={item.buildingId}>
-            {item.buildingName}
-          </Select.Option>
-        ))}
-      </Select>,
+          {buildData.map(item => (
+            <Select.Option key={item.buildingId} value={item.buildingId}>
+              {item.buildingName}
+            </Select.Option>
+          ))}
+        </Select>
+      ),
       value: userData.buildingIds,
       hidden: () => isConsultant,
-      rules: [
-        { required: true, message: '请选择授权项目' },
-      ]
+      rules: [{ required: true, message: '请选择授权项目' }],
     },
     {
       label: '简介',

src/pages/system/Sellhouse/houseTypes/Newindex.jsx

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { Checkbox, Input, Card, Form, Button, Row, Col,InputNumber , message } from 'antd';
+import { Checkbox, Input, Card, Form, Button, Row, Col, InputNumber, message } from 'antd';
 import { connect } from 'dva';
 import XForm, { FieldTypes } from '@/components/XForm';
 import request from '@/utils/request';
 import router from 'umi/router';
 import apis from '@/services/apis';
+import AuthButton from '@/components/AuthButton';
 
 const { TextArea } = Input;
 
@@ -114,12 +115,15 @@ const Poster = props => {
         <Form.Item label="顺序">
           {getFieldDecorator('sort', {
             initialValue: data.sort,
-          })(<InputNumber  style={{ width: '500px' }} />)}
+          })(<InputNumber style={{ width: '500px' }} />)}
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          <Button type="primary" htmlType="submit">
-            保存
-          </Button>
+          <AuthButton name="encyclopedias.type.submit" noRight={null}>
+            <Button type="primary" htmlType="submit">
+              保存
+            </Button>
+          </AuthButton>
+
           <Button style={{ marginLeft: '20px' }} onClick={Backcom}>
             取消
           </Button>

src/pages/system/Sellhouse/houseTypes/index.jsx

@@ -68,12 +68,12 @@ const header = props => {
 
       render: withActions((text, record) => [
      
-          <AuthButton name="admin.role.publish" noRight={null}>
+          <AuthButton name="encyclopedias.type.delete" noRight={null}>
             <EditIcon type="delete" text="删除" onClick={() => onDelete(record.policyTypeId)} />
           </AuthButton>
        ,
 
-        <AuthButton name="admin.role.put" noRight={null}>
+        <AuthButton name="encyclopedias.type.edit" noRight={null}>
           <EditIcon text="编辑" type="edit" onClick={() => addHouseTypes(record.policyTypeId)} />
         </AuthButton>,
       ]),
@@ -88,7 +88,7 @@ const header = props => {
 
   const actionRender = () => {
     return (
-      <AuthButton name="admin.taPolicy.post" noRight={null}>
+      <AuthButton name="encyclopedias.type.add" noRight={null}>
         <Button type="primary" style={{ margin: '20px 0' }} onClick={()=>addHouseTypes()}>
           新增
         </Button>

src/pages/system/Sellhouse/index.jsx

@@ -12,30 +12,33 @@ import apis from '@/services/apis';
 import request from '@/utils/request';
 // import styles from '../style/GoodsList.less';
 
-const header = (props) => {
-  const [data, setData] = useState({})
+const header = props => {
+  const [data, setData] = useState({});
 
   useEffect(() => {
     getList({ pageNum: 1, pageSize: 10, cityId: '' });
-  }, [])
+  }, []);
 
   // 查询列表
-  const getList = (params) => {
-    request({ ...apis.system.getTaPolicy, params: { ...params,...props.form.getFieldsValue() }, }).then((data) => {
-      console.log(data)
-      setData(data)
-    })
-  }
+  const getList = params => {
+    request({
+      ...apis.system.getTaPolicy,
+      params: { ...params, ...props.form.getFieldsValue() },
+    }).then(data => {
+      console.log(data);
+      setData(data);
+    });
+  };
 
   // 跳转到编辑商品
-  const toEditPolicy = (policyId) => () => {
+  const toEditPolicy = policyId => () => {
     router.push({
       pathname: '/news/Sellhouse/Edit',
       query: {
-        policyId
+        policyId,
       },
     });
-  }
+  };
 
   /**
    *
@@ -49,14 +52,18 @@ const header = (props) => {
       dataIndex: 'policyImg',
       key: 'policyImg',
       align: 'center',
-      render: (policyImg,row) =><Navigate onClick={toEditPolicy(row.policyId)} ><img src={policyImg} width={93}/></Navigate> ,
+      render: (policyImg, row) => <img src={policyImg} width={93} />,
     },
     {
       title: '标题',
       dataIndex: 'title',
       key: 'title',
       align: 'center',
-      render: (text, record) => <Navigate to={`/news/Sellhouse/Edit?policyId=${record.policyId}`}>{text}</Navigate>
+      render: (text, record) => (
+        <AuthButton name="encyclopedias.publish" noRight={text}>
+          <Navigate to={`/news/Sellhouse/Edit?policyId=${record.policyId}`}>{text}</Navigate>
+        </AuthButton>
+      ),
     },
     {
       title: '副标题',
@@ -81,150 +88,184 @@ const header = (props) => {
       dataIndex: 'createDate',
       key: 'createDate',
       align: 'center',
-      render: (createDate) => <><span>{moment(createDate).format('YYYY-MM-DD')}</span></>
+      render: createDate => (
+        <>
+          <span>{moment(createDate).format('YYYY-MM-DD')}</span>
+        </>
+      ),
     },
     {
       title: '热点',
       dataIndex: 'isHot',
       key: 'isHot',
       align: 'center',
-      render: (x) => <><span>{x === 1 ? '是' : '否'}</span></>
+      render: x => (
+        <>
+          <span>{x === 1 ? '是' : '否'}</span>
+        </>
+      ),
     },
     {
       title: '状态',
       dataIndex: 'publishStatus',
       key: 'publishStatus',
       align: 'center',
-      render: (publishStatus) => <><span>{publishStatus === 1 ? '已发布' : '未发布'}</span></>
+      render: publishStatus => (
+        <>
+          <span>{publishStatus === 1 ? '已发布' : '未发布'}</span>
+        </>
+      ),
     },
-    
+
     {
       title: '操作',
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
       render: withActions((x, row) => [
-        <AuthButton name="admin.taPolicy.publish" noRight={null}>
-          <EditIcon type={row.publishStatus === 0 ? 'publish' : 'cancel'} text={row.publishStatus === 0 ? '发布' : '取消发布'} onClick={publicOrNoPublic(row)}></EditIcon>
+        <AuthButton name="encyclopedias.publish" noRight={null}>
+          <EditIcon
+            type={row.publishStatus === 0 ? 'publish' : 'cancel'}
+            text={row.publishStatus === 0 ? '发布' : '取消发布'}
+            onClick={publicOrNoPublic(row)}
+          ></EditIcon>
         </AuthButton>,
-        
-        <AuthButton name="admin.taPolicy.top" noRight={null}>
-          <EditIcon type={row.weight === 1 ? 'cancel' : 'top'} text={row.weight === 1 ? '取消置顶' : '置顶'} onClick={topPolicy(row)}></EditIcon>
+
+        <AuthButton name="encyclopedias.top" noRight={null}>
+          <EditIcon
+            type={row.weight === 1 ? 'cancel' : 'top'}
+            text={row.weight === 1 ? '取消置顶' : '置顶'}
+            onClick={topPolicy(row)}
+          ></EditIcon>
         </AuthButton>,
-        
-        <AuthButton name="admin.taPolicy.id.put" noRight={null}>
+
+        <AuthButton name="encyclopedias.edit" noRight={null}>
           <EditIcon type="edit" text="编辑" onClick={toEditPolicy(row.policyId)}></EditIcon>
         </AuthButton>,
 
-        <AuthButton name="admin.taPolicy.id.delete" noRight={null}>
+        <AuthButton name="encyclopedias.delete" noRight={null}>
           <EditIcon type="delete" text="删除" onClick={deletePolicy(row.policyId)}></EditIcon>
         </AuthButton>,
-      ])
+      ]),
     },
   ];
 
   // 删除
-  const deletePolicy = (policyId) => () => {
+  const deletePolicy = policyId => () => {
     Modal.confirm({
       title: '购房政策会被删除，小程序端和后台都无法再看到',
       okText: '确定',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.system.deleteTaPolicy, urlData: { id: policyId }, }).then((data) => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10, cityId: '' });
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
+        request({ ...apis.system.deleteTaPolicy, urlData: { id: policyId } })
+          .then(data => {
+            message.info('操作成功！');
+            getList({ pageNum: 1, pageSize: 10, cityId: '' });
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
       },
     });
-  }
-
+  };
 
   //   置顶
-  const topPolicy = (row) => () => {
-    const weight = Math.abs(row.weight - 1)
-    row.weight = weight
-    request({ ...apis.system.updateTaPolicy, urlData: { id: row.policyId }, data: row, }).then((data) => {
-      console.log(data)
-      message.info('操作成功！')
-      getList({ pageNum: 1, pageSize: 10, cityId: '' });
-    }).catch((err) => {
-      console.log(err)
-      message.info(err.msg || err.message)
-    })
-  }
-
-  const publicOrNoPublic = (row) => () => {
+  const topPolicy = row => () => {
+    const weight = Math.abs(row.weight - 1);
+    row.weight = weight;
+    request({ ...apis.system.updateTaPolicy, urlData: { id: row.policyId }, data: row })
+      .then(data => {
+        console.log(data);
+        message.info('操作成功！');
+        getList({ pageNum: 1, pageSize: 10, cityId: '' });
+      })
+      .catch(err => {
+        console.log(err);
+        message.info(err.msg || err.message);
+      });
+  };
+
+  const publicOrNoPublic = row => () => {
     if (row.publishStatus === 1) {
-      row.publishStatus = 0
+      row.publishStatus = 0;
     } else {
-      row.publishStatus = 1
+      row.publishStatus = 1;
     }
-    const title = row.publishStatus === 0 ? '购房政策会在小程序端隐藏，后台可继续编辑重新发布' : '确认发布此数据'
+    const title =
+      row.publishStatus === 0
+        ? '购房政策会在小程序端隐藏，后台可继续编辑重新发布'
+        : '确认发布此数据';
     Modal.confirm({
       title: title,
       okText: '确定',
       cancelText: '取消',
       onOk() {
-        request({ ...apis.system.updateTaPolicy, urlData: { id: row.policyId }, data: row, }).then((data) => {
-          console.log(data)
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10, cityId: '' });
-        }).catch((err) => {
-          console.log(err)
-          message.info(err.msg || err.message)
-        })
+        request({ ...apis.system.updateTaPolicy, urlData: { id: row.policyId }, data: row })
+          .then(data => {
+            console.log(data);
+            message.info('操作成功！');
+            getList({ pageNum: 1, pageSize: 10, cityId: '' });
+          })
+          .catch(err => {
+            console.log(err);
+            message.info(err.msg || err.message);
+          });
       },
     });
+  };
 
-
-  }
-
-  const changePageNum = (pageNumber) => {
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() });
+  };
 
   // 提交事件
   const handleSubmit = (e, props) => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        console.log('提交数据: ', values)
-        getList({ pageNum: 1, pageSize: 10, ...values })
+        console.log('提交数据: ', values);
+        getList({ pageNum: 1, pageSize: 10, ...values });
       }
     });
-  }
+  };
 
-  const { getFieldDecorator } = props.form
+  const { getFieldDecorator } = props.form;
   return (
-
     <Card>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('cityId')(
-            <SelectCity allowClear/>,
-          )}
-        </Form.Item>
+        <Form.Item>{getFieldDecorator('cityId')(<SelectCity allowClear />)}</Form.Item>
         <Form.Item>
           <AuthButton name="admin.taPolicy.search" noRight={null}>
-            <Button type="primary" htmlType="submit" >
+            <Button type="primary" htmlType="submit">
               搜索
-          </Button>
+            </Button>
           </AuthButton>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.taPolicy.post" noRight={null}>
-        <Button type="primary" style={{margin:'20px 0'}} onClick={toEditPolicy()}>新增</Button>
+      <AuthButton name="encyclopedias.add" noRight={null}>
+        <Button type="primary" style={{ margin: '20px 0' }} onClick={toEditPolicy()}>
+          新增
+        </Button>
       </AuthButton>
-      <Table rowKey="housingPolicy" dataSource={data.records} columns={columns} pagination={false} />
+      <Table
+        rowKey="housingPolicy"
+        dataSource={data.records}
+        columns={columns}
+        pagination={false}
+      />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
+        <Pagination
+          showQuickJumper
+          defaultCurrent={1}
+          total={data.total}
+          onChange={changePageNum}
+          current={data.current}
+        />
       </div>
     </Card>
-  )
-}
+  );
+};
 const WrappedHeader = Form.create({ name: 'header' })(header);
 
-export default WrappedHeader
+export default WrappedHeader;

src/pages/system/housingPolicy/List/index.jsx

@@ -49,7 +49,7 @@ const header = (props) => {
       dataIndex: 'policyImg',
       key: 'policyImg',
       align: 'center',
-      render: (policyImg,row) =><Navigate onClick={toEditPolicy(row.policyId)} ><img src={policyImg} /></Navigate> ,
+      render: (policyImg,row) =><img src={policyImg} />,
     },
     {
       title: '标题',
@@ -84,19 +84,19 @@ const header = (props) => {
       key: 'handle',
       align: 'center',
       render: withActions((x, row) => [
-        <AuthButton name="admin.taPolicy.publish" noRight={null}>
+        <AuthButton name="encyclopedias.publish" noRight={null}>
           <EditIcon type={row.publishStatus === 0 ? 'publish' : 'cancel'} text={row.publishStatus === 0 ? '发布' : '取消发布'} onClick={publicOrNoPublic(row)}></EditIcon>
         </AuthButton>,
         
-        <AuthButton name="admin.taPolicy.top" noRight={null}>
+        <AuthButton name="encyclopedias.top" noRight={null}>
           <EditIcon type={row.weight === 1 ? 'cancel' : 'top'} text={row.weight === 1 ? '取消置顶' : '置顶'} onClick={topPolicy(row)}></EditIcon>
         </AuthButton>,
         
-        <AuthButton name="admin.taPolicy.id.put" noRight={null}>
+        <AuthButton name="encyclopedias.edit" noRight={null}>
           <EditIcon type="edit" text="编辑" onClick={toEditPolicy(row.policyId)}></EditIcon>
         </AuthButton>,
 
-        <AuthButton name="admin.taPolicy.id.delete" noRight={null}>
+        <AuthButton name="encyclopedias.delete" noRight={null}>
           <EditIcon type="delete" text="删除" onClick={deletePolicy(row.policyId)}></EditIcon>
         </AuthButton>,
       ])
@@ -195,7 +195,7 @@ const header = (props) => {
           </AuthButton>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.taPolicy.post" noRight={null}>
+      <AuthButton name="encyclopedias.add" noRight={null}>
         <Button type="primary" style={{margin:'20px 0'}} onClick={toEditPolicy()}>新增</Button>
       </AuthButton>
       <Table rowKey="housingPolicy" dataSource={data.records} columns={columns} pagination={false} />