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

config/config.js

@@ -346,7 +346,12 @@ export default {
                   hideInMenu: true,
                   component: './staff/list/editRole',
                 },
-
+                {
+                  path: '/staff/list/addRole',
+                  name: '添加角色',
+                  hideInMenu: true,
+                  component: './staff/list/addRole',
+                },  
               ],
             },
             {

src/pages/activity/editActivity.jsx

@@ -148,6 +148,7 @@ const Edit = (props) => {
           method: 'PUT',
           data: submitValue,
         }).then((data) => {
+          message.info("保存成功")
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
@@ -158,6 +159,7 @@ const Edit = (props) => {
           method: 'POST',
           data: submitValue,
         }).then((data) => {
+          message.info("保存成功")
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
@@ -172,12 +174,55 @@ 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  = () => {
-      console.log(inputValue)
-      console.log(textAreaValue)
-      console.log(imgValue)
-      console.log(dynamicId)
+       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>
@@ -217,15 +262,15 @@ 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>
@@ -241,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%' }}>
@@ -260,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/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);