feats

src/components/AuthButton/index.jsx

@@ -3,10 +3,10 @@ import React from 'react';
 let allBtns = [];
 let current = [];
 
-const AuthButton = ({ children, name, noRight }) => {
+const AuthButton = ({ children, name, noRight = null }) => {
   const btn = allBtns.filter(x => x.code === name)[0]
-  if (!btn) {
-    return <>{children}</>
+  if (!btn || !name) {
+    return children
   }
 
   const hasRight = current.filter(x => x.code === name)[0]  

src/components/Poster/Form.jsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react'
 import { Button, Form, Input, message } from 'antd'
 import ImageUpload from '@/components/XForm/ImageUpload'
+import AuthButton from '@/components/AuthButton'
 import { fetch, apis } from '@/utils/request'
 
 const formItemLayout = {
@@ -19,7 +20,7 @@ const saveData = fetch(apis.activity.addPoster)
 const updateData = fetch(apis.activity.updatePoster)
 
 const PosterForm = (props) => {
-  const { form, targetId, targetType } = props
+  const { form, targetId, targetType, rights } = props
   const { getFieldDecorator, resetFields, setFieldsValue, validateFields } = form
 
   const [formData, setFormData] = useState()
@@ -91,11 +92,13 @@ const PosterForm = (props) => {
       </Form.Item>
       <Form.Item label="海报描述">
       {getFieldDecorator('posterDescription')(<Input.TextArea row={4} />)}
-      </Form.Item>
+      </Form.Item>*/}
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
-        <Button loading={loading} style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
-        {/* <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button> */}
-       {/* </Form.Item> */}
+        <AuthButton name={rights}>
+          <Button loading={loading} style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
+        </AuthButton>
+        {/* <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button>  */}
+      </Form.Item>
     </Form>
   )
 }

src/components/Poster/index.jsx

@@ -7,7 +7,7 @@ import Styles from './style.less'
 const noop = x => x;
 
 export default (props) => {
-  const { target, onCancel = noop } = props
+  const { target, rights, onCancel = noop } = props
   const { id: targetId, type: targetType } = target
 
   const [posterImg, setPosterImg] = useState()
@@ -21,6 +21,7 @@ export default (props) => {
         <Form
           targetId={targetId}
           targetType={targetType}
+          rights={rights}
           onImageChange={setPosterImg}
           onCancel={onCancel}
         />

src/components/Share/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect } from 'react'
 import { Button, Form, Input, message } from 'antd'
 import ImageUpload from '@/components/XForm/ImageUpload'
+import AuthButton from '@/components/AuthButton'
 import { fetch, apis } from '@/utils/request'
 
 const formItemLayout = {
@@ -18,7 +19,7 @@ const saveData = fetch(apis.activity.addShareContent)
 const updateData = fetch(apis.activity.updateShareContent)
 
 const ShareForm = (props) => {
-  const { target, form } = props
+  const { target, form, rights } = props
   const { id: targetId, type: targetType } = target
   const { getFieldDecorator, resetFields, setFieldsValue, validateFields } = form
 
@@ -87,7 +88,9 @@ const ShareForm = (props) => {
       })(<ImageUpload />)}
       </Form.Item>
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
-        <Button loading={loading} style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
+        <AuthButton name={rights}>
+          <Button loading={loading} style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
+        </AuthButton>
         {/* <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button> */}
       </Form.Item>
     </Form>

src/pages/building/Developers/Edit.jsx

@@ -1,10 +1,11 @@
 import React, { useState, useEffect } from 'react';
 import { Input, Button, Card, Form, notification, message } from 'antd';
 import router from 'umi/router';
+import AuthButton from '@/components/AuthButton'
 // import Styles from './style.less';
-import ImageUploader from '../../../components/XForm/ImageUpload';
-import request from '../../../utils/request';
-import apis from '../../../services/apis';
+import ImageUploader from '@/components/XForm/ImageUpload';
+import request from '@/utils/request';
+import apis from '@/services/apis';
 import { fetch } from '@/utils/request';
 import pinyin from 'pinyin';
 
@@ -193,9 +194,11 @@ function Edit(props) {
           {...tailFormItemLayout}
           style={{ display: 'flex', justifyContent: 'space-between' }}
         >
-          <Button type="primary" htmlType="submit" style={{ margin: '0' }}>
-            确定
-          </Button>
+          <AuthButton name="building.brand">
+            <Button type="primary" htmlType="submit" style={{ margin: '0' }}>
+              确定
+            </Button>
+          </AuthButton>
           &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={() => router.go(-1)}>取消</Button>
         </Form.Item>

src/pages/building/Developers/index.jsx

@@ -60,7 +60,7 @@ export default (props) => {
   const actionRender = () => {
     return (
       //name
-      <AuthButton name="admin.brand.addBrand" noRight={null}>
+      <AuthButton name="building.brand.add" noRight={null}>
         <Button type="primary" icon="plus" onClick={toEdit} >
           新增
         </Button>

src/pages/building/Developers/tableColumns.js

@@ -47,10 +47,10 @@ export default ({page,getBrandData, onEdit, onDelete}) => [
     key: 'options',
     align: 'center',
     render: withActions((_, row) => [
-      <AuthButton name="admin.building.public" noRight={null}>
+      <AuthButton name="building.brand.edit" noRight={null}>
         <OperButton onClick={() => onEdit(row)}>编辑</OperButton>
       </AuthButton>,
-      <AuthButton name="admin.brabd.delete" noRight={null}>
+      <AuthButton name="building.brand.delete" noRight={null}>
         <OperButton.Confirm
           title="确认删除?"
           content="删除之后不可恢复"

src/pages/building/Edit/AlbumList/List.jsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Button, Collapse, Popconfirm } from 'antd';
 import ImageListUpload from '@/components/XForm/ImageListUpload';
+import AuthButton from '@/components/AuthButton'
 
 const { Panel } = Collapse;
 
@@ -35,19 +36,21 @@ export default props => {
 
   const Extra = item => (
     <>
-      <Button type="link" size="small" onClick={(e)=>{e.stopPropagation(),props.onRename(item)}}>
-        重命名
-      </Button>
-      {/* <Popconfirm title="Are you sure delete this task?" onConfirm={props.onDelete}> */}
-      <Button
-        type="link"
-        size="small"
-        style={{ color: 'red' }}
-        onClick={e =>{ e.stopPropagation(),props.onDelete(item)} }
-      >
-        删除
-      </Button>
-      {/* </Popconfirm> */}
+      <AuthButton name="building.photo.rename">
+        <Button type="link" size="small" onClick={(e)=>{e.stopPropagation(),props.onRename(item)}}>
+          重命名
+        </Button>
+      </AuthButton>
+      <AuthButton name="building.photo.delete">
+        <Button
+          type="link"
+          size="small"
+          style={{ color: 'red' }}
+          onClick={e =>{ e.stopPropagation(),props.onDelete(item)} }
+        >
+          删除
+        </Button>
+      </AuthButton>
     </>
   );
 

src/pages/building/Edit/AlbumList/index.jsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { Button, Modal, message, Input } from 'antd';
 import request, { apis } from '@/utils/request';
+import AuthButton from '@/components/AuthButton'
 import Form from './Form';
 import List from './List';
 import ModalForm from '../components/ModalForm';
@@ -135,9 +136,11 @@ export default props => {
   return (
     <div>
       <div>
-        <Button type="primary" onClick={() => setVisible(true)}>
-          新增相册
-        </Button>
+        <AuthButton name="building.photo.add">
+          <Button type="primary" onClick={() => setVisible(true)}>
+            新增相册
+          </Button>
+        </AuthButton>
       </div>
       <Form
         visible={visible}

src/pages/building/Edit/Apartment/Form.jsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import { Button, Form, Input, message, Select } from 'antd';
 import ImageUpload from '@/components/XForm/ImageUpload';
+import AuthButton from '@/components/AuthButton'
 import { fetch, apis } from '@/utils/request';
 import ModalForm from '../components/ModalForm';
 import InputNumber from '../components/InputNumber';
@@ -158,9 +159,11 @@ const AMForm = props => {
         })(<InputNumber min={0} step={1} style={fullWidth} />)}
       </Form.Item>
       <Form.Item label=" " colon={false} style={{ marginTop: '2em' }}>
-        <Button loading={loading} style={{ marginLeft: '4em' }} type="primary" htmlType="submit">
-          保存
-        </Button>
+        <AuthButton name="building.houseType.edit">
+          <Button loading={loading} style={{ marginLeft: '4em' }} type="primary" htmlType="submit">
+            保存
+          </Button>
+        </AuthButton>
         <Button style={{ marginLeft: '2em' }} onClick={props.onCancel}>
           取消
         </Button>

src/pages/building/Edit/Apartment/List.jsx

@@ -1,5 +1,6 @@
 import React from 'react'
 import { Button, Table, Popconfirm } from 'antd'
+import AuthButton from '@/components/AuthButton'
 import moment from 'moment'
 
 const saleType = [
@@ -87,13 +88,17 @@ export default (props) => {
       key: 'apartmentId',
       render: (_, record) => (
         <>
-          <Button type="link" onClick={() => props.onEdit(record)}>编辑</Button>
-          <Popconfirm
-            title="确定要进行删除操作 ?"
-            onConfirm={() => props.onDelete(record)}
-          >
-            <Button type="link" style={{ color: 'red' }}>删除</Button>
-          </Popconfirm>
+          <AuthButton name="building.houseType.edit">
+            <Button type="link" onClick={() => props.onEdit(record)}>编辑</Button>
+          </AuthButton>
+          <AuthButton name="building.houseType.delete">
+            <Popconfirm
+              title="确定要进行删除操作 ?"
+              onConfirm={() => props.onDelete(record)}
+            >
+              <Button type="link" style={{ color: 'red' }}>删除</Button>
+            </Popconfirm>
+          </AuthButton>
         </>
       ),
     },

src/pages/building/Edit/Apartment/index.jsx

@@ -1,6 +1,7 @@
 import React, { useEffect, useState, useRef } from 'react'
 import { Button, message } from 'antd'
 import { fetch, apis } from '@/utils/request'
+import AuthButton from '@/components/AuthButton'
 import Form from './Form'
 import List from './List'
 
@@ -62,7 +63,9 @@ export default (props) => {
   return (
     <div>
       <div>
-        <Button type="primary" onClick={() => handleEdit()}>新增户型</Button>
+        <AuthButton name="building.houseType.add">
+          <Button type="primary" onClick={() => handleEdit()}>新增户型</Button>
+        </AuthButton>
       </div>
       <Form buildingId={id} visible={visible} onCancel={() => setVisible(false)} formData={apartmentRef.current} onSuccess={handleSuccess} />
       <List loading={loading} dataSource={list} onEdit={handleEdit} onDelete={handleDelete} />

src/pages/building/Edit/Basic/index.jsx

@@ -7,6 +7,7 @@ import ImageListUpload from '@/components/XForm/ImageListUpload'
 import SelectCity from '@/components/SelectButton/CitySelect'
 import AreaSelect from '@/components/SelectButton/AreaSelect'
 import InstitutionSelect from '@/components/SelectButton/InstitutionSelect'
+import AuthButton from '@/components/AuthButton'
 import { POI_TYPES_KETY, POI_TYPES, getPoiData } from '@/utils/map'
 import Amap from '../components/Amap'
 import BuildingType from '../components/BuildingTypeSelect'
@@ -444,9 +445,11 @@ const BuildingBasic = React.forwardRef((props, ref) => {
         </Form.Item> */}
 
         <Form.Item label=" " colon={false}>
-          <Button style={{marginLeft: '6em'}} type="primary" htmlType="submit">
-              确定
-          </Button>
+          <AuthButton name="building.detail.save">
+            <Button style={{marginLeft: '6em'}} type="primary" htmlType="submit">
+                确定
+            </Button>
+          </AuthButton>
           <Button style={{marginLeft: '2em'}} onClick={() => router.go(-1)}>
               取消
           </Button>

src/pages/building/Edit/Channel.jsx

@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react'
 import { connect } from 'dva';
 import { Button, Form, Input, message, Select } from 'antd'
 import { fetch, apis } from '@/utils/request'
+import AuthButton from '@/components/AuthButton'
 import InputNumber from './components/InputNumber'
 import { formItemLayout, validMinNum } from './utils'
 
@@ -80,6 +81,9 @@ const ChannelForm = React.forwardRef((props, ref) => {
       {getFieldDecorator('remark', {})(<Input.TextArea row={4} />)}
       </Form.Item>
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
+        <AuthButton name="building.channel.save">
+          <Button style={{marginLeft: '4em'}} loading={loading} type="primary" htmlType="submit">保存</Button>
+        </AuthButton>
         <Button style={{marginLeft: '4em'}} loading={loading} type="primary" htmlType="submit">保存</Button>
         {/* <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button> */}
       </Form.Item>

src/pages/building/Edit/News/Form.jsx

@@ -1,9 +1,10 @@
 import React, { useState, useEffect } from 'react';
 import { Button, Form, Input, DatePicker, notification } from 'antd';
-import ModalForm from '../components/ModalForm';
+import AuthButton from '@/components/AuthButton'
 import request from '@/utils/request';
 import apis from '@/services/apis';
 import moment from 'moment';
+import ModalForm from '../components/ModalForm';
 
 const fullWidth = { width: '100%' };
 
@@ -14,7 +15,6 @@ const AMForm = props => {
 
   useEffect(() => {
     if (data) {
-      console.log(data, '-----------------');
       data.trendTime=moment(data.trendTime)
       setFieldsValue(data);
     }
@@ -81,9 +81,11 @@ const AMForm = props => {
         })(<Input.TextArea row={4} />)}
       </Form.Item>
       <Form.Item label=" " colon={false} style={{ marginTop: '2em' }}>
-        <Button style={{ marginLeft: '4em' }} type="primary" htmlType="submit">
-          保存
-        </Button>
+        <AuthButton name="building.dynamic.edit">
+          <Button style={{ marginLeft: '4em' }} type="primary" htmlType="submit">
+            保存
+          </Button>
+        </AuthButton>
         <Button style={{ marginLeft: '2em' }} onClick={props.onCancel}>
           取消
         </Button>

src/pages/building/Edit/News/List.jsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Button, Table,Popconfirm  } from 'antd';
+import AuthButton from '@/components/AuthButton'
 import moment from 'moment'
 
 export default props => {
@@ -29,14 +30,18 @@ export default props => {
       key: 'apartmentId',
       render: (_, record) => (
         <>
-          <Button type="link" onClick={() => props.onEdit(record)}>
-            编辑
-          </Button>
-          <Popconfirm title="确定要进行删除操作 ?" onConfirm={() => props.onDelete(record)}>
-            <Button type="link" style={{ color: 'red' }}>
-              删除
+          <AuthButton name="building.dynamic.edit">
+            <Button type="link" onClick={() => props.onEdit(record)}>
+              编辑
             </Button>
-          </Popconfirm>
+          </AuthButton>
+          <AuthButton name="building.dynamic.delete">
+            <Popconfirm title="确定要进行删除操作 ?" onConfirm={() => props.onDelete(record)}>
+              <Button type="link" style={{ color: 'red' }}>
+                删除
+              </Button>
+            </Popconfirm>
+          </AuthButton>
         </>
       ),
     },

src/pages/building/Edit/News/index.jsx

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { Button, notification } from 'antd';
+import AuthButton from '@/components/AuthButton'
 import Form from './Form';
 import List from './List';
 
@@ -71,9 +72,11 @@ export default props => {
   return (
     <div>
       <div>
-        <Button type="primary" onClick={() => setVisible({visible:true})}>
-          新增动态
-        </Button>
+        <AuthButton name="building.dynamic.add">
+          <Button type="primary" onClick={() => setVisible({visible:true})}>
+            新增动态
+          </Button>
+        </AuthButton>
       </div>
       <Form visibleData={visible} buildingId={id} onCancel={() => setVisible({visible:false})} onSuccess={onSuccess} />
       <List data={data} buildingId={id} loading={loading} onChangePageNum={onChangePageNum} onDelete={onDelete} onEdit={onEdit}/>

src/pages/building/Edit/OnSiteService.jsx

@@ -2,8 +2,9 @@ import React, { useState, useEffect } from 'react';
 import { Input, Popconfirm, Table, Typography,notification } from 'antd';
 import request from '@/utils/request';
 import apis from '@/services/apis';
-import Styles from './style.less';
+import AuthButton from '@/components/AuthButton'
 import { getImgURL } from '@/utils/image';
+import Styles from './style.less';
 
 const { Text } = Typography;
 
@@ -95,11 +96,13 @@ export default props => {
       title: '操作',
       key: 'action',
       render: (_, row) => (
-        <Popconfirm title="确认执行取消操作?" onConfirm={() => handleCancel(row)}>
-          <a href="#" style={{ color: 'red' }}>
-            取消绑定
-          </a>
-        </Popconfirm>
+        <AuthButton name="building.marketing.delete">
+          <Popconfirm title="确认执行取消操作?" onConfirm={() => handleCancel(row)}>
+            <a href="#" style={{ color: 'red' }}>
+              取消绑定
+            </a>
+          </Popconfirm>
+        </AuthButton>
       ),
     },
   ];

src/pages/building/Edit/Panorama/Form.jsx

@@ -1,9 +1,10 @@
 import React, { useState } from 'react';
 import { Button, Form, Input, Select, Radio, notification } from 'antd';
 import ImageUpload from '@/components/XForm/ImageUpload';
-import ModalForm from '../components/ModalForm';
+import AuthButton from '@/components/AuthButton'
 import request from '@/utils/request';
 import apis from '@/services/apis';
+import ModalForm from '../components/ModalForm';
 
 const fullWidth = { width: '100%' };
 const { Option } = Select;
@@ -83,9 +84,11 @@ const AMForm = props => {
         })(<Input />)}
       </Form.Item>
       <Form.Item label=" " colon={false} style={{ marginTop: '2em' }}>
-        <Button style={{ marginLeft: '4em' }} type="primary" htmlType="submit">
-          保存
-        </Button>
+        <AuthButton name="building.panorama.add">
+          <Button style={{ marginLeft: '4em' }} type="primary" htmlType="submit">
+            保存
+          </Button>
+        </AuthButton>
         <Button style={{ marginLeft: '2em' }} onClick={props.onCancel}>
           取消
         </Button>

src/pages/building/Edit/Panorama/List.jsx

@@ -3,6 +3,7 @@ import { Button, Table, notification, Popconfirm } from 'antd';
 import request from '@/utils/request';
 import apis from '@/services/apis';
 import { getImgURL } from '@/utils/image';
+import AuthButton from '@/components/AuthButton'
 
 export default props => {
   const { data,loading } = props;
@@ -41,12 +42,13 @@ export default props => {
       dataIndex: 'apartmentId',
       key: 'apartmentId',
       render: (_, record) => (
-        <Popconfirm title="确定要进行删除操作 ?" onConfirm={() => props.onDelete(record)}>
-         
-          <Button type="link" style={{ color: 'red' }}>
-            删除
-          </Button>
-        </Popconfirm>
+        <AuthButton name="building.panorama.delete">
+          <Popconfirm title="确定要进行删除操作 ?" onConfirm={() => props.onDelete(record)}>
+            <Button type="link" style={{ color: 'red' }}>
+              删除
+            </Button>
+          </Popconfirm>
+        </AuthButton>
       ),
     },
   ];

src/pages/building/Edit/Panorama/index.jsx

@@ -1,9 +1,10 @@
 import React, { useState, useEffect } from 'react';
 import { Button, notification } from 'antd';
-import Form from './Form';
-import List from './List';
+import AuthButton from '@/components/AuthButton'
 import request from '@/utils/request';
 import apis from '@/services/apis';
+import Form from './Form';
+import List from './List';
 
 export default props => {
   const { history } = props;
@@ -72,9 +73,11 @@ export default props => {
   return (
     <div>
       <div>
-        <Button type="primary" onClick={() => setVisible(true)}>
-          新增全景
-        </Button>
+        <AuthButton name="building.panorama.add">
+          <Button type="primary" onClick={() => setVisible(true)}>
+            新增全景
+          </Button>
+        </AuthButton>
       </div>
       <Form
         visible={visible}

src/pages/building/Edit/SpecialRoom/Form.jsx

@@ -1,11 +1,12 @@
 import React,{useEffect} from 'react'
 import { Button, Form, Input, DatePicker,notification } from 'antd'
 import moment from 'moment'
+import request from '@/utils/request';
+import apis from '@/services/apis';
+import AuthButton from '@/components/AuthButton'
 import ModalForm from '../components/ModalForm'
 import InputNumber from '../components/InputNumber'
 import { validMinNum } from '../utils'
-import request from '@/utils/request';
-import apis from '@/services/apis';
 
 const fullWidth = { width: '100%' }
 
@@ -16,7 +17,6 @@ const AMForm = (props) => {
 
   useEffect(() => {
     if (data) {
-      console.log(data, '-----------------');
       // data.trendTime=moment(data.trendTime)
       data.time=[moment(data.startTime),moment(data.endTime)]
       setFieldsValue(data);
@@ -30,7 +30,6 @@ const AMForm = (props) => {
         console.error(err);
         return;
       }
-      console.log(values, '-----------------');
       values.buildingId = props.buildingId;
       values.startTime = values.time[0]
       values.endTime = values.time[1]
@@ -124,7 +123,9 @@ const AMForm = (props) => {
         })(<InputNumber min={0} precision={0.01} step={1} placeholder="请填写节省总价" addonAfter="元"/>)}
       </Form.Item>
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
-        <Button style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
+        <AuthButton name="building.special.edit">
+          <Button style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
+        </AuthButton>
         <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button>
       </Form.Item>
     </ModalForm>

src/pages/building/Edit/SpecialRoom/List.jsx

@@ -4,6 +4,7 @@ import TableList from '@/components/TableList';
 import request from '@/utils/request';
 import apis from '@/services/apis';
 import moment from 'moment';
+import AuthButton from '@/components/AuthButton'
 
 export default (props) => {
   const { data = {}, onChangePageNum,loading } = props;
@@ -44,13 +45,17 @@ export default (props) => {
       key: 'apartmentId',
       render: (_, record) => (
         <>
-          <Button type="link" onClick={() => props.onEdit(record)}>编辑</Button>
-          <Popconfirm
-            title="确定要进行删除操作 ?"
-            onConfirm={() => props.onDelete(record)}
-          >
-            <Button type="link" style={{ color: 'red' }}>删除</Button>
-          </Popconfirm>
+          <AuthButton name="building.special.edit">
+            <Button type="link" onClick={() => props.onEdit(record)}>编辑</Button>
+          </AuthButton>
+          <AuthButton name="building.special.delete">
+            <Popconfirm
+              title="确定要进行删除操作 ?"
+              onConfirm={() => props.onDelete(record)}
+            >
+              <Button type="link" style={{ color: 'red' }}>删除</Button>
+            </Popconfirm>
+          </AuthButton>
         </>
       ),
     },

src/pages/building/Edit/SpecialRoom/index.jsx

@@ -1,9 +1,10 @@
 import React, { useState, useEffect } from 'react'
 import { Button,notification } from 'antd'
-import Form from './Form'
-import List from './List'
+import AuthButton from '@/components/AuthButton'
 import request from '@/utils/request';
 import apis from '@/services/apis';
+import Form from './Form'
+import List from './List'
 
 export default (props) => {
 
@@ -69,7 +70,9 @@ export default (props) => {
   return (
     <div>
       <div>
-        <Button type="primary" onClick={() => setVisible({visible:true})}>新增特价房</Button>
+        <AuthButton name="building.special.add">
+          <Button type="primary" onClick={() => setVisible({visible:true})}>新增特价房</Button>
+        </AuthButton>
       </div>
       <Form visibleData={visible} buildingId={id} onCancel={() => setVisible({visible:false})} onSuccess={onSuccess}  />
       <List data={data} buildingId={id} loading={loading} onChangePageNum={onChangePageNum} onDelete={onDelete} onEdit={onEdit}/>

src/pages/building/Edit/index.jsx

@@ -65,11 +65,11 @@ export default (props) => {
           </div>
         </TabPane>
         <TabPane tab="海报图片" key="5">
-          <Poster target={target} {...props} />
+          <Poster target={target} rights="building.poster.save" {...props} />
         </TabPane>
         <TabPane tab="分享设置" key="6">
           <div className={styles['tab-wrapper']} style={{maxWidth: '800px'}}>
-            <Share target={target} {...props} />
+            <Share target={target} rights="building.share.save" {...props} />
           </div>
         </TabPane>
       </Tabs>

src/pages/building/List/index.jsx

@@ -3,6 +3,7 @@ import React, { useMemo, useRef, useCallback, useState } from 'react'
 import { Button, notification, Spin } from 'antd'
 import { router } from 'umi'
 import QueryTable from '@/components/QueryTable'
+import AuthButton from '@/components/AuthButton'
 import request from '@/utils/request'
 import apis from '@/services/apis'
 import getSearchFields from './searchFields'
@@ -47,7 +48,11 @@ export default (props) => {
 
   const actionRender = () => {
     const gotoAdd = () => router.push('/building/add')
-    return <Button type="primary" icon="plus" onClick={gotoAdd}>新增</Button>
+    return (
+      <AuthButton name="building.add">
+        <Button type="primary" icon="plus" onClick={gotoAdd}>新增</Button>
+      </AuthButton>
+    )
   }
 
   return (

src/pages/building/List/tableColumns.js

@@ -36,7 +36,7 @@ export default ({page, onPublish, onDelete}) => [
     key: 'buildingName',
     align: 'center',
     render: (t, row) => (
-      <AuthButton name="admin.building.update" noRight={t}>
+      <AuthButton name="building.detail" noRight={t}>
         <Button
           type="link"
           onClick={() => router.push({
@@ -74,10 +74,10 @@ export default ({page, onPublish, onDelete}) => [
     key: 'options',
     align: 'center',
     render: withActions((_, row) => [
-      <AuthButton name="admin.building.public" noRight={null}>
+      <AuthButton name="building.publish" noRight={null}>
         <OperButton onClick={() => onPublish(row)}>{row.status === 1 ? '取消发布' : '发布'}</OperButton>
       </AuthButton>,
-      <AuthButton name="admin.building.delete" noRight={null}>
+      <AuthButton name="building.delete" noRight={null}>
         <OperButton.Confirm
           title="确认删除?"
           content="删除之后不可恢复"

src/pages/building/type/edi.jsx

@@ -1,6 +1,7 @@
 import React, {  useEffect } from 'react';
 import { Input, Button, Form, Card, notification } from 'antd';
 import router from 'umi/router';
+import AuthButton from '@/components/AuthButton';
 import Styles from './style.less';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
@@ -91,16 +92,17 @@ function body(props) {
           })(<Input placeholder="名称" />)}
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'space-between' }}>
-          <Button
-            type="primary"
-            htmlType="submit"
-            className={Styles.addButton}
-            style={{ margin: '0' }}
-          >
-            确定
-          </Button>
-          &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-          <Button onClick={() => router.go(-1)}>取消</Button>
+          <AuthButton name="building.type.submit">
+            <Button
+              type="primary"
+              htmlType="submit"
+              className={Styles.addButton}
+              style={{ margin: '0' }}
+            >
+              确定
+            </Button>
+          </AuthButton>
+          <Button style={{marginLeft: '2em'}} onClick={() => router.go(-1)}>取消</Button>
         </Form.Item>
       </Form>
     </Card>

src/pages/building/type/index.jsx

@@ -45,10 +45,10 @@ export default function BuildType() {
       key: 'row',
       align: 'center',
       render: withActions((_, record) => [
-        <AuthButton name="admin.tdBuildingType.delete" noRight={null}>
+        <AuthButton name="building.type.delete" noRight={null}>
           <EditIcon text="删除" type="delete" onClick={() => deleteType(record)} />
         </AuthButton>,
-        <AuthButton name="admin.tdBuildingType.update" noRight={null}>
+        <AuthButton name="building.type.edit" noRight={null}>
           <EditIcon text="编辑" type="edit" onClick={() => toEdi(record.buildingTypeId)} />
         </AuthButton>,
       ]),

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

@@ -159,11 +159,13 @@ const PrivateCustomer = () => {
         align: 'center',
         width: '20%',
         render: withActions((_, record) => [
-          <Button type="link" onClick={() => toCustomerDateil(record)}>
-            查看详情
-          </Button>,
+          <AuthButton name="customer.detail">
+            <Button type="link" onClick={() => toCustomerDateil(record)}>
+              查看详情
+            </Button>
+          </AuthButton>,
           // <EditIcon color="#FF4A4A" text="查看详情" onClick={() => toCustomerDateil(record)} />,
-          <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
+          <AuthButton name="customer.status.change" noRight={null}>
             <Button
               type="link"
               onClick={() => {
@@ -175,15 +177,12 @@ const PrivateCustomer = () => {
                   },
                 });
               }}
-
-              // });
-              // onClick={() => handShowModel(record, actionList.changeStatus)}
             >
               变更状态
             </Button>
           </AuthButton>,
 
-          <AuthButton name="admin.customer.recommend.belong" noRight={null}>
+          <AuthButton name="customer.belong.change" noRight={null}>
             <Button type="link" onClick={() => handShowModel(record, actionList.attribution)}>
               调整归属
             </Button>

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

@@ -166,18 +166,16 @@ const PublicCustomer = () => {
         dataIndex: 'customerId',
         key: 'customerId',
         align: 'center',
-       
+
         render: withActions((_, record) => [
-          <Button  type="link" onClick={() => publicCustomerDetail(record)}>
-            查看详情
-          </Button>,
+          <AuthButton name="customer.detail">
+            <Button  type="link" onClick={() => publicCustomerDetail(record)}>
+              查看详情
+          </Button>
+          </AuthButton>,
 
-          <AuthButton name="admin.customer.assign" noRight={null}>
-            <Button
-        
-              type="link"
-              onClick={() => handShowModel(record, actionList.assistConsultant)}
-            >
+          <AuthButton name="customer.consultant.dispatch" noRight={null}>
+            <Button type="link" onClick={() => handShowModel(record, actionList.assistConsultant)}>
               分配置业顾问
             </Button>
           </AuthButton>,

src/pages/recommend/channel/audit.jsx

@@ -20,8 +20,9 @@ import {
 } from 'antd';
 import ImageUpload from '@/components/XForm/ImageUpload';
 import moment from 'moment';
-import request from '../../../utils/request';
-import apis from '../../../services/apis';
+import AuthButton from '@/components/AuthButton';
+import request from '@/utils/request';
+import apis from '@/services/apis';
 import { router } from 'umi';
 
 import Attribution from './components/attribution';
@@ -186,17 +187,21 @@ function body(props) {
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
           {data.status === '1' && (
             <>
-              <Button type="primary" htmlType="submit">
-                确定
-              </Button>
-              <Button
-                type="danger"
-                ghost
-                style={{ marginLeft: '4em' }}
-                onClick={() => submitDate({ status: '2' })}
-              >
-                无效
-              </Button>
+              <AuthButton name="customer.channel.report">
+                <Button type="primary" htmlType="submit">
+                  确定
+                </Button>
+              </AuthButton>
+              <AuthButton name="customer.channel.report">
+                <Button
+                  type="danger"
+                  ghost
+                  style={{ marginLeft: '4em' }}
+                  onClick={() => submitDate({ status: '2' })}
+                >
+                  无效
+                </Button>
+              </AuthButton>
             </>
           )}
           <Button style={{ marginLeft: '4em' }} onClick={() => router.goBack(-1)}>

src/pages/recommend/channel/index.jsx

@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
 import {  Avatar, Button,message } from 'antd';
 import moment from 'moment';
-import request from '../../../utils/request';
-import apis from '../../../services/apis';
+import request from '@/utils/request';
+import apis from '@/services/apis';
 import QueryTable from '@/components/QueryTable'
 import { router } from 'umi';
 import AuthButton from '@/components/AuthButton';
@@ -112,15 +112,18 @@ function Recommend(props) {
       dataIndex: 'customerId',
       key: 'customerId',
       render: (_, record) => (
-        <>{record.status === '1' ?<Button type='link' onClick={() => {
-          toAudit(record.channelCustomerId)
-          }}>到访确认</Button>:
-          <Button type='link' onClick={() => {
-            toAudit(record.channelCustomerId)
-            }}>查看详情</Button>
+        <>{record.status === '1' ? (
+          <AuthButton name="customer.channel.report">
+            <Button type='link' onClick={() => toAudit(record.channelCustomerId)}>到访确认</Button>
+          </AuthButton>
+        ): (
+          <AuthButton name="customer.channel.detail">
+            <Button type='link' onClick={() => toAudit(record.channelCustomerId)}>查看详情</Button>
+          </AuthButton>
+        )
           }
           {/* {
-            <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
+            <AuthButton name="customer.channel.report" noRight={null}>
               {record.verifyStatus === 0 ? <span style={{ color: 'rgba(239,39,58,1)', cursor: 'pointer' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
             </AuthButton>
           } */}

src/pages/recommend/customer/audit.jsx

@@ -1,9 +1,10 @@
 import React, { useState, useEffect } from 'react';
 import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Upload, message, notification } from 'antd';
 import ImageUpload from '@/components/XForm/ImageUpload';
+import AuthButton from '@/components/AuthButton';
 import moment from 'moment';
-import request from '../../../utils/request';
-import apis from '../../../services/apis';
+import request from '@/utils/request';
+import apis from '@/services/apis';
 import { router } from 'umi';
 
 import Attribution from './components/attribution'
@@ -182,12 +183,18 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item style={{ display: 'flex', justifyContent: 'center' }}>
-          {data.status==='1'&&<><Button type="primary" htmlType="submit" >
-            确定
-          </Button>
-          <Button type="danger" ghost style={{marginLeft: '4em'}} onClick={() => submitDate({ status: '2' })}>
-            无效
-          </Button></>}
+          {data.status==='1'&& <>
+            <AuthButton name="customer.common.verify">
+              <Button type="primary" htmlType="submit" >
+                确定
+              </Button>
+            </AuthButton>
+            <AuthButton name="customer.common.verify">
+              <Button type="danger" ghost style={{marginLeft: '4em'}} onClick={() => submitDate({ status: '2' })}>
+                无效
+              </Button>
+            </AuthButton>
+          </>}
           <Button style={{marginLeft: '4em'}} onClick={() => router.goBack(-1)}>
             取消
           </Button>

src/pages/recommend/customer/index.jsx

@@ -1,8 +1,8 @@
 import React, { useState } from 'react';
 import {  Avatar, Button,message } from 'antd';
 import moment from 'moment';
-import request from '../../../utils/request';
-import apis from '../../../services/apis';
+import request from '@/utils/request';
+import apis from '@/services/apis';
 import QueryTable from '@/components/QueryTable'
 import { router } from 'umi';
 import AuthButton from '@/components/AuthButton';
@@ -112,12 +112,14 @@ function Recommend(props) {
       dataIndex: 'customerId',
       key: 'customerId',
       render: (_, record) => (
-        <>{record.status === '1' ?<Button type='link' onClick={() => {
-          toAudit(record.channelCustomerId)
-          }}>审核</Button>:
-          <Button type='link' onClick={() => {
-            toAudit(record.channelCustomerId)
-            }}>查看详情</Button>
+        <>{record.status === '1' ? (
+          <AuthButton name="customer.channel.verify">
+            <Button type='link' onClick={() => toAudit(record.channelCustomerId)}>审核</Button>
+          </AuthButton>
+        ) : (
+          <Button type='link' onClick={() => toAudit(record.channelCustomerId)}>查看详情</Button>
+        )
+          
           }
           {/* {
             <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>

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

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Checkbox, Input, Card, Form, Button, Row, Col, Spin, message } from 'antd';
 import { connect } from 'dva';
 import XForm, { FieldTypes } from '@/components/XForm';
+import AuthButton from '@/components/AuthButton';
 import request from '@/utils/request';
 import router from 'umi/router';
 import apis from '@/services/apis';
@@ -166,13 +167,13 @@ const Poster = props => {
     }
   }
   const gridStyle1 = {
-    width: '16%',
+    width: '20%',
     textAlign: 'left',
     height: '72px',
     padding:'24px'
   };
   const gridStyle2 = {
-    width: '84%',
+    width: '80%',
     textAlign: 'left',
     height: '72px',
   };
@@ -217,7 +218,7 @@ const Poster = props => {
     <Card>
       <div>
       <Spin spinning={ loading } size="large">
-        <Form labelCol={{ span: 6 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form labelCol={{ span: 2 }} wrapperCol={{ span: 18 }} onSubmit={handleSubmit}>
           <Form.Item label="角色名称">
             {getFieldDecorator('roleName', {
               rules: [{ required: true, message: '请输入角色名称' }],
@@ -227,9 +228,7 @@ const Poster = props => {
           {userMenus.map(item => (
             (item.parentCode === '-1') &&
             <Row >
-              <Col span={6}>
-              </Col>
-              <Col span={18}>
+              <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'}} >
                   {
@@ -259,9 +258,11 @@ const Poster = props => {
             </Row>
           ))}
           <Form.Item wrapperCol={{ span: 15, offset: 7 }} style={{ marginTop: '10px' }}>
-            <Button type="primary" htmlType="submit">
-              保存
-          </Button>
+            <AuthButton name="role.submit">
+              <Button type="primary" htmlType="submit">
+                保存
+              </Button>
+            </AuthButton>
             <Button onClick = {toRoleList} style={{ marginLeft: '20px' }}>
               取消
           </Button>

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

@@ -119,11 +119,11 @@ const header = props => {
         return record.isAdmin ? [] :
           [
             record.status === 1 ?
-            <AuthButton name="admin.role.publish" noRight={null}>
+            <AuthButton name="role.delete" noRight={null}>
               <EditIcon type="delete" text="删除" onClick={() => stop(record.roleId, record.status)} />
             </AuthButton> : null,
 
-            <AuthButton name="admin.role.put" noRight={null}>
+            <AuthButton name="role.edit" noRight={null}>
               <EditIcon text="编辑" type="edit" onClick={() => toEditRole(record.roleId)} />
             </AuthButton>,
           ]
@@ -134,7 +134,7 @@ const header = props => {
 
   return (
     <Card>
-      <AuthButton name="admin.role.add" noRight={null}>
+      <AuthButton name="role.add" noRight={null}>
         <Button type="primary"  onClick={addRole}>新增</Button>
       </AuthButton>
       <div style={{marginTop:'20px'}}>

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

@@ -5,6 +5,7 @@ import router from 'umi/router';
 import { FieldTypes, createForm } from '@/components/XForm';
 import apis from '@/services/apis';
 import request from '@/utils/request';
+import AuthButton from '@/components/AuthButton';
 import BuildingSelection from '../components/BuildingSelection';
 
 const { TextArea } = Input;

src/pages/staff/staff/list/index.jsx

@@ -206,11 +206,11 @@ export default props => {
       align: 'center',
       render: withActions(
         (_, row) => [
-          <AuthButton name="admin.building.public" noRight={null}>
+          <AuthButton name="staff.stop" noRight={null}>
             <OperButton onClick={confirm(row)}>{row.status === 1 ? '停用' : '启用'}</OperButton>
           </AuthButton>,
-          <AuthButton name="admin.building.delete" noRight={null}>
-               <OperButton onClick={() => toEdit(row)}>编辑</OperButton>
+          <AuthButton name="staff.edit" noRight={null}>
+            <OperButton onClick={() => toEdit(row)}>编辑</OperButton>
           </AuthButton>,
         ],
         { noMargin: true },
@@ -220,7 +220,7 @@ export default props => {
 
   const actionRender = () => {
     return (
-      <AuthButton name="admin.tdBuildingType.add" noRight={null}>
+      <AuthButton name="staff.add" noRight={null}>
         <Button type="primary" icon="plus" onClick={() => toEdit()}>
           新增
         </Button>

src/utils/request.js

@@ -46,8 +46,8 @@ request.interceptors.request.use((url, options) => {
 
   return (
     {
-      url: 'https://xlk.njyz.tech' + apiURL,
-      // url: apiURL,
+      // url: 'https://xlk.njyz.tech' + apiURL,
+      url: apiURL,
       options: {
         ...opts,
         headers: {
@@ -56,6 +56,7 @@ request.interceptors.request.use((url, options) => {
           ...authHeader,
           ...actionHeader,
           ...headers,
+          'X-ACTION': 'admin',  // 先写死
         },
         data,
         requestType: data instanceof FormData ? 'form' : 'json',