编辑项目-项目类型

config/config.js

@@ -124,7 +124,8 @@ export default {
                 },
                 {
                   path: '/building/list/add',
-                  name: '', // 项目添加
+                  name: '项目添加', // 项目添加
+                  hideInMenu: true,
                   component: './building/list/add/index',
                 },
                 {
@@ -134,7 +135,8 @@ export default {
                 },
                 {
                   path: '/building/type/edi',
-                  name: '',
+                  name: '项目类型编辑',
+                  hideInMenu: true,
                   component: './building/type/edi',
                 },
               ],
@@ -151,7 +153,8 @@ export default {
                 },
                 {
                   path: '/customer/customerlist/customerDetail',
-                  name: '',
+                  name: '客户编辑',
+                  hideInMenu: true,
                   component: './customer/customerlist/customerDetail',
                 },
                 {
@@ -171,7 +174,8 @@ export default {
                 },
                 {
                   path: '/customer/recommendCustomer/audit',
-                  name: '', //审核
+                  name: '客户审核', 
+                  hideInMenu: true,
                   component: './customer/recommendCustomer/audit',
                 },
                 {
@@ -198,7 +202,8 @@ export default {
                 },
                 {
                   path: '/integralMall/editGoods',
-                  name: '',
+                  name: '商品编辑',
+                  hideInMenu: true,
                   component: './integralMall/editGoods',
                 },
                 {
@@ -213,7 +218,8 @@ export default {
                 },
                 {
                   path: '/integralMall/verifyList',
-                  name: '',
+                  name: '商品核销列表',
+                  hideInMenu: true,
                   component: './integralMall/verifyList',
                 },
               ],
@@ -230,12 +236,14 @@ export default {
                 },
                 {
                   path: '/channel/addChannel',
-                  name: '',
+                  name: '添加渠道',
+                  hideInMenu: true,
                   component: './channel/addChannel',
                 },
                 {
                   path: '/channel/editChannel',
-                  name: '',
+                  name: '编辑渠道',
+                  hideInMenu: true,
                   component: './channel/editChannel',
                 },
                 {
@@ -245,12 +253,14 @@ export default {
                 },
                 {
                   path: '/channel/recommendClients',
-                  name: '',
+                  name: '渠道推荐',
+                  hideInMenu: true,
                   component: './channel/recommendClients',
                 },
                 {
                   path: '/channel/InviteClients',
-                  name: '',
+                  name: '邀请客户',
+                  hideInMenu: true,
                   component: './channel/InviteClients',
                 },
               ],
@@ -267,7 +277,8 @@ export default {
                 },
                 {
                   path: '/news/type/editNews',
-                  name: '',
+                  name: '编辑资讯类型',
+                  hideInMenu: true,
                   component: './news/type/editNews',
                 },
                 {
@@ -277,7 +288,8 @@ export default {
                 },
                 {
                   path: '/news/list/editNewsList',
-                  name: '',
+                  name: '编辑资讯',
+                  hideInMenu: true,
                   component: './news/list/editNewsList',
                 },
               ],
@@ -294,12 +306,14 @@ export default {
                 },
                 {
                   path: '/activity/editActivity',
-                  name: '',
+                  name: '编辑活动',
+                  hideInMenu: true,
                   component: './activity/editActivity',
                 },
                 {
                   path: '/activity/SignList',
-                  name: '',
+                  name: '报名列表',
+                  hideInMenu: true,
                   component: './activity/SignList',
                 },
               ],
@@ -316,7 +330,8 @@ export default {
                 },
                 {
                   path: '/staff/editStaff',
-                  name: '',
+                  name: '编辑员工',
+                  hideInMenu: true,
                   component: './staff/list/editStaff',
                 },
 
@@ -327,10 +342,16 @@ export default {
                 },
                 {
                   path: '/staff/editRole',
-                  name: '',
+                  name: '编辑角色',
+                  hideInMenu: true,
                   component: './staff/list/editRole',
                 },
-
+                {
+                  path: '/staff/list/addRole',
+                  name: '添加角色',
+                  hideInMenu: true,
+                  component: './staff/list/addRole',
+                },  
               ],
             },
             {
@@ -345,7 +366,8 @@ export default {
                 },
                 {
                   path: '/carouselFigure/editCarousel',
-                  name: '',
+                  name: '轮播图编辑',
+                  hideInMenu: true,
                   component: './carouselFigure/editCarousel',
                 },
                 {
@@ -355,7 +377,8 @@ export default {
                 },
                 {
                   path: '/carouselFigure/editAdvertising',
-                  name: '',
+                  name: '开屏广告编辑',
+                  hideInMenu: true,
                   component: './carouselFigure/editAdvertising',
                 },
               ],
@@ -387,7 +410,8 @@ export default {
                 },
                 {
                   path: '/system/editPolicy',
-                  name: '',
+                  name: '购房政策编辑',
+                  hideInMenu: true,
                   component: './system/editPolicy',
                 },
               ],
@@ -455,7 +479,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://localhost:8080/',
+      target: 'http://192.168.0.11:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

package.json

@@ -45,6 +45,7 @@
     "@antv/data-set": "^0.10.2",
     "antd": "^3.20.0",
     "classnames": "^2.2.6",
+    "dayjs": "^1.8.16",
     "dva": "^2.4.1",
     "echarts": "^4.3.0",
     "lodash": "^4.17.11",
@@ -68,6 +69,7 @@
     "@ant-design/colors": "^3.1.0",
     "@ant-design/pro-cli": "^1.0.0",
     "@types/classnames": "^2.2.7",
+    "@types/echarts": "^4.1.14",
     "@types/express": "^4.17.0",
     "@types/history": "^4.7.2",
     "@types/jest": "^24.0.13",

src/components/AuthButton/index.jsx

@@ -0,0 +1,25 @@
+import React from 'react';
+
+let allBtns = [];
+let current = [];
+
+const AuthButton = ({ children, name, noRight }) => {
+  const btn = allBtns.filter(x => x.code === name)[0]
+
+  // 没维护的按钮, 或者不需要权限的按钮直接通过
+  if (!btn || !btn.roles || !btn.roles.length) {
+    return <>{children}</>
+  }
+
+  const hasRight = btn.roles.some(x => current.some(y => x === y))
+  return hasRight ? <>{children}</> : <>{noRight}</>
+}
+
+const setAllBtnAuth = x => allBtns = x;
+const setUserBtnAuth = x => current = x;
+
+export default AuthButton;
+export {
+  setAllBtnAuth,
+  setUserBtnAuth,
+};

src/components/EchartsTest/EChart.jsx

@@ -3,17 +3,20 @@ import React, { Component } from 'react';
 // 引入 ECharts 主模块
 import echarts from 'echarts/lib/echarts';
 // 引入柱状图
-import  'echarts/lib/chart/bar';
+import 'echarts/lib/chart/bar';
+import 'echarts/lib/chart/pie';
 // 引入提示框和标题组件
 import 'echarts/lib/component/tooltip';
+import 'echarts/lib/component/legend';
 import 'echarts/lib/component/title';
 
+
 class EchartsTest extends Component {
-    chartRef = undefined
+    chartRef = React.createRef();
     chart = undefined
     defaultChartOption = {}
 
-    componentDidMount() {
+    componentDidMount () {
         this.chart = echarts.init(this.chartRef.current)
 
         // 绘制图表
@@ -23,25 +26,28 @@ class EchartsTest extends Component {
         });
     }
 
-    componentDidUpdate(preProps) {
+    componentDidUpdate (preProps) {
         if (preProps.options != this.props.options) {
-            this.chart.setOption({
+            const options = {
                 ...this.defaultChartOption,
                 ...this.props.options || {},
-            });
+            }
+
+            console.log(options)
+
+            this.chart.setOption(options);
         }
     }
 
-    handleDom = ref => this.chartRef = ref
-
-    render() {
+    render () {
         const style = {
             width: '600px',
+            height: '400px',
             ...this.props.style || {}
         }
 
         return (
-            <div ref={this.handleDom} style={style}></div>
+            <div ref={this.chartRef} style={style}></div>
         );
     }
 }

src/components/XForm/ImageListUpload.jsx

@@ -3,71 +3,77 @@ 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 })
-    console.log(fileList)
-    if (typeof this.props.onChange === 'function') {
-      // return item.response.url
-      const images = fileList.filter(item => item.status === 'done')
-      console.log(images)
-      this.props.onChange(images.map(item => item.response.url))
+  handleChange = (e) => {
+    if (e.file.status === "uploading") {
+      this.setState({ loading: true });
+      return;
     }
-  };
 
-  render() {
-    const { previewVisible, previewImage, fileList } = this.state;
+    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]);
+    //     }
+    //   }
+    // }
+  };
 
-    const { value } = this.props
-    let images = []
-    if (value !== undefined && value !== null) {
-      // ?x-oss-process=style/thumbnail
-      images = value.map(item => ({ response: { url: item, thumbUrl: item, status: 'done' } }))
+  handleUploadSucess = (url) => {
+    this.setState({ loading: false });
+    if (typeof this.props.onChange === 'function') {
+      const fileList = this.props.value || [];
+      this.props.onChange([...fileList, url]);
     }
-    console.log('imageList: ', images)
+  }
+
+  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 || images}
+          fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}
           { ...uploaderProps }
+          onSuccess={this.handleUploadSucess}
         >
           {(fileList || images).length >= 8 ? null : uploadButton}
         </Upload>

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

@@ -23,6 +23,7 @@ body {
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  font-size: 16px;
 }
 
 ul,
@@ -47,77 +48,107 @@ ol {
   }
 }
 
-.ant-pro-global-header{
+.ant-layout-header .ant-pro-global-header{
   background:#393C39;
 }
-.ant-pro-sider-menu-sider.light .ant-pro-sider-menu-logo{
+.ant-layout .ant-pro-sider-menu-sider.light .ant-pro-sider-menu-logo{
   background:#EF273A;
   box-shadow: none;
   border: none;
-}
-.ant-input-affix-wrapper .ant-input-prefix{
-  left:7px;
-}
-.ant-input-affix-wrapper .ant-input:not(:first-child) {
-  padding-left: 40px;
-}
-.ant-pro-global-header-trigger{
-  display: none;
-}
-.ant-pro-sider-menu-sider.light{
-  box-shadow: none;
-  .ant-pro-sider-menu-logo h1{
-    color: #fff;
+  a{
+    h1{
+      color: #fff;
+    }
   }
 }
-.ant-pro-page-header-wrap-page-header-warp{
-  background:rgba(240,240,240,1);
-}
-.ant-menu:not(.ant-menu-horizontal) .ant-menu-item-selected{
-  background:rgb(230, 227, 227);
-  border: none;
-}
-.ant-menu-inline .ant-menu-selected::after, .ant-menu-inline .ant-menu-item-selected::after{
-  opacity: 0;
+.antd-pro-layouts-user-layout-container{
+  .ant-input-affix-wrapper .ant-input-prefix{
+    left:7px;
+  }
+  .ant-input-affix-wrapper .ant-input:not(:first-child) {
+    padding-left: 40px;
+  }
 }
-.ant-menu-inline > .ant-menu-item{
-  height: 45px;
-  line-height: 45px;
+ 
+.ant-layout{
+  .ant-menu-vertical .ant-menu-item,
+.ant-menu-vertical-left .ant-menu-item,
+.ant-menu-vertical-right .ant-menu-item,
+.ant-menu-inline .ant-menu-item,
+.ant-menu-vertical .ant-menu-submenu-title,
+.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;
-  margin: 0;
-}
-.ant-menu.ant-pro-sider-menu{
-  padding: 0!important;
-}
-
-.ant-breadcrumb + .ant-page-header-heading{
-  display: none;
 }
-.ant-page-header{
-  height: 50px;
-  padding:0 30px;
-  line-height: 50px;
+.ant-breadcrumb{
+  font-size: 16px;
+  .anticon {
+    font-size: 16px;
+  }
+} 
+  .ant-pro-global-header-trigger{
+    display: none;
+  }
+  .ant-pro-sider-menu-sider.light{
+    box-shadow: none;
+    .ant-pro-sider-menu-logo h1{
+      color: #fff;
+    }
+  }
+  .ant-pro-page-header-wrap-page-header-warp{
+    background:rgba(240,240,240,1);
+  }
+   .ant-menu:not(.ant-menu-horizontal)  .ant-menu-item-selected{
+    background:rgb(230, 227, 227)!important;
+    border: none!important;
+  }
+  .ant-menu-inline .ant-menu-selected::after, .ant-menu-inline .ant-menu-item-selected::after{
+    opacity: 0;
+  }
+  .ant-menu-inline > .ant-menu-item{
+    height: 45px;
+    line-height: 45px;
+    
+    margin: 0;
+    .ant-menu-submenu-title{
+      font-size: 16px!important;
+    }
+  }
+  .ant-menu.ant-pro-sider-menu{
+    padding: 0!important;
+  }
   
-  .ant-breadcrumb{
-    color: #333;
+  .ant-breadcrumb + .ant-page-header-heading{
+    display: none;
   }
-}
-.ant-pro-sider-menu-logo img{
-  height: 41px;
-}
-.ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active {
-  color: #FF7E48;
-}
-.ant-table{
-  line-height: 3;
-}
-.ant-modal-header{
-  border-bottom: none;
-  .ant-modal-title{
-    font-size: 24px;
+  .ant-page-header{
+    height: 50px;
+    padding:0 30px;
     line-height: 50px;
+    
+    .ant-breadcrumb{
+      color: #333;
+    }
+  }
+  .ant-pro-sider-menu-logo img{
+    height: 41px;
+  }
+  .ant-tabs.ant-tabs-card .ant-tabs-card-bar .ant-tabs-tab-active {
+    color: #FF7E48;
+  }
+  .ant-table{
+    line-height: 3;
+  }
+  .ant-modal-header{
+    border-bottom: none;
+    .ant-modal-title{
+      font-size: 24px;
+      line-height: 50px;
+    }
+  }
+  .ant-modal-footer{
+    border-top:none;
   }
 }
-.ant-modal-footer{
-  border-top:none;
-}

src/layouts/BasicLayout.jsx

@@ -6,24 +6,17 @@
 import ProLayout from '@ant-design/pro-layout';
 import React, { useEffect } from 'react';
 import Link from 'umi/link';
+import Redirect from 'umi/redirect';
 import { connect } from 'dva';
 import { formatMessage } from 'umi-plugin-react/locale';
-import Authorized from '@/utils/Authorized';
+// import Authorized from '@/utils/Authorized';
 import RightContent from '@/components/GlobalHeader/RightContent';
+import RenderAuthorize from '@/components/Authorized';
 import { isAntDesignPro } from '@/utils/utils';
 import logo from '../assets/logo.png';
-
-/**
- * use Authorized check all menu item
- */
-const menuDataRender = menuList =>
-  menuList.map(item => {
-    const localItem = { ...item, children: item.children ? menuDataRender(item.children) : [] };
-    return Authorized.check(item.authority, localItem, null);
-  });
+  
 const footerRender = () => {
   return (
-
     <div
       style={{
         padding: ' 44px 0',
@@ -32,22 +25,18 @@ const footerRender = () => {
         fontFamily: 'monospace',
         fontWeight: '200',
         color: 'rgba(102, 102, 102, 1)',
-    
-
       }}
     >
       copy Right @ 知与行
     </div>
   )
 }
+
 const BasicLayout = props => {
   const { dispatch, children, settings } = props;
-  /**
-   * constructor
-   */
-
+  
   useEffect(() => {
-    if (dispatch) {
+    if (dispatch && !props.user.currentUser.userId) {
       dispatch({
         type: 'user/fetchCurrent',
       });
@@ -56,9 +45,8 @@ const BasicLayout = props => {
       });
     }
   }, []);
-  /**
-   * init variables
-   */
+  
+  const Authorized = RenderAuthorize(props.user.currentUser.roles)
 
   const handleMenuCollapse = payload => {
     if (dispatch) {
@@ -69,6 +57,26 @@ const BasicLayout = props => {
     }
   };
 
+  const findAuthority = (path) => {
+    return ((props.user.menuList || []).filter(x => x.code === path)[0] || {}).roles
+  }
+  
+  /**
+   * use Authorized check all menu item
+   */
+  const menuDataRender = menuList =>
+    menuList.map(item => {
+      const localItem = { ...item, children: item.children ? menuDataRender(item.children) : [] };
+      const authority = findAuthority(item.path);
+      // return Authorized.check(item.authority, localItem, null);
+      return Authorized.check(authority, localItem, null);
+    });
+
+  const checkRights = (children) => {
+    const authority = findAuthority(props.location.pathname);
+    return Authorized.check(authority, children, <Redirect to="/exception/403" />);
+  }
+
   return (
     <ProLayout
       logo={logo}
@@ -106,12 +114,13 @@ const BasicLayout = props => {
       {...settings}
     // pageTitleRender={()=><></>}
     >
-      {children}
+      {checkRights(children)}
     </ProLayout>
   );
 };
 
-export default connect(({ global, settings }) => ({
+export default connect(({ global, settings, user }) => ({
   collapsed: global.collapsed,
   settings,
+  user
 }))(BasicLayout);

src/models/login.js

@@ -1,8 +1,13 @@
 import { routerRedux } from 'dva/router';
 import { stringify } from 'querystring';
-import { fakeAccountLogin, getFakeCaptcha } from '@/services/login';
+// import { fakeAccountLogin, getFakeCaptcha } from '@/services/login';
 import { setAuthority } from '@/utils/authority';
 import { getPageQuery } from '@/utils/utils';
+import { fetch, apis } from '@/utils/request';
+
+const signin = fetch(apis.user.signin);
+const signout = fetch(apis.user.signout);
+
 const Model = {
   namespace: 'login',
   state: {
@@ -10,7 +15,7 @@ const Model = {
   },
   effects: {
     *login({ payload }, { call, put }) {
-      const response = yield call(fakeAccountLogin, payload);
+      const response = yield call(signin, { data: payload });
       yield put({
         type: 'changeLoginStatus',
         payload: response,
@@ -42,9 +47,11 @@ const Model = {
       yield call(getFakeCaptcha, payload);
     },
 
-    *logout(_, { put }) {
+    *logout(_, { put, call }) {
       const { redirect } = getPageQuery(); // redirect
 
+      yield call(signout, { logout: true });
+
       if (window.location.pathname !== '/user/login' && !redirect) {
         yield put(
           routerRedux.replace({
@@ -59,7 +66,7 @@ const Model = {
   },
   reducers: {
     changeLoginStatus(state, { payload }) {
-      setAuthority((payload.user.roles || []).map(x => x.roleId));
+      // setAuthority((payload.user.roles || []).map(x => x.roleId));
       return { ...state, status: 'ok', type: payload.type };
     },
   },

src/models/user.js

@@ -1,11 +1,14 @@
-import request from '../utils/request';
-import apis from '../services/apis';
+import { fetch, apis } from '@/utils/request';
+import { setAllBtnAuth, setUserBtnAuth } from '@/components/AuthButton';
+
+const getCurrentUser = fetch(apis.user.current)
 
 const UserModel = {
   namespace: 'user',
   state: {
     currentUser: {},
     menuList: [],
+    buttonList: [],
   },
   effects: {
     // *fetch(_, { call, put }) {
@@ -17,7 +20,7 @@ const UserModel = {
     // },
 
     *fetchCurrent(_, { call, put }) {
-      const response = yield call(request, apis.user.current);
+      const response = yield call(getCurrentUser);
 
       yield put({
         type: 'saveCurrentUser',
@@ -26,8 +29,14 @@ const UserModel = {
     },
   },
   reducers: {
-    saveCurrentUser(state, { payload = {} }) {
-      return { ...state, currentUser: payload.taUser || {}, menuList: payload.menuList || [] };
+    saveCurrentUser(state, { payload }) {
+      const { taUser = {} , menuList = [], buttonList = [] } = payload || {}
+      const currentUser = { ...taUser, roles: (taUser.roles || []).map(x => x.roleId) }
+
+      setAllBtnAuth(buttonList)
+      setUserBtnAuth(currentUser.roles)
+
+      return { ...state, currentUser, menuList, buttonList };
     },
     changeNotifyCount(
       state = {

src/pages/activity/ActivityList.jsx

@@ -250,7 +250,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/editActivity.jsx

@@ -26,8 +26,7 @@ const { TextArea } = Input;
  * @returns
  */
 const Edit = (props) => {
-  const [tab, changeTab] = useState('poster')
-  // const [tab, changeTab] = useState('basic')
+  const [tab, changeTab] = useState('basic')
   const dynamicId = props.location.query.dynamicId
   const [dynamicData, setDynamicData] = useState({})
   if (dynamicId) {
@@ -149,6 +148,7 @@ const Edit = (props) => {
           method: 'PUT',
           data: submitValue,
         }).then((data) => {
+          message.info("保存成功")
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
@@ -159,6 +159,7 @@ const Edit = (props) => {
           method: 'POST',
           data: submitValue,
         }).then((data) => {
+          message.info("保存成功")
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
@@ -173,6 +174,57 @@ const Edit = (props) => {
     const [inputValue, changeInput] = useState('')
     const [textAreaValue, changeTextArea] = useState('')
     const [imgValue, changeImg] = useState('')
+    const [posterId, setPosterId] = useState('')
+
+    if(dynamicId){
+      useEffect(() => {
+        request({
+          url: '/api/admin/poster',
+          method: 'GET',
+          params: {targetId: dynamicId,targetType: 'activity'},
+        }).then((data) => {
+          console.log(data,"2222")
+          if(data.length > 0){
+            setPosterId(data[0].posterId)
+            changeImg(data[0].posterImg)
+            changeTextArea(data[0].posterDescription)
+            changeInput(data[0].posterTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }, [])
+    }
+
+    const submitPoster  = () => {
+       if(dynamicId){
+        if(posterId){
+          request({
+            url: '/api/admin/poster/'+posterId,
+            method: 'PUT',
+            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) => {
+            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' }}>
@@ -210,20 +262,20 @@ const Edit = (props) => {
         <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 onChange={e => changeImg(e)} />
+            <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' }} placeholder="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+            <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} onChange={e => changeTextArea(e.target.value)} />
+            <TextArea rows={5} value={textAreaValue} onChange={e => changeTextArea(e.target.value)} />
           </div>
 
         </div>
       </div>
-      <Button type="primary" onClick={() => router.go(-1)} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
+      <Button type="primary" onClick={submitPoster} style={{ margin: '40px 40px 40px 30vw' }}> 确定</Button>
       <Button onClick={() => router.go(-1)}>取消</Button>
     </div>
 
@@ -234,13 +286,55 @@ const Edit = (props) => {
   const Share = (props) => {
     const [inputValue, changeInput] = useState('')
     const [imgValue, changeImg] = useState('')
-    // const changeInputValue = e => {
-    //   changeInput(e.target.value)
-    // }
-
-    // const handleSubmit = (values) => {
+    const [shareContentId, setShareContentId] = useState('')
+    
+    if(dynamicId){
+      useEffect(() => {
+        request({
+          url: '/api/admin/shareContent',
+          method: 'GET',
+          params: {targetId: dynamicId,targetType: 'activity'},
+        }).then((data) => {
+          console.log(data,"2222")
+          if(data.length > 0){
+            setShareContentId(data[0].shareContentId)
+            changeImg(data[0].shareContentImg)
+            changeInput(data[0].shareContentTitle)
+          }
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }, [])
+    }
 
-    // }
+    const submitShare = () => {
+      if(dynamicId){
+        if(shareContentId){
+          request({
+            url: '/api/admin/shareContent/'+shareContentId,
+            method: 'PUT',
+            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) => {
+            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%' }}>
@@ -253,13 +347,13 @@ const Edit = (props) => {
       </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="请输入海报标题" onChange={e => changeInput(e.target.value)} />
+        <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 onChange={e => changeImg(e)} />
+        <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
       </div>
-      <Button type="primary" htmlType="submit" style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
+      <Button type="primary" htmlType="submit" onClick={submitShare} style={{ margin: '40px 40px 40px 220px' }}> 确定</Button>
       <Button onClick={() => router.go(-1)}>取消</Button>
     </div>
   }

src/pages/building/list/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;
@@ -100,56 +101,56 @@ 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)}>
-                编辑
+    <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
         </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: '#1990FF' }} 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.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={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+        </span>
+        <span style={{
+          color: '#FF4A4A', position: 'absolute', right: '0',
+        }} onClick={() => deleteBuilding(data)}>
+          删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-              </span>
-            </p>
-          </Card>
+        </span>
+      </p>
+    </Card>
   )
 }
 
@@ -209,7 +210,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) {
@@ -285,18 +286,21 @@ function body(props) {
           </Button>
         </Form.Item>
       </Form>
-      <Button type="danger" className={Styles.addButton} onClick={() => toAdd()}>
-        新增楼盘
-      </Button>
+
+      <AuthButton name="building.add" noRight={null}>
+        <Button type="danger" className={Styles.addButton} onClick={() => toAdd()}>
+          新增楼盘
+        </Button>
+      </AuthButton>
 
       {/* 卡片内容，显示楼盘项目  */}
       <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/type/index.jsx

@@ -96,8 +96,8 @@ function body() {
 
   return (
     <>
-      <Button type="primary" className={Styles.addButton} onClick={() => toEdi()}>新增类型</Button>
-      <Table dataSource={data.records} columns={columns} pagination={false}/>
+      <Button type="danger" onClick={() => toEdi()}>新增类型</Button>
+      <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/carouselFigure/advertisingList.jsx

@@ -217,7 +217,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

@@ -217,7 +217,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/channel/brokerList.jsx

@@ -166,7 +166,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/customer/customerlist/index.jsx

@@ -248,8 +248,8 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="danger" htmlType="submit" >
-            搜索
+          <Button type="primary" htmlType="submit" >
+            查询
           </Button>
         </Form.Item>
       </Form>

src/pages/customer/report/index.jsx

@@ -159,7 +159,7 @@ function body(props) {
           </Button>
         </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/indexEcharts/components/UserSource.jsx

@@ -0,0 +1,180 @@
+import React, { Component, useState, useEffect } from 'react';
+
+import EChart from '../../../components/EchartsTest/EChart';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import dayjs from 'dayjs';
+import router from 'umi/router';
+import {Table, Select, Row, Col, Menu, Dropdown, Button, Icon, message } from 'antd';
+// import UserSource from './mmm';
+
+
+const UserSource = (props) => {
+
+  const [data, setData] = useState({ records: [] })
+  //柱图
+
+  useEffect(() => {
+    userResource()
+  }, [])
+
+  function userResource () {
+    request({
+      ...apis.indexEcharts.userResource,
+      params: { pageNum: 1, pageSize: 9999 }
+    }).then((data) => {
+      // console.log(data , '3333')
+      setData(data)
+    })
+  }
+
+  function toEdit () {
+    router.push({
+      pathname: '/indexEcharts/userSource',
+      // query: {
+      //   a: 'b',
+      // },
+    });
+  }
+
+  const dataset = data || {};
+  const source = dataset.columnar || [];
+
+  // const source = this.dataset.columnar || [];
+  const subtitle = '最近7天';
+  const baroptions = {
+    color: ['#286DD0', '#8565CE', '#6A96F8', '#F5749E', '#8B7FE2'],
+    xAxis: { type: 'category' },
+    legend: {
+      left: '20%',
+      data: ['所有用户', '注册用户'],
+    },
+
+    tooltip: {},
+
+    yAxis: {},
+    series: [
+      { type: 'bar', name: '所有用户', datasetIndex: 0 },
+      { type: 'bar', name: '注册用户' },
+    ],
+    dataset: {
+      id: 'bar',
+      dimensions: ['fromName', 'userCount', 'registered'],
+      source: source,
+    },
+
+  }
+  const { person_estate_agent = 0, person_null = 0, person_realty_consultant = 0 } = dataset.pie || {};
+  const pieoptions = {
+    // xAxis: {},
+    color: ['#286DD0', '#8565CE', '#6A96F8', '#F5749E', '#8B7FE2'],
+    legend: {
+      // left: '70%',
+      data: ['来源置业顾问', '来源全民经纪人', '自主进入'],
+    },
+    tooltip: {},
+    // yAxis: {},
+
+    series: [
+      {
+        type: 'pie',
+        // datasetIndex: 1,
+        center: ['50%', '50%'],
+        radius: [0, '50%'],
+      },
+    ],
+    dataset: {
+      id: 'pie',
+      source: [
+        { form: '来源置业顾问', value: person_realty_consultant },
+        { form: '来源全民经纪人', value: person_estate_agent },
+        { form: '自主进入', value: person_null },
+      ]
+    },
+
+
+
+
+
+  }
+  function handleSelectChange (e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  //表格
+  const dataSource = [
+    {
+      name: '置业顾问',
+      status: '1',//显示停用
+    },
+    {
+      name: '置业经理',
+      status: '1',//停用
+    },
+  ];
+
+  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: 'center',
+      render: text => <a>{text}</a>,
+    },
+  
+    {
+      title: '操作  ',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+  
+      render: () => <>11</>
+       
+    },
+  ];
+
+  const style = {
+    width: '100%',
+    height: '400px',
+
+  }
+  const styles = {
+    width: '100%',
+    height: '400px',
+
+  }
+
+
+  return (
+    <>
+      <div>
+        <h3>用户来源 <small>{subtitle}</small></h3>
+        <Row>
+          <Col span={16}>
+            <EChart options={baroptions} style={style} /></Col>
+          <Col span={8}>
+            <EChart options={pieoptions} style={styles} /></Col>
+        </Row>
+      </div>
+      <Select style={{ width: '180px' }} placeholder="所有用户" onChange={handleSelectChange}>
+        <Option value={0}>所有用户</Option>
+        <Option value={1}>注册用户</Option>
+      </Select>
+
+
+      <Table dataSource={dataSource} columns={columns} />
+
+    </>
+  )
+}
+
+export default UserSource;

src/pages/indexEcharts/index.jsx

@@ -0,0 +1,27 @@
+
+import React, { useState, useEffect }  from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Row, Col, Tag, Pagination, Modal, DatePicker } from 'antd';
+
+// import styles from '../../style/GoodsList.less';
+import router from 'umi/router';
+
+import request from '../../utils/request'
+import apis from '../../services/apis';
+// import Styles from './style.less';/
+import UserSource from './components/UserSource.jsx';
+
+
+const header = (props) => {
+
+
+  return (
+
+    <>
+    {/* <div>2222</div> */}
+     <UserSource  ></UserSource>
+    </>
+  )
+}
+
+
+export default  header

src/pages/indexEcharts/userSource.jsx

@@ -0,0 +1,77 @@
+import dayjs from 'dayjs';
+import React from 'react';
+import {Radio, DatePicker,  Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, Breadcrumb } from 'antd';
+
+import UserSource from './components/UserSource.jsx';
+// import XForm, { FieldTypes } from '../../components/XForm';
+import moment from 'moment';
+
+
+const header = props => {
+  const { RangePicker } = DatePicker;
+  function onChange(dates, dateStrings) {
+    console.log('From: ', dates[0], ', to: ', dates[1]);
+    console.log('From: ', dateStrings[0], ', to: ', dateStrings[1]);
+  }
+
+
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    // props.form.validateFields((err, values) => {
+    //   if (!err) {
+    //     getList({ pageNum: 1, pageSize: 10, ...values })
+    //   }
+    // });
+  }
+
+
+  function getDataOf(days){      
+    // const endDate = new Date()
+    // const startDate = dayjs().subtract(days, 'day').toDate()
+
+    // this.$refs.chart.getData({ startDate, endDate })
+  }
+
+  function onChange(e) {
+    console.log(`radio checked:${e.target.value}`);
+  }
+
+  return (<>
+  {/* <el-button type="text" @click="() => getDataOf(7)">最近7天</el-button>
+      <el-button type="text" @click="() => getDataOf(30)">最近1月</el-button>
+      <el-date-picker
+        v-model="dateRange"
+        type="daterange"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        style="margin-left: 16px">
+      </el-date-picker>
+      <el-button type="primary" icon="el-icon-search" style="margin-left: 32px" @click="search">查询</el-button>
+    </div>
+    <user-source ref="chart" mode="all"></user-source> */}
+  <Radio.Group onChange={onChange} defaultValue="a">
+        <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
+        <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
+      </Radio.Group>
+      <RangePicker
+      ranges={{
+        Today: [moment(), moment()],
+        'This Month': [moment().startOf('month'), moment().endOf('month')],
+      }}
+      showTime
+      format="YYYY/MM/DD HH:mm:ss"
+      // onChange={onChange}
+    />
+     <Button type="primary" htmlType="submit" >
+            查询
+          </Button>
+  <div>
+    
+
+    <UserSource ></UserSource>
+  </div>
+  </>
+  )
+}
+
+export default header

src/pages/integralMall/GoodsList.jsx

@@ -184,7 +184,7 @@ function header(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.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/integralMall/exchangeRecords.jsx

@@ -190,7 +190,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/news/list/NewsList.jsx

@@ -178,7 +178,7 @@ function body(props) {
           </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)}>
             发布
-              <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
           </span>
         }
 

src/pages/staff/list/RoleList.jsx

@@ -25,7 +25,7 @@ function confirm() {
 }
 function toEditRole() {
   router.push({
-    pathname: '/staff/editRole',
+    pathname: '/staff/list/addRole',
     query: {
       a: 'b',
     },

src/pages/staff/list/StaffList.jsx

@@ -146,7 +146,7 @@ function CartBody (props) {
             data.labels.map((item, index) => {
               const color = colors[item];
               console.log(color, '------');
-              return <Tag className={Styles.cardTag}  color = {color}>{item}</Tag>
+              return <Tag className={Styles.cardTag} color={color}>{item}</Tag>
             })
           }
         </span>

src/pages/staff/list/addRole.jsx

@@ -0,0 +1,162 @@
+import React, { useState, useEffect } from 'react';
+import { Checkbox, Input, Card } from 'antd';
+import { connect } from 'dva';
+import XForm, { FieldTypes } from '../../../components/XForm';
+import request from '../../../utils/request';
+import channels from './channelList.less';
+
+const { TextArea } = Input;
+
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+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(() => {
+    localStorage.removeItem('value');
+    menuList({ pageNum: 1, pageSize: 100 })
+  }, [])
+
+  function menuList(params) {
+    request({
+      url: '/api/admin/menuList',
+      method: 'GET',
+      params: { ...params },
+  // eslint-disable-next-line no-shadow
+  }).then(data => {
+      console.log(data)
+      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 = [
+    '项目管理',
+    '员工管理',
+    '客户管理',
+    '系统管理',
+    '渠道管理',
+    '轮播图管理',
+    '资讯管理',
+    '活动管理',
+    '积分商城',
+    '首页数据',
+  ]
+
+  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>
+    </>
+    )
+  }
+
+  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)
+  }
+  return <XForm onSubmit={handleSubmit} fields={fields}></XForm>
+}
+
+
+export default connect(({ user }) => ({ user }))(Edit);

src/pages/staff/list/editRole.jsx

@@ -146,7 +146,7 @@ const Edit = (props) => {
       textAlign: 'left',
     };
 
-{/* <Checkbox>{Permission[index]}</Checkbox> */}
+    {/* <Checkbox>{Permission[index]}</Checkbox> */ }
     return <>
       <div style={{}}>
       {Array.from(data).map(Item =>
@@ -157,16 +157,16 @@ const Edit = (props) => {
             
               {dataSource.map((items, indexs) => (
               <>
-                <Card.Grid style={gridStyle1}><Checkbox>{items.name}</Checkbox></Card.Grid>
-                
+                <Card.Grid style={gridStyle1}><Checkbox value=''>{items.name}</Checkbox></Card.Grid>
+
                 <Card.Grid style={gridStyle2}>
-                {items.per.map((itemss,indexss) =>(
-                  <Checkbox>{items.per[indexss]}</Checkbox>
-                ))}
+                  {items.per.map((itemss, indexss) => (
+                    <Checkbox value=''>{items.per[indexss]}</Checkbox>
+                  ))}
                 </Card.Grid>
-                </>
+              </>
             ))}
-            
+
           </Card>
 
 

src/pages/staff/list/style.less

@@ -61,7 +61,6 @@
 }
 
 .cardTag {
-  width: 48px;
   height: 18px;
   font-size: 10px;
   // background: #fdce22;

src/services/apis.js

@@ -2,10 +2,14 @@ const prefix = '/api/admin'
 
 export default {
   image: {
-    upload: {
+    uploadForAnt: {
       url: `${prefix}/antd/image`,
       method: 'POST',
-    }
+    },
+    upload: {
+      url: `${prefix}/image`,
+      method: 'POST',
+    },
   },
   user: {
     current: {
@@ -16,6 +20,10 @@ export default {
       method: 'POST',
       url: `${prefix}/taUser/signin`,
     },
+    signout: {
+      method: 'POST',
+      url: `${prefix}/taUser/signout`,
+    },
   },
   building: {
     getList: {
@@ -145,4 +153,55 @@ export default {
       url: `${prefix}/customer/recommend/get/id`,
     },
   },
+  indexEcharts: {
+    userResource: {
+      method: 'GET',
+      url: `${prefix}/selectUserResource`
+    },
+
+  }
+  // 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`
+  //   },
+  // },
 }

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 }