zls

config/config.js

@@ -123,13 +123,23 @@ export default {
                   component: './building/list/index',
                 },
                 {
+<<<<<<< HEAD
+=======
+                  path: '/building/list/add',
+                  name: '项目添加', // 项目添加
+                  hideInMenu: true,
+                  component: './building/list/add/index',
+                },
+                {
+>>>>>>> ed52b30a02a5604a8626322e59d620f25aa7558d
                   path: '/building/type',
                   name: '项目类型',
                   component: './building/type/index',
                 },
                 {
                   path: '/building/type/edi',
-                  name: '',
+                  name: '项目类型编辑',
+                  hideInMenu: true,
                   component: './building/type/edi',
                 },
               ],
@@ -145,6 +155,15 @@ export default {
                   component: './customer/customerlist/index',
                 },
                 {
+<<<<<<< HEAD
+=======
+                  path: '/customer/customerlist/customerDetail',
+                  name: '客户编辑',
+                  hideInMenu: true,
+                  component: './customer/customerlist/customerDetail',
+                },
+                {
+>>>>>>> ed52b30a02a5604a8626322e59d620f25aa7558d
                   path: '/customer/drift/list',
                   name: '游客列表',
                   component: './customer/drift/index',
@@ -161,7 +180,8 @@ export default {
                 },
                 {
                   path: '/customer/recommendCustomer/audit',
-                  name: '', //审核
+                  name: '客户审核', 
+                  hideInMenu: true,
                   component: './customer/recommendCustomer/audit',
                 },
                 {
@@ -188,7 +208,8 @@ export default {
                 },
                 {
                   path: '/integralMall/editGoods',
-                  name: '',
+                  name: '商品编辑',
+                  hideInMenu: true,
                   component: './integralMall/editGoods',
                 },
                 {
@@ -203,7 +224,8 @@ export default {
                 },
                 {
                   path: '/integralMall/verifyList',
-                  name: '',
+                  name: '商品核销列表',
+                  hideInMenu: true,
                   component: './integralMall/verifyList',
                 },
               ],
@@ -220,12 +242,14 @@ export default {
                 },
                 {
                   path: '/channel/addChannel',
-                  name: '',
+                  name: '添加渠道',
+                  hideInMenu: true,
                   component: './channel/addChannel',
                 },
                 {
                   path: '/channel/editChannel',
-                  name: '',
+                  name: '编辑渠道',
+                  hideInMenu: true,
                   component: './channel/editChannel',
                 },
                 {
@@ -235,12 +259,14 @@ export default {
                 },
                 {
                   path: '/channel/recommendClients',
-                  name: '',
+                  name: '渠道推荐',
+                  hideInMenu: true,
                   component: './channel/recommendClients',
                 },
                 {
                   path: '/channel/InviteClients',
-                  name: '',
+                  name: '邀请客户',
+                  hideInMenu: true,
                   component: './channel/InviteClients',
                 },
               ],
@@ -257,7 +283,8 @@ export default {
                 },
                 {
                   path: '/news/type/editNews',
-                  name: '',
+                  name: '编辑资讯类型',
+                  hideInMenu: true,
                   component: './news/type/editNews',
                 },
                 {
@@ -265,6 +292,15 @@ export default {
                   name: '资讯列表',
                   component: './news/list/NewsList',
                 },
+<<<<<<< HEAD
+=======
+                {
+                  path: '/news/list/editNewsList',
+                  name: '编辑资讯',
+                  hideInMenu: true,
+                  component: './news/list/editNewsList',
+                },
+>>>>>>> ed52b30a02a5604a8626322e59d620f25aa7558d
               ],
             },
             {
@@ -279,12 +315,14 @@ export default {
                 },
                 {
                   path: '/activity/editActivity',
-                  name: '',
+                  name: '编辑活动',
+                  hideInMenu: true,
                   component: './activity/editActivity',
                 },
                 {
                   path: '/activity/SignList',
-                  name: '',
+                  name: '报名列表',
+                  hideInMenu: true,
                   component: './activity/SignList',
                 },
               ],
@@ -302,7 +340,8 @@ export default {
                 },
                 {
                   path: '/staff/editStaff',
-                  name: '',
+                  name: '编辑员工',
+                  hideInMenu: true,
                   component: './staff/list/editStaff',
                 },
              
@@ -313,10 +352,49 @@ export default {
                 },
                 {
                   path: '/staff/editRole',
-                  name: '',
+                  name: '编辑角色',
+                  hideInMenu: true,
                   component: './staff/list/editRole',
                 },
+<<<<<<< HEAD
              
+=======
+                {
+                  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',
+                },
+>>>>>>> ed52b30a02a5604a8626322e59d620f25aa7558d
               ],
             },
             {
@@ -346,7 +424,8 @@ export default {
                 },
                 {
                   path: '/system/editPolicy',
-                  name: '',
+                  name: '购房政策编辑',
+                  hideInMenu: true,
                   component: './system/editPolicy',
                 },
               ],
@@ -414,7 +493,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://192.168.0.11:8080/',
+      target: 'http://192.168.0.84:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/components/XForm/ImageListUpload.jsx

@@ -0,0 +1,74 @@
+import React from 'react';
+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: [],
+  };
+
+  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,
+      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))
+    }
+  };
+
+  render() {
+    const { previewVisible, previewImage, fileList } = this.state;
+
+    const { value } = this.props
+
+    const uploadButton = (
+      <div>
+        <Icon type="plus" />
+        <div className="ant-upload-text">Upload</div>
+      </div>
+    );
+    return (
+      <div className="clearfix">
+        <Upload
+          listType="picture-card"
+          fileList={fileList || value}
+          onPreview={this.handlePreview}
+          onChange={this.handleChange}
+          { ...uploaderProps }
+        >
+          {fileList.length >= 8 ? null : uploadButton}
+        </Upload>
+        <Modal visible={previewVisible} footer={null} onCancel={this.handleCancel}>
+          <img alt="example" style={{ width: '100%' }} src={previewImage} />
+        </Modal>
+      </div>
+    );
+  }
+}
+
+export default ImageListUpload;

src/components/XForm/style.css

@@ -0,0 +1,13 @@
+:global .avatar-uploader > .ant-upload {
+  width: 128px;
+  height: 128px;
+}
+/* you can make up upload button and sample style by using stylesheets */
+.ant-upload-select-picture-card i {
+  font-size: 32px;
+  color: #999;
+}
+.ant-upload-select-picture-card .ant-upload-text {
+  margin-top: 8px;
+  color: #666;
+}

src/components/XForm/style.less

@@ -6,3 +6,15 @@
     }
   }
 }
+
+
+/* you can make up upload button and sample style by using stylesheets */
+.ant-upload-select-picture-card i {
+  font-size: 32px;
+  color: #999;
+}
+
+.ant-upload-select-picture-card .ant-upload-text {
+  margin-top: 8px;
+  color: #666;
+}

src/components/XForm/style.wxss

@@ -0,0 +1,13 @@
+:global .avatar-uploader > .ant-upload {
+  width: 128px;
+  height: 128px;
+}
+/* you can make up upload button and sample style by using stylesheets */
+.ant-upload-select-picture-card i {
+  font-size: 32px;
+  color: #999;
+}
+.ant-upload-select-picture-card .ant-upload-text {
+  margin-top: 8px;
+  color: #666;
+}

src/global.less

@@ -47,77 +47,87 @@ 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;
-}
-.ant-menu-inline > .ant-menu-item{
-  height: 45px;
-  line-height: 45px;
-  font-size: 16px;
-  margin: 0;
-}
-.ant-menu.ant-pro-sider-menu{
-  padding: 0!important;
-}
-
-.ant-breadcrumb + .ant-page-header-heading{
-  display: none;
+.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-page-header{
-  height: 50px;
-  padding:0 30px;
-  line-height: 50px;
+ 
+.ant-layout{
+  .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;
+    font-size: 16px;
+    margin: 0;
+  }
+  .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,16 @@
 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 RightContent from '@/components/GlobalHeader/RightContent';
 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,14 +24,13 @@ const footerRender = () => {
         fontFamily: 'monospace',
         fontWeight: '200',
         color: 'rgba(102, 102, 102, 1)',
-    
-
       }}
     >
       copy Right @ 知与行
     </div>
   )
 }
+
 const BasicLayout = props => {
   const { dispatch, children, settings } = props;
   /**
@@ -69,6 +60,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 +117,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/user.js

@@ -26,8 +26,11 @@ const UserModel = {
     },
   },
   reducers: {
-    saveCurrentUser(state, { payload = {} }) {
-      return { ...state, currentUser: payload.taUser || {}, menuList: payload.menuList || [] };
+    saveCurrentUser(state, { payload }) {
+      const { taUser = {} , menuList = [] } = payload || {}
+      const currentUser = { ...taUser, roles: (taUser.roles || []).map(x => x.roleId) }
+
+      return { ...state, currentUser, menuList };
     },
     changeNotifyCount(
       state = {

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/add/components/base.jsx

@@ -1,11 +1,12 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, InputNumber } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, InputNumber, notification } from 'antd';
 import moment from 'moment';
 import request from '../../../../../utils/request';
 import apis from '../../../../../services/apis';
 import Styles from '../style.less';
 import { router } from 'umi';
 import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import ImageListUpload from '../../../../../components/XForm/ImageListUpload'
 import Wangedit from '../../../../../components/Wangedit/Wangedit'
 import TagGroup from './tags'
 
@@ -23,21 +24,67 @@ const formItemLayout = {
   },
 };
 
+
+function openNotificationWithIcon(type, message) {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+}
+
+
 function AddBuilding(props) {
   const { getFieldDecorator } = props.form;
 
+  if (props.building.buildingId !== undefined) {
+    const { buildingId } = props.building
+    if (buildingId !== '') {
+      // eslint-disable-next-line react-hooks/rules-of-hooks
+      useEffect(() => {
+        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 => {
+      res.openingDate = moment(res.openingDate)
+      res.receivedDate = moment(res.receivedDate)
+      props.form.setFieldsValue(res)
+    })
+  }
+
   function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFieldsAndScroll((err, values) => {
       if (!err) {
-        console.log('Received values of form: ', values);
+        addBuilding(values)
       }
     });
   }
 
+  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(() => {
+      openNotificationWithIcon('success', '操作成功')
+    }).catch(err => {
+      openNotificationWithIcon('error', err.message)
+    })
+  }
+
   return (
         <Form {...formItemLayout} onSubmit={handleSubmit}>
-          <Form.Item label="楼盘编号">
+          <Form.Item label="楼盘编号" hasFeedback>
             {getFieldDecorator('code')(<Input />)}
           </Form.Item>
           <Form.Item label="楼盘名称" hasFeedback>
@@ -47,13 +94,13 @@ function AddBuilding(props) {
             {getFieldDecorator('name')(<Input />)}
           </Form.Item>
           <Form.Item label="项目类型" hasFeedback>
-            {getFieldDecorator('name')(<Input />)}
+            {getFieldDecorator('buildingProjectType')(<Input />)}
           </Form.Item>
           <Form.Item label="均价" hasFeedback>
             {getFieldDecorator('price')(<Input />)}
           </Form.Item>
           <Form.Item label="开盘时间" hasFeedback>
-            {getFieldDecorator('openingDate')(<DatePicker />)}
+            {getFieldDecorator('openingDate')(<DatePicker format="YYYY/MM/DD" />)}
           </Form.Item>
           <Form.Item label="电话" hasFeedback>
             {getFieldDecorator('tel')(<Input />)}
@@ -79,17 +126,17 @@ function AddBuilding(props) {
             )}
           </Form.Item>
           <Form.Item label="项目主图" hasFeedback>
-            {getFieldDecorator('tags')(
-              <ImageUpload />,
+            {getFieldDecorator('avatarImage')(
+              <ImageListUpload />,
             )}
           </Form.Item>
           <Form.Item label="地址图片" hasFeedback>
-            {getFieldDecorator('tags')(
+            {getFieldDecorator('mapImg')(
               <ImageUpload />,
             )}
           </Form.Item>
           <Form.Item label="海报底图" hasFeedback>
-            {getFieldDecorator('tags')(
+            {getFieldDecorator('poster')(
               <ImageUpload />,
             )}
           </Form.Item>
@@ -123,11 +170,11 @@ function AddBuilding(props) {
           <Form.Item label="项目坐标" hasFeedback>
             {getFieldDecorator('coordinate')(<Input disabled />)}
           </Form.Item>
-          <Form.Item label="项目地址" hasFeedback>
-            {getFieldDecorator('coordinate')(<Input />)}
+          <Form.Item label="地图位置" hasFeedback>
+            {(<Input />)}
           </Form.Item>
           <Form.Item label="周边交通" hasFeedback>
-            {getFieldDecorator('buildingArea')(
+            {getFieldDecorator('buildingTransport')(
               <TagGroup />,
             )}
           </Form.Item>
@@ -184,7 +231,7 @@ function AddBuilding(props) {
             {getFieldDecorator('rightsYear')(<InputNumber />)}
           </Form.Item>
           <Form.Item label="预售许可证" hasFeedback>
-            {getFieldDecorator('decoration')(
+            {getFieldDecorator('preSalePermit')(
               <ImageUpload />,
             )}
           </Form.Item>

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

@@ -138,7 +138,7 @@ function imageSet(props) {
 
       {/* 编辑页 */}
       {/*  onSuccess是子组件传递事件信息  */}
-      <ModalImage visibleData={visibleData} key={visibleData.apartmentId} onSuccess={getList}/>
+      <ModalImage visibleData={visibleData} key={1} onSuccess={getList}/>
     </>
   )
 }

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

@@ -89,7 +89,7 @@ class ModalImage extends React.Component {
     const { url, method } = apis.building.buildingApartmentGetById
     const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(apartmentId)
 
-    request({ url: tempUrl, method , params: { ...params } }).then(res => {
+    request({ url: tempUrl, method, params: { ...params } }).then(res => {
       // res.img = res.buildingImgList.map((item, _) => item.url)
       res.img = res.buildingImgList[0].url
       this.props.form.setFieldsValue(res)

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

@@ -34,15 +34,29 @@ class EditableTagGroup extends React.Component {
       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
+    }
+
     return (
       <div>
-        {tags.map((tag, index) => {
+        {data.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

@@ -29,35 +29,24 @@ const formItemLayout = {
 };
 
 function AddBuilding(props) {
-  // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [dataSource, setDataSource] = useState({ records: [] })
-
-  const [buildingAreaTags, setBuildingAreaTags] = useState({ tags: ['Unremovable', 'Tag 2', 'Tag 3'], inputVisible: false, inputValue: '' })
-
-
-  const { getFieldDecorator } = props.form;
-
-  function handleSubmit(e) {
-    e.preventDefault();
-    props.form.validateFieldsAndScroll((err, values) => {
-      if (!err) {
-        console.log('Received values of form: ', values);
-      }
-    });
-  }
-
   function tabsCallback(key) {
     console.log(key);
   }
 
+  console.log(props.location)
+
   return (
     <Tabs defaultActiveKey="1" onChange={tabsCallback}>
       <TabPane tab="基本信息" key="1">
-        <Base />
-      </TabPane>
-      <TabPane tab="图片" key="2">
-        <ImageSet building={{ buildingId: '159fd19bb973b6972c10fbebf07ddeb1' }} />
+        <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/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, notification, Modal } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
@@ -13,6 +13,14 @@ const { Meta } = Card;
 
 const tempDate = [{ code: 's101' }]
 
+function openNotificationWithIcon(type, message) {
+  notification[type]({
+    message,
+    description:
+      '',
+  });
+}
+
 /**
  *卡片
  *
@@ -21,6 +29,76 @@ const tempDate = [{ code: 's101' }]
 function CartBody(props) {
   const { data } = props
 
+
+  function toEdi(record) {
+    router.push({
+      pathname: '/building/list/add',
+      query: {
+        id: record.buildingId,
+      },
+    })
+  }
+
+  /**
+   *发布 取消 发布
+   *
+   * @param {*} record
+   */
+  function pulicAndUnPulic(record) {
+    const modal = Modal.confirm();
+    const buidingStatus = record.status === 1 ? 2 : 1
+    const title = record.status === 1 ? '确认取消发布此数据?' : '确认发布此数据?'
+
+    modal.update({
+      content: title,
+      okText: '确认',
+      cancelText: '关闭',
+      onOk: () => {
+        request({ ...apis.building.updateStatus, data: { id: record.buildingId, status: buidingStatus } }).then(() => {
+          openNotificationWithIcon('success', '操作成功')
+          props.onSuccess()
+        }).catch(err => {
+          openNotificationWithIcon('error', err.message)
+        })
+
+        modal.destroy();
+      },
+      onCancel: () => {
+        modal.destroy();
+      },
+    });
+  }
+
+  /**
+   *删除楼盘
+   *
+   * @param {*} record
+   */
+  function deleteBuilding(record) {
+    const { url, method } = apis.building.deleteBuilding
+    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(record.buildingId)
+
+    const modal = Modal.confirm();
+    modal.update({
+      content: '确定删除此楼盘？',
+      okText: '确认',
+      cancelText: '关闭',
+      onOk: () => {
+        request({ url: tempUrl, method }).then(() => {
+          openNotificationWithIcon('success', '操作成功')
+          props.onSuccess()
+        }).catch(err => {
+          openNotificationWithIcon('error', err.message)
+        })
+
+        modal.destroy();
+      },
+      onCancel: () => {
+        modal.destroy();
+      },
+    });
+  }
+
   return (
           <Card
             hoverable
@@ -31,7 +109,7 @@ function CartBody(props) {
             <p className={Styles.cardText}>
               <span className={Styles.title}>楼盘编号</span>
               <span >：{ data.code }</span>
-              <span className={Styles.ediText}>
+              <span className={Styles.ediText} onClick={() => toEdi(data)}>
                 编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
               </span>
@@ -52,20 +130,21 @@ function CartBody(props) {
             </p>
             <p className={Styles.cardItem}>
               <span className={Styles.title}>发布状态</span>
-              <span >：{ data.status === '1' ? '已发布' : '未发布' }</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' }}>
-                取消发布
+              <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)}>
                 删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
               </span>
@@ -213,9 +292,9 @@ function body(props) {
       {/* 卡片内容，显示楼盘项目  */}
       <Row style={{ padding: ' 0 10px' }}>
         {
-          dataSource.records.map((item, index) => (
+          dataSource.records.map((item, _) => (
               <Col span={8}>
-                <CartBody data={item} key={item.buildingId}/>
+                <CartBody data={item} key={item.buildingId} onSuccess={getList}/>
               </Col>
             ))
         }

src/pages/channel/channelList.jsx

@@ -109,6 +109,7 @@ const header = props => {
   const [data, setData] = useState({ channelNmae: [], result: [] })
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
+    localStorage.removeItem('value');
     getList({ pageNum: 1, pageSize: 10 })
   }, [])
 

src/pages/customer/independentList/index.jsx

@@ -374,11 +374,10 @@ function body(props) {
         <>
           {
             <>
-              <sapn style={{ color: 'rgba(239,39,58,1)' }}>查看详细</sapn>
+              {/* <sapn style={{ color: 'rgba(239,39,58,1)' }}>查看详细</sapn> */}
+              <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => Invite(record)}>邀请经纪人</a>
               &nbsp;&nbsp;&nbsp;&nbsp;
-              <sapn style={{ color: 'rgba(239,39,58,1)' }} onClick={() => Invite(record)}>邀请经纪人</sapn>
-              &nbsp;&nbsp;&nbsp;&nbsp;
-              <sapn style={{ color: 'rgba(239,39,58,1)' }} onClick={() => gM(record)}>推荐客户</sapn>
+              <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => gM(record)}>推荐客户</a>
             </>
           }
         </>

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/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

@@ -1,12 +1,11 @@
-import React, { useState } from 'react';
-
+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 XForm, { FieldTypes } from '../../../components/XForm';
-import Wangedit from '../../../components/Wangedit/Wangedit'
+import Wangedit from '../../../components/Wangedit/Wangedit';
+import request from '../../../utils/request';
 import channels from './channelList.less';
-
 import Tagss from '../components/Tagss.jsx';
 
 const { TextArea } = Input;
@@ -19,9 +18,24 @@ const { TextArea } = Input;
  * @returns
  */
 const Edit = (props) => {
-
-
-
+  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)
+  })
+  }
   // const [tab, changeTab] = useState('basic')
 
   const Permission = [
@@ -99,7 +113,7 @@ const Edit = (props) => {
   // }
   // const [Card] = useState('Poster')
 
-  const Poster = (props) => {
+  const Poster = props => {
 
     const dataSource = [
 
@@ -135,13 +149,13 @@ const Edit = (props) => {
     {/* <Checkbox>{Permission[index]}</Checkbox> */ }
     return <>
       <div style={{}}>
-
+      {Array.from(data).map(Item =>
+                <Checkbox value={ Item.menuId }> { Item.name } </Checkbox>,
+              )}
         {Permission.map((item, index) => (
-
-
-          <Card title={<Checkbox value=''>{Permission[index]}</Checkbox>} bordered={true} style={{ width: '100%' }}>
-
-            {dataSource.map((items, indexs) => (
+          <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>
 

src/services/apis.js

@@ -22,6 +22,22 @@ export default {
       method: 'GET',
       url: `${prefix}/buildinglist`,
     },
+    updateStatus: {
+      method: 'PUT',
+      url: `${prefix}/building/update/status`,
+    },
+    addBuilding: {
+      method: 'POST',
+      url: `${prefix}/building/add`,
+    },
+    buildingGetById: {
+      method: 'GET',
+      url: `${prefix}/buildingSelectId/id`,
+    },
+    deleteBuilding: {
+      method: 'DELETE',
+      url: `${prefix}/building/delete/id`,
+    },
     buildingApartment: {
       method: 'GET',
       url: `${prefix}/buildingApartment/buildingId/id`,