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

config/config.js

@@ -510,7 +510,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://192.168.0.11:8080/',
+      target: 'http://localhost:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/components/SelectButton/BuildSelect.jsx

@@ -1,6 +1,6 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { Select } from 'antd';
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -33,11 +33,7 @@ const BuildingSelect = (props) => {
   },[])
 
   const getCityList = (e) => {
-    request({
-        url: '/api/admin/buildinglist/select',
-        method: 'GET',
-        params: {pageNum: 1,pageSize: 999},
-    }).then((data) => {
+    request({ ...apis.building.buildingSelect, params: {pageNum: 1,pageSize: 999}, }).then((data) => {
         setData(data.records)
     })
   }

src/components/SelectButton/CitySelect.jsx

@@ -23,6 +23,7 @@ const CitySelect = (props) => {
         url: '/api/admin/tdCity',
         method: 'GET',
         params: {leveltype: 2, pageNum: 1,pageSize: 999},
+        action: 'select',
     }).then((data) => {
         setData(data)
     })

src/components/SelectButton/NewTypeSelect.jsx

@@ -23,6 +23,7 @@ const NewsTypeSelect = (props) => {
         url: '/api/admin/taNewsType',
         method: 'GET',
         params: {pageNum: 1,pageSize: 999},
+        action: 'select',
     }).then((data) => {
         setData(data.records)
     })

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

@@ -6,6 +6,7 @@ import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
 import AuthButton from '@/components/AuthButton';
+import axios from 'umi-request';
 
 
 const { Option } = Select;
@@ -77,6 +78,34 @@ function body(props) {
     })
   }
 
+  /**
+   *导出数据（推荐用户）
+   *
+   */
+  function exportRecommendCustomer() {
+    axios(apis.customer.customerRecommendRecommenderExport.url, {
+      ...apis.customer.customerRecommendRecommenderExport, responseType: 'blob',
+    }).then(response => {
+      // console.log('response: ', response)
+      download(response)
+    }).catch(error => {
+
+    })
+  }
+
+  function download(data) {
+    if (!data) {
+      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()
+  }
+
   const columns = [
     {
       title: '头像',
@@ -179,13 +208,14 @@ 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>
+      <Button type="primary" onClick={() => exportRecommendCustomer()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
+        导出数据
+      </Button>
 
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>

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
@@ -95,13 +97,12 @@ function body(props) {
         okText: '确认',
         cancelText: '取消',
         onOk() {
-          request({
-            url: '/api/admin/taNews/' + newsId,
-            method: 'DELETE',
-            // data: { ...row },
-          }).then((data) => {
+          request({ ...apis.news.delete, urlData: { id: newsId },}).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10 });
+          }).catch((err) => {
+            console.log(err)
+            message.info(err.msg || err.message)
           })
         }
       });
@@ -125,13 +126,12 @@ function body(props) {
           okText: '确认',
           cancelText: '取消',
           onOk() {
-            request({
-              url: '/api/admin/taNews/' + newsId,
-              method: 'PUT',
-              data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId },
-            }).then((data) => {
+            request({ ...apis.news.cancel, data:{"newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId}, urlData: { id: newsId },}).then((data) => {
               message.info('操作成功！')
               getList({ pageNum: 1, pageSize: 10 });
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
             })
           },
           onCancel() {
@@ -144,13 +144,12 @@ function body(props) {
           okText: '确认',
           cancelText: '取消',
           onOk() {
-            request({
-              url: '/api/admin/taNews/' + newsId,
-              method: 'PUT',
-              data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId },
-            }).then((data) => {
+            request({ ...apis.news.cancel, data:{"newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId}, urlData: { id: newsId },}).then((data) => {
               message.info('操作成功！')
               getList({ pageNum: 1, pageSize: 10 });
+            }).catch((err) => {
+              console.log(err)
+              message.info(err.msg || err.message)
             })
           },
           onCancel() {
@@ -167,25 +166,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' }} 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',zIndex:1 }} 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' }} />
+            </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 +275,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/list/editNewsList.jsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker,message } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../../style/GoodsList.less';
+import apis from '../../../services/apis';
 import moment from 'moment';
 import router from 'umi/router';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
@@ -9,8 +10,16 @@ import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
 import XForm, { FieldTypes } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
 import request from '../../../utils/request'
+import PosterBottom from '../../../assets/bottom.png'
+import ImageUploader from '../../../components/XForm/ImageUpload';
+import logo from '../../../assets/logo.png';
+import yinhao from '../../../assets/yinhao.png'
+import touxiang from '../../../assets/touxiang.jpg';
+import poster1 from '../../../assets/poster1.png';
+import poster2 from '../../../assets/poster2.png';
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
 /**
  *
  *
@@ -118,11 +127,165 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
   }
   
   const Poster = (props) => {
-   return <div>Poster</div>
+    const [inputValue, changeInput] = useState('')
+    const [textAreaValue, changeTextArea] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [posterId, setPosterId] = useState('')
+
+    if(newsId){
+      useEffect(() => {
+        request({ ...apis.activity.poster, params: {targetId: newsId,targetType: 'news'} }).then((data) => {
+          console.log(data,"2222")
+          if(data.length > 0){
+            setPosterId(data[0].posterId)
+            changeImg(data[0].posterImg)
+            changeTextArea(data[0].posterDescription)
+            changeInput(data[0].posterTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }, [])
+    }
+
+    const submitPoster  = () => {
+       if(newsId){
+        if(posterId){
+          request({ ...apis.activity.updatePoster, urlData: {id: posterId}, data: {targetId: newsId,targetType: 'news',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }else{
+          request({ ...apis.activity.addPoster, data: {targetId: newsId,targetType: 'news',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
+            setPosterId(data.posterId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }
+       }else{
+        message.warn("请先保存基本信息数据")
+       }
+    }
+
+    return <div>
+      <div style={{ display: 'flex' }}>
+        <div style={{ width: '420px', height: '900px', display: 'inline-block', marginTop: '30px' }}>
+          <div style={{ width: '375px', height: '785px', backgroundColor: '#fff', boxShadow: '0px 0px 16px 6px rgba(0,0,0,0.15)', position: 'relative', margin: '0 auto' }}>
+            <img style={{ width: '100%', height: '300px' }} src={imgValue ? imgValue : poster1} alt="" />
+            <div style={{ display: 'flex', alignItems: 'center', marginTop: '-24px' }}>
+              <img style={{ width: '70px', height: '70px', border: '4px solid #fff', borderRadius: '35px', marginLeft: '16px' }} src={touxiang} alt="" />
+              <span style={{ color: '#222', fontWeight: '600', margin: '24px 10px 0 14px', fontSize: '17px' }}>喵喵</span>
+              <span style={{ color: '#999', marginTop: '25px', fontSize: '17px' }}>邀您阅读</span>
+              <span style={{ color: '#999', margin: '25px 0 0 60px', fontSize: '17px' }}>2019.09.21</span>
+            </div>
+            <p style={{
+              margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
+              display: '-webkit-box', lineClamp: '3', height: '60px',
+              WebkitLineClamp: '2',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{inputValue ? inputValue : '海报标题'}</p>
+
+            <img src={yinhao} style={{ width: '30px', marginLeft: '20px' }} alt="" />
+            <p style={{
+              margin: '16px 20px 28px 20px', fontSize: '17px', color: '#999',
+              display: '-webkit-box', lineClamp: '3', height: '76px',
+              WebkitLineClamp: '3',
+              WebkitBoxOrient: 'vertical',
+              overflow: 'hidden',
+              textOverflow: 'ellipsis'
+            }}>{textAreaValue ? textAreaValue : '海报描述'}</p>
+            <img src={PosterBottom} style={{ width: '100%' }} alt="" />
+          </div>
+          <p style={{ textAlign: 'center', fontSize: '19px', color: '#666', marginTop: '30px' }}>海报模板</p>
+        </div>
+
+        <div >
+          <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
+            <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+          </div>
+          <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
+            <Input style={{ width: '20vw' }} value={inputValue} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+          </div>
+          <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+            <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报描述</p>
+            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
+          </div>
+
+        </div>
+      </div>
+      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+      <Button onClick={() => router.go(-1)}>取消</Button>
+    </div>
+
   }
  
   const Share = (props) => {
-    return <div>Share</div>
+    const [inputValue, changeInput] = useState('')
+    const [imgValue, changeImg] = useState('')
+    const [shareContentId, setShareContentId] = useState('')
+    
+    if(newsId){
+      useEffect(() => {
+        request({ ...apis.activity.shareContent, params: {targetId: newsId,targetType: 'news'},}).then((data) => {
+          console.log(data,"2222")
+          if(data.length > 0){
+            setShareContentId(data[0].shareContentId)
+            changeImg(data[0].shareContentImg)
+            changeInput(data[0].shareContentTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }, [])
+    }
+
+    const submitShare = () => {
+      if(newsId){
+        if(shareContentId){
+          request({ ...apis.activity.updateShareContent, urlData: {id: shareContentId},data: {targetId: newsId,shareContentType: 'news',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }else{
+          request({ ...apis.activity.addShareContent, data: {targetId: newsId,shareContentType: 'news',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
+            setShareContentId(data.shareContentId)
+            message.info("保存成功")
+          }).catch((err) => {
+            message.info(err.msg || err.message)
+          })
+         }
+       }else{
+        message.warn("请先保存基本信息数据")
+       }
+    }
+
+    return <div style={{ padding: '20px' }}>
+      <div style={{ display: 'flex', margin: '10px 0 40px 0', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享模板</p>
+        <div>
+          <p style={{ display: 'flex', alignItems: 'center', fontSize: '14px', color: '#999', margin: '0', lineHeight: '0' }}><img src={logo} style={{ width: '22px', marginRight: '10px' }} />知与行互动</p>
+          <p style={{ fontSize: '16px', color: '#222', fontWeight: '600', margin: '0' }}>{inputValue ? inputValue : '置业V客厅 精准获客平台'}</p>
+          <img style={{ width: '200px', height: '140px' }} src={imgValue ? imgValue : poster2} alt="" />
+        </div>
+      </div>
+      <div style={{ display: 'flex', alignItems: 'center', width: '100%' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报标题</p>
+        <Input placeholder="请输入海报标题" value={inputValue} onChange={e => changeInput(e.target.value)} />
+      </div>
+      <div style={{ display: 'flex', width: '100%', marginTop: '40px' }}>
+        <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>分享图片</p>
+        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
+      </div>
+      <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button onClick={() => router.go(-1)}>取消</Button>
+    </div>
   }
 
   return (

src/pages/news/type/NewsType.jsx

@@ -3,8 +3,9 @@ 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 apis from '../../../services/apis';
 import request from '../../../utils/request'
 
 const { Option } = Select;
@@ -20,15 +21,12 @@ function header(props) {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taNewsType',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.newsType.list, params: { ...params } }).then((data) => {
         console.log(data)
         setData(data)
     })
   }
+
   
   // 提交事件
   const handleSubmit = (e, props) => {
@@ -62,14 +60,22 @@ function header(props) {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({
-          url: '/api/admin/taNewsType/' + newsId,
-          method: 'DELETE',
-          data: { ...row },
-        }).then((data) => {
+        request({ ...apis.newsType.delete, urlData: { id: newsId },}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
+        }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
         })
+
+        // request({
+        //   url: '/api/admin/taNewsType/' + newsId,
+        //   method: 'DELETE',
+        //   data: { ...row },
+        // }).then((data) => {
+        //   message.info('操作成功！')
+        //   getList({ pageNum: 1, pageSize: 10 });
+        // })
       }
     });
   }
@@ -99,8 +105,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 +136,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/staff/list/addRole.jsx

@@ -41,16 +41,6 @@ const Poster = props => {
     buttonList({ pageNum: 1, pageSize: 100 })
   }, [])
   // 当前所有的菜单
-  // function menuList(params) {
-  //   request({
-  //     url: '/api/admin/menuList',
-  //     method: 'GET',
-  //     params: { ...params },
-  //     // eslint-disable-next-line no-shadow
-  //   }).then(data => {
-  //     setData(data)
-  //   })
-  // }
   function menuList(params) {
     request({ ...apis.role.menuList, params: { ...params } }).then((data) => {
       setData(data)
@@ -61,18 +51,6 @@ const Poster = props => {
   }
 
   // 所有按钮
-  // function buttonList(params) {
-  //   request({
-  //     url: '/api/admin/buttonList',
-  //     method: 'GET',
-  //     params: { ...params },
-  //     // eslint-disable-next-line no-shadow
-  //   }).then(data => {
-  //     console.log(data)
-  //     setBuutonDate(data)
-  //   })
-  // }
-
   function buttonList(params) {
     request({ ...apis.role.buttonList, params: { ...params } }).then((data) => {
       setBuutonDate(data)
@@ -83,27 +61,6 @@ const Poster = props => {
 
 
   // 根据角色id查询当前的菜单及其按钮
-  // function buttonAndMenuList(params, id) {
-  //   console.log('id: ', id)
-  //   request({
-  //     url: `/api/admin/taRole/details/${id}`,
-  //     method: 'GET',
-  //     params: { ...params },
-  //     // eslint-disable-next-line no-shadow
-  //   }).then(data => {
-  //     console.log('data.roleName: ', data)
-  //     props.form.setFieldsValue({ roleName: data.roleName })
-  //     console.log(data)
-  //     setData(data)
-
-  //     // 获取所有的权限Id
-  //     if (data.sysMenuList) {
-  //       setDataMenuId(data.sysMenuList.map(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)))
-  //     }
-  //   })
-  // }
-
   function buttonAndMenuList(params, ids) {
     request({ ...apis.role.buttonAndMenuList, urlData: { id: ids }, params: { ...params } }).then(data => {
       props.form.setFieldsValue({ roleName: data.roleName })
@@ -168,16 +125,6 @@ const Poster = props => {
       pathname: '/staff/RoleList',
     });
   }
-  // function updateAuthMenu(params) {
-  //   request({
-  //     url: '/api/admin/updateAuthMenu',
-  //     method: 'POST',
-  //     data: { ...params },
-  //     // eslint-disable-next-line no-shadow
-  //   }).then(data => {
-  //     toRoleList()
-  //   })
-  // }
 
   function updateAuthMenu(data) {
     request({ ...apis.role.updateAuthMenu, data: { ...data } }).then((data) => {

src/pages/staff/list/editStaff.jsx

@@ -26,6 +26,7 @@ const Edit = (props) => {
   const userId = props.location.query.userId
   const [userData, setUserData] = useState({})
   const [tagData, setTagData] = useState([])
+  const [roleData, setRoleData] = useState([])
 
   const getTagList = () => {
     request({ ...apis.staff.taTags, params: {pageNum:1,pageSize:999} }).then((data) => {
@@ -33,6 +34,13 @@ const Edit = (props) => {
     })
   }
 
+  const getRoleList = () => {
+    request({ ...apis.role.getRoleList, params: {pageNum:1,pageSize:999} }).then((data) => {
+      console.log(data)
+      setRoleData(data.records)
+    })
+  }
+
   // 查询列表
   const getUserData = (userId) => {
     request({ ...apis.staff.getTaUser, urlData: {id:userId} }).then((data) => {
@@ -43,6 +51,7 @@ const Edit = (props) => {
 
   useEffect(() => {
     getTagList();
+    getRoleList();
     if (userId) {
       getUserData(userId);
     }
@@ -103,6 +112,22 @@ const Edit = (props) => {
       placeholder: '请输入电话号码',
       value: userData.phone,
     },
+    {
+      label: '角色',
+      name: 'roleIds',
+      render: <Select
+                mode="multiple"
+                style={{ width: '100%' }}
+                placeholder="请选择标签"
+                onChange={tagsChange} >
+                  {roleData.map(item => (
+                    <Select.Option key={item.roleId} value={item.roleId}>
+                      {item.roleName}
+                    </Select.Option>
+                  ))}
+              </Select>,
+      value: userData.roleIds,
+    },
     {
       label: '标签',
       name: 'taTags',

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

@@ -5,10 +5,12 @@ export default {
     uploadForAnt: {
       url: `${prefix}/antd/image`,
       method: 'POST',
+      action: 'upload',
     },
     upload: {
       url: `${prefix}/image`,
       method: 'POST',
+      action: 'upload',
     },
   },
   user: {
@@ -26,7 +28,8 @@ export default {
     signout: {
       method: 'POST',
       url: `${prefix}/taUser/signout`,
-      logout: true
+      logout: true,
+      action: 'signout',
     },
   },
   building: {
@@ -85,6 +88,11 @@ export default {
       url: `${prefix}/apartment/deleted/id`,
       action: 'admin.apartment.deleted.id.delete',
     },
+    buildingSelect: {
+      url: `${prefix}/buildinglist/select`,
+      method: 'GET',
+      action: 'select',
+    }
   },
   buildingType: {
     getList: {
@@ -119,6 +127,28 @@ export default {
       url: `${prefix}/taNews`,
       action: 'admin.taNews.get',
     },
+    delete: {
+        method: 'DELETE',
+        url: `${prefix}/taNews/:id`,
+        action: 'admin.taNews.id.delete',
+    },
+    cancel: {
+        method: 'PUT',
+        url: `${prefix}/taNews/:id`,
+        action: 'admin.taNews.id.put',
+    },
+  },
+  newsType: {
+    list: {
+        method: 'GET',
+        url: `${prefix}/taNewsType`,
+        action: 'admin.taNewsType.get',
+      },
+    delete: {
+        method: 'DELETE',
+        url: `${prefix}/taNewsType/:id`,
+        action: 'admin.taNewsType.id.delete',
+    },
   },
   customer: {
     drift: {
@@ -186,47 +216,59 @@ export default {
       url: `${prefix}/customer/recommend/get/id`,
       action: 'admin.customer.recommend.get.id.get',
     },
+    customerRecommendRecommenderExport: { // 导出数据（推荐客户）
+      method: 'GET',
+      url: `${prefix}/customer/recommend/recommender/export`,
+      action: 'admin.customer.recommend.recommender.export.get',
+    },
   },
   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',
     },
 
   },
@@ -244,17 +286,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`,
@@ -352,7 +394,7 @@ export default {
       url: `${prefix}/taPointsExchange/change`,
       method: 'PUT',
       action: 'admin.taPointsExchange.change.put',
-    }
+    },
   },
   carsuseFigure: {
     extendContent: {
@@ -379,7 +421,7 @@ export default {
       url: `${prefix}/extendContent`,
       method: 'POST',
       action: 'admin.extendContent.post',
-    }
+    },
   },
   system: {
     taPolicy: {
@@ -436,7 +478,7 @@ export default {
       url: `${prefix}/taBuildingReport/add`,
       method: 'POST',
       action: 'admin.taBuildingReport.add.post',
-    }
+    },
   },
   staff: {
     taUser: {