927

.eslintrc.js

@@ -5,5 +5,6 @@ module.exports = {
   globals: {
     ANT_DESIGN_PRO_ONLY_DO_NOT_USE_IN_YOUR_PRODUCTION: true,
     page: true,
+    AMap: true,
   },
 };

.gitignore

@@ -38,3 +38,5 @@ screenshot
 .eslintcache
 
 build
+
+config/proxy.js

config/routes.js

@@ -0,0 +1,348 @@
+export default [
+  {
+    path: '/user',
+    component: '../layouts/UserLayout',
+    routes: [
+      {
+        name: 'login',
+        path: '/user/login',
+        component: './user/login',
+      },
+    ],
+  },
+  {
+    path: '/',
+    component: '../layouts/SecurityLayout',
+    routes: [
+      {
+        path: '/',
+        component: '../layouts/BasicLayout',
+        authority: ['admin', 'user'],
+        routes: [
+          {
+            path: '/',
+            redirect: '/welcome',
+          },
+          {
+            path: '/welcome',
+            name: '首页',
+            component: './Welcome',
+          },
+          {
+            path: '/building',
+            name: '项目管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/building/list',
+                name: '项目列表',
+                component: './building/list/index',
+              },
+              {
+                path: '/building/list/add',
+                name: '项目添加', // 项目添加
+                hideInMenu: true,
+                component: './building/list/add/index',
+              },
+              {
+                path: '/building/type',
+                name: '项目类型',
+                component: './building/type/index',
+              },
+              {
+                path: '/building/type/edi',
+                name: '项目类型编辑',
+                hideInMenu: true,
+                component: './building/type/edi',
+              },
+            ],
+          },
+          {
+            path: '/customer',
+            name: '客户管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/customer/customerlist/list',
+                name: '客户列表',
+                component: './customer/customerlist/index',
+              },
+              {
+                path: '/customer/customerlist/customerDetail',
+                name: '客户编辑',
+                hideInMenu: true,
+                component: './customer/customerlist/customerDetail',
+              },
+              {
+                path: '/customer/drift/list',
+                name: '游客列表',
+                component: './customer/drift/index',
+              },
+              {
+                path: '/customer/report/list',
+                name: '报备客户',
+                component: './customer/report/index',
+              },
+              {
+                path: '/customer/recommendCustomer/list',
+                name: '推荐客户',
+                component: './customer/recommendCustomer/index',
+              },
+              {
+                path: '/customer/recommendCustomer/audit',
+                name: '客户审核', 
+                hideInMenu: true,
+                component: './customer/recommendCustomer/audit',
+              },
+              {
+                path: '/customer/independentList',
+                name: '经纪人',
+                component: './customer/independentList/index',
+              },
+            ],
+          },
+          {
+            path: '/integralMall',
+            name: '积分商城',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/integralMall/GoodsList',
+                name: '商品列表',
+                component: './integralMall/GoodsList',
+              },
+              {
+                path: '/integralMall/achieve',
+                name: '积分获取',
+                component: './integralMall/achieve',
+              },
+              {
+                path: '/integralMall/editGoods',
+                name: '商品编辑',
+                hideInMenu: true,
+                component: './integralMall/editGoods',
+              },
+              {
+                path: '/integralMall/exchangeRecords',
+                name: '兑换记录',
+                component: './integralMall/exchangeRecords',
+              },
+              {
+                path: '/integralMall/writeOff',
+                name: '商品核销',
+                component: './integralMall/writeOff',
+              },
+              {
+                path: '/integralMall/verifyList',
+                name: '商品核销列表',
+                hideInMenu: true,
+                component: './integralMall/verifyList',
+              },
+            ],
+          },
+          {
+            path: '/channel',
+            name: '渠道管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/channel/channelList',
+                name: '渠道管理',
+                component: './channel/channelList',
+              },
+              {
+                path: '/channel/addChannel',
+                name: '添加渠道',
+                hideInMenu: true,
+                component: './channel/addChannel',
+              },
+              {
+                path: '/channel/editChannel',
+                name: '编辑渠道',
+                hideInMenu: true,
+                component: './channel/editChannel',
+              },
+              {
+                path: '/channel/brokerList',
+                name: '经纪人',
+                component: './channel/brokerList',
+              },
+              {
+                path: '/channel/recommendClients',
+                name: '渠道推荐',
+                hideInMenu: true,
+                component: './channel/recommendClients',
+              },
+              {
+                path: '/channel/InviteClients',
+                name: '邀请客户',
+                hideInMenu: true,
+                component: './channel/InviteClients',
+              },
+            ],
+          },
+          {
+            path: '/news',
+            name: '资讯管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/news/type/NewsType',
+                name: '资讯类型',
+                component: './news/type/NewsType',
+              },
+              {
+                path: '/news/type/editNews',
+                name: '编辑资讯类型',
+                hideInMenu: true,
+                component: './news/type/editNews',
+              },
+              {
+                path: '/news/list/NewsList',
+                name: '资讯列表',
+                component: './news/list/NewsList',
+              },
+              {
+                path: '/news/list/editNewsList',
+                name: '编辑资讯',
+                hideInMenu: true,
+                component: './news/list/editNewsList',
+              },
+            ],
+          },
+          {
+            path: '/activity',
+            name: '活动管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/activity/ActivityList',
+                name: '活动列表',
+                component: './activity/ActivityList',
+              },
+              {
+                path: '/activity/editActivity',
+                name: '编辑活动',
+                hideInMenu: true,
+                component: './activity/editActivity',
+              },
+              {
+                path: '/activity/SignList',
+                name: '报名列表',
+                hideInMenu: true,
+                component: './activity/SignList',
+              },
+            ],
+          },
+          {
+            path: '/staff',
+            name: '员工管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/staff/StaffList',
+                name: '员工列表',
+                component: './staff/list/StaffList',
+              },
+              {
+                path: '/staff/editStaff',
+                name: '编辑员工',
+                hideInMenu: true,
+                component: './staff/list/editStaff',
+              },
+
+              {
+                path: '/staff/RoleList',
+                name: '角色管理',
+                component: './staff/list/RoleList',
+              },
+              {
+                path: '/staff/editRole',
+                name: '编辑角色',
+                hideInMenu: true,
+                component: './staff/list/editRole',
+              },
+              {
+                path: '/staff/list/addRole',
+                name: '添加角色',
+                hideInMenu: true,
+                component: './staff/list/addRole',
+              },  
+            ],
+          },
+          {
+            path: '/carouselFigure',
+            name: '轮播图管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/carouselFigure/carouselFigureList',
+                name: '轮播图列表',
+                component: './carouselFigure/carouselFigureList',
+              },
+              {
+                path: '/carouselFigure/editCarousel',
+                name: '轮播图编辑',
+                hideInMenu: true,
+                component: './carouselFigure/editCarousel',
+              },
+              {
+                path: '/carouselFigure/advertisingList',
+                name: '开屏广告',
+                component: './carouselFigure/advertisingList',
+              },
+              {
+                path: '/carouselFigure/editAdvertising',
+                name: '开屏广告编辑',
+                hideInMenu: true,
+                component: './carouselFigure/editAdvertising',
+              },
+            ],
+          },
+          {
+            path: '/system',
+            name: '系统管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/system/messageList',
+                name: '客户留言',
+                component: './system/messageList',
+              },
+              {
+                path: '/system/report',
+                name: '报表数据',
+                component: './system/report',
+              },
+              {
+                path: '/system/intention',
+                name: '意向值',
+                component: './system/intention',
+              },
+              {
+                path: '/system/housingPolicy',
+                name: '购房政策维护',
+                component: './system/housingPolicy',
+              },
+              {
+                path: '/system/editPolicy',
+                name: '购房政策编辑',
+                hideInMenu: true,
+                component: './system/editPolicy',
+              },
+            ],
+          },
+          {
+            component: './404',
+          },
+        ],
+      },
+      {
+        component: './404',
+      },
+    ],
+  },
+  {
+    component: './404',
+  },
+];

package.json

@@ -55,6 +55,8 @@
     "path-to-regexp": "^3.0.0",
     "qs": "^6.7.0",
     "react": "^16.8.6",
+    "react-amap": "^1.2.8",
+    "react-amap-plugin-autocomplete": "0.0.4",
     "react-copy-to-clipboard": "^5.0.1",
     "react-document-title": "^2.0.3",
     "react-dom": "^16.8.6",

src/app.js

@@ -1,3 +1,24 @@
+(function (doc, win) {
+  var docEl = doc.documentElement,
+    resizeEvt = 'onorientationchange' in window ? 'onorientationchange' : 'resize',
+    recalc = function () {
+      var clientWidth = docEl.clientWidth;
+      if (!clientWidth) return;
+      if (clientWidth < 1700) {
+        docEl.style.fontSize = '150px';
+      } else if ( 1700>=clientWidth>2000 ){
+        docEl.style.fontSize = '170px';
+      }else{
+        docEl.style.fontSize = '170px';
+        // docEl.style.fontSize = 100 * (clientWidth / 1400) + 'px';
+      }
+    };
+
+  if (!doc.addEventListener) return;
+  win.addEventListener(resizeEvt, recalc, false);
+  doc.addEventListener('DOMContentLoaded', recalc, false);
+})(document, window);
+
 export const dva = {
   config: {
     onError(e) {

src/components/EchartsTest/EChart.jsx

@@ -5,12 +5,21 @@ import echarts from 'echarts/lib/echarts';
 // 引入柱状图
 import 'echarts/lib/chart/bar';
 import 'echarts/lib/chart/pie';
+import 'echarts/lib/chart/scatter';
+import 'echarts/lib/chart/effectScatter';
+import 'echarts/lib/chart/map';
 // 引入提示框和标题组件
 import 'echarts/lib/component/tooltip';
 import 'echarts/lib/component/legend';
 import 'echarts/lib/component/title';
 import 'echarts/lib/chart/line';
 import 'echarts/lib/component/dataZoom';
+import 'echarts/lib/component/geo';
+import 'echarts/lib/component/visualMap';
+
+import { ChinaData } from './china';
+
+echarts.registerMap('china', ChinaData);
 
 class EchartsTest extends Component {
     chartRef = React.createRef();
@@ -34,7 +43,6 @@ class EchartsTest extends Component {
                 ...this.props.options || {},
             }
 
-            // console.log(options)
 
             this.chart.setOption(options);
         }

src/components/SelectButton/BuildSelect.jsx

@@ -1,10 +1,18 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { Select } from 'antd';
 
 import request from '../../utils/request'
 
 const { Option } = Select;
 
+function usePrevious(props) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current;
+}
+
 /**
  *
  *
@@ -13,7 +21,12 @@ const { Option } = Select;
  */
 const BuildingSelect = (props) => {
   const [ data, setData ] = useState([])
-  const [ value, setValue ] = useState(props.value)
+  const [ value, setValue ] = useState('')
+  const preProps = usePrevious(props)
+  
+  if ((!preProps || !preProps.value) && props.value && !value) {
+    setValue(props.value)
+  }
 
   useEffect(() => {
     getCityList();

src/components/XForm/ImageListUpload.jsx

@@ -3,65 +3,79 @@ import { Upload, Icon, Modal } from 'antd';
 import './style.less';
 import { uploaderProps } from '../../utils/upload';
 
-function getBase64(file) {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.readAsDataURL(file);
-    reader.onload = () => resolve(reader.result);
-    reader.onerror = error => reject(error);
-  });
-}
-
 class ImageListUpload extends React.Component {
   state = {
     previewVisible: false,
     previewImage: '',
-    fileList: [],
+    loadding: false,
   };
 
+  getFileList = () => {
+    return (this.props.value || []).map((img, inx) => ({ uid: inx, url: img, status: 'done' }))
+  }
+
   handleCancel = () => this.setState({ previewVisible: false });
 
   handlePreview = async file => {
-    if (!file.url && !file.preview) {
-      file.preview = await getBase64(file.originFileObj);
-    }
-
     this.setState({
-      previewImage: file.url || file.preview,
+      previewImage: file.url ,
       previewVisible: true,
     });
   };
 
-  handleChange = ({ fileList }) => {
-    this.setState({ fileList })
-    if (typeof this.props.onChange === 'function') {
-      // return item.response.url
-      const images = fileList.filter(item => item.status === 'done')
-      this.props.onChange(images.map(item => item.response.url))
+  handleChange = (e) => {
+    if (e.file.status === "uploading") {
+      this.setState({ loading: true });
+      return;
+    }
+
+    if (e.file.state === 'removed') {
+      const fileList = (this.props.value || []).filter(x => x != e.file.url);
+      this.props.onChange(fileList);
     }
+
+    // if (e.file.status === "done") {
+    //   this.setState({
+    //     loading: false,
+    //   })
+
+    //   if (e.file.response && e.file.response.url) {
+    //     if (typeof this.props.onChange === 'function') {
+    //       const fileList = this.getFileList()
+    //       this.props.onChange([...fileList || [], e.file.response.url]);
+    //     }
+    //   }
+    // }
   };
 
-  render() {
-    const { previewVisible, previewImage, fileList } = this.state;
+  handleUploadSucess = (url) => {
+    this.setState({ loading: false });
+    if (typeof this.props.onChange === 'function') {
+      const fileList = this.props.value || [];
+      this.props.onChange([...fileList, url]);
+    }
+  }
 
-    const { value } = this.props
+  render() {
+    const { previewVisible, previewImage } = this.state;
+    const fileList = this.getFileList();
 
     const uploadButton = (
       <div>
-        <Icon type="plus" />
-        <div className="ant-upload-text">Upload</div>
+        <Icon style={{ fontSize: '2em', color: '#aaa' }} type={this.state.loading ? "loading" : "plus"}  />
       </div>
     );
     return (
       <div className="clearfix">
         <Upload
           listType="picture-card"
-          fileList={fileList || value}
+          fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}
           { ...uploaderProps }
+          onSuccess={this.handleUploadSucess}
         >
-          {fileList.length >= 8 ? null : uploadButton}
+          {(fileList || images).length >= 8 ? null : uploadButton}
         </Upload>
         <Modal visible={previewVisible} footer={null} onCancel={this.handleCancel}>
           <img alt="example" style={{ width: '100%' }} src={previewImage} />

src/components/XForm/ImageUpload.jsx

@@ -16,24 +16,35 @@ class ImageUpload extends React.Component {
       this.setState({ loading: true });
       return;
     }
+    
+    if (e.file.state === 'removed') {
+      this.props.onChange();
+    }
 
-    if (info.file.status === "done") {
-      this.setState({
-        loading: false,
-      })
+    // if (info.file.status === "done") {
+    //   this.setState({
+    //     loading: false,
+    //   })
 
-      if (info.file.response && info.file.response.url) {
-        this.setState({
-          imageUrl: info.file.response.thumbUrl,
-        });
+    //   if (info.file.response && info.file.response.url) {
+    //     this.setState({
+    //       imageUrl: info.file.response.thumbUrl,
+    //     });
 
-        if (typeof this.props.onChange === 'function') {
-          this.props.onChange(info.file.response.url);
-        }
-      }
-    }
+    //     if (typeof this.props.onChange === 'function') {
+    //       this.props.onChange(info.file.response.url);
+    //     }
+    //   }
+    // }
   };
 
+  handleUploadSucess = (url) => {
+    this.setState({ loading: false });
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(url);
+    }
+  }
+
   render() {
     const uploadButton = (
       <div>
@@ -50,8 +61,8 @@ class ImageUpload extends React.Component {
         showUploadList={false}
         beforeUpload={this.props.beforeUpload}
         onChange={this.handleChange}
-
         {...uploaderProps}
+        onSuccess={this.handleUploadSucess}
       >
         {(this.state.imageUrl || value) ? (
           <img src={this.state.imageUrl || value} alt="avatar" style={{ width: "100%" }} />

src/global.less

@@ -79,13 +79,23 @@ ol {
 .ant-menu-vertical-left .ant-menu-submenu-title,
 .ant-menu-vertical-right .ant-menu-submenu-title,
 .ant-menu-inline .ant-menu-submenu-title,
-.ant-input ,.ant-btn{
-  font-size: 16px;
+.ant-input ,.ant-btn,.ant-select,.ant-table,.ant-form-item,.ant-form label,.ant-tabs-nav-container {
+  font-size: 0.1rem;
+  
+}
+.ant-input{
+  height: 32px;
+  border-radius: 4px;
+  padding: 0 0 0 10px;
+  align-items: center;
+}
+.ant-row.ant-form-item .ant-form-item-label.ant-col-sm-3{
+  min-width: 100px;
 }
 .ant-breadcrumb{
-  font-size: 16px;
+  font-size: 0.1rem;
   .anticon {
-    font-size: 16px;
+    font-size: 0.1rem;
   }
 } 
   .ant-pro-global-header-trigger{

src/models/login.js

@@ -50,7 +50,7 @@ const Model = {
     *logout(_, { put, call }) {
       const { redirect } = getPageQuery(); // redirect
 
-      yield call(signout, { logout: true });
+      yield call(signout);
 
       if (window.location.pathname !== '/user/login' && !redirect) {
         yield put(

src/pages/Welcome.jsx

@@ -1,7 +1,9 @@
 import React from 'react';
 import { Card, Typography, Alert, Row, Col } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
-import EchartsTest from '../components/EchartsTest'
+import EchartsTest from '../components/EchartsTest';
+import CityNums from './charts/CityNums';
+
 const option = {
   xAxis: {
     type: 'category',
@@ -15,12 +17,13 @@ const option = {
     type: 'line'
   }]
 };
+
 export default () => (
   <>
     <div style={{ display: 'flex' }}>
       <div style={{
         textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(241,43,62,1) 0%,rgba(254,144,155,1) 100%)', height: '100px',
-        boxShadow: '0px 18px 14px -15px rgba(241,43,62,1)',
+        boxShadow: '0px  0.11rem 14px -15px rgba(241,43,62,1)',
         borderRadius: '12px', width: '32%', marginRight: '2%'
       }}>
         <span style={{ fontSize: '24px', color: '#fff' }}>总用户 </span>
@@ -28,7 +31,7 @@ export default () => (
       </div>
       <div style={{
         textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(144deg,rgba(255,126,74,1) 0%,rgba(255,196,168,1) 100%)', height: '100px',
-        boxShadow: '0px 18px 14px -15px rgba(255,126,74,1)',
+        boxShadow: '0px  0.11rem 14px -15px rgba(255,126,74,1)',
         borderRadius: '12px', width: '32%', marginRight: '2%'
       }}>
         <span style={{ fontSize: '24px', color: '#fff' }}>总注册用户 </span>
@@ -36,7 +39,7 @@ export default () => (
       </div>
       <div style={{
         textAlign: 'center', display: 'flex', justifyContent: 'center', lineHeight: '100px', background: 'linear-gradient(137deg,rgba(107,130,230,1) 0%,rgba(152,175,251,1) 100%)', height: '100px',
-        boxShadow: '0px 18px 14px -15px rgba(107,130,230,1)',
+        boxShadow: '0px  0.11rem 14px -15px rgba(107,130,230,1)',
         borderRadius: '12px', width: '32%',
       }}>
         <span style={{ fontSize: '24px', color: '#fff' }}>最近7天新增 </span>
@@ -44,7 +47,7 @@ export default () => (
       </div>
     </div>
     <EchartsTest style={{width: 500, height:500}}></EchartsTest>
-
+    <CityNums></CityNums>
   </>
 );
 

src/pages/activity/ActivityList.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 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'
 
 const { Option } = Select;
@@ -22,11 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/iBuildingDynamicList',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.activity.list, params: { ...params } }).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -124,11 +120,7 @@ const toEditGoods = (dynamicId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/buildingDynamic/finish',
-                  method: 'PUT',
-                  data: {dynamicId: row.dynamicId, top: ""},
-              }).then((data) => {
+              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: ""} }).then((data) => {
                   console.log(data)
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10 })
@@ -143,11 +135,7 @@ const toEditGoods = (dynamicId) => () => {
 //   置顶
   const topDynamic = (row) => () => {
       const weight = Math.abs(row.weight - 1)
-      request({
-          url: '/api/admin/buildingDynamic/weight',
-          method: 'PUT',
-          params: {dynamicId: row.dynamicId, weight},
-      }).then((data) => {
+      request({ ...apis.activity.weight, params: {dynamicId: row.dynamicId, weight} }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
@@ -167,10 +155,7 @@ const toEditGoods = (dynamicId) => () => {
   
   // 取消活动
   const cancelDynamic = (row) => {
-      request({
-          url: '/api/admin/buildingDynamic/cancel/'+row.dynamicId,
-          method: 'PUT',
-      }).then((data) => {
+      request({ ...apis.activity.cancel, urlData: {id: row.dynamicId}}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
       }).catch((err) => {
@@ -181,10 +166,7 @@ const toEditGoods = (dynamicId) => () => {
   
   //发布活动
   const sendDynamic = (row) => {
-      request({
-          url: '/api/admin/buildingDynamic/send/'+row.dynamicId,
-          method: 'PUT',
-      }).then((data) => {
+      request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
       }).catch((err) => {
@@ -250,7 +232,7 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       <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/activity/SignList.jsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -50,11 +50,7 @@ const header = (props) => {
 
   // 查询列表
   const getSignList = (params) => {
-    request({
-        url: '/api/admin/SignList',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.activity.signList, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })

src/pages/activity/editActivity.jsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } 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'
@@ -36,11 +37,7 @@ const Edit = (props) => {
 
     // 查询列表
     const getDynamicData = (dynamicId) => {
-      request({
-        url: '/api/admin/buildingDynamic/Details',
-        method: 'GET',
-        params: { dynamicId },
-      }).then((data) => {
+      request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
         console.log(data)
         setDynamicData(data)
       })
@@ -143,22 +140,14 @@ const Edit = (props) => {
       console.log('submit data --->', submitValue)
       if (dynamicId) {
         submitValue.dynamicId = dynamicId
-        request({
-          url: '/api/admin/buildingDynamic/update',
-          method: 'PUT',
-          data: submitValue,
-        }).then((data) => {
+        request({ ...apis.activity.update, data: submitValue }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       } else {
-        request({
-          url: '/api/admin/buildingDynamic/add',
-          method: 'POST',
-          data: submitValue,
-        }).then((data) => {
+        request({ ...apis.activity.add, data: submitValue }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {
@@ -178,11 +167,7 @@ const Edit = (props) => {
 
     if(dynamicId){
       useEffect(() => {
-        request({
-          url: '/api/admin/poster',
-          method: 'GET',
-          params: {targetId: dynamicId,targetType: 'activity'},
-        }).then((data) => {
+        request({ ...apis.activity.poster, params: {targetId: dynamicId,targetType: 'activity'} }).then((data) => {
           console.log(data,"2222")
           if(data.length > 0){
             setPosterId(data[0].posterId)
@@ -199,21 +184,13 @@ const Edit = (props) => {
     const submitPoster  = () => {
        if(dynamicId){
         if(posterId){
-          request({
-            url: '/api/admin/poster/'+posterId,
-            method: 'PUT',
-            data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},
-          }).then((data) => {
+          request({ ...apis.activity.updatePoster, urlData: {id: posterId}, data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
          }else{
-          request({
-            url: '/api/admin/poster',
-            method: 'POST',
-            data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},
-          }).then((data) => {
+          request({ ...apis.activity.addPoster, data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
             setPosterId(data.posterId)
             message.info("保存成功")
           }).catch((err) => {
@@ -245,7 +222,7 @@ const Edit = (props) => {
               textOverflow: 'ellipsis'
             }}>{inputValue ? inputValue : '海报标题'}</p>
 
-            <img src={yinhao} style={{ width: '30px', marginLeft: '10px' }} alt="" />
+            <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',
@@ -290,11 +267,7 @@ const Edit = (props) => {
     
     if(dynamicId){
       useEffect(() => {
-        request({
-          url: '/api/admin/shareContent',
-          method: 'GET',
-          params: {targetId: dynamicId,targetType: 'activity'},
-        }).then((data) => {
+        request({ ...apis.activity.shareContent, params: {targetId: dynamicId,targetType: 'activity'},}).then((data) => {
           console.log(data,"2222")
           if(data.length > 0){
             setShareContentId(data[0].shareContentId)
@@ -310,21 +283,13 @@ const Edit = (props) => {
     const submitShare = () => {
       if(dynamicId){
         if(shareContentId){
-          request({
-            url: '/api/admin/shareContent/'+shareContentId,
-            method: 'PUT',
-            data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},
-          }).then((data) => {
+          request({ ...apis.activity.updateShareContent, urlData: {id: shareContentId},data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
          }else{
-          request({
-            url: '/api/admin/shareContent',
-            method: 'POST',
-            data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},
-          }).then((data) => {
+          request({ ...apis.activity.addShareContent, data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
             setShareContentId(data.shareContentId)
             message.info("保存成功")
           }).catch((err) => {

src/pages/building/list/add/amap.css

@@ -0,0 +1,43 @@
+.infoBox {
+  padding: 10px;
+  position: absolute;
+  top: 20px;
+  left: 20px;
+  background-color: white;
+  width: 280px;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, 0.5);
+  z-index: 100;
+}
+.infoBox .inputText {
+  margin-right: 10px;
+}
+.infoBox .input {
+  width: 150px;
+  height: 32px;
+  font-size: 16px;
+}
+/* types */
+.native-toast-error {
+  background-color: #d92727;
+  color: white;
+}
+.native-toast-success {
+  background-color: #62a465;
+  color: white;
+}
+.native-toast-warning {
+  background-color: #fdaf17;
+  color: white;
+}
+.native-toast-info {
+  background-color: #5060ba;
+  color: white;
+}
+[class^="native-toast-icon-"] {
+  vertical-align: middle;
+  margin-right: 8px;
+}
+[class^="native-toast-icon-"] svg {
+  width: 16px;
+  height: 16px;
+}

src/pages/building/list/add/amap.less

@@ -0,0 +1,53 @@
+
+.infoBox {
+  padding: 10px;
+  position: absolute;
+  top: 20px;
+  left: 20px;
+  background-color: white;
+  width: 290px;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, .5);
+  z-index: 100;
+  .inputText{
+    margin-right: 10px;
+  }
+  .input{
+    width: 150px;
+    height: 32px;
+    font-size: 16px;
+  }
+ 
+}
+
+
+/* types */
+
+.native-toast-error {
+  background-color: #d92727;
+  color: white;
+}
+
+.native-toast-success {
+  background-color: #62a465;
+  color: white;
+}
+
+.native-toast-warning {
+  background-color: #fdaf17;
+  color: white;
+}
+
+.native-toast-info {
+  background-color: #5060ba;
+  color: white;
+}
+
+[class^="native-toast-icon-"] {
+  vertical-align: middle;
+  margin-right: 8px
+}
+
+[class^="native-toast-icon-"] svg {
+  width: 16px;
+  height: 16px;
+}

src/pages/building/list/add/amap.wxss

@@ -0,0 +1,43 @@
+.infoBox {
+  padding: 10px;
+  position: absolute;
+  top: 20px;
+  left: 20px;
+  background-color: white;
+  width: 280px;
+  box-shadow: 0 2px 6px 0 rgba(114, 124, 245, 0.5);
+  z-index: 100;
+}
+.infoBox .inputText {
+  margin-right: 10px;
+}
+.infoBox .input {
+  width: 150px;
+  height: 32px;
+  font-size: 16px;
+}
+/* types */
+.native-toast-error {
+  background-color: #d92727;
+  color: white;
+}
+.native-toast-success {
+  background-color: #62a465;
+  color: white;
+}
+.native-toast-warning {
+  background-color: #fdaf17;
+  color: white;
+}
+.native-toast-info {
+  background-color: #5060ba;
+  color: white;
+}
+[class^="native-toast-icon-"] {
+  vertical-align: middle;
+  margin-right: 8px;
+}
+[class^="native-toast-icon-"] svg {
+  width: 16px;
+  height: 16px;
+}

src/pages/building/list/add/components/amap.jsx

@@ -0,0 +1,107 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Map, Marker } from 'react-amap';
+import styles from '../amap.less'
+
+class Amap extends React.Component {
+  constructor(props) {
+    super(props);
+    // 高德地图 Marker 实例
+    this.markerInstance = undefined
+    // 高德地图 Map 实例
+    this.mapInstance = undefined
+    this.amapEvents = {
+      created: mapInstance => {
+        console.log('高德地图 Map 实例创建成功；如果你要亲自对实例进行操作，可以从这里开始。比如：');
+        console.log(mapInstance.getZoom());
+        this.mapInstance = mapInstance
+
+        AMap.plugin(['AMap.Autocomplete', 'AMap.PlaceSearch', 'AMap.CitySearch'], () => {
+          // 实例化Autocomplete
+          const autoOptions = {
+            // city 限定城市，默认全国
+            city: '全国',
+            // input 为绑定输入提示功能的input的DOM ID
+            input: 'amapInput',
+          }
+          const autoComplete = new AMap.Autocomplete(autoOptions);
+          // 无需再手动执行search方法，autoComplete会根据传入input对应的DOM动态触发search
+
+          const placeSearch = new AMap.PlaceSearch({
+            city: '南京',
+            map: mapInstance,
+          })
+
+          // 监听下拉框选中事件
+          AMap.event.addListener(autoComplete, 'select', e => {
+            // TODO 针对选中的poi实现自己的功能
+            placeSearch.setCity(e.poi.adcode)
+            placeSearch.search(e.poi.name)
+          })
+
+
+          const citySearch = new AMap.CitySearch()
+          citySearch.getLocalCity((status, result) => {
+            if (status === 'complete' && result.info === 'OK') {
+              // 查询成功，result即为当前所在城市信息
+              console.log('当前所在城市：', result)
+              if (result && result.city && result.bounds) {
+                // 当前城市名称
+                // const cityinfo = result.city;
+
+                // 当前城市位置信息
+                const citybounds = result.bounds;
+                // document.getElementById('info').innerHTML = '您当前所在城市：'+cityinfo;
+                // 地图显示当前城市
+                mapInstance.setBounds(citybounds);
+              }
+            }
+          })
+        })
+
+        // 实例点击事件
+        mapInstance.on('click', e => {
+          const lngLat = `${e.lnglat.getLng()},${e.lnglat.getLat()}`
+          console.log('坐标位置:', lngLat)
+          this.props.onChange(lngLat)
+        });
+      },
+    };
+    this.markerEvents = {
+      created: markerInstance => {
+        console.log('高德地图 Marker 实例创建成功；如果你要亲自对实例进行操作，可以从这里开始。比如：');
+        console.log(markerInstance.getPosition());
+
+        this.markerInstance = markerInstance
+      },
+    }
+    this.markerPosition = { longitude: 120, latitude: 30 };
+  }
+
+  render() {
+    const { value } = this.props
+    if (value) {
+      this.markerInstance.setPosition(value.split(','))
+    }
+
+    return (
+      <>
+        <div style={{ width: '100%', height: '400px', position: 'relative' }}>
+          <Map events={this.amapEvents} amapkey="f0d1d4f82432504003ebf46e5e36ff03">
+            <Marker position={this.markerPosition} events={this.markerEvents} />
+          </Map>
+          {
+          <div className={styles.infoBox}>
+            <span className={styles.inputText}>请输入关键字</span>
+            <input id="amapInput" className={styles.input} type="text" />
+          </div>
+          }
+        </div>
+      </>
+    )
+  }
+}
+
+// f0d1d4f82432504003ebf46e5e36ff03
+
+export default Amap

src/pages/building/list/add/components/base.jsx

@@ -9,6 +9,9 @@ import ImageUpload from '../../../../../components/XForm/ImageUpload'
 import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
 import Wangedit from '../../../../../components/Wangedit/Wangedit'
 import TagGroup from './tags'
+import Amap from './amap'
+import BudildingProjectType from './buildingProjectType'
+import SelectCity from '../../../../../components/SelectButton/CitySelect'
 
 const { Option } = Select
 const { TabPane } = Tabs;
@@ -55,6 +58,7 @@ function AddBuilding(props) {
     request({ url: tempUrl, method }).then(res => {
       res.openingDate = moment(res.openingDate)
       res.receivedDate = moment(res.receivedDate)
+      res.avatarImage = res.buildingImg.map(item => item.url)
       props.form.setFieldsValue(res)
     })
   }
@@ -71,12 +75,13 @@ function AddBuilding(props) {
   function addBuilding(data) {
     data.openingDate = moment(data.openingDate, 'yyyy-MM-dd HH:mm:ss')
     data.receivedDate = moment(data.receivedDate, 'yyyy-MM-dd HH:mm:ss')
-    data.buildingProjectType = []
     // 项目主图
     data.img = data.avatarImage && data.avatarImage.map((item, index) => ({ imgType: 'banner', url: item, orderNo: index + 1 }))
 
-    request({ ...apis.building.addBuilding, data: { ...data } }).then(() => {
+    const api = data.buildingId === undefined ? apis.building.addBuilding : apis.building.updateBuilding
+    request({ ...api, data: { ...data } }).then(() => {
       openNotificationWithIcon('success', '操作成功')
+      router.go(-1)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
     })
@@ -84,6 +89,9 @@ function AddBuilding(props) {
 
   return (
         <Form {...formItemLayout} onSubmit={handleSubmit}>
+          <Form.Item label="项目Id" hasFeedback style={{ display: 'none' }}>
+            {getFieldDecorator('buildingId')(<Input disabled />)}
+          </Form.Item>
           <Form.Item label="楼盘编号" hasFeedback>
             {getFieldDecorator('code')(<Input />)}
           </Form.Item>
@@ -93,13 +101,13 @@ function AddBuilding(props) {
           <Form.Item label="别名" hasFeedback>
             {getFieldDecorator('name')(<Input />)}
           </Form.Item>
-          <Form.Item label="项目类型" hasFeedback>
-            {getFieldDecorator('buildingProjectType')(<Input />)}
+          <Form.Item label="项目类型">
+            {getFieldDecorator('buildingProjectType')(<BudildingProjectType />)}
           </Form.Item>
           <Form.Item label="均价" hasFeedback>
             {getFieldDecorator('price')(<Input />)}
           </Form.Item>
-          <Form.Item label="开盘时间" hasFeedback>
+          <Form.Item label="开盘时间"  hasFeedback>
             {getFieldDecorator('openingDate')(<DatePicker format="YYYY/MM/DD" />)}
           </Form.Item>
           <Form.Item label="电话" hasFeedback>
@@ -109,16 +117,17 @@ function AddBuilding(props) {
             {getFieldDecorator('dynamic')(<Input />)}
           </Form.Item>
           <Form.Item label="物业类型" hasFeedback>
-            {getFieldDecorator('buildingProperty')(
-              <Select mode="multiple" placeholder="物业类型" style={{ width: '1016px' }}>
-                <Option value="未知">未知</Option>
-              </Select>,
+            {getFieldDecorator('propertyType')(
+              // <Select mode="multiple" placeholder="物业类型" style={{ width: '1016px' }}>
+              //   <Option value="未知">未知</Option>
+              // </Select>,
+              <Input />,
             )}
           </Form.Item>
           <Form.Item label="销售状态" hasFeedback>
             {getFieldDecorator('marketStatus')(<Input />)}
           </Form.Item>
-          <Form.Item label="标签" hasFeedback>
+          <Form.Item label="标签" hasFeedback style={{ display: 'none' }}>
             {getFieldDecorator('tags')(
               <Select mode="multiple" placeholder="标签" style={{ width: '1016px' }}>
                 <Option value="未知">未知</Option>
@@ -156,9 +165,7 @@ function AddBuilding(props) {
           </Form.Item>
           <Form.Item label="所在城市" hasFeedback>
             {getFieldDecorator('cityId')(
-              <Select placeholder="选择城市" style={{ width: '200px' }}>
-                <Option value="red">Red</Option>
-              </Select>,
+              <SelectCity />,
             )}
           </Form.Item>
           <Form.Item label="楼盘区域" hasFeedback>
@@ -171,7 +178,7 @@ function AddBuilding(props) {
             {getFieldDecorator('coordinate')(<Input disabled />)}
           </Form.Item>
           <Form.Item label="地图位置" hasFeedback>
-            {(<Input />)}
+            {getFieldDecorator('coordinate')(<Amap />)}
           </Form.Item>
           <Form.Item label="周边交通" hasFeedback>
             {getFieldDecorator('buildingTransport')(

src/pages/building/list/add/components/buildingProjectType.jsx

@@ -0,0 +1,245 @@
+import React, { useEffect, useState } from 'react'
+import { Button, Radio, Icon, Form, Input, Row, Col, Modal, notification, Checkbox } from 'antd';
+import { render } from 'react-dom';
+import request from '../../../../../utils/request';
+import apis from '../../../../../services/apis';
+
+
+const formItemLayout = {
+  labelCol: {
+    xs: { span: 24 },
+    sm: { span: 3 },
+  },
+  wrapperCol: {
+    xs: { span: 24 },
+    sm: { span: 16 },
+  },
+};
+
+/**
+ * 项目类型 form 表单子组件
+ *
+ * @param {*} props
+ */
+class TypeForm extends React.Component {
+
+  componentDidMount() {
+    this.props.form.setFieldsValue(this.props.type)
+  }
+
+  onChange(e, name) {
+    // console.log(e.target.value)
+    this.props.form.validateFieldsAndScroll((err, values) => {
+      if (!err) {
+        // console.log('Received values of form: ', values);
+        values[name] = e.target.value
+        values.buildingTypeName = this.props.type.buildingTypeName
+        console.log('values: ', values)
+        this.props.onSuccess(values)
+      }
+    });
+  }
+
+  close() {
+    this.props.onClose(this.props.form.getFieldsValue(['buildingTypeId']))
+  }
+
+  render() {
+    const { getFieldDecorator } = this.props.form;
+
+    // this.props.form.setFieldsValue(this.props.type)
+
+    return (
+      <>
+        <Col span={11} style={{
+          position: 'relative',
+          border: '1px solid #eee',
+          borderRadius: '4px',
+          marginTop:'16px'
+        }}>
+
+          <p style={{ padding: '20px', borderBottom: '1px solid #eee' }}>{this.props.type.buildingTypeName || ''}  <Button type="link" style={{ position: 'absolute', right: '16px' }} icon="close" onClick={() => this.close()} /></p>
+
+          <Form {...formItemLayout} style={{ padding: '10px 0px 10px 10px' }}>
+            <Form.Item label="类型编号" style={{ display: 'none' }}>
+              {getFieldDecorator('buildingTypeId')(<Input disabled />)}
+            </Form.Item>
+            <Form.Item label="状态" style={{ display: 'none' }}>
+              {getFieldDecorator('status')(<Input disabled />)}
+            </Form.Item>
+            <Form.Item label="价格">
+              {getFieldDecorator('price')(<Input type="number" placeholder="元/㎡" onChange={e => this.onChange(e, 'price')} />)}
+            </Form.Item>
+            <Form.Item label="装修标准">
+              {getFieldDecorator('decoration')(<Input onChange={e => this.onChange(e, 'decoration')} />)}
+            </Form.Item>
+            <Form.Item label="产权年限">
+              {getFieldDecorator('rightsYear')(<Input onChange={e => this.onChange(e, 'rightsYear')} />)}
+            </Form.Item>
+          </Form>
+        </Col>
+      </>
+    )
+  }
+}
+
+const WrappedTypeForm = Form.create({ name: 'TypeForm' })(TypeForm);
+
+/**
+ *项目类型组件
+ *
+ * @param {*} props
+ */
+class ProjectTypeBody extends React.Component {
+
+  constructor(props) {
+    super(props)
+    this.state = {
+      one: false,
+      projectType: [],
+      defaultCheckboxValue: [], // 多选框默认选中的值
+      visible: false,
+      data: [],
+      // data: [{ buildingTypeId: '1', buildingTypeName: '公寓', price: '10', decoration: '全包', rightsYear: '10', status: '1' }, { buildingTypeId: '2', buildingTypeName: '住宅', price: '10', decoration: '全包', rightsYear: '10', status: '1' }, { buildingTypeId: '3', buildingTypeName: '太平房', price: '10', decoration: '全包', rightsYear: '10', status: '1' }],
+    }
+  }
+
+  componentDidMount() {
+    this.getList({ pageNum: 1, pageSize: 999 })
+  }
+
+  componentDidUpdate(prevProps) {
+    // 典型用法（不要忘记比较 props）：
+    if (this.props.value !== prevProps.data && !this.state.one) {
+      this.setValue()
+      this.setState({ one: true })
+    }
+  }
+
+  onSuccess = (values, item) => {
+    const newData = this.getNewProjectType(values)
+    this.setState({ data: newData })
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(newData)
+    }
+  }
+
+  onCheckboxChange = checkedValues => {
+    // console.log('checkedValues: ', checkedValues)
+    const checked = (`${checkedValues}` || '').split(',')
+    const { projectType } = this.state
+    const buildingType = projectType.filter(item => checked.includes(`${item.buildingTypeId}`))
+
+    const tempDate = buildingType.map(item => ({ buildingTypeId: item.buildingTypeId, buildingTypeName: item.buildingTypeName, price: '', decoration: '', rightsYear: '', status: '1' }))
+    const updateProjectDate = this.updateProjectType(tempDate)
+    console.log('updateProjectDate: ', updateProjectDate)
+    this.setState({ data: updateProjectDate })
+  }
+
+  onClose = e => {
+    const { data } = this.state
+    const buildingType = data.filter(item => e.buildingTypeId !== item.buildingTypeId)
+    this.setState({ data: buildingType })
+    this.setState({ defaultCheckboxValue: buildingType.map(item => item.buildingTypeId) })
+  }
+
+  getNewProjectType = values => {
+    const data = []
+    this.state.data.map(item => {
+      if (item.buildingTypeId === values.buildingTypeId) {
+        data.push(values)
+      } else {
+        data.push(item)
+      }
+    })
+
+    return data
+  }
+
+  updateProjectType = values => {
+    // 获取所有复选框选中的id
+    const valueIdArray = values.map(item => item.buildingTypeId)
+    // console.log('valueIdArray: ', valueIdArray)
+
+    // 获取 data 中已经赋值的数据  交集
+    const valueData = this.state.data.filter(item => valueIdArray.includes(item.buildingTypeId))
+    // console.log('valueData: ', valueData)
+
+    // 获取 非 data中数据(也就是没有赋值)，交集
+    const trueValueArr = valueData.map(item => item.buildingTypeId)
+    const trueValueData = values.filter(item => !trueValueArr.includes(item.buildingTypeId))
+
+    // console.log('trueValueData: ', trueValueData)
+
+    // 把两个 数组的值，合并返回
+    return valueData.concat(trueValueData)
+  }
+
+  getList = params => {
+    request({ ...apis.buildingType.getList, params: { ...params } }).then(res => {
+      this.setState({ projectType: res.records })
+    }).catch(err => {
+      this.openNotificationWithIcon('error', err.message)
+    })
+  }
+
+  setValue = () => {
+    let tempData = []
+    let tempCheckboxValue = []
+    const { value } = this.props
+    // console.log('value: ', value)
+    if (value !== undefined && value !== null) {
+      tempData = value
+      tempCheckboxValue = tempData.map(item => item.buildingTypeId)
+      this.setState({ defaultCheckboxValue: tempCheckboxValue })
+      this.setState({ data: tempData })
+    }
+  }
+
+  openNotificationWithIcon = (type, message) => {
+    notification[type]({
+      message,
+      description: '',
+    })
+  }
+
+  handleOk = e => {
+    this.setState({
+      visible: false,
+    });
+  };
+
+  handleCancel = e => {
+    this.setState({
+      visible: false,
+    });
+  };
+
+  showMadel = () => {
+    this.setState({ visible: true })
+    this.getList({ pageNum: 1, pageSize: 999 })
+  }
+
+  render() {
+    return (
+      <>
+        <Button type="primary" icon="plus" size="large" onClick={() => this.showMadel()} />
+        <Modal
+          title="项目类型"
+          visible={this.state.visible}
+          onOk={this.handleOk}
+          onCancel={this.handleCancel}
+        >
+          <Checkbox.Group options={this.state.projectType.map(item => ({ label: item.buildingTypeName, value: item.buildingTypeId }))} defaultValue={this.state.defaultCheckboxValue} onChange={e => this.onCheckboxChange(e)} />
+        </Modal>
+        <Row type="flex" justify="space-between">
+          {
+            this.state.data.map(item => <WrappedTypeForm type={item} key={item.id} onSuccess={(e) => this.onSuccess(e, item)} onClose={(e) => this.onClose(e)} />)
+          }
+        </Row>
+      </>
+    )
+  }
+}
+
+export default ProjectTypeBody

src/pages/building/list/add/components/imageSet.jsx

@@ -61,6 +61,15 @@ function imageSet(props) {
     })
   }
 
+  /**
+   *回调事件
+   *
+   */
+  function onModalChange() {
+    getList()
+    setVisibleData({ visible: false, apartmentId: '', buildingId: '' })
+  }
+
   /**
    *打开编辑页
    *
@@ -138,7 +147,7 @@ function imageSet(props) {
 
       {/* 编辑页 */}
       {/*  onSuccess是子组件传递事件信息  */}
-      <ModalImage visibleData={visibleData} key={1} onSuccess={getList}/>
+      <ModalImage visibleData={visibleData} key={1} onSuccess={() => onModalChange()}/>
     </>
   )
 }

src/pages/building/list/add/components/modalImage.jsx

@@ -5,6 +5,7 @@ import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
 import Styles from '../style.less';
 import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
 import Wangedit from '../../../../../components/Wangedit/Wangedit'
 
 
@@ -61,8 +62,8 @@ class ModalImage extends React.Component {
   // }
 
   componentDidUpdate(preProps, preState) {
-    console.log(this.props.visibleData)
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
+      console.log(this.props.visibleData)
       this.getById()
       this.setState({ visibleData: this.props.visibleData });
     }
@@ -91,7 +92,7 @@ class ModalImage extends React.Component {
 
     request({ url: tempUrl, method, params: { ...params } }).then(res => {
       // res.img = res.buildingImgList.map((item, _) => item.url)
-      res.img = res.buildingImgList[0].url
+      res.img = res.buildingImgList.map(item => item.url)
       this.props.form.setFieldsValue(res)
     }).catch(err => {
      this.openNotificationWithIcon('error', err)
@@ -118,7 +119,7 @@ class ModalImage extends React.Component {
 
   submitData(data) {
     // TODO 这里应该是要支持多图，但是封装的控件没有
-    data.img = [{ imgType: 'aparment', url: data.img, orderNo: 1 }]
+    data.img = data.img.map((item, index) => ({ imgType: 'aparment', url: item, orderNo: index }))
     data.buildingId = this.props.visibleData.buildingId;
     const api = data.apartmentId !== undefined ? apis.building.buildingApartmentUpdate : apis.building.buildingApartmentAdd;
 
@@ -131,7 +132,7 @@ class ModalImage extends React.Component {
       // onSuccess() 是自定义
       this.props.onSuccess()
 
-      this.handleCancel()
+      // this.setState({ visibleData: { visible: false, apartmentId: '', buildingId: '' } }, () => console.log('回调：', this.state.visibleData))
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions
       this.openNotificationWithIcon('error', err)
@@ -186,7 +187,7 @@ class ModalImage extends React.Component {
               </Form.Item>
               <Form.Item label="图片">
               {getFieldDecorator('img')(
-                <ImageUpload />,
+                <ImageListUpload />,
               )}
               </Form.Item>
               <Form.Item label="面积">

src/pages/building/list/add/components/poster.jsx

@@ -0,0 +1,145 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../../../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../../../../components/XForm';
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+import request from '../../../../../utils/request'
+import PosterBottom from '../../../../../assets/bottom.png'
+import yinhao from '../../../../../assets/yinhao.png'
+import ImageUploader from '../../../../../components/XForm/ImageUpload';
+import poster1 from '../../../../../assets/poster1.png';
+import poster2 from '../../../../../assets/poster2.png';
+import Styles from '../style.less';
+import apis from '../../../../../services/apis';
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const Poster = props => {
+  const [inputValue, changeInput] = useState('')
+  const [textAreaValue, changeTextArea] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [posterId, setPosterId] = useState('')
+
+  const [building, setBuilding] = useState({})
+  const { buildingId } = props.building
+
+  if (buildingId) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      request({
+        ...apis.activity.poster,
+        params: { targetId: buildingId, targetType: 'building' },
+      }).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)
+      })
+
+      getById(buildingId)
+    }, [])
+  }
+
+  // 获取详情信息
+  function getById(currentId) {
+    const { url, method } = apis.building.buildingGetById
+    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(currentId)
+
+    request({ url: tempUrl, method }).then(res => {
+      setBuilding(res)
+    })
+  }
+
+  const submitPoster = () => {
+    if (buildingId) {
+      if (posterId) {
+        request({
+          ...apis.activity.updatePoster,
+          urlData: { id: posterId },
+          data: { targetId: buildingId, targetType: 'building', posterImg: imgValue, posterTitle: inputValue, posterDescription: textAreaValue },
+        }).then(() => {
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+      } else {
+        request({
+          ...apis.activity.addPoster,
+          data: { targetId: buildingId, targetType: 'building', 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 || poster1} alt="" />
+
+          <p className={Styles.tagLabel}>
+            {
+              building.buildingTag && building.buildingTag.map(item => <span>{item.tagName}</span>)
+            }
+          </p>
+          <p style={{
+            margin: '10px 20px', fontSize: '20px', color: '#222', fontWeight: '600',
+            display: '-webkit-box', lineClamp: '3', height: '36px',lineHeight:'36px',
+            WebkitLineClamp: '1',
+            WebkitBoxOrient: 'vertical',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+          }}>{building.buildingName || '楼盘标题'}</p>
+          <p style={{ color: '#999',padding:' 0 20px' }}>约<span style={{ color: '#fd0d0c', fontSize: '24px',marginLeft:'6px' }}>{ building.price }</span><span style={{ color: '#fd0d0c', fontSize: '20px' }}>元/m²</span></p>
+
+          <img src={yinhao} style={{ width: '30px', marginLeft: '22px' }} 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 || '海报描述'}</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>
+}
+
+export default Poster

src/pages/building/list/add/components/share.jsx

@@ -0,0 +1,96 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '../../../../../components/SelectButton/BuildSelect'
+import XForm, { FieldTypes } from '../../../../../components/XForm';
+import Wangedit from '../../../../../components/Wangedit/Wangedit'
+import request from '../../../../../utils/request'
+import PosterBottom from '../../../../../assets/bottom.png'
+import yinhao from '../../../../../assets/yinhao.png'
+import ImageUploader from '../../../../../components/XForm/ImageUpload';
+import logo from '../../../../../assets/logo.png';
+import touxiang from '../../../../../assets/touxiang.jpg';
+import poster1 from '../../../../../assets/poster1.png';
+import poster2 from '../../../../../assets/poster2.png';
+import apis from '../../../../../services/apis';
+
+const Share = props => {
+  const [inputValue, changeInput] = useState('')
+  const [imgValue, changeImg] = useState('')
+  const [shareContentId, setShareContentId] = useState('')
+
+  const { buildingId } = props.building
+  if (buildingId) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    useEffect(() => {
+      request({
+        ...apis.activity.shareContent,
+        params: { targetId: buildingId, targetType: 'building' },
+      }).then(data => {
+        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 (buildingId) {
+      if (shareContentId) {
+        request({
+          ...apis.activity.updateShareContent,
+          urlData: { id: shareContentId },
+          data: { targetId: buildingId, shareContentType: 'building', shareContentImg: imgValue,shareContentTitle: inputValue },
+        }).then(data => {
+          message.info('保存成功')
+        }).catch(err => {
+          message.info(err.msg || err.message)
+        })
+       } else {
+        request({
+          ...apis.activity.addShareContent,
+          data: { targetId: buildingId, shareContentType: 'building', 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>
+}
+
+export default Share

src/pages/building/list/add/components/tags.jsx

@@ -3,15 +3,23 @@ import { Tag, Input, Tooltip, Icon } from 'antd';
 
 class EditableTagGroup extends React.Component {
   state = {
-    tags: [],
     inputVisible: false,
     inputValue: '',
   };
 
+  // 每次取值，都从 this.props.value 获取最新值
+  getTags = () => (this.props.value || '').split(',')
+
+  toggleOnChange = tags => {
+    if (typeof this.props.onChange === 'function') {
+      this.props.onChange(tags.join(','))
+    }
+  }
+
   handleClose = removedTag => {
-    const tags = this.state.tags.filter(tag => tag !== removedTag);
-    console.log(tags);
-    this.setState({ tags });
+    const tags = this.getTags().filter(tag => tag !== removedTag);
+    // this.setState({ tags });
+    this.toggleOnChange(tags)
   };
 
   showInput = () => {
@@ -24,39 +32,27 @@ class EditableTagGroup extends React.Component {
 
   handleInputConfirm = () => {
     const { inputValue } = this.state;
-    let { tags } = this.state;
+
+    const tags = this.getTags()
     if (inputValue && tags.indexOf(inputValue) === -1) {
-      tags = [...tags, inputValue];
+      // 如果有新的值，就把这个值追加到 tags 原本值的后面，在通过onChange事件传递出去
+      this.toggleOnChange(tags.concat(inputValue))
     }
-    console.log(tags);
+
     this.setState({
-      tags,
       inputVisible: false,
       inputValue: '',
     });
-
-    if (typeof this.props.onChange === 'function') {
-      const tempTags = tags.join(',')
-      this.props.onChange(tempTags);
-    }
   };
 
   saveInputRef = input => (this.input = input);
 
   render() {
-    const { tags, inputVisible, inputValue } = this.state;
-
-    const { value } = this.props
-    let data = []
-    if (value !== undefined && value !== null) {
-      data = value.split(',')
-    } else {
-      data = tags
-    }
+    const { inputVisible, inputValue } = this.state;
 
     return (
       <div>
-        {data.map((tag, index) => {
+        {this.getTags().map((tag, index) => {
           const isLongTag = tag.length > 20;
           const tagElem = (
             <Tag key={tag} closable onClose={() => this.handleClose(tag)}>

src/pages/building/list/add/index.jsx

@@ -12,6 +12,8 @@ import Wangedit from '../../../../components/Wangedit/Wangedit'
 import TagGroup from './components/tags'
 import Base from './components/base'
 import ImageSet from './components/imageSet'
+import Poster from './components/poster'
+import Share from './components/share'
 
 
 const { Option } = Select
@@ -29,25 +31,50 @@ const formItemLayout = {
 };
 
 function AddBuilding(props) {
-  function tabsCallback(key) {
-    console.log(key);
+
+  const [tab, setTab] = useState('base')
+
+  function tabsCallback(e) {
+    console.log(e);
+    setTab(e.target.value)
   }
 
-  console.log(props.location)
+  // console.log(props.location)
 
   return (
-    <Tabs defaultActiveKey="1" onChange={tabsCallback}>
-      <TabPane tab="基本信息" key="1">
-        <Base building={{ buildingId: props.location.query && props.location.query.id }} />
-      </TabPane>
-      {
-        props.location.query.id &&
-        <TabPane tab="图片" key="2">
-          {/* '159fd19bb973b6972c10fbebf07ddeb1' */}
-          <ImageSet building={{ buildingId: props.location.query && props.location.query.id }} />
-        </TabPane>
-      }
-    </Tabs>
+    <>
+      <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
+        <Radio.Button value="base">基本信息</Radio.Button>
+        {
+          props.location.query.id &&
+          (
+            <>
+              <Radio.Button value="image">图片</Radio.Button>
+              <Radio.Button value="poster">海报图片</Radio.Button>
+              <Radio.Button value="share">分享设置</Radio.Button>
+            </>
+          )
+        }
+      </Radio.Group>
+      <div style={{ marginTop: '20px' }}>
+        { tab === 'base' && <Base building={{ buildingId: props.location.query && props.location.query.id }} /> }
+        { props.location.query.id && (tab === 'image' && <ImageSet building={{ buildingId: props.location.query && props.location.query.id }} />)}
+        { props.location.query.id && (tab === 'poster' && <Poster building={{ buildingId: props.location.query && props.location.query.id }} />)}
+        { props.location.query.id && (tab === 'share' && <Share building={{ buildingId: props.location.query && props.location.query.id }} />)}
+      </div>
+    </>
+    // <Tabs defaultActiveKey="1" onChange={tabsCallback}>
+    //   <TabPane tab="基本信息" key="1">
+    //     <Base building={{ buildingId: props.location.query && props.location.query.id }} />
+    //   </TabPane>
+    //   {
+    //     props.location.query.id &&
+    //     <TabPane tab="图片" key="2">
+    //       {/* '159fd19bb973b6972c10fbebf07ddeb1' */}
+    //       <ImageSet building={{ buildingId: props.location.query && props.location.query.id }} />
+    //     </TabPane>
+    //   }
+    // </Tabs>
   )
 }
 

src/pages/building/list/add/style.less

@@ -0,0 +1,20 @@
+.tagLabel{
+  padding: 14px 20px 0 20px;
+  margin: 0 0 5px 0;
+  span{
+    padding: 2px 8px;
+    font-size: 10px;
+    background-color: #e1f7eb;
+    color: #3de180;
+    border-radius: 2px;
+    margin-right: 10px;
+  }
+  span:nth-child(3n+2){
+    color: #72a0d1;
+    background-color: #eaeff5;
+  }
+  span:nth-child(3n+3){
+    color: #ff5858;
+    background-color: #fff0f1;
+  }
+}

src/pages/building/list/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 SelectCity from '../../../components/SelectButton/CitySelect'
 
 
 const { Option } = Select;
@@ -101,56 +102,62 @@ function CartBody(props) {
   }
 
   return (
-          <Card
-            hoverable
-            style={{ minWidth: '400px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
-            cover={<img alt="example" src={ data.poster } style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
-            bodyStyle={{ padding: '10px 20px' }}
-          >
-            <p className={Styles.cardText}>
-              <span className={Styles.title}>楼盘编号</span>
-              <span >：{ data.code }</span>
-              <span className={Styles.ediText} onClick={() => toEdi(data)}>
-                编辑
-                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-              </span>
-            </p>
-            <p className={Styles.cardText}>
-              <span className={Styles.title}>楼盘名称</span>
-              <span >：{ data.name }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>均价</span>
-              <span >
-                ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> { data.price } </span>元/m
+    <Card
+      hoverable
+      style={{ minWidth: '330px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
+      cover={<img alt="example" src={data.poster} style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
+      bodyStyle={{ padding: '10px 20px' }}
+    >
+      <p className={Styles.cardText}>
+        <span className={Styles.title}>楼盘编号</span>
+        <span >：{data.code}</span>
+        <AuthButton name="admin.building.update.put" noRight={null}>
+          <span className={Styles.ediText} onClick={() => toEdi(data)}>
+            编辑
+                  <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
+          </span>
+        </AuthButton>
+      </p>
+      <p className={Styles.cardText}>
+        <span className={Styles.title}>楼盘名称</span>
+        <span >：{data.name}</span>
+      </p>
+      <p className={Styles.cardItem}>
+        <span className={Styles.title}>均价</span>
+        <span >
+          ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price} </span>元/m
         </span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>项目地址</span>
-              <span className={ Styles.address }>：{ data.address }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>发布状态</span>
-              <span >：{ data.status === 1 ? '已发布' : '未发布' }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>录入时间</span>
-              <span >：{ data.createDate }</span>
-            </p>
-            <p style={{ margin: '15px 0', position: 'relative', fontSize: '18px' }}>
-              <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
-                {/* 已发布的时候，需要显示取消发布的字样 */}
-                { data.status === 1 ? '取消发布' : '发布' }
-                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-              </span>
-              <span style={{
-                color: '#FF4A4A', position: 'absolute', right: '0',
-              }} onClick={() => deleteBuilding(data)}>
-                删除
+      </p>
+      <p className={Styles.cardItem}>
+        <span className={Styles.title}>项目地址</span>
+        <span className={Styles.address}>：{data.address}</span>
+      </p>
+      <p className={Styles.cardItem}>
+        <span className={Styles.title}>发布状态</span>
+        <span >：{data.status === 1 ? '已发布' : '未发布'}</span>
+      </p>
+      <p className={Styles.cardItem}>
+        <span className={Styles.title}>录入时间</span>
+        <span >：{data.createDate}</span>
+      </p>
+      <p style={{ margin: '15px 0', position: 'relative', fontSize: '0.11rem' }}>
+      <AuthButton name="admin.building.update.status.put" noRight={null}>
+        <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
+          {/* 已发布的时候，需要显示取消发布的字样 */}
+          {data.status === 1 ? '取消发布' : '发布'}
+          <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+        </span>
+      </AuthButton>
+      <AuthButton name="admin.building.delete.id.delete" noRight={null}>
+        <span style={{
+          color: '#FF4A4A', position: 'absolute', right: '0',
+        }} onClick={() => deleteBuilding(data)}>
+          删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-              </span>
-            </p>
-          </Card>
+        </span>
+      </AuthButton>
+      </p>
+    </Card>
   )
 }
 
@@ -210,7 +217,7 @@ function body(props) {
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNum: pageNumber, pageSize: 9 })
+    getList({ pageNum: pageNumber, pageSize: 9 })
   }
 
   function getDate(value, dateString) {
@@ -266,10 +273,7 @@ function body(props) {
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('cityId')(
-            <Select style={{ width: '180px' }} placeholder="城市" onChange={handleSelectChange}>
-              <Option value="male">male</Option>
-              <Option value="female">female</Option>
-            </Select>,
+             <SelectCity />,
           )}
         </Form.Item>
         <Form.Item>
@@ -281,13 +285,15 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit">
-            搜索
-          </Button>
+          <AuthButton name="admin.buildinglist.get" noRight={null}>
+            <Button type="primary" htmlType="submit">
+              搜索
+            </Button>
+          </AuthButton>
         </Form.Item>
       </Form>
 
-      <AuthButton name="building.add" noRight={null}>
+      <AuthButton name="admin.building.add.post" noRight={null}>
         <Button type="danger" className={Styles.addButton} onClick={() => toAdd()}>
           新增楼盘
         </Button>
@@ -297,10 +303,10 @@ function body(props) {
       <Row style={{ padding: ' 0 10px' }}>
         {
           dataSource.records.map((item, _) => (
-              <Col span={8}>
-                <CartBody data={item} key={item.buildingId} onSuccess={getList}/>
-              </Col>
-            ))
+            <Col span={8}>
+              <CartBody data={item} key={item.buildingId} onSuccess={getList} />
+            </Col>
+          ))
         }
       </Row>
       {/* 分页 */}

src/pages/building/list/style.css

@@ -15,31 +15,34 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #333;
-  line-height: 24px;
+  line-height: 1.5;
   display: flex;
   align-items: center;
   position: relative;
+  margin-bottom: 0.08rem;
 }
 .cardItem {
-  font-size: 18px;
+  font-size: 0.11rem;
   font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
+
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
-  line-height: 24px;
   position: absolute;
   right: 0;
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width: 0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/building/list/style.less

@@ -15,36 +15,39 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
-
+  margin-bottom: 0.08rem;
+  
 }
 .cardItem{
-  font-size: 18px;
+  font-size: 0.11rem;
   font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;  
+  margin-bottom: 0.08rem;
+  .title{
+    display: inline-block;
+    width: 0.54rem;
+    min-width: 0.54rem;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
-  line-height: 24px;
   position: absolute;
   right: 0;
+
 }
-.title{
-  display: inline-block;
-  width: 84px;
-  justify-content: space-between;
-  text-align: justify;
-  text-align-last:justify
-}
+
 
 .address { 
   width: 400px;

src/pages/building/list/style.wxss

@@ -15,7 +15,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -23,23 +23,23 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size: 0.11rem;
   font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;
+  margin-bottom: 0.08rem;
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
-  line-height: 24px;
   position: absolute;
   right: 0;
+  margin-bottom: 0.08rem;
 }
 .title {
   display: inline-block;
-  width: 84px;
+   width: 0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/building/type/index.jsx

@@ -5,6 +5,7 @@ import moment from 'moment';
 import Styles from './style.less'
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
+import AuthButton from '@/components/AuthButton';
 
 function body() {
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -20,7 +21,7 @@ function body() {
       title: '类型名称',
       dataIndex: 'buildingTypeName',
       key: 'buildingTypeName',
-      render: (_, record) => <Tag color="blue" onClick={() => toEdi(record.buildingTypeId)}>{ record.buildingTypeName }</Tag>,
+      render: (_, record) => <Tag color="blue" onClick={() => toEdi(record.buildingTypeId)}>{record.buildingTypeName}</Tag>,
     },
     {
       title: '创建时间',
@@ -35,9 +36,9 @@ function body() {
       render: (_, record) => (
         <span onClick={() => deleteType(record)}>
           <span style={{
-              color: '#FF4A4A', right: '0',
+            color: '#FF4A4A', right: '0',
           }} >
-              删除
+            删除
           <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
           </span>
         </span>
@@ -96,8 +97,10 @@ function body() {
 
   return (
     <>
-      <Button type="primary" className={Styles.addButton} onClick={() => toEdi()}>新增类型</Button>
-      <Table dataSource={data.records} columns={columns} pagination={false}/>
+      <AuthButton name="admin.tdBuildingType.post" noRight={null}>
+        <Button type="danger" onClick={() => toEdi()}>新增类型</Button>
+      </AuthButton>
+      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} />
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={onChange} />

src/pages/building/type/style.css

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,15 +24,16 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
-  font-weight: 400;
+
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +41,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width: 0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/building/type/style.less

@@ -16,24 +16,25 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 
 }
 .cardItem{
-  font-size: 18px;
-  font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;  
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -41,7 +42,7 @@
 }
 .title{
   display: inline-block;
-  width: 84px;
+  width: 0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify

src/pages/building/type/style.wxss

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/carouselFigure/advertisingList.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 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'
 
 const { Option } = Select;
@@ -22,11 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/extendContent',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -97,11 +93,7 @@ const toEdit = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/buildingDynamic/finish',
-                  method: 'PUT',
-                  data: {dynamicId: row.dynamicId, top: ""},
-              }).then((data) => {
+              request({ ...apis.carsuseFigure.finish, data: {dynamicId: row.dynamicId, top: ""},}).then((data) => {
                   console.log(data)
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
@@ -123,11 +115,7 @@ const toEdit = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/extendContent/'+row.contentId,
-                  method: 'PUT',
-                  data: row,
-              }).then((data) => {
+              request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
               }).catch((err) => {
@@ -143,11 +131,7 @@ const toEdit = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/extendContent/'+row.contentId,
-                  method: 'PUT',
-                  data: row,
-              }).then((data) => {
+              request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
               }).catch((err) => {
@@ -217,7 +201,7 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEdit()}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
       <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

@@ -6,7 +6,7 @@ import router from 'umi/router';
 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'
 
 const { Option } = Select;
@@ -22,11 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/extendContent',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -97,11 +93,7 @@ const toEditCarouse = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/buildingDynamic/finish',
-                  method: 'PUT',
-                  data: {dynamicId: row.dynamicId, top: ""},
-              }).then((data) => {
+            request({ ...apis.carsuseFigure.finish, data: {dynamicId: row.dynamicId, top: ""},}).then((data) => {
                   console.log(data)
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
@@ -123,11 +115,7 @@ const toEditCarouse = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/extendContent/'+row.contentId,
-                  method: 'PUT',
-                  data: row,
-              }).then((data) => {
+            request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
               }).catch((err) => {
@@ -143,11 +131,7 @@ const toEditCarouse = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/extendContent/'+row.contentId,
-                  method: 'PUT',
-                  data: row,
-              }).then((data) => {
+            request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
               }).catch((err) => {
@@ -217,7 +201,7 @@ const handleSubmit = (e, props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
       <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/editAdvertising.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 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'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -27,10 +28,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   // 查询列表
   const getDetail = (contentId) => {
-    request({
-        url: '/api/admin/extendContent/' + contentId,
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -123,21 +121,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     const handleSubmit = val => { 
       val.showType = 'screen'
       if(contentId){
-        request({
-          url: '/api/admin/extendContent/'+contentId,
-          method: 'PUT',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       }else{
-        request({
-          url: '/api/admin/extendContent',
-          method: 'POST',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)

src/pages/carouselFigure/editCarousel.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 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'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -27,10 +28,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   // 查询列表
   const getDetail = (contentId) => {
-    request({
-        url: '/api/admin/extendContent/' + contentId,
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -123,21 +121,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     const handleSubmit = val => { 
       val.showType = 'banner'
       if(contentId){
-        request({
-          url: '/api/admin/extendContent/'+contentId,
-          method: 'PUT',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       }else{
-        request({
-          url: '/api/admin/extendContent',
-          method: 'POST',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)

src/pages/channel/InviteClients.jsx

@@ -4,6 +4,7 @@ import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Sele
 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'
 
 const { Option } = Select;
@@ -45,24 +46,34 @@ const header = props => {
   const [data, setData] = useState({ channelNmae: [], result: [] })
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    getList({ id: props.location.query.id, pageNum: 1, pageSize: 10 })
+    getListInvite({ id: props.location.query.id, pageNum: 1, pageSize: 10 })
   }, [])
 
-  function getList(params) {
-    request({
-      url: '/api/admin/channel/InviteClientsList',
-      method: 'GET',
-      params: { ...params },
-  // eslint-disable-next-line no-shadow
-  }).then(data => {
-      console.log(data)
+  // function getListInvite(params) {
+  //   request({
+  //     url: '/api/admin/channel/InviteClientsList',
+  //     method: 'GET',
+  //     params: { ...params },
+  // // eslint-disable-next-line no-shadow
+  // }).then(data => {
+  //     console.log(data)
+  //     setData(data)
+  // })
+  // }
+
+  function getListInvite(params) {
+    request({ ...apis.channelList.getListInvite, params: { ...params } }).then((data) => {
       setData(data)
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
   })
   }
+
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNum: pageNumber, pageSize: 9 })
+    getListInvite({ pageNum: pageNumber, pageSize: 9 })
   }
   return (
     <>

src/pages/channel/addChannel.jsx

@@ -3,6 +3,7 @@ import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Sele
 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'
 
 const { TextArea } = Input;
@@ -17,18 +18,14 @@ const header = props => {
   //   addChannel({ pageNum: 1, pageSize: 10 })
   // }, [])
 
-  function addChannel (params) {
-    request({
-      url: '/api/admin/channel',
-      method: 'POST',
-      data: { ...params },
-      // eslint-disable-next-line no-shadow
-    }).then(data => {
-      console.log(data)
+  function addChannel(params) {
+    request({ ...apis.channelList.addChannel, data: { ...params } }).then((data) => {
       setData(data)
-      // eslint-disable-next-line no-unused-expressions
       router.go(-1)
-    })
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+  })
   }
 
   function handleSubmit (e) {

src/pages/channel/brokerList.jsx

@@ -3,6 +3,7 @@ import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Sele
 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'
 
 const { Option } = Select;
@@ -102,37 +103,27 @@ const header = props => {
 //   const [page, changePage] = useState({})
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    getList()
+    getListBroker()
   }, [])
-      function getList(params) {
-      request({
-        url: '/api/admin/channel/broker',
-        method: 'GET',
-        params: { ...params },
-    // eslint-disable-next-line no-shadow
-    }).then(data => {
-        console.log(data)
+
+    function getListBroker(params) {
+      request({ ...apis.channelList.getListBroker, params: { ...params } }).then((data) => {
         setData(data)
+    }).catch((err) => {
+        console.log(err)
+        message.info(err.msg || err.message)
     })
     }
-  // const getList = e => {
-  //   request({
-  //       url: '/api/xxx',
-  //       method: 'GET',
-  //       params: {},
-  //   // eslint-disable-next-line no-shadow
-  //   }).then(data => {
-  //       setData(data)
-  //   })
-  // }
+
+
  // 查询
  function queryList() {
-  getList({ ...queryData, pageNum: 1, pageSize: 10, channelId: localStorage.getItem('value') })
+  getListBroker({ ...queryData, pageNum: 1, pageSize: 10, channelId: localStorage.getItem('value') })
 }
     // 分页
     function onChange(pageNumber) {
       // eslint-disable-next-line react-hooks/rules-of-hooks
-        getList({ pageNum: pageNumber, pageSize: 10 })
+      getListBroker({ pageNum: pageNumber, pageSize: 10 })
     }
     // 获取input的值
     function onInputChangePhone (e) {
@@ -145,7 +136,7 @@ const header = props => {
     setQueryData({ ...queryData, phone: e.target.value })
   }
   function refurbishList () {
-    getList({ pageNum: 1, pageSize: 10 })
+    getListBroker({ pageNum: 1, pageSize: 10 })
   }
   // eslint-disable-next-line no-undef
   function handleClick() {
@@ -166,7 +157,7 @@ return (
       {/* <Button onClick={() => refurbishList() }>重置</Button> */}
     </div>
     </div>
-    <Table dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
+    <Table style={{marginTop:'40px'}} dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
   </>
 )
 }

src/pages/channel/channelList.jsx

@@ -3,6 +3,7 @@ import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Sele
 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'
 
 const { Option } = Select;
@@ -80,7 +81,7 @@ const columns = [
     dataIndex: '',
     key: '',
     align: 'center',
-    render: (text, record) => <a style={ { color: '#66B3FF' } } onClick= {() => toedit(record.channelId)} >编辑</a>,
+    render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => toedit(record.channelId)} >编辑</a>,
   },
 ];
 
@@ -93,16 +94,16 @@ function toAdd() {
     },
   });
 }
-  // 跳编辑页面
-  function toedit(channelId) {
-    // alert(channelId)
-    router.push({
-      pathname: '/channel/editChannel',
-      query: {
-        id: channelId,
-      },
-    });
-  }
+// 跳编辑页面
+function toedit(channelId) {
+  // alert(channelId)
+  router.push({
+    pathname: '/channel/editChannel',
+    query: {
+      id: channelId,
+    },
+  });
+}
 
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -112,16 +113,13 @@ const header = props => {
     localStorage.removeItem('value');
     getList({ pageNum: 1, pageSize: 10 })
   }, [])
-
+ 
   function getList(params) {
-    request({
-      url: '/api/admin/channel',
-      method: 'GET',
-      params: { ...params },
-  // eslint-disable-next-line no-shadow
-  }).then(data => {
-      console.log(data)
+    request({ ...apis.channelList.getList, params: { ...params } }).then((data) => {
       setData(data)
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
   })
   }
   // value 的值
@@ -133,48 +131,48 @@ const header = props => {
   function queryList() {
     getList({ pageNum: 1, pageSize: 10, channelId: localStorage.getItem('value') })
   }
- // 重置
- function reset() {
-  getList({ pageNum: 1, pageSize: 10 })
- }
+  // 重置
+  function reset() {
+    getList({ pageNum: 1, pageSize: 10 })
+  }
 
- // 跳编辑页
- function toEdit() {
-  router.push({
-    pathname: '/integralMall/editGoods',
-    query: {
-      a: 'b',
-    },
-  });
-}
+  // 跳编辑页
+  function toEdit() {
+    router.push({
+      pathname: '/integralMall/editGoods',
+      query: {
+        a: 'b',
+      },
+    });
+  }
 
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNum: pageNumber, pageSize: 9 })
+    getList({ pageNum: pageNumber, pageSize: 9 })
   }
 
   return (
     <>
       <div className={channels.searchBox}>
-        <dvi>
+        <div>
           <span className={channels.selectName}>渠道名称</span>
           <Select defaultValue="请选择" style={{ width: 180 }} onChange={handleChange}>
-          <option value="">全部</option>
-              {data.channelNmae.map(Item =>
-                <Option value={ Item.channelId }> { Item.channelName } </Option>,
-              )}
-              {/* {listItems} */}
+            <option value="">全部</option>
+            {data.channelNmae.map(Item =>
+              <Option value={Item.channelId}> {Item.channelName} </Option>,
+            )}
+            {/* {listItems} */}
           </Select>
-        </dvi>
+        </div>
         <div >
-        <Button type="primary" onClick={() => queryList() }>查询</Button>
-        {/* <Button onClick={() => reset() }>重置</Button> */}
+          <Button type="primary" onClick={() => queryList()}>查询</Button>
+          {/* <Button onClick={() => reset() }>重置</Button> */}
         </div>
       </div>
       <Button type="danger" onClick={toAdd} className={channels.about} >新增</Button>
       <Table dataSource={data.result.records} columns={columns} pagination={{ pageSize: 10, total: data.result.total, onChange }} />
-  </>
+    </>
   )
 }
 

src/pages/channel/editChannel.jsx

@@ -3,6 +3,7 @@ import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Sele
 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'
 
 const { TextArea } = Input;
@@ -14,30 +15,29 @@ const header = props => {
   useEffect(() => {
     getById()
   }, [])
+  
+  
   // 查询当前信息
-  function getById() {
-    request({
-      url: `/api/admin/channel/${props.location.query.id}`,
-      method: 'GET',
-  // eslint-disable-next-line no-shadow
-  }).then(data => {
+  function getById(params) {
+    request({ ...apis.channelList.getById, urlData: { id: props.location.query.id } }).then((data) => {
       props.form.setFieldsValue(data)
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
   })
   }
 
   // 编辑
   function editChannel(data) {
-      request({
-        url: `/api/admin/channel/${props.location.query.id}`,
-        method: 'PUT',
-        data: { ...data },
-    // eslint-disable-next-line no-shadow
-    }).then(data => {
-         // eslint-disable-next-line no-unused-expressions
-         router.go(-1)
-    })
+    request({ ...apis.channelList.editChannel, urlData: { id: props.location.query.id }, data: { ...data } }).then((data) => {
+      router.go(-1)
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+  })
   }
 
+
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {

src/pages/channel/recommendClients.jsx

@@ -3,6 +3,7 @@ import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Sele
 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'
 
 const { Option } = Select;
@@ -98,18 +99,27 @@ const header = props => {
 //   const [page, changePage] = useState({})
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    getList({ pageNumber: 1, pageSize: 10 })
+    getListRecommend({ pageNumber: 1, pageSize: 10 })
   }, [])
 
-  function getList(params) {
-    request({
-      url: `/api/admin/customer/recommend/${props.location.query.id}`,
-      method: 'GET',
-      params: { ...params },
-  // eslint-disable-next-line no-shadow
-  }).then(data => {
-      console.log(data)
+  // function getListRecommend(params) {
+  //   request({
+  //     url: `/api/admin/customer/recommend/${props.location.query.id}`,
+  //     method: 'GET',
+  //     params: { ...params },
+  // // eslint-disable-next-line no-shadow
+  // }).then(data => {
+  //     console.log(data)
+  //     setData(data)
+  // })
+  // }
+
+  function getListRecommend(params) {
+    request({ ...apis.channelList.getListRecommend, urlData: { id: props.location.query.id }, params: { ...params } }).then((data) => {
       setData(data)
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
   })
   }
 
@@ -117,7 +127,7 @@ const header = props => {
    // 分页
  function onChange(pageNum) {
       // eslint-disable-next-line react-hooks/rules-of-hooks
-        getList({ pageNumber: pageNum, pageSize: 9 })
+      getListRecommend({ pageNumber: pageNum, pageSize: 9 })
     }
 return (
   <>

src/pages/charts/CityNums.jsx

@@ -0,0 +1,137 @@
+import React, { useState, useEffect } from 'react';
+import Echart from '../../components/EchartsTest/EChart';
+import { fetch, apis } from '@/utils/request';
+
+const geoOptions = {
+  backgroundColor: '#fff',
+  title: {
+    text: '城市分布',
+    left: 20,
+    top: 20
+  },
+  tooltip : {
+      trigger: 'item',
+      formatter: (params) => {
+        return `${params.data.name}: ${params.data.value[2]}`
+      }
+  },
+  geo: {
+      map: 'china',
+      roam: true,
+      zoom: 1.2,
+      label: {
+        normal: {
+          show: true,
+          color: '#aaa',
+        },
+        emphasis: {
+          show: true
+        }
+      },
+      itemStyle: {
+          normal: {
+              areaColor: '#f3f3f3',
+              borderColor: '#ddd'
+          },
+          emphasis: {
+              areaColor: '#eee'
+          }
+      }
+  },
+}
+
+const getCityData = fetch(apis.indexEcharts.userCity)
+
+const mapDataRange = x => {
+  // 映射区间 [1, 100000] => [rangeStart, rangeEnd]
+  const min = 1
+  const max = 100000
+  const rangeStart = 16
+  const rangeEnd = 24
+
+  return rangeStart + (x - min) * (rangeEnd - rangeStart) / (max - min)
+}
+
+const CityNums = (props) => {
+  const [data, setData]= useState([])
+
+  useEffect(() => {
+    getCityData().then(response => {
+      const { selectCityUser = [] } = response || {}
+      const data = selectCityUser.map((item) => {
+        return {
+          name: item.name,
+          value: [item.lng - 0, item.lat - 0, item.cityCount]
+        }
+      })
+      setData(data)
+    })
+  }, [])
+
+  const options = {
+    ...geoOptions,
+    series: [
+      {
+        name: '人数',
+        type: 'scatter',
+        coordinateSystem: 'geo',
+        data,
+        symbolSize: 10,
+        label: {
+            normal: {
+                formatter: '{b}',
+                position: 'right',
+                show: false
+            },
+            emphasis: {
+                show: true
+            }
+        },
+        itemStyle: {
+            normal: {
+                color: '#DB3C4B'
+            }
+        }
+      },
+      {
+          name: '前三',
+          type: 'effectScatter',
+          coordinateSystem: 'geo',
+          data: data.sort(function (a, b) {
+              return b.value[2] - a.value[2];
+          }).slice(0, 3),
+          symbolSize: function (val) {
+              return mapDataRange(val[2]);
+          },
+          showEffectOn: 'render',
+          rippleEffect: {
+              brushType: 'stroke'
+          },
+          hoverAnimation: true,
+          label: {
+              normal: {
+                  formatter: '{b}',
+                  position: 'right',
+                  show: false
+              }
+          },
+          itemStyle: {
+              normal: {
+                  color: '#DB3C4B',
+                  shadowBlur: 10,
+                  shadowColor: '#333'
+              }
+          },
+          zlevel: 1
+      }
+    ],
+  }
+
+  return (
+    <div style={{ margin: '24px 0', width: '100%', borderRadius: '8px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
+      <Echart options={options} style={{ width: '100%', height: '600px' }} ></Echart>
+    </div>
+  )
+}
+
+export default CityNums;

src/pages/customer/customerlist/index.jsx

@@ -9,6 +9,8 @@ import router from 'umi/router';
 import Attribution from './components/attribution'
 import IntegralRecord from './components/integralRecord'
 import ChangeStatus from './components/changeStatus'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import AuthButton from '@/components/AuthButton';
 
 
 const { Option } = Select;
@@ -190,13 +192,19 @@ function body(props) {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
-          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
-          &nbsp;&nbsp;
-          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
-          <br />
-          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => toCustomerDateil(record)}>查看详情</Button>
-          &nbsp;&nbsp;
-          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+          <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
+            <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
+            &nbsp;&nbsp;
+            <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
+          </AuthButton>
+            <br />
+          <AuthButton name="admin.customer.recommend.get" noRight={null}>
+            <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => toCustomerDateil(record)}>查看详情</Button>
+          </AuthButton>
+            &nbsp;&nbsp;
+          <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
+            <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+          </AuthButton>
         </>
       ),
     },
@@ -207,9 +215,7 @@ function body(props) {
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
           {getFieldDecorator('buildingId')(
-            <Select style={{ width: '180px' }} placeholder="意向项目" onChange={handleSelectChange}>
-              <Option value="male">male</Option>
-            </Select>,
+            <BuildSelect />,
           )}
         </Form.Item>
         <Form.Item>
@@ -248,17 +254,21 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="danger" htmlType="submit" >
-            搜索
-          </Button>
+          <AuthButton name="admin.customer.recommend.get" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              查询
+            </Button>
+          </AuthButton>
         </Form.Item>
       </Form>
 
       <div style={{ marginTop: '20px', marginBottom: '20px' }}>
-        <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
-          <Radio.Button value="private">私客</Radio.Button>
-          <Radio.Button value="public">公客</Radio.Button>
-        </Radio.Group>
+        <AuthButton name="admin.customer.recommend.get" noRight={null}>
+          <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
+            <Radio.Button value="private">私客</Radio.Button>
+            <Radio.Button value="public">公客</Radio.Button>
+          </Radio.Group>
+        </AuthButton>
       </div>
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
 

src/pages/customer/customerlist/style.css

@@ -19,7 +19,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -27,7 +27,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -35,7 +35,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -43,7 +43,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/customerlist/style.less

@@ -19,24 +19,25 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 
 }
 .cardItem{
-  font-size: 18px;
-  font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
-  align-items: center;  
+  align-items: center; 
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem; 
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -44,7 +45,7 @@
 }
 .title{
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify

src/pages/customer/customerlist/style.wxss

@@ -19,7 +19,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -27,7 +27,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -35,7 +35,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -43,7 +43,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/drift/style.less

@@ -16,24 +16,25 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 
 }
 .cardItem{
-  font-size: 18px;
-  font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
-  align-items: center;  
+  align-items: center; 
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem; 
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -41,7 +42,7 @@
 }
 .title{
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify

src/pages/customer/independentList/index.jsx

@@ -5,6 +5,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
 
 
 const { Option } = Select;
@@ -375,9 +376,13 @@ function body(props) {
           {
             <>
               {/* <sapn style={{ color: 'rgba(239,39,58,1)' }}>查看详细</sapn> */}
-              <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => Invite(record)}>邀请经纪人</a>
+              <AuthButton name="admin.channel.InviteClientsList.get" noRight={null}>
+                <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => Invite(record)}>邀请经纪人</a>
+              </AuthButton>
               &nbsp;&nbsp;&nbsp;&nbsp;
-              <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => gM(record)}>推荐客户</a>
+              <AuthButton name="admin.customer.recommend.id.get" noRight={null}>
+                <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => gM(record)}>推荐客户</a>
+              </AuthButton>
             </>
           }
         </>
@@ -405,9 +410,11 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
-            搜索
-          </Button>
+          <AuthButton name="admin.customer.agents.get" noRight={null}>
+            <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
+              搜索
+            </Button>
+          </AuthButton>
         </Form.Item>
       </Form>
 

src/pages/customer/independentList/style.css

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/independentList/style.less

@@ -16,24 +16,25 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 
 }
 .cardItem{
-  font-size: 18px;
-  font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;  
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -41,7 +42,7 @@
 }
 .title{
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify

src/pages/customer/independentList/style.wxss

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/recommendCustomer/index.jsx

@@ -5,6 +5,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
 
 
 const { Option } = Select;
@@ -130,7 +131,9 @@ function body(props) {
       render: (_, record) => (
         <>
           {
-            record.verifyStatus === 0 ? <sapn style={{ color: 'rgba(239,39,58,1)' }} onClick={() => toAudit(record.customerId)}>审核</sapn> : ''
+            <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
+              {record.verifyStatus === 0 ? <sapn style={{ color: 'rgba(239,39,58,1)' }} onClick={() => toAudit(record.customerId)}>审核</sapn> : ''}
+            </AuthButton>
           }
         </>
       ),
@@ -176,9 +179,11 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
-            搜索
-          </Button>
+          <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/recommendCustomer/style.css

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/recommendCustomer/style.less

@@ -16,16 +16,17 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 
 }
 .cardItem{
-  font-size: 18px;
+  font-size: 0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -33,7 +34,7 @@
   align-items: center;  
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -41,7 +42,7 @@
 }
 .title{
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify

src/pages/customer/recommendCustomer/style.wxss

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/report/index.jsx

@@ -4,6 +4,8 @@ import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import AuthButton from '@/components/AuthButton';
 
 
 const { Option } = Select;
@@ -148,18 +150,18 @@ function body(props) {
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('buildingId')(
-            <Select style={{ width: '180px' }} placeholder="意向项目" onChange={handleSelectChange}>
-              <Option value="male">male</Option>
-            </Select>,
+            <BuildSelect />,
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit">
-            搜索
-          </Button>
+          <AuthButton name="admin.customer.recommend.report.get" noRight={null}>
+            <Button type="primary" htmlType="submit">
+              搜索
+            </Button>
+          </AuthButton>
         </Form.Item>
       </Form>
-      <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
+      <Table style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>
   );
 }

src/pages/customer/report/style.css

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/customer/report/style.less

@@ -16,24 +16,26 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
   color: #333;
-  line-height: 24px;
   display: flex;
   align-items: center;
   position: relative;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 
 }
 .cardItem{
-  font-size: 18px;
-  font-weight: 400;
+
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;  
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 }
 .ediText {
-  font-size: 18px;
+  font-size: 0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -41,7 +43,7 @@
 }
 .title{
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last:justify

src/pages/customer/report/style.wxss

@@ -16,7 +16,7 @@
   margin: 10px 0px;
 }
 .cardText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #333;
   line-height: 24px;
   display: flex;
@@ -24,7 +24,7 @@
   position: relative;
 }
 .cardItem {
-  font-size: 18px;
+  font-size:  0.11rem;
   font-weight: 400;
   color: #666;
   line-height: 24px;
@@ -32,7 +32,7 @@
   align-items: center;
 }
 .ediText {
-  font-size: 18px;
+  font-size:  0.11rem;
   color: #ff925c;
   line-height: 24px;
   position: absolute;
@@ -40,7 +40,7 @@
 }
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
   text-align-last: justify;

src/pages/integralMall/GoodsList.jsx

@@ -4,8 +4,9 @@ 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 apis from '../../services/apis';
 import request from '../../utils/request'
+import AuthButton from '@/components/AuthButton';
 
 const { Option } = Select;
 
@@ -20,11 +21,7 @@ function header(props) {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taGoods',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.integralMall.getTaGoods, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -62,11 +59,7 @@ function header(props) {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({
-          url: '/api/admin/taGoods/change',
-          method: 'PUT',
-          data: { ...row },
-        }).then((data) => {
+        request({ ...apis.integralMall.changeTaGoods, data: { ...row },}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
         })
@@ -131,8 +124,21 @@ function header(props) {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x, row) => <><span style={{ color: '#EF273A', marginRight: '20px' }} onClick={changeGoodsStatus(row)}>{row.status == 1 ? '下架' : '上架'}<Icon type="shopping-cart" className={styles.shoppingCart} />
-                            </span><span style={{ color: '#FF925C' }} onClick={toEditGoods(row.goodsId)}>编辑<Icon type="form" className={styles.edit} /></span></>,
+      render: (x, row) => (
+        <>
+          <AuthButton name="admin.taGoods.change.put" noRight={null}>
+            <span style={{ color: '#EF273A', marginRight: '20px' }} onClick={changeGoodsStatus(row)}>
+              {row.status == 1 ? '下架' : '上架'}
+              {<Icon type="shopping-cart" className={styles.shoppingCart} />}
+            </span>
+          </AuthButton>
+          <AuthButton name="admin.taGoods.put" noRight={null}>
+            <span style={{ color: '#FF925C' }} onClick={toEditGoods(row.goodsId)}>
+              编辑<Icon type="form" className={styles.edit} />
+            </span>
+          </AuthButton>
+        </>
+      ),
     },
   ];
 
@@ -179,12 +185,14 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
-          </Button>
+          <AuthButton name="admin.taGoods.get" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
+            </Button>
+          </AuthButton>
         </Form.Item>
       </Form>
-      <Button type="primary" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       <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/achieve.jsx

@@ -5,7 +5,9 @@ import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-import request from '../../utils/request'
+import apis from '../../services/apis';
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
 
 const { TabPane } = Tabs;
 
@@ -28,11 +30,7 @@ useEffect(() => {
 
 // 查询列表
 const getList = (params) => {
-  request({
-      url: '/api/admin/tdPointsRules',
-      method: 'GET',
-      params: { ...params },
-  }).then((data) => {
+  request({ ...apis.integralMall.tdPointsRules, params: { ...params },}).then((data) => {
       console.log(data)
       setData(data)
   })
@@ -54,11 +52,7 @@ const changePageNum = (pageNumber) => {
   }
 
   const changeStatus = (row) => () => {
-    request({
-      url: '/api/admin/tdPointsRules/change',
-      method: 'PUT',
-      data: { ...row },
-    }).then((data) => {
+    request({ ...apis.integralMall.change, data: { ...row },}).then((data) => {
       message.info('操作成功！')
       getList({ pageNum: 1, pageSize: 10, type: carType})
     })
@@ -96,8 +90,20 @@ const columns = [
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => <><span style={{ color: '#EF273A', marginRight: '20px' }} onClick={changeStatus(row)}>{row.status == 1?'停用':'启用'}<Icon type="stop" className={styles.shoppingCart} /></span>
-                      <span style={{ color: '#FF925C' }}>{row.buildingId != null ? '编辑'`${<Icon type="form" className={styles.edit} />}` : ''}</span></>,
+      render: (x,row) => (
+        <>
+          <AuthButton name="admin.tdPointsRules.change.put" noRight={null}>
+            <span style={{ color: '#EF273A', marginRight: '20px' }} onClick={changeStatus(row)}>
+              {row.status == 1?'停用':'启用'}<Icon type="stop" className={styles.shoppingCart} />
+            </span>
+          </AuthButton>
+          <AuthButton name="admin.tdPointsRules.put" noRight={null}>
+            <span style={{ color: '#FF925C' }}>
+              {row.buildingId != null ? '编辑'`${<Icon type="form" className={styles.edit} />}` : ''}
+            </span>
+          </AuthButton>
+        </>
+      ),
     },
   ];
 

src/pages/integralMall/editGoods.jsx

@@ -6,6 +6,7 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import router from 'umi/router';
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { TextArea } = Input;
@@ -21,10 +22,7 @@ const header = props => {
 
   // 查询列表
   const getGoodsData = (goodsId) => {
-    request({
-        url: '/api/admin/taGoods/' + goodsId,
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.integralMall.taGoods, urlData: { id: goodsId },}).then((data) => {
         console.log(data)
         setGoodsData(data)
     })
@@ -111,21 +109,13 @@ const header = props => {
   const handleSubmit = (values) => {
     if(goodsId){
       values.goodsId = goodsId
-      request({
-        url: '/api/admin/taGoods',
-        method: 'PUT',
-        data: values,
-      }).then((data) => {
+      request({ ...apis.integralMall.updateTaGoods, data: values,}).then((data) => {
         cancelPage()
       }).catch((err) => {
         message.info(err.msg || err.message)
       })
       }else{
-      request({
-        url: '/api/admin/taGoods/add',
-        method: 'POST',
-        data: values,
-      }).then((data) => {
+      request({ ...apis.integralMall.addTaGoods, data: values,}).then((data) => {
         cancelPage()
       }).catch((err) => {
         message.info(err.msg || err.message)

src/pages/integralMall/exchangeRecords.jsx

@@ -5,7 +5,7 @@ import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 /**
@@ -27,11 +27,7 @@ function record(props) {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taPointsExchange',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.integralMall.taPointsExchange, params: { ...params },}).then((data) => {
         setData(data)
     })
   }
@@ -190,7 +186,7 @@ function record(props) {
           </Form.Item>
         </div>
       </Form>
-      <Table dataSource={data.records} columns={columns} pagination={false} />
+      <Table style={{marginTop:'40px'}} 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} />
       </div>

src/pages/integralMall/verifyList.jsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -19,11 +19,7 @@ const header = (props) => {
 
   // 查询列表
   const getVerifyList = (params) => {
-    request({
-      url: '/api/admin/taPointsExchange',
-      method: 'GET',
-      params: { ...params },
-    }).then((data) => {
+    request({ ...apis.integralMall.taPointsExchange, params: { ...params },}).then((data) => {
         setData(data)
     })
   }
@@ -39,11 +35,7 @@ const header = (props) => {
   }
 
   const changeStatus = (row) => () => {
-    request({
-      url: '/api/admin/taPointsExchange/change',
-      method: 'PUT',
-      data: row
-    }).then((data) => {
+    request({ ...apis.integralMall.changeTaPointsExchange, data: row}).then((data) => {
         message.info("操作成功")
         getVerifyList({ pageNum: pageNumber, pageSize: 10, phone: props.location.query.telValue })
     })

src/pages/news/list/NewsList.jsx

@@ -167,48 +167,48 @@ 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: '18px', color: '#FF7E48' }} onClick={toEditList(data.newsId)}>
+        <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: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
+          <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: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
+          <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="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
           </span>
         }
 
-        <span style={{ position: 'absolute', right: '20px', bottom: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={changeNewsListStatus(data.newsId)}>
+        <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>
         <div style={{ position: 'absolute', left: '260px', top: '0px', padding: '20px' }}>
           <p style={{
-            fontSize: '18px', color: '#333', fontWeight: '600', marginBottom: '10px', overflow: 'hidden',
+            fontSize: ' 0.11rem', color: '#333', fontWeight: '600', marginBottom: '10px', overflow: 'hidden',
             textOverflow: 'ellipsis',
             whiteSpace: 'nowrap',
             width: '300px',
           }}>{data.newsName}</p>
-          <p style={{ fontSize: '18px', color: '#555', marginBottom: '10px' }}>
+          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '10px' }}>
             <span style={{ display: 'inline-block', width: '190px' }}>咨询类型：{data.newsType.newsTypeName}</span>
             <span>状态：{data.newsStatus == 0 ? "已发布" : "未发布"}</span>
           </p>
 
-          <p style={{ fontSize: '18px', color: '#555', marginBottom: '10px' }}>
+          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '10px' }}>
             <span style={{ display: 'inline-block', width: '190px' }}>阅读数量：{data.pvNum}</span>
             <span>转发数量：{data.shareNum}</span>
           </p>
 
-          <p style={{ fontSize: '18px', color: '#555', marginBottom: '10px' }}>
+          <p style={{ fontSize: ' 0.11rem', color: '#555', marginBottom: '10px' }}>
             <span style={{ display: 'inline-block', width: '190px' }}>点赞数量：{data.favorNum}</span>
             <span>收藏数量：{data.saveNum}</span>
           </p>
 
-          <p style={{ fontSize: '18px', color: '#999', marginBottom: '10px' }}>发布时间：{data.createDate}</p>
+          <p style={{ fontSize: ' 0.11rem', color: '#999', marginBottom: '10px' }}>发布时间：{data.createDate}</p>
         </div>
       </Card>
     )

src/pages/news/list/style.less

@@ -16,24 +16,25 @@
     margin: 10px 0px;
   }
   .cardText {
-    font-size: 18px;
     color: #333;
-    line-height: 24px;
     display: flex;
     align-items: center;
     position: relative;
+    line-height: 1.5;
+    font-size: 0.11rem;
+    margin-bottom: 0.08rem;
   
   }
   .cardItem{
-    font-size: 18px;
-    font-weight: 400;
     color: #666;
-    line-height: 24px;
     display: flex;
     align-items: center;  
+    line-height: 1.5;
+    font-size: 0.11rem;
+    margin-bottom: 0.08rem;
   }
   .ediText {
-    font-size: 18px;
+    font-size: 0.11rem;
     color: #ff925c;
     line-height: 24px;
     position: absolute;
@@ -41,7 +42,7 @@
   }
   .title{
     display: inline-block;
-    width: 84px;
+    width:  0.54rem;
     justify-content: space-between;
     text-align: justify;
     text-align-last:justify

src/pages/staff/list/RoleList.jsx

@@ -7,40 +7,82 @@ import router from 'umi/router';
 import { Card, Avatar } from 'antd';
 import request from '../../../utils/request'
 import Styles from './style.less';
-
-
-function confirm() {
-  Modal.confirm({
-    title: '确认停用该角色？',
-    okText: '确认',
-    cancelText: '取消',
-    onOk() {
-      console.log('OK');
-    },
-    onCancel() {
-      console.log('Cancel');
-    },
+import apis from '../../../services/apis';
+
+const header = props => {
+// function confirm(id) {
+//   Modal.confirm({
+//     title: '确认停用该角色？',
+//     okText: '确认',
+//     cancelText: '取消',
+//     onOk() {
+//     },
+//     onCancel() {
+//       console.log('Cancel');
+//     },
+//   });
+// }
+
+function addRole(roleId) {
+  router.push({
+    pathname: '/staff/list/addRole',
   });
-
 }
-function toEditRole() {
+
+function toEditRole(roleId) {
   router.push({
     pathname: '/staff/list/addRole',
     query: {
-      a: 'b',
+      id: roleId,
     },
   });
 }
+const [data, setData] = useState({ data: [] })
+// 初始化角色
+ useEffect(() => {
+   localStorage.removeItem('value');
+    getRoleList({ pageNum: 1, pageSize: 100 })
+ }, [])
+
+//  function getRoleList(params) {
+//    request({
+//      url: '/api/admin/taRole',
+//      method: 'GET',
+//      params: { ...params },
+//  // eslint-disable-next-line no-shadow
+//  }).then(data => {
+//      console.log(data)
+//      setData(data)
+//  })
+//  }
+
+ function getRoleList(params) {
+  request({ ...apis.role.getRoleList, params: { ...params } }).then((data) => {
+    setData(data)
+}).catch((err) => {
+    console.log(err)
+    message.info(err.msg || err.message)
+})
+}
+
 
+function stop(ids) {
+  request({ ...apis.role.stop, urlData: { id: ids } }).then((data) => {
+    getRoleList({ pageNum: 1, pageSize: 100 })
+}).catch((err) => {
+    console.log(err)
+    message.info(err.msg || err.message)
+})
+}
 
 const dataSource = [
   {
     name: '置业顾问',
-    status: '1',//显示停用
+    status: '1',
   },
   {
     name: '置业经理',
-    status: '1',//停用
+    status: '1',
   },
 ];
 
@@ -55,10 +97,9 @@ const columns = [
   // },
   {
     title: '角色名称',
-    dataIndex: 'name',
-    key: 'name',
+    dataIndex: 'roleName',
+    key: 'roleName',
     align: 'center',
-    render: text => <a>{text}</a>,
   },
 
   {
@@ -67,11 +108,11 @@ const columns = [
     key: 'status',
     align: 'center',
 
-    render: () => <>
-      <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={confirm}>停用
-      <Icon type="stop" className={styles.shoppingCart} style={{fontSize:14}}/>
+    render: (text, record) => <>
+      <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={() => stop(record.roleId)}>{ record.status === 1 ? '停用' : '启用' }
+      <Icon type="stop" className={styles.shoppingCart} style={{ fontSize: 14 }}/>
       </span>
-      <span style={{ color: '#FF925C' }} onClick={toEditRole}>编辑
+      <span style={{ color: '#FF925C' }} onClick={() => toEditRole(record.roleId)} >编辑
       <Icon type="form" className={styles.edit} />
       </span>
     </>,
@@ -80,22 +121,15 @@ const columns = [
 ];
 
 
-const header = (props) => {
-
-
-
-
-  return (
+return (
     <>
-      <Button type="danger" className={styles.addBtn} onClick={toEditRole}>新增</Button>
+      <Button type="danger" className={styles.addBtn} onClick={addRole}>新增</Button>
       <div className={Styles.roletext}>
 
-        <Table dataSource={dataSource} columns={columns} />
+        <Table dataSource={data.records} columns={columns} />
       </div>
     </>
 
   )
 }
-const WrappedHeader = Form.create({ name: 'header' })(header);
-
-export default WrappedHeader
+export default header

src/pages/staff/list/StaffList.jsx

@@ -5,114 +5,23 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../../style/GoodsList.less';
 import router from 'umi/router';
 import { Card, Avatar } from 'antd';
+import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import Styles from './style.less';
 
 const { Meta } = Card;
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-//标签颜色
-const colors = {
-  金牌顾问: '#E34B59',
-  销售冠军: '#E8747E',
-  优选顾问: '#EEC37E',
-  人气顾问: '#FDDA9F',
-}
-// 提交事件
-function handleSubmit (e, props) {
-  e.preventDefault();
-  props.form.validateFields((err, values) => {
-    if (!err) {
-      console.log('提交数据: ', values)
-    }
-  });
-}
-// Change 事件
-function handleSelectChange (props) {
-  console.log(props)
-}
 
-// 分页
-function onChange (pageNumber) {
-  console.log('Page: ', pageNumber);
-}
 // 跳转到编辑商品
-function toEditStaff () {
+const toEditStaff = (userId) => () => {
   router.push({
     pathname: '/staff/editStaff',
-    // query: {
-    //   a: 'b',
-    // },
-  });
-}
-function confirm () {
-  Modal.confirm({
-    title: '确认停用该角色？',
-    okText: '确认',
-    cancelText: '取消',
-    onOk () {
-      console.log('OK');
-    },
-    onCancel () {
-      console.log('Cancel');
+    query: {
+      userId
     },
   });
-
 }
-/**
- *
- *
- * 
- */
-
-// 假数据
-const tempData = [
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 222',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 333',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 444',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 555',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '0',
-    tel: '133 333 555',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问', '销售冠军'],
-  },
-  {
-    name: '吴媛',
-    status: '1',// 启用
-    tel: '133 333 555',
-    avatar: 'https://zos.alipayobjects.com/rmsportal/ODTLcjxAfvqbxHnVXCYX.png',
-    labels: ['金牌顾问'],
-  },
-
-
-
-]
 
 
 /**
@@ -120,52 +29,73 @@ const tempData = [
  *
  * @returns
  */
-function CartBody (props) {
+const CartBody = (props) => {
   const { data } = props
 
+  const confirm = (data) => () => {
+    console.log(data,"11111")
+    if(data.status === 1){
+      Modal.confirm({
+        title: '确认停用该角色？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.staff.change, urlData: {id:data.userId,type:'off'}}).then((data) => {
+            message.info("操作成功")
+            props.onFresh()
+          })
+        }
+      });
+    }else{
+      Modal.confirm({
+        title: '确认启用该角色？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.staff.change, urlData: {id:data.userId,type:'on'}}).then((data) => {
+            message.info("操作成功")
+            props.onFresh()
+          })
+        }
+      });
+    }
+    
+  }
   return (
 
     <Card className={Styles.card}>
       <div>
 
-        <Avatar src={data.avatar} style={{ width: 94, height: 94 }} />
-        <span className={Styles.ediText} style={{ marginLeft: '20px' }} onClick={toEditStaff}>
+        <Avatar src={data.avatar} style={{ width: '0.48rem', height: '0.48rem' }} />
+        <Button type="link" style={{ marginLeft: '0.04rem', color: '#FF925C', fontSize: '0.11rem' }} onClick={toEditStaff(data.userId)}>
           编辑
-                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-        </span>
-        <span className={Styles.ediText} style={{ marginLeft: '50px' }} onClick={confirm}>
-          停用
-                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-        </span>
+                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
+        </Button>
+        <Button type="link" style={{ fontSize: ' 0.11rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={confirm(data)}>
+          {data.status === 1 ? '停用' : '启用'}
+                <Icon type={data.status===1?'close-circle':'form'} style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
+        </Button>
+        {/* <Button type="link" style={{ fontSize: ' 0.11rem', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
+          启用
+                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+        </Button> */}
 
       </div>
       <div>
 
         <span>
           {
-            data.labels.map((item, index) => {
-              const color = colors[item];
-              console.log(color, '------');
-              return <Tag className={Styles.cardTag} color={color}>{item}</Tag>
+            data.taTagsList.map((item, index) => {
+              return <Tag className={Styles.cardTag} color={item.tagColor}>{item.tagName}</Tag>
             })
           }
         </span>
-        {/* {
-           data.label.map((item, index) => (
-              
-                <Tag className={Styles.cardTag}>{item}</Tag>
-          
-            ))
-            } */}
-
-        <p className={Styles.cardText} style={{ width: '300px' }}>
-          <span>姓名:{data.name}</span>
-
-          <span style={{ float: "right" }}>状态:{data.status === '1' ? '启用' : '停用'}</span>
 
+        <p className={Styles.cardText} >姓名 : {data.userName}
         </p>
-        <p className={Styles.cardText} style={{ width: '300px' }}>
-          <span>电话:{data.tel}</span>
+        <p className={Styles.statusText} > 状态 : {data.status === 1 ? '启用' : '停用'} </p>
+        <p className={Styles.phoneText} >
+          电话 : {data.phone}
         </p>
       </div>
 
@@ -173,31 +103,34 @@ function CartBody (props) {
   )
 }
 
-
 const header = (props) => {
-  const [data, setData] = useState({})
-  //   const [page, changePage] = useState({})
-
-  // useEffect(() => {
-  //   request({
-  //       url: '/api/admin/iBuildingDynamicList',
-  //       method: 'GET',
-  //       params: {pageNum: 1,pageSize: 10},
-  //   }).then((data) => {
-  //       console.log(data)
-  //       setData(data)
-  //   })
-  // })
-
-  // const getList = (e) => {
-  //   request({
-  //       url: '/api/xxx',
-  //       method: 'GET',
-  //       params: {},
-  //   }).then((data) => {
-  //       setData(data)
-  //   })
-  // }
+  const [tempData, setTempData] = useState([])
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  }, [])
+
+  const getList = (params) => {
+    request({ ...apis.staff.taUser, params: { ...params } }).then((data) => {
+      console.log(data, "listData")
+      setTempData(data.records)
+    })
+  }
+
+  // 分页
+  const onChange = (pageNumber) => {
+    getList({ pageNum: pageNumber, pageSize: 10 });
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
 
   const { getFieldDecorator } = props.form
   return (
@@ -205,7 +138,7 @@ const header = (props) => {
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         <Form.Item>
-          {getFieldDecorator('name')(
+          {getFieldDecorator('userName')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="姓名"
@@ -213,7 +146,7 @@ const header = (props) => {
           )}
         </Form.Item>
         <Form.Item>
-          {getFieldDecorator('tel')(
+          {getFieldDecorator('phone')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="电话"
@@ -223,30 +156,13 @@ const header = (props) => {
 
         <Form.Item>
 
-          {getFieldDecorator('goodState')(
-            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态" >
               <Option value="1">启用</Option>
               <Option value="0">停用</Option>
             </Select>,
           )}
         </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('isMain')(
-            <Select style={{ width: '180px' }} placeholder="请选择" onChange={handleSelectChange}>
-              <Option value="1">职业顾问</Option>
-              <Option value="0">其他</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('name')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="标签"
-            />,
-          )}
-        </Form.Item>
-
 
         <Form.Item>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
@@ -254,22 +170,20 @@ const header = (props) => {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="danger" className={styles.addBtn} onClick={toEditStaff}>新增</Button>
-
+      <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>
       <Row style={{ padding: ' 0 10px' }}>
         {
           tempData.map((item, index) => (
             <Col span={6}>
-              <CartBody data={item} />
+              <CartBody data={item} onFresh={()=> getList({ pageNum: 1, pageSize: 10 })}/>
             </Col>
           ))
         }
       </Row>
 
-      {/* <Table dataSource={data.records} columns={columns} /> */}
       {/* 分页  */}
       <div style={{ display: 'flex', justifyContent: 'flex-end' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={500} onChange={onChange} />
+        <Pagination showQuickJumper defaultCurrent={1} total={tempData.total} onChange={onChange} />
       </div>
     </>
   )

src/pages/staff/list/addRole.jsx

@@ -1,9 +1,12 @@
 import React, { useState, useEffect } from 'react';
-import { Checkbox, Input, Card } from 'antd';
+import { Checkbox, Input, Card, Form, Button,Row,Col } from 'antd';
 import { connect } from 'dva';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import request from '../../../utils/request';
 import channels from './channelList.less';
+import { resolve, join } from 'path';
+import router from 'umi/router';
+import apis from '../../../services/apis';
 
 const { TextArea } = Input;
 
@@ -14,149 +17,252 @@ const { TextArea } = Input;
  * @param {*} props
  * @returns
  */
-const Edit = props => {
-  console.log('props,props', props.user.currentUser)
+const Poster = props => {
   const userMenus = props.user.currentUser.menus;
   const userBtns = props.user.currentUser.buttons;
 
-
+  // 获取当前所有菜单
   const [data, setData] = useState({ data: [] })
- // 获取当前所有菜单
+  const [buutonDate, setBuutonDate] = useState({})
+
+  // 展示要显示的菜单和按钮----（编辑）
+  const [dataMenuId, setDataMenuId] = useState([])
+  const [dataButtonId, setDataButtonId] = useState([])
+
   useEffect(() => {
-    localStorage.removeItem('value');
-    menuList({ pageNum: 1, pageSize: 100 })
+    // 新增和编辑用一个页面
+    if (props.location.query) {
+      const { id } = props.location.query
+      if (id) {
+        buttonAndMenuList('', id)
+      }
+    }
+    // menuList({ pageNum: 1, pageSize: 100 })
+    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({
-      url: '/api/admin/menuList',
-      method: 'GET',
-      params: { ...params },
-  // eslint-disable-next-line no-shadow
-  }).then(data => {
+    request({ ...apis.role.menuList, params: { ...params } }).then((data) => {
+      setData(data)
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+  })
+  }
+
+  // 所有按钮
+  // function buttonList(params) {
+  //   request({
+  //     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)
+  }).catch((err) => {
+      console.log(err)
+  })
+  }
+
+
+  // 根据角色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 })
       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)))
+      }
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
   })
   }
 
-  // function SuBmenu(params) {
-  //  return Array.from(userMenus).map(Item =>
-  //  <Checkbox value={ Item.menuId }> { Item.name }</Checkbox>)
+  // const [menus, setMenus] = useState([]);
+  // 判断menus是否有值
+  const [menus, setMenus] = useState([]);
+
+  const addMenus = m => setMenus([...menus, m])
+  const delMenus = m => setMenus(menus.filter(x => x.menuId !== m.menuId));
+
+  const handleMenuChange = m => e => {
+    if (e.target.checked) {
+      setDataMenuId(dataMenuId.concat(m.menuId))
+      addMenus(m)
+    } else {
+      setDataMenuId(dataMenuId.filter(item => item !== m.menuId));
+      delMenus(m)
+    }
+  }
+
+  const [but, setBut] = useState([]);
+  // 判断menus是否有值
+  const addBut = m => setBut([...but, m])
+  const delBut = m => setBut(but.filter(x => x.menuId !== m.menuId));
+  const handleButChange = m => e => {
+    if (e.target.checked) {
+      setDataButtonId(dataButtonId.concat(m.btnId))
+      addBut(m)
+    } else {
+      setDataButtonId(dataButtonId.filter(item => item !== m.btnId));
+      delBut(m)
+    }
+  }
+  const gridStyle1 = {
+    width: '17%',
+    textAlign: 'left',
+  };
+  const gridStyle2 = {
+    width: '80%',
+    textAlign: 'left',
+    height: '72px',
+  };
+
+  function toRoleList() {
+    router.push({
+      pathname: '/staff/RoleList',
+    });
+  }
+  // function updateAuthMenu(params) {
+  //   request({
+  //     url: '/api/admin/updateAuthMenu',
+  //     method: 'POST',
+  //     data: { ...params },
+  //     // eslint-disable-next-line no-shadow
+  //   }).then(data => {
+  //     toRoleList()
+  //   })
   // }
-  // const [tab, changeTab] = useState('basic')
-
-  const Permission = [
-    '项目管理',
-    '员工管理',
-    '客户管理',
-    '系统管理',
-    '渠道管理',
-    '轮播图管理',
-    '资讯管理',
-    '活动管理',
-    '积分商城',
-    '首页数据',
-  ]
-
-  const Poster = props => {
-    const dataSource = [
-      {
-        name: '员工管理',
-        per: [
-          '111111',
-          '22222',
-          '33333',
-        ],
-      },
-      {
-        name: '角色管理',
-        per: [
-          '444',
-          '555',
-          '666',
-        ],
-      },
-    ];
-
-
-    const gridStyle1 = {
-      width: '20%',
-      textAlign: 'left',
-    };
-    const gridStyle2 = {
-      width: '80%',
-      textAlign: 'left',
-      height: '69px',
-    };
-
-    return (
-    <>
-      <div style={{}}>
-        {userMenus.map(item => (
-          <Card title={<Checkbox>{item.name}</Checkbox>} bordered style={{ width: '100%' }}>
-              {
-                   userMenus.map(menu => (
-
-                    (item.menuId === menu.menuRoot && item.menuId !== menu.menuId) &&
-                    <>
-                      <Card.Grid style={gridStyle1} >
-                          <Checkbox>{menu.name}</Checkbox>
-                      </Card.Grid>
-                      <Card.Grid style={gridStyle2}>
-                        {userBtns.map(btn => (
-                          <>
-                            {
-                              btn.menuId === menu.menuId &&
-                              <Checkbox>{btn.name}</Checkbox>
-                            }
-                          </>
-                        ))}
-                      </Card.Grid>
-                   </>
-                   ))
-              }
-          </Card>
-        ))}
-      </div>
-    </>
-    )
+
+  function updateAuthMenu(data) {
+    request({ ...apis.role.updateAuthMenu, data: { ...data } }).then((data) => {
+      toRoleList()
+  }).catch((err) => {
+      console.log(err)
+  })
   }
 
-  const fields = [
-    {
-      label: '角色名称',
-      name: 'roleName',
-      type: FieldTypes.Text,
-      // placeholder: '名称',
-      value: ''
-    },
-    {
-      label: '简介',
-      name: 'roleIntroduction',
-      render: <TextArea className={channels.inpuitTxt} ></TextArea>,
-      value: ''
-
-    },
-
-    {
-      label: '菜单权限',
-      name: 'rolePermission',
-      render:
-        <>
-          <div>
-
-            <Poster />
-          </div>
-        </>,
-    },
-
-  ]
-
-  const handleSubmit = val => {
-    window.console.log('submit data --->', val)
+
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (props.location.query.id !== undefined) {
+        console.log('menus', menus)
+      
+        const sumitMenu = userMenus.filter(item => dataMenuId.includes(item.menuId))
+        const sumitBtn = buutonDate.filter(item => dataButtonId.includes(item.btnId))
+        // console.log('sumitMenu', sumitMenu)
+        // console.log('sumitBtn', sumitBtn)
+        // console.log('sumitMenu', sumitMenu)
+        // const sumitBut = data.sysMenuList[0].sysButtonInMenu.concat(but)
+        updateAuthMenu({ sysMenu: sumitMenu, name: values.roleName, id: props.location.query.id, sysButton: sumitBtn })
+      } else {
+        updateAuthMenu({ sysMenu: menus, name: values.roleName, id: props.location.query.id, sysButton: but })
+        }
+    });
   }
-  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
-}
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <div >
+        <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+          <Form.Item label="角色名称">
+            {getFieldDecorator('roleName', {
+              rules: [{ required: true, message: '请输入角色名称' }],
+            })(<Input className={channels.inpuit} />)}
+
+          </Form.Item>
+          {userMenus.map(item => (
+            (item.parentCode === '-1') &&
+            <Row >
+              <Col span={7}>
+
+              </Col>
+              <Col span={17}>
 
 
-export default connect(({ user }) => ({ user }))(Edit);
+                <Card title={<Checkbox checked={dataMenuId.includes(item.menuId)} onChange={handleMenuChange(item)}>{item.name}</Checkbox>} bordered style={{ width: '100%', alignItems: 'center' }} >
+                  {
+                    userMenus.map(menu => (
+
+                      (item.menuId === menu.menuRoot && item.menuId !== menu.menuId) &&
+                      <>
+                        <Card.Grid style={gridStyle1} >
+                          <Checkbox checked={dataMenuId.includes(menu.menuId)} onChange={handleMenuChange(menu)}>{menu.name}</Checkbox>
+                        </Card.Grid>
+                        <Card.Grid style={gridStyle2}>
+                          {buutonDate.length > 0 && buutonDate.map(btn => (
+                            <>
+                              {
+                                btn.menuId === menu.menuId &&
+                                <Checkbox checked={dataButtonId.includes(btn.btnId)} onChange={handleButChange(btn)}>{btn.name}</Checkbox>
+                              }
+                            </>
+                          ))}
+                        </Card.Grid>
+                      </>
+                    ))
+                  }
+                </Card>
+              </Col>
+
+            </Row>
+          ))}
+          <Form.Item wrapperCol={{ span: 15, offset: 7 }} style={{ marginTop: '10px' }}>
+            <Button type="primary" htmlType="submit">
+              保存
+          </Button>
+            <Button className={channels.formButton} htmlType="submit" onChange = {toRoleList}>
+              取消
+          </Button>
+          </Form.Item>
+        </Form>
+      </div>
+    </>
+  )
+}
+const WrappedNormalLoginForm = Form.create({ name: 'Poster' })(Poster);
+export default connect(({ user }) => ({ user }))(WrappedNormalLoginForm);

src/pages/staff/list/editRole.jsx

@@ -1,12 +1,10 @@
 import React, { useState, useEffect } from 'react';
-import { Checkbox, Row, Col, Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, DatePicker, Select, Form, Alert, Card } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import styles from '../../style/GoodsList.less';
+import { Checkbox, Input, Card } from 'antd';
+import { connect } from 'dva';
 import XForm, { FieldTypes } from '../../../components/XForm';
-import Wangedit from '../../../components/Wangedit/Wangedit';
 import request from '../../../utils/request';
 import channels from './channelList.less';
-import Tagss from '../components/Tagss.jsx';
+import { resolve } from 'path';
 
 const { TextArea } = Input;
 
@@ -17,7 +15,11 @@ const { TextArea } = Input;
  * @param {*} props
  * @returns
  */
-const Edit = (props) => {
+const Edit = props => {
+  console.log('props,props', props.user.currentUser)
+  const userMenus = props.user.currentUser.menus;
+  const userBtns = props.user.currentUser.buttons;
+
   const [data, setData] = useState({ data: [] })
  // 获取当前所有菜单
   useEffect(() => {
@@ -36,6 +38,11 @@ const Edit = (props) => {
       setData(data)
   })
   }
+
+  // function SuBmenu(params) {
+  //  return Array.from(userMenus).map(Item =>
+  //  <Checkbox value={ Item.menuId }> { Item.name }</Checkbox>)
+  // }
   // const [tab, changeTab] = useState('basic')
 
   const Permission = [
@@ -51,80 +58,47 @@ const Edit = (props) => {
     '首页数据',
   ]
 
-  // const Basic = (props) => {
-
-  //   const dataSource = [
-
-
-  //     {
-  //       name: '员工管理',
-  //       per: [
-  //         '111111',
-  //         '22222',
-  //         '33333',
-  //       ]
-  //     },
-  //     {
-  //       name: '角色管理',
-  //       per: [
-  //         '444',
-  //         '555',
-  //         '666',
-  //       ]
-  //     },
-  //   ];
-
-  //   const columns = [
-  //     // {
-  //     //   title: '商品图片',
-  //     //   dataIndex: 'img',
-  //     //   key: 'img',
-  //     //   align: 'center',
-
-  //     //   render: (text, record) => <img src={record.img} className={channels.touxiang} />,
-  //     // },
-  //     {
-  //       title: '员工管理',
-  //       dataIndex: 'name',
-  //       key: 'name',
-  //       align: 'left',
-  //       render: text => <a>{text}</a>,
-  //     },
-
-  //     {
-  //       // title: '操作  ',
-  //       dataIndex: 'status',
-  //       key: 'per',
-  //       align: 'left',
-  //       render: () => <>
-  //         {/* {pre.map((item,index)=>(
-  //       <Checkbox>{item[index]}</Checkbox>
-
-
-  //               ))} */}
-  //       </>,
-  //     },
-  //   ];
-  //   return <Table dataSource={dataSource} columns={columns} />
-
-
+  const Poster = props => {
+    const [menus, setMenus] = useState([]);
+// 判断menus是否有值
+    const addMenus = m => setMenus([...menus, m]);
+    const delMenus = m => setMenus(menus.filter(x => x.menuId !== m.menuId));
+    const handleMenuChange = m => e => {
+      console.log('e', m)
+      if (e.target.checked) {
+        addMenus(m)
+      } else {
+        delMenus(m)
+      }
+      console.log('menus', menus)
+    }
 
+    const [but, setBut] = useState([]);
+    // 判断menus是否有值
+        const addBut = m => setBut([...but, m]);
+        const delBut = m => setBut(but.filter(x => x.menuId !== m.menuId));
+        const handleButChange = m => e => {
+          console.log('e', m)
+          if (e.target.checked) {
+            addBut(m)
+          } else {
+            delBut(m)
+          }
+          // console.log('menus', menus)
 
-  // }
-  // const [Card] = useState('Poster')
+          console.log('menus', menus)
+          console.log('but', but)
+        }
 
-  const Poster = props => {
 
     const dataSource = [
-
-
       {
         name: '员工管理',
         per: [
           '111111',
           '22222',
           '33333',
-        ]
+        ],
       },
       {
         name: '角色管理',
@@ -132,7 +106,7 @@ const Edit = (props) => {
           '444',
           '555',
           '666',
-        ]
+        ],
       },
     ];
 
@@ -144,45 +118,45 @@ const Edit = (props) => {
     const gridStyle2 = {
       width: '80%',
       textAlign: 'left',
+      height: '69px',
     };
 
-    {/* <Checkbox>{Permission[index]}</Checkbox> */ }
-    return <>
+    return (
+    <>
       <div style={{}}>
-      {Array.from(data).map(Item =>
-                <Checkbox value={ Item.menuId }> { Item.name } </Checkbox>,
-              )}
-        {Permission.map((item, index) => (
-          <Card title={<Checkbox>{Permission[index]}</Checkbox>} bordered={true} style={{ width: '100%' }}>
-            
-              {dataSource.map((items, indexs) => (
-              <>
-                <Card.Grid style={gridStyle1}><Checkbox value=''>{items.name}</Checkbox></Card.Grid>
-
-                <Card.Grid style={gridStyle2}>
-                  {items.per.map((itemss, indexss) => (
-                    <Checkbox value=''>{items.per[indexss]}</Checkbox>
-                  ))}
-                </Card.Grid>
-              </>
-            ))}
-
+        {/* { console.log('userMenus', userMenus) }
+        { console.log('userBtns', userBtns) } */}
+        {userMenus.map(item => (
+          (item.parentCode === '-1') &&
+          <Card title={<Checkbox onChange={handleMenuChange(item)}>{item.name}</Checkbox>} bordered style={{ width: '100%' }}>
+              {
+                   userMenus.map(menu => (
+
+                    (item.menuId === menu.menuRoot && item.menuId !== menu.menuId) &&
+                    <>
+                      <Card.Grid style={gridStyle1} >
+                          <Checkbox onChange={handleMenuChange(menu)}>{menu.name}</Checkbox>
+                      </Card.Grid>
+                      <Card.Grid style={gridStyle2}>
+                        {userBtns.map(btn => (
+                          <>
+                            {
+                              btn.menuId === menu.menuId &&
+                              <Checkbox onChange={handleButChange(btn)}>{btn.name}</Checkbox>
+                            }
+                          </>
+                        ))}
+                      </Card.Grid>
+                   </>
+                   ))
+              }
           </Card>
-
-
-
         ))}
       </div>
     </>
+    )
   }
 
-  const Share = (props) => {
-    return <div>Share</div>
-  }
-
-
-
-
   const fields = [
     {
       label: '角色名称',
@@ -191,9 +165,6 @@ const Edit = (props) => {
       // placeholder: '名称',
       value: ''
     },
-
-
-
     {
       label: '简介',
       name: 'roleIntroduction',
@@ -208,50 +179,25 @@ const Edit = (props) => {
       render:
         <>
           <div>
-
-            <Poster />
-
-            {/* <Radio.Group value={tab} defaultValue="1" buttonStyle="solid">
-             
-        <Checkbox>Checkbox</Checkbox>
-                {Permission.map((item,index)=>(
-                  <Radio.Button style={BottonStyle} value="{index}">{Permission[index]}</Radio.Button>
-                 
-                ))}
-            </Radio.Group>
-          
-          </div>
-          <div>
-             
-          <Table dataSource={Permission[index]} columns={columns} />
-           
-             */}
+            <Poster/>
           </div>
         </>,
-
-    }
-    // {
-    //   label: '状态',
-    //   name: 'roleState',
-    //   render: <Radio.Group>
-    //     <Radio.Button style={{background:'#f0f0f0'}} value="a">禁用</Radio.Button>
-    //     <Radio.Button style={{background:'#f0f0f0',color:'#ff7e48'}} value="b">启用</Radio.Button>
-    //   </Radio.Group>,
-    //   value: 'b'
-    // },
+    },
 
   ]
 
   const handleSubmit = val => {
     window.console.log('submit data --->', val)
+    request({
+      url: '/api/admin/menuList',
+      method: 'POST',
+      params: { ...params },
+  // eslint-disable-next-line no-shadow
+  }).then(data => {
+      console.log(data)
+      setData(data)
+  })
   }
   return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
-
-
-
-
 }
-
-
-
-export default Edit
+export default connect(({ user }) => ({ user }))(Edit);

src/pages/staff/list/editStaff.jsx

@@ -1,15 +1,19 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 
 import { Input, Menu, Dropdown, Button, Icon, message, Table, Tooltip, Tabs, Radio, Divider, Tag, Select, Form, Alert } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import router from 'umi/router';
 import styles from '../../style/GoodsList.less';
 import XForm, { FieldTypes } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
 import channels from './channelList.less';
-
 import Tagss from '../components/Tagss.jsx';
+import apis from '../../../services/apis';
+import request from '../../../utils/request'
 
 const { TextArea } = Input;
+const { Option } = Select;
 
 
 /**
@@ -19,113 +23,146 @@ const { TextArea } = Input;
  * @returns
  */
 const Edit = (props) => {
+  const userId = props.location.query.userId
+  const [userData, setUserData] = useState({})
+  const [tagData, setTagData] = useState([])
+
+  const getTagList = () => {
+    request({ ...apis.staff.taTags, params: {pageNum:1,pageSize:999} }).then((data) => {
+      setTagData(data.records)
+    })
+  }
+
+  // 查询列表
+  const getUserData = (userId) => {
+    request({ ...apis.staff.getTaUser, urlData: {id:userId} }).then((data) => {
+      console.log(data,"tauser")
+      setUserData(data)
+    })
+  }
+
+  useEffect(() => {
+    getTagList();
+    if (userId) {
+      getUserData(userId);
+    }
+  }, [])
+
+  const tagsChange = (value) => {
+    console.log(`selected ${value}`);
+  }
+
+  const handleSubmit = val => {
+    if(userId){
+      request({ ...apis.staff.updateTaUser, urlData: {id:userId},data: val, }).then((data) => {
+        console.log(data,"tauser")
+        message.info("保存成功")
+        router.go(-1)
+      })
+    }else{
+      request({ ...apis.staff.addTaUser, data: val, }).then((data) => {
+        console.log(data,"tauser")
+        message.info("保存成功")
+        router.go(-1)
+      })
+    }
+  }
 
   const fields = [
     {
       label: '名称',
-      name: 'staffName',
+      name: 'userName',
       type: FieldTypes.Text,
-      // placeholder: '名称',
-      value: ''
+      value: userData.userName
     },
     {
       label: '公司',
-      name: 'staffCompany',
+      name: 'orgName',
       type: FieldTypes.Text,
       placeholder: '请输入公司名称',
-      value: ''
+      value: userData.orgName
     },
     {
       label: '部门',
-      name: 'staffDepartment',
+      name: 'department',
       type: FieldTypes.Text,
       placeholder: '请输入部门',
-      value: ''
+      value: userData.department
     },
     {
       label: '职位',
-      name: 'staffPosition',
+      name: 'position',
       type: FieldTypes.Text,
       placeholder: '请输入职位',
-      value: ''
+      value: userData.position
     },
     {
       label: '电话',
-      name: 'staffTel',
+      name: 'phone',
       type: FieldTypes.Text,
       placeholder: '请输入电话号码',
-      value: ''
-      // rules: [
-      //   { message: '请输入电话号码'}
-      // ]
+      value: userData.phone,
     },
     {
       label: '标签',
-      name: 'staffTag',
-      render: 
-      <Tagss/>
-     
-   
+      name: 'taTags',
+      render: <Select
+                mode="multiple"
+                style={{ width: '100%' }}
+                placeholder="请选择标签"
+                onChange={tagsChange} >
+                  {tagData.map(item => (
+                    <Select.Option key={item.tagId} value={item.tagId}>
+                      {item.tagName}
+                    </Select.Option>
+                  ))}
+              </Select>,
+      value: userData.taTags,
     },
     {
       label: '地址',
-      name: 'staffAddress',
+      name: 'address',
       type: FieldTypes.Text,
       placeholder: '请输入地址',
-      value: ''
+      value: userData.address
 
     },
     {
       label: '授权项目',
-      name: 'staffProject',
-      type: FieldTypes.Select,
-      placeholder: '请选择',
-      value: ''
+      name: 'buildingId',
+      render: <BuildSelect />,
+      value: userData.buildingId
     },
-
-    // {
-    //   label: '授权项目',
-    //   name: 'staffProject',
-    //   type: FieldTypes.Text,
-    //   placeholder: '请选择'
-    // },
-
     {
       label: '图片',
-      name: 'staffImage',
+      name: 'photo',
       type: FieldTypes.ImageUploader,
       extra: '建议图片大小 640 * 640',
-      value: ''
+      value: userData.photo
     },
 
 
     {
       label: '简介',
-      name: 'staffIntroduction',
+      name: 'description',
       render: <TextArea className={channels.inpuitTxt} ></TextArea>,
-      value: ''
+      value: userData.description
 
     },
     {
       label: '状态',
-      name: 'staffstate',
+      name: 'status',
       render: <Radio.Group>
-        <Radio.Button style={{background:'#f0f0f0'}} value="a">禁用</Radio.Button>
-        <Radio.Button style={{background:'#f0f0f0',color:'#ff7e48'}} value="b">启用</Radio.Button>
+        <Radio.Button style={{background:'#f0f0f0'}} value="0">禁用</Radio.Button>
+        <Radio.Button style={{background:'#f0f0f0',color:'#ff7e48'}} value="1">启用</Radio.Button>
       </Radio.Group>,
-      value: 'b'
+      value: null != userData.status ? userData.status : '1'
     },
-
   ]
 
-  const handleSubmit = val => {
-    window.console.log('submit data --->', val)
-  }
-  return <XForm onSubmit={handleSubmit} fields={fields} push={8}></XForm>
-
-
-
+  console.log('--------->', fields)
 
+  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
 }
 
 

src/pages/staff/list/style.less

@@ -11,78 +11,70 @@
   border: 1px solid #dbdbdb;
 }
 
-.addButton {
-  // background: #50be00;
-  border-radius: 4px;
-  border: 0px;
-  margin: 10px 0px;
-}
 
 .card {
-  width: 348px;
-  height: 244px;
+  min-width: 240px;
+  margin-right: 0.1rem;
+  height: 240px;
   background: rgba(255, 255, 255, 1);
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
   border-radius: 12px;
   margin-bottom: 40px;
-
+  position: relative;
+  
 }
 
 .cardText {
-
-  height: 28px;
-  font-size: 20px;
-  font-weight: 400;
+  font-size: 0.12rem;
   color: rgba(102, 102, 102, 1);
-  line-height: 28px;
-  margin-top: 10px;
-  margin-bottom: 0;
-
+  position: absolute;
+  bottom:0.28rem;
+}
+.statusText {
+  font-size: 0.12rem;
+  color: rgba(102, 102, 102, 1);
+  position: absolute;
+  bottom:0.28rem;
+  right: 20px;
+}
+.phoneText{
+  font-size: 0.12rem;
+  color: rgba(102, 102, 102, 1);
+  position: absolute;
+  bottom:0.05rem;
 }
 
 .cardItem {
-  font-size: 18px;
-  font-weight: 400;
   color: #666;
-  line-height: 24px;
   display: flex;
   align-items: center;
+  line-height: 1.5;
+  font-size: 0.11rem;
+  margin-bottom: 0.08rem;
 }
 
-.ediText {
-  width: 36px;
-  height: 25px;
-  font-size: 18px;
-
-  font-weight: 400;
-  color: rgba(255, 146, 92, 1);
-  line-height: 25px;
-
-}
 
 .cardTag {
-  height: 18px;
   font-size: 10px;
-  // background: #fdce22;
   border-radius: 4px;
   color: #ffffff;
-  line-height: 14px;
+  line-height: 16px;
   margin-top: 10px;
   padding: 1px 3px;
+
 }
 
 .title {
   display: inline-block;
-  width: 84px;
+  width:  0.54rem;
   justify-content: space-between;
   text-align: justify;
-  text-align-last: justify
+  text-align-last: justify;
 }
 
 
 .roletext {
   font-size: 20px;
-
   font-weight: 400;
   color: rgba(51, 51, 51, 1);
   line-height: 28px;

src/pages/system/editPolicy.jsx

@@ -8,6 +8,7 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 import SelectCity from '../../components/SelectButton/CitySelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -27,10 +28,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   // 查询列表
   const getPolicyData = (policyId) => {
-    request({
-        url: '/api/admin/taPolicy/' + policyId,
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.system.taPolicy, urlData: {id: policyId} }).then((data) => {
         console.log(data)
         setPolicyData(data)
     })
@@ -80,22 +78,14 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       console.log('submit data --->', val)
       if(policyId){
         val.policyId = policyId
-        request({
-          url: '/api/admin/taPolicy/'+policyId,
-          method: 'PUT',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.system.updateTaPolicy, urlData: {id: policyId},data: val, }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       }else{
-        request({
-          url: '/api/admin/taPolicy',
-          method: 'POST',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.system.addTaPolicy,data: val, }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {

src/pages/system/housingPolicy.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 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'
 
 const { Option } = Select;
@@ -21,11 +21,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taPolicy',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.system.getTaPolicy, params: { ...params }, }).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -104,10 +100,7 @@ const deletePolicy = (policyId) => () => {
     okText: '确定',
     cancelText: '取消',
     onOk() {
-        request({
-            url: '/api/admin/taPolicy/'+policyId,
-            method: 'DELETE',
-        }).then((data) => {
+        request({ ...apis.system.deleteTaPolicy, urlData: {id: policyId }, }).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10,cityId: '' });
         }).catch((err) => {
@@ -123,11 +116,7 @@ const deletePolicy = (policyId) => () => {
   const topPolicy = (row) => () => {
       const weight = Math.abs(row.weight - 1)
       row.weight = weight
-      request({
-          url: '/api/admin/taPolicy/'+row.policyId,
-          method: 'PUT',
-          data: row,
-      }).then((data) => {
+      request({ ...apis.system.updateTaPolicy, urlData: {id: row.policyId},data: row, }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10,cityId: '' });
@@ -144,11 +133,7 @@ const deletePolicy = (policyId) => () => {
         row.publishStatus = 1
       }
 
-      request({
-        url: '/api/admin/taPolicy/'+row.policyId,
-        method: 'PUT',
-        data: row,
-      }).then((data) => {
+      request({ ...apis.system.updateTaPolicy, urlData: {id: row.policyId},data: row, }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10,cityId: '' });

src/pages/system/intention.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 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 SelectCity from '../../components/SelectButton/CitySelect'
 
@@ -23,11 +24,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   const changBuilding = (buildingId) => {
     setBuildingIdData(buildingId)
-    request({
-      url: '/api/admin/tdBizEventIntention',
-      method: 'GET',
-      params: {pageNum: 1, pageSize: 999,buildingId}
-    }).then((data) => {
+    request({ ...apis.system.tdBizEventIntention, params: {pageNum: 1, pageSize: 999,buildingId}}).then((data) => {
       console.log(data)
       setData(data.records)
     })
@@ -50,11 +47,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     if(buildingIdValue === ''){
       return
     }
-    request({
-      url: '/api/admin/taBuildingIntentionAddOrUpdate/' + buildingIdValue,
-      method: 'POST',
-      data
-    }).then((data) => {
+    request({ ...apis.system.taBuildingIntentionAddOrUpdate, urlData: {id: buildingIdValue}, data,}).then((data) => {
       message.info("保存成功")
     })
   }
@@ -66,8 +59,8 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
         <BuildSelect onChange={changBuilding}/>
       </Col>
     </Row>
-    <Row>
-      <Col span={3} offset={3}>
+    <Row style={{margin:'10px 0'}}>
+      <Col span={5} offset={2}>
         用户操作
       </Col>
       <Col span={3} offset={3}>
@@ -76,7 +69,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     </Row>
     {data.map((x) => {
       return <Row>
-                <Col span={3} offset={3}>
+                <Col span={5} offset={2}>
                   <Checkbox checked={x.checkbox} onChange={changeBox(x)}>{x.eventName}</Checkbox>
                 </Col>
                 <Col span={3} offset={3}>

src/pages/system/messageList.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 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'
 
 const { Option } = Select;
@@ -22,11 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taCustomerMessage',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.system.taCustomerMessage, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })

src/pages/system/report.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 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'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -27,19 +28,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   // 查询数据
   const getReportList = () => {
-    request({
-        url: '/api/admin/tdReports',
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.system.tdReports, }).then((data) => {
         setData((data.records || []).map(x => ({label: x.reportName, value: x.reportCode}) ))
     })
   }
 
   const getCheckedList = () => {
-    request({
-      url: '/api/admin/taBuildingReports',
-      method: 'GET',
-    }).then((data) => {
+    request({ ...apis.system.taBuildingReports, }).then((data) => {
       setCheckData((data.records || []).map((x) => x.reportCode))
     })
   }
@@ -51,11 +46,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   const saveCheckedReport = () => {
     console.log(checkData)
-    request({
-      url: '/api/admin/taBuildingReport/add',
-      method: 'POST',
-      data: {list: checkData}
-    }).then((data) => {
+    request({ ...apis.system.addTaBuildingReports, data: {list: checkData}}).then((data) => {
       message.info("保存成功")
     })
   }

src/pages/user/login/components/Login/index.jsx

@@ -118,7 +118,7 @@ class Login extends Component {
           <div className={styles.con}>
             <p className={styles.welcome}>Welcome</p>
             <div className={styles.title}>
-              <span style={{fontSize:'18px',lineHeight:'18px'}}>ying xiao yun</span>
+              <span style={{fontSize:' 0.11rem',lineHeight:' 0.11rem'}}>ying xiao yun</span>
               <p className={styles.name}>营销云·系统</p>
             </div>
           </div>

src/pages/user/login/components/Login/index.less

@@ -38,11 +38,11 @@ position: relative;
 }
 .login {
   background-color: #fff;
-  width:580px;
-  height:480px;
-  padding:120px 50px;
+  width:100%;
+  height:58vh;
   border-radius:0px 30px 30px 0px;
   margin: 0 auto;
+  padding: 10vh 0;
   :global {
     .ant-tabs .ant-tabs-bar {
       margin-bottom: 24px;
@@ -52,6 +52,13 @@ position: relative;
     .ant-form-item {
       margin: 0 2px 24px;
     }
+    .ant-input-affix-wrapper,.ant-form-item-control{ 
+      width: 36vw;
+      max-width: 600px;
+      min-width: 200px;
+      margin: 0 auto;
+      display: block;
+      }
   }
 
   .getCaptcha {
@@ -84,7 +91,7 @@ position: relative;
 
   .prefixIcon {
     color: #fff;
-    font-size: 18px;
+    font-size:  0.11rem;
     background-color: #EF273A;
     padding: 3px 4px;
   }

src/pages/user/login/index.jsx

@@ -91,9 +91,7 @@ class Login extends Component {
         >
           <UserName
             name="loginName"
-            placeholder={`${formatMessage({
-              id: 'user-login.login.userName',
-            })}: admin or user`}
+            placeholder="请输入用户名"
             rules={[
               {
                 required: true,
@@ -105,9 +103,7 @@ class Login extends Component {
           />
           <Password
             name="loginPassword"
-            placeholder={`${formatMessage({
-              id: 'user-login.login.password',
-            })}: ant.design`}
+            placeholder="请输入密码"
             rules={[
               {
                 required: true,

src/pages/user/login/style.less

@@ -4,7 +4,7 @@
   // width: 368px;
   margin: 0 auto;
   @media screen and (max-width: @screen-sm) {
-    width: 95%;
+    width: 100%;
   }
 
   .icon {

src/services/apis.js

@@ -2,147 +2,189 @@ const prefix = '/api/admin'
 
 export default {
   image: {
-    upload: {
+    uploadForAnt: {
       url: `${prefix}/antd/image`,
       method: 'POST',
-    }
+    },
+    upload: {
+      url: `${prefix}/image`,
+      method: 'POST',
+    },
   },
   user: {
     current: {
       method: 'GET',
       url: `${prefix}/taUser/current`,
+      action: 'admin.taUser.current.get',
     },
     signin: {
       method: 'POST',
       url: `${prefix}/taUser/signin`,
+      login: true,
+      action: 'admin.taUser.signin.post',
     },
     signout: {
       method: 'POST',
       url: `${prefix}/taUser/signout`,
+      logout: true
     },
   },
   building: {
     getList: {
       method: 'GET',
       url: `${prefix}/buildinglist`,
+      action: 'admin.buildinglist.get',
     },
     updateStatus: {
       method: 'PUT',
       url: `${prefix}/building/update/status`,
+      action: 'admin.building.update.status.put',
     },
     addBuilding: {
       method: 'POST',
       url: `${prefix}/building/add`,
+      action: 'admin.building.add.post',
+    },
+    updateBuilding: {
+      method: 'PUT',
+      url: `${prefix}/building/update`,
+      action: 'admin.building.update.put',
     },
     buildingGetById: {
       method: 'GET',
       url: `${prefix}/buildingSelectId/id`,
+      action: 'admin.buildingSelectId.id.get',
     },
     deleteBuilding: {
       method: 'DELETE',
       url: `${prefix}/building/delete/id`,
+      action: 'admin.building.delete.id.delete',
     },
     buildingApartment: {
       method: 'GET',
       url: `${prefix}/buildingApartment/buildingId/id`,
+      action: 'admin.buildingApartment.buildingId.id.get',
     },
     buildingApartmentGetById: {
       method: 'GET',
       url: `${prefix}/buildingApartment/id`,
+      action: 'admin.buildingApartment.id.get',
     },
     buildingApartmentUpdate: {
       method: 'PUT',
       url: `${prefix}/buildingApartment/update`,
+      action: 'admin.buildingApartment.update.put',
     },
     buildingApartmentAdd: {
       method: 'POST',
       url: `${prefix}/buildingApartment/add`,
+      action: 'admin.buildingApartment.add.post',
     },
     buildingApartmentDelete: {
       method: 'DELETE',
       url: `${prefix}/apartment/deleted/id`,
+      action: 'admin.apartment.deleted.id.delete',
     },
   },
   buildingType: {
     getList: {
       method: 'GET',
       url: `${prefix}/tdBuildingType`,
+      action: 'admin.tdBuildingType.get',
     },
     delete: {
       method: 'DELETE',
       url: `${prefix}/tdBuildingType/id`,
+      action: 'admin.tdBuildingType.id.delete',
     },
     update: {
       method: 'PUT',
       url: `${prefix}/tdBuildingType/id`,
+      action: 'admin.tdBuildingType.id.put',
     },
     add: {
       method: 'POST',
       url: `${prefix}/tdBuildingType`,
+      action: 'admin.tdBuildingType.post',
     },
     getById: {
       method: 'GET',
       url: `${prefix}/tdBuildingType/id`,
+      action: 'admin.tdBuildingType.id.get',
     },
   },
   news: {
     getList: {
       method: 'GET',
       url: `${prefix}/taNews`,
+      action: 'admin.taNews.get',
     },
   },
   customer: {
     drift: {
       method: 'GET',
       url: `${prefix}/customer/recommend/drift`,
+      action: 'admin.customer.recommend.drift.get',
     },
     report: {
       method: 'GET',
       url: `${prefix}/customer/recommend/report`,
+      action: 'admin.customer.recommend.report.get',
     },
     recommender: {
       method: 'GET',
       url: `${prefix}/customer/recommend/recommender`,
+      action: 'admin.customer.recommend.recommender.get',
     },
     auto: {
       method: 'PUT',
       url: `${prefix}/customer/recommend/verify/id`,
+      action: 'admin.customer.recommend.verify.id.put',
     },
     recommendGetById: {
       method: 'GET',
       url: `${prefix}/customer/recommend/getById/id`,
+      action: 'admin.customer.recommend.getById.id.get',
     },
     agents: {
       method: 'GET',
       url: `${prefix}/customer/agents`,
+      action: 'admin.customer.agents.get',
     },
     customerRecommend: {
       method: 'GET',
       url: `${prefix}/customer/recommend`,
+      action: 'admin.customer.recommend.get',
     },
     consultant: {
       method: 'GET',
       url: `${prefix}/consultant`,
+      action: 'admin.consultant.get',
     },
     recommendEdit: {
       method: 'PUT',
       url: `${prefix}/customer/recommend/edit/id`,
+      action: 'admin.customer.recommend.edit.id.put',
     },
     taPointsRecords: {
       method: 'GET',
       url: `${prefix}/mine/taPointsRecords/id`,
+      action: 'admin.mine.taPointsRecords.id.get',
     },
     recommend: {
       method: 'GET',
       url: `${prefix}/customer/recommend/id`,
+      action: 'admin.customer.recommend.id.get',
     },
     InviteClientsList: {
       method: 'GET',
       url: `${prefix}/channel/InviteClientsList`,
+      action: 'admin.channel.InviteClientsList.get',
     },
     CustomerRecommendGet: {
       method: 'GET',
       url: `${prefix}/customer/recommend/get/id`,
+      action: 'admin.customer.recommend.get.id.get',
     },
   },
   indexEcharts: {
@@ -181,49 +223,320 @@ export default {
       url: `${prefix}/selectIntentionUser`
     },
 
-  }
-  // indexEcharts:{
-  //   list:{
-  //     method:'get',
-  //     url: `${commPrefix}/indexStatistical`
-  //   },
-  //   userResource: {
-  //       method:'get',
-  //       url: `${commPrefix}/selectUserResource`
-  //   },
-  //   userConversion: {
-  //     method:'get',
-  //     url: `${commPrefix}/selectConversion`
-  //   },
-  //   userActive: {
-  //     method:'get',
-  //     url: `${commPrefix}/selectActiveUserCount`
-  //   },
-  //   newUser: {
-  //     method:'get',
-  //     url: `${commPrefix}/selectNewsUserCount`
-  //   },
-  //   userBehavior: {
-  //     summary: {
-  //       method:'get',
-  //       url: `${commPrefix}/selectUserBehavior`
-  //     },
-  //     profile: {
-  //       method:'get',
-  //       url: `${commPrefix}/selectEventAll`
-  //     },
-  //   },
-  //   intentionUsers: {
-  //     method:'get',
-  //     url: `${commPrefix}/selectIntentionUser`
-  //   },
-  //   userSex: {
-  //     method:'get',
-  //     url: `${commPrefix}/selectSexUser`
-  //   },
-  //   userCity: {
-  //     method:'get',
-  //     url: `${commPrefix}/selectCityUser`
-  //   },
-  // },
+    userCity: {
+      method:'get',
+      url: `${prefix}/selectCityUser`,
+      action: 'admin.selectCityUser.get'
+    },
+
+  },
+  activity: {
+      list: {
+        method: 'GET',
+        url: `${prefix}/iBuildingDynamicList`,
+        action: 'admin.iBuildingDynamicList.get',
+      },
+      weight: {
+        method: 'PUT',
+        url: `${prefix}/buildingDynamic/weight`,
+        action: 'admin.buildingDynamic.weight.put',
+      },
+      cancel: {
+        method: 'PUT',
+        url: `${prefix}/buildingDynamic/cancel/:id`,
+        action: 'admin.buildingDynamic.cancel.dynamicId.put'
+      },
+      send: {
+        url: `${prefix}/buildingDynamic/send/:id`,
+        method: 'PUT',
+        action: 'admin.buildingDynamic.send.dynamicId.put'
+      },
+      finish: {
+        url: `${prefix}/buildingDynamic/finish`,
+        method: 'PUT',
+        action: 'admin.buildingDynamic.finish.put'
+      },
+      details: {
+        url: `${prefix}/buildingDynamic/Details`,
+        method: 'GET',
+        action: 'admin.buildingDynamic.Details.get',
+      },
+      update: {
+        url: `${prefix}/buildingDynamic/update`,
+        method: 'PUT',
+        action: 'admin.buildingDynamic.update.put',
+      },
+      add: {
+        url: `${prefix}/buildingDynamic/add`,
+        method: 'POST',
+        action: 'admin.buildingDynamic.add.post',
+      },
+      poster: {
+        url: `${prefix}/poster`,
+        method: 'GET',
+        action: 'admin.poster.get',
+      },
+      updatePoster: {
+        url: `${prefix}/poster/:id`,
+        method: 'PUT',
+        action: 'admin.poster.id.put',
+      },
+      addPoster: {
+        url: `${prefix}/poster`,
+        method: 'POST',
+        action: 'admin.poster.post',
+      },
+      shareContent: {
+        url: `${prefix}/shareContent`,
+        method: 'GET',
+        action: 'admin.shareContent.get',
+      },
+      updateShareContent: {
+        url: `${prefix}/shareContent/:id`,
+        method: 'PUT',
+        action: 'admin.shareContent.id.put',
+      },
+      addShareContent: {
+        url: `${prefix}/shareContent`,
+        method: 'POST',
+        action: 'admin.shareContent.post',
+      },
+      signList: {
+        url: `${prefix}/SignList`,
+        method: 'GET',
+        action: 'admin.SignList.get',
+      }
+  },
+  integralMall: {
+    tdPointsRules: {
+      url: `${prefix}/tdPointsRules`,
+      method: 'GET',
+      action: 'admin.tdPointsRules.get',
+    },
+    change: {
+      url: `${prefix}/tdPointsRules/change`,
+      method: 'PUT',
+      action: 'admin.tdPointsRules.change.put',
+    },
+    taGoods: {
+      url: `${prefix}/taGoods/:id`,
+      method: 'GET',
+      action: 'admin.taGoods.id.get',
+    },
+    updateTaGoods: {
+      url: `${prefix}/taGoods`,
+      method: 'PUT',
+      action: 'admin.taGoods.put',
+    },
+    addTaGoods: {
+      url: `${prefix}/taGoods/add`,
+      method: 'POST',
+      action: 'admin.taGoods.add.post',
+    },
+    taPointsExchange: {
+      url: `${prefix}/taPointsExchange`,
+      method: 'GET',
+      action: 'admin.taPointsExchange.get',
+    },
+    getTaGoods: {
+      url: `${prefix}/taGoods`,
+      method: 'GET',
+      action: 'admin.taGoods.get',
+    },
+    changeTaGoods: {
+      url: `${prefix}/taGoods/change`,
+      method: 'PUT',
+      action: 'admin.taGoods.change.put',
+    },
+    changeTaPointsExchange: {
+      url: `${prefix}/taPointsExchange/change`,
+      method: 'PUT',
+      action: 'admin.taPointsExchange.change.put',
+    }
+  },
+  carsuseFigure: {
+    extendContent: {
+      url: `${prefix}/extendContent`,
+      method: 'GET',
+      action: 'admin.extendContent.get',
+    },
+    finish: {
+      url: `${prefix}/buildingDynamic/finish`,
+      method: 'PUT',
+      action: 'admin.buildingDynamic.finish.put',
+    },
+    updataExtendContent: {
+      url: `${prefix}/extendContent/:id`,
+      method: 'PUT',
+      action: 'admin.extendContent.id.put',
+    },
+    getExtendContent: {
+      url: `${prefix}/extendContent/:id`,
+      method: 'GET',
+      action: 'admin.extendContent.id.get',
+    },
+    addExtendContent: {
+      url: `${prefix}/extendContent`,
+      method: 'POST',
+      action: 'admin.extendContent.post',
+    }
+  },
+  system: {
+    taPolicy: {
+      url: `${prefix}/taPolicy/:id`,
+      method: 'GET',
+      action: 'admin.taPolicy.id.get',
+    },
+    updateTaPolicy: {
+      url: `${prefix}/taPolicy/:id`,
+      method: 'PUT',
+      action: 'admin.taPolicy.id.put',
+    },
+    addTaPolicy: {
+      url: `${prefix}/taPolicy`,
+      method: 'POST',
+      action: 'admin.taPolicy.post',
+    },
+    getTaPolicy: {
+      url: `${prefix}/taPolicy`,
+      method: 'GET',
+      action: 'admin.taPolicy.get',
+    },
+    deleteTaPolicy: {
+      url: `${prefix}/taPolicy/:id`,
+      method: 'DELETE',
+      action: 'admin.taPolicy.id.delete',
+    },
+    tdBizEventIntention: {
+      url: `${prefix}/tdBizEventIntention`,
+      method: 'GET',
+      action: 'admin.tdBizEventIntention.get',
+    },
+    taBuildingIntentionAddOrUpdate: {
+      url: `${prefix}/taBuildingIntentionAddOrUpdate/:id`,
+      method: 'POST',
+      action: 'admin.taBuildingIntentionAddOrUpdate.buildingId.post',
+    },
+    taCustomerMessage: {
+      url: `${prefix}/taCustomerMessage`,
+      method: 'GET',
+      action: 'admin.taCustomerMessage.get',
+    },
+    tdReports: {
+      url: `${prefix}/tdReports`,
+      method: 'GET',
+      action: 'admin.tdReports.get',
+    },
+    taBuildingReports: {
+      url: `${prefix}/taBuildingReports`,
+      method: 'GET',
+      action: 'admin.taBuildingReports.get',
+    },
+    addTaBuildingReports: {
+      url: `${prefix}/taBuildingReport/add`,
+      method: 'POST',
+      action: 'admin.taBuildingReport.add.post',
+    }
+  },
+  staff: {
+    taUser: {
+      url: `${prefix}/taUser`,
+      method: 'GET',
+      action: 'admin.taUser.get',
+    },
+    taTags: {
+      url: `${prefix}/taTags`,
+      method: 'GET',
+      action: 'admin.taTags.get',
+    },
+    getTaUser: {
+      url: `${prefix}/taUser/:id`,
+      method: 'GET',
+      action: 'admin.taUser.id.get',
+    },
+    updateTaUser: {
+      url: `${prefix}/taUser/:id`,
+      method: 'PUT',
+      action: 'admin.taUser.id.put',
+    },
+    addTaUser: {
+      url: `${prefix}/taUser`,
+      method: 'POST',
+      action: 'admin.taUser.post',
+    },
+    change: {
+      url: `${prefix}/turn/taUser/:id/:type`,
+      method: 'PUT',
+      action: 'admin.turn.taUser.put',  
+    },
+  },
+  channelList: {
+    getList: {
+      url: `${prefix}/channel`,
+      method: 'GET',
+      action: 'admin.channel.get',
+    },
+    addChannel: {
+      url: `${prefix}/channel`,
+      method: 'POST',
+      action: 'admin.channel.post',
+    },
+    getById: {
+      url: `${prefix}/channel/:id`,
+      method: 'GET',
+      action: 'admin.channel.id.get',
+    },
+    editChannel: {
+      url: `${prefix}/channel/:id`,
+      method: 'PUT',
+      action: 'admin.channel.id.put',
+    },
+    getListBroker: {
+      url: `${prefix}/channel/broker`,
+      method: 'GET',
+      action: 'admin.channel.broker.get',
+    },
+    getListRecommend: {
+      url: `${prefix}/customer/recommend/:id`,
+      method: 'GET',
+      action: 'admin.customer.recommend.id.get',
+    },
+    getListInvite: {
+      url: `${prefix}/channel/InviteClientsList`,
+      method: 'GET',
+      action: 'admin.InviteClientsList.get',
+    },
+ },
+ role: {
+  getRoleList: {
+    url: `${prefix}/taRole`,
+    method: 'GET',
+    action: 'admin.taRole.get',
+  },
+  stop: {
+    url: `${prefix}/taRole/stop/:id`,
+    method: 'PUT',
+    action: 'admin.taRole.stop.id.PUT',
+  },
+  menuList: {
+    url: `${prefix}/menuList`,
+    method: 'GET',
+    action: 'admin.menuList.get',
+  },
+  buttonList: {
+    url: `${prefix}/buttonList`,
+    method: 'GET',
+    action: 'admin.buttonList.get',
+  },
+  buttonAndMenuList: {
+    url: `${prefix}/taRole/details/:id`,
+    method: 'GET',
+    action: 'admin.taRole.details.id.get'
+  },
+  updateAuthMenu: {
+    url: `${prefix}/updateAuthMenu`,
+    method: 'POST',
+    action: 'admin.updateAuthMenu.post',
+  },
+ },
 }

src/utils/mixStr.js

@@ -12,7 +12,7 @@ const fill2Len = (str, len) => {
   return str.repeat(Math.floor(len / orginLen)) + str.substr(0, len % orginLen)
 }
 
-const mixChars = window.navigator.userAgent + (new Date).toUTCString().replace(/\d{2}:\d{2}:\d{2}/, '')
+const mixChars = window.navigator.userAgent // + (new Date).toUTCString().replace(/\d{2}:\d{2}:\d{2}/, '')
 
 const strXOR = (str, mix) => {
   if (!str) return str

src/utils/request.js

@@ -33,15 +33,17 @@ const replaceURLParams = (url, params = {}) => {
 }
 
 request.interceptors.request.use((url, options) => {
-  const { urlData, headers = {}, logout = false, data, ...opts } = options
+  const { urlData, headers = {}, logout = false, login = false, action, data, ...opts } = options
   const apiURL = urlData ? replaceURLParams(url, urlData) : url
   const token = mixStr(window.localStorage.getItem('test-foobar'))
-  const authHeader = token ? { Authorization: `Bearer ${token}` } : {}
 
-  if (logout) {
+  if (login || logout) {
     window.localStorage.removeItem('test-foobar')
   }
 
+  const authHeader = !login ? { Authorization: `Bearer ${token}` } : {}
+  const actionHeader = action ? { 'X-ACTION': action  }: {}
+
   return (
     {
       url: apiURL,
@@ -49,6 +51,7 @@ request.interceptors.request.use((url, options) => {
         ...opts,
         headers: {
           ...authHeader,
+          ...actionHeader,
           ...headers,
         },
         data,

src/utils/upload.js

@@ -1,11 +1,39 @@
-import apis from '../services/apis';
+import { fetch, apis } from './request';
+import mixStr from './mixStr';
+
+const getToken = () => mixStr(window.localStorage.getItem('test-foobar'))
+
+const uploadImage = fetch(apis.image.upload)
 
 const uploaderProps = {
   name: 'file',
-  action: apis.image.upload.url,
-  headers: {
-    Authorization: `Bearer ${window.localStorage.getItem('x-token')}`
-  }
+  // action: apis.image.uploadForAnt.url,
+  accept: '.png, .jpg, .jpeg, .gif',
+  // headers: {
+  //   Authorization: `Bearer ${getToken()}`
+  // },
+  customRequest({
+    action,
+    file,
+    headers,
+    onError,
+    onProgress,
+    onSuccess,
+    withCredentials,
+  }) {
+    const data = new FormData()
+    data.append('file', file)
+
+    uploadImage({ data }).then((img) => {
+      onSuccess(img, file);
+    }).catch(onError);
+
+    return {
+      abort() {
+        console.log('upload progress is aborted.');
+      },
+    };
+  },
 }
 
 export { uploaderProps }