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

src/pages/activity/ActivityList.jsx

@@ -7,7 +7,8 @@ import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
-import request from '../../utils/request'
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -96,12 +97,23 @@ const toEditGoods = (dynamicId) => () => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => <><span style={{ color: '#1990FF'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
-                           <span style={{ color: '#1990FF' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
-                           <span style={{ color: '#1990FF' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
-                           <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-                           <span style={{ color: '#FF925C' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>
-                         </>
+      render: (x,row) => (
+        <>
+          <AuthButton name="admin.SignList.get" noRight={null}>
+            <span style={{ color: '#1990FF'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
+          </AuthButton>
+          <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+            <span style={{ color: '#1990FF' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
+            <span style={{ color: '#1990FF' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#FF925C' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+        </>
+      )
     },
   ];
   
@@ -232,7 +244,9 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      </AuthButton>
       <Table dataSource={data.list} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/building/list/index.jsx

@@ -285,11 +285,9 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <AuthButton name="admin.buildinglist.get" noRight={null}>
             <Button type="primary" htmlType="submit">
               搜索
             </Button>
-          </AuthButton>
         </Form.Item>
       </Form>
 

src/pages/carouselFigure/advertisingList.jsx

@@ -7,7 +7,8 @@ import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
-import request from '../../utils/request'
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -80,10 +81,14 @@ const toEdit = (contentId) => () => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => <>
-                           <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-                           <span style={{ color: '#FF925C' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
-                         </>
+      render: (x,row) => (
+        <>
+          <AuthButton name="admin.extendContent.id.put" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#FF925C' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+        </>
+      )
     },
   ];
   
@@ -201,7 +206,9 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
+      <AuthButton name="admin.extendContent.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
+      </AuthButton>
       <Table 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} />

src/pages/carouselFigure/carouselFigureList.jsx

@@ -7,7 +7,8 @@ import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
-import request from '../../utils/request'
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -80,10 +81,14 @@ const toEditCarouse = (contentId) => () => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => <>
-                           <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-                           <span style={{ color: '#FF925C' }} onClick={toEditCarouse(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
-                         </>
+      render: (x,row) => (
+        <>
+          <AuthButton name="admin.extendContent.id.put" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={changeStatus(row)}>{ row.status === 1 ? '禁用' : '启用' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#FF925C' }} onClick={toEditCarouse(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+        </>
+      )
     },
   ];
   
@@ -201,7 +206,9 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="danger" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
+      <AuthButton name="admin.extendContent.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
+      </AuthButton>
       <Table 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} />

src/pages/channel/channelList.jsx

@@ -4,7 +4,8 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from './channelList.less';
 import router from 'umi/router';
 import apis from '../../services/apis';
-import request from '../../utils/request'
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
 
 const { Option } = Select;
 
@@ -81,7 +82,11 @@ const columns = [
     dataIndex: '',
     key: '',
     align: 'center',
-    render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => toedit(record.channelId)} >编辑</a>,
+    render: (text, record) => (
+      <AuthButton name="admin.channel.id.put" noRight={null}>
+        <a style={{ color: '#66B3FF' }} onClick={() => toedit(record.channelId)} >编辑</a>
+      </AuthButton>
+    )
   },
 ];
 
@@ -170,7 +175,9 @@ const header = props => {
           {/* <Button onClick={() => reset() }>重置</Button> */}
         </div>
       </div>
-      <Button type="danger" onClick={toAdd} className={channels.about} >新增</Button>
+      <AuthButton name="admin.channel.post" noRight={null}>
+        <Button type="danger" onClick={toAdd} className={channels.about} >新增</Button>
+      </AuthButton>
       <Table dataSource={data.result.records} columns={columns} pagination={{ pageSize: 10, total: data.result.total, onChange }} />
     </>
   )

src/pages/customer/customerlist/index.jsx

@@ -254,11 +254,9 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <AuthButton name="admin.customer.recommend.get" noRight={null}>
             <Button type="primary" htmlType="submit" >
               查询
             </Button>
-          </AuthButton>
         </Form.Item>
       </Form>
 

src/pages/customer/independentList/index.jsx

@@ -410,11 +410,9 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <AuthButton name="admin.customer.agents.get" noRight={null}>
             <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
               搜索
             </Button>
-          </AuthButton>
         </Form.Item>
       </Form>
 

src/pages/customer/recommendCustomer/index.jsx

@@ -179,11 +179,9 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <AuthButton name="admin.customer.recommend.recommender.get" noRight={null}>
             <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
               搜索
             </Button>
-          </AuthButton>
         </Form.Item>
       </Form>
 

src/pages/customer/report/index.jsx

@@ -154,11 +154,9 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <AuthButton name="admin.customer.recommend.report.get" noRight={null}>
             <Button type="primary" htmlType="submit">
               搜索
             </Button>
-          </AuthButton>
         </Form.Item>
       </Form>
       <Table style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />

src/pages/integralMall/GoodsList.jsx

@@ -185,14 +185,14 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <AuthButton name="admin.taGoods.get" noRight={null}>
             <Button type="primary" htmlType="submit" className={styles.searchBtn}>
               搜索
             </Button>
-          </AuthButton>
         </Form.Item>
       </Form>
-      <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      <AuthButton name="admin.taGoods.add.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      </AuthButton>
       <Table 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} />

src/pages/integralMall/exchangeRecords.jsx

@@ -7,6 +7,7 @@ import moment from 'moment';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
 import request from '../../utils/request'
+import AuthButton from '@/components/AuthButton';
 
 /**
   @param {*} props
@@ -182,7 +183,7 @@ function record(props) {
           <Form.Item>
             <Button type="primary" htmlType="submit" className={styles.searchBtn}>
               搜索
-          </Button>
+            </Button>
           </Form.Item>
         </div>
       </Form>

src/pages/integralMall/writeOff.jsx

@@ -6,6 +6,7 @@ import router from 'umi/router';
 import erweima from '../../assets/erweima.png';
 import saoma from '../../assets/saoma.png';
 import list from '../../assets/list.png';
+import AuthButton from '@/components/AuthButton';
 
 const { TabPane } = Tabs;
 function callback(key) {
@@ -41,7 +42,9 @@ class Dialog extends React.Component {
     const { visible, loading } = this.state;
     return (
       <div>
-        <Button type="primary" onClick={this.showModal} style={{ margin: '80px auto', display: 'block', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }}>立即核销</Button>
+        <AuthButton name="admin.taPointsExchange.recId.put" noRight={null}>
+          <Button type="primary" onClick={this.showModal} style={{ margin: '80px auto', display: 'block', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }}>立即核销</Button>
+        </AuthButton>
         <Modal
           style={{ marginTop: '20vh' }}
           visible={visible}
@@ -142,7 +145,9 @@ function header(props) {
           </Row>
           <div style={{ margin: '110px auto', display: 'block', textAlign: 'center' }}>
             <Input placeholder="请输入手机号" style={{ width: '200px' }} onChange={changeTel} />
-            <Button type="primary" style={{ marginLeft: '10px', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }} onClick={verifyTel}>立即核销</Button>
+            <AuthButton name="admin.taPointsExchange.recId.put" noRight={null}>
+              <Button type="primary" style={{ marginLeft: '10px', padding: '6px 46px', backgroundColor: '#EA2323', border: 'none' }} onClick={verifyTel}>立即核销</Button>
+            </AuthButton>
           </div>
         </TabPane>
       </Tabs>,

src/pages/news/list/NewsList.jsx

@@ -9,6 +9,8 @@ import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import SelectCity from '../../../components/SelectButton/CitySelect'
 
+import AuthButton from '@/components/AuthButton';
+
 
 const { Option } = Select;
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -167,25 +169,28 @@ function body(props) {
         cover={<img alt="example" src={data.newsImg} style={{ borderRadius: '12px 0 0 12px', width: '260px', height: '253px' }}></img>}
         bodyStyle={{ padding: '10px 20px' }}
       >
-        <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={toEditList(data.newsId)}>
-          编辑
-                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-        </span>
-        {data.newsStatus === 0 ?
-          <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
-            取消发布
-              <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-          </span> :
-          <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' ,zIndex:'1'}} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
-            发布
-              <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+        <AuthButton name="admin.taNews.id.put" noRight={null}>
+          <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={toEditList(data.newsId)}>
+            编辑
+                  <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
           </span>
-        }
-
-        <span style={{ position: 'absolute', right: '20px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={changeNewsListStatus(data.newsId)}>
-          删除
+          {data.newsStatus === 0 ?
+            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
+              取消发布
+                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+            </span> :
+            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
+              发布
+                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+            </span>
+          }
+        </AuthButton>
+        <AuthButton name="admin.taNews.id.delete" noRight={null}>
+            <span style={{ position: 'absolute', right: '20px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={changeNewsListStatus(data.newsId)}>
+                  删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-        </span>
+            </span>
+        </AuthButton>
         <div style={{ position: 'absolute', left: '260px', top: '0px', padding: '20px' }}>
           <p style={{
             fontSize: ' 0.11rem', color: '#333', fontWeight: '600', marginBottom: '10px', overflow: 'hidden',
@@ -273,9 +278,11 @@ function body(props) {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="danger" style={{ padding: '0 40px', margin: '20px 0' }} onClick={toEditList()}>
-        新增
-      </Button>
+      <AuthButton name="admin.taNews.post" noRight={null}>
+        <Button type="danger" style={{ padding: '0 40px', margin: '20px 0' }} onClick={toEditList()}>
+          新增
+        </Button>
+      </AuthButton>
 
       {/* 卡片内容，显示楼盘项目  */}
       <Row style={{ padding: ' 0 10px' }}>

src/pages/news/type/NewsType.jsx

@@ -3,7 +3,8 @@ import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagina
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../../style/GoodsList.less';
 import router from 'umi/router';
-import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect';
+import AuthButton from '@/components/AuthButton';
 
 import request from '../../../utils/request'
 
@@ -99,8 +100,20 @@ function header(props) {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x, row) => <><span style={{ color: '#EF273A', marginRight: '20px' }} onClick={changeNewsStatus(row, row.newsTypeId)}>{row.status == 1 ? '删除' : '上架'}<Icon type="shopping-cart" className={styles.shoppingCart} />
-                            </span><span style={{ color: '#FF925C' }} onClick={toEditNews(row.newsTypeId)}>编辑<Icon type="form" className={styles.edit} /></span></>,
+      render: (x, row) => (
+        <>
+          <AuthButton name="admin.taNewsType.id.delete" noRight={null}>
+            <span style={{ color: '#EF273A', marginRight: '20px' }} onClick={changeNewsStatus(row, row.newsTypeId)}>
+              {row.status == 1 ? '删除' : '上架'}<Icon type="shopping-cart" className={styles.shoppingCart} />
+            </span>
+          </AuthButton>
+          <AuthButton name="admin.taNewsType.id.put" noRight={null}>
+            <span style={{ color: '#FF925C' }} onClick={toEditNews(row.newsTypeId)}>
+              编辑<Icon type="form" className={styles.edit} />
+            </span>
+          </AuthButton>
+        </>
+      )
     },
   ];
 
@@ -118,7 +131,9 @@ function header(props) {
           )}
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditNews()}>新增</Button>
+      <AuthButton name="admin.taNewsType.post" noRight={null}>
+        <Button type="primary" className={styles.addBtn} onClick={toEditNews()}>新增</Button>
+      </AuthButton>
       <Table 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} />

src/pages/system/housingPolicy.jsx

@@ -7,7 +7,8 @@ import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
-import request from '../../utils/request'
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -84,12 +85,18 @@ const toEditPolicy = (policyId) => () => {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => <>
-                           <span style={{ color: '#1990FF' }} onClick={publicOrNoPublic(row)}>{ row.publishStatus === 0 ? '发布' : '取消发布' }<Icon type="close-circle" className={styles.edit} /></span>
-                           <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={topPolicy(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-                           <span style={{ color: '#FF925C' }} onClick={toEditPolicy(row.policyId)}>编辑<Icon type="form" className={styles.edit} /></span>
-                           <span style={{ color: '#FF925C' }} onClick={deletePolicy(row.policyId)}>删除<Icon type="form" className={styles.edit} /></span>
-                         </>
+      render: (x,row) => (
+        <>
+          <AuthButton name="admin.taPolicy.id.put" noRight={null}>
+            <span style={{ color: '#1990FF' }} onClick={publicOrNoPublic(row)}>{ row.publishStatus === 0 ? '发布' : '取消发布' }<Icon type="close-circle" className={styles.edit} /></span>
+            <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={topPolicy(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+            <span style={{ color: '#FF925C' }} onClick={toEditPolicy(row.policyId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.taPolicy.id.delete" noRight={null}>
+            <span style={{ color: '#FF925C' }} onClick={deletePolicy(row.policyId)}>删除<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+        </>
+      )
     },
   ];
   
@@ -174,7 +181,9 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditPolicy()}>新增</Button>
+      <AuthButton name="admin.taPolicy.post" noRight={null}>
+        <Button type="primary" className={styles.addBtn} onClick={toEditPolicy()}>新增</Button>
+      </AuthButton>
       <Table 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} />

src/pages/system/intention.jsx

@@ -9,7 +9,8 @@ import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import apis from '../../services/apis';
 import request from '../../utils/request'
-import SelectCity from '../../components/SelectButton/CitySelect'
+import SelectCity from '../../components/SelectButton/CitySelect';
+import AuthButton from '@/components/AuthButton';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 /**
@@ -78,7 +79,9 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
               </Row>
     })}
     <Row>
-      <Button type="primary" className={styles.searchBtn} onClick={submitValue}>确定</Button>
+      <AuthButton name="admin.taBuildingIntentionAddOrUpdate.buildingId.post" noRight={null}>
+        <Button type="primary" className={styles.searchBtn} onClick={submitValue}>确定</Button>
+      </AuthButton>
     </Row>
     </>
   );

src/pages/system/report.jsx

@@ -8,7 +8,8 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import apis from '../../services/apis';
-import request from '../../utils/request'
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 /**
@@ -56,7 +57,9 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       <Row>
         <Checkbox.Group options={data} value={checkData} onChange={onChange} />
       </Row>
-      <Button type="primary" className={styles.searchBtn} onClick={saveCheckedReport}>提交</Button>
+      <AuthButton name="admin.taBuildingReport.add.post" noRight={null}>
+        <Button type="primary" className={styles.searchBtn} onClick={saveCheckedReport}>提交</Button>
+      </AuthButton>
     </>
   );
  }

src/services/apis.js

@@ -26,7 +26,7 @@ export default {
     signout: {
       method: 'POST',
       url: `${prefix}/taUser/signout`,
-      logout: true
+      logout: true,
     },
   },
   building: {
@@ -195,43 +195,50 @@ export default {
   indexEcharts: {
     userResource: {
       method: 'GET',
-      url: `${prefix}/selectUserResource`
+      url: `${prefix}/selectUserResource`,
+      action: 'userStatistics',
     },
     userBehavior: {
       summary: {
         method: 'GET',
-        url: `${prefix}/selectUserBehavior`
+        url: `${prefix}/selectUserBehavior`,
+        action: 'userBehaviorStatistics',
       },
       profile: {
         method: 'GET',
-        url: `${prefix}/selectEventAll`
+        url: `${prefix}/selectEventAll`,
+        action: 'behaviorIncident',
       },
     },
     userActive: {
       method: 'GET',
-      url: `${prefix}/selectActiveUserCount`
+      url: `${prefix}/selectActiveUserCount`,
+      action: 'selectActiveUserCount',
     },
     userSex: {
       method: 'GET',
-      url: `${prefix}/selectSexUser`
+      url: `${prefix}/selectSexUser`,
+      action: 'selectSexUser',
     },
     newUser: {
       method: 'GET',
-      url: `${prefix}/selectNewsUserCount`
+      url: `${prefix}/selectNewsUserCount`,
+      action: 'selectNewsUserCount',
     },
     userConversion: {
       method: 'GET',
-      url: `${prefix}/selectConversion`
+      url: `${prefix}/selectConversion`,
+      action: 'selectConversion',
     },
     intentionUsers: {
       method: 'GET',
-      url: `${prefix}/selectIntentionUser`
+      url: `${prefix}/selectIntentionUser`,
+      action: 'selectIntentionUser',
     },
-
     userCity: {
-      method:'get',
+      method: 'get',
       url: `${prefix}/selectCityUser`,
-      action: 'admin.selectCityUser.get'
+      action: 'admin.selectCityUser.get',
     },
 
   },
@@ -249,17 +256,17 @@ export default {
       cancel: {
         method: 'PUT',
         url: `${prefix}/buildingDynamic/cancel/:id`,
-        action: 'admin.buildingDynamic.cancel.dynamicId.put'
+        action: 'admin.buildingDynamic.cancel.dynamicId.put',
       },
       send: {
         url: `${prefix}/buildingDynamic/send/:id`,
         method: 'PUT',
-        action: 'admin.buildingDynamic.send.dynamicId.put'
+        action: 'admin.buildingDynamic.send.dynamicId.put',
       },
       finish: {
         url: `${prefix}/buildingDynamic/finish`,
         method: 'PUT',
-        action: 'admin.buildingDynamic.finish.put'
+        action: 'admin.buildingDynamic.finish.put',
       },
       details: {
         url: `${prefix}/buildingDynamic/Details`,
@@ -357,7 +364,7 @@ export default {
       url: `${prefix}/taPointsExchange/change`,
       method: 'PUT',
       action: 'admin.taPointsExchange.change.put',
-    }
+    },
   },
   carsuseFigure: {
     extendContent: {
@@ -384,7 +391,7 @@ export default {
       url: `${prefix}/extendContent`,
       method: 'POST',
       action: 'admin.extendContent.post',
-    }
+    },
   },
   system: {
     taPolicy: {
@@ -441,7 +448,7 @@ export default {
       url: `${prefix}/taBuildingReport/add`,
       method: 'POST',
       action: 'admin.taBuildingReport.add.post',
-    }
+    },
   },
   staff: {
     taUser: {