合并

src/pages/channel/InviteClients.jsx

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

src/pages/channel/addChannel.jsx

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

src/pages/channel/brokerList.jsx

@@ -3,6 +3,7 @@ import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Sele
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from './channelList.less';
 import router from 'umi/router';
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -102,37 +103,27 @@ const header = props => {
 //   const [page, changePage] = useState({})
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    getList()
+    getListBroker()
   }, [])
-      function getList(params) {
-      request({
-        url: '/api/admin/channel/broker',
-        method: 'GET',
-        params: { ...params },
-    // eslint-disable-next-line no-shadow
-    }).then(data => {
-        console.log(data)
+
+    function getListBroker(params) {
+      request({ ...apis.channelList.getListBroker, params: { ...params } }).then((data) => {
         setData(data)
+    }).catch((err) => {
+        console.log(err)
+        message.info(err.msg || err.message)
     })
     }
-  // const getList = e => {
-  //   request({
-  //       url: '/api/xxx',
-  //       method: 'GET',
-  //       params: {},
-  //   // eslint-disable-next-line no-shadow
-  //   }).then(data => {
-  //       setData(data)
-  //   })
-  // }
+
+
  // 查询
  function queryList() {
-  getList({ ...queryData, pageNum: 1, pageSize: 10, channelId: localStorage.getItem('value') })
+  getListBroker({ ...queryData, pageNum: 1, pageSize: 10, channelId: localStorage.getItem('value') })
 }
     // 分页
     function onChange(pageNumber) {
       // eslint-disable-next-line react-hooks/rules-of-hooks
-        getList({ pageNum: pageNumber, pageSize: 10 })
+      getListBroker({ pageNum: pageNumber, pageSize: 10 })
     }
     // 获取input的值
     function onInputChangePhone (e) {
@@ -145,7 +136,7 @@ const header = props => {
     setQueryData({ ...queryData, phone: e.target.value })
   }
   function refurbishList () {
-    getList({ pageNum: 1, pageSize: 10 })
+    getListBroker({ pageNum: 1, pageSize: 10 })
   }
   // eslint-disable-next-line no-undef
   function handleClick() {

src/pages/channel/channelList.jsx

@@ -3,6 +3,7 @@ import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Sele
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from './channelList.less';
 import router from 'umi/router';
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -112,17 +113,14 @@ const header = props => {
     localStorage.removeItem('value');
     getList({ pageNum: 1, pageSize: 10 })
   }, [])
-
+ 
   function getList(params) {
-    request({
-      url: '/api/admin/channel',
-      method: 'GET',
-      params: { ...params },
-      // eslint-disable-next-line no-shadow
-    }).then(data => {
-      console.log(data)
+    request({ ...apis.channelList.getList, params: { ...params } }).then((data) => {
       setData(data)
-    })
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+  })
   }
   // value 的值
   function handleChange(value) {

src/pages/channel/editChannel.jsx

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

src/pages/channel/recommendClients.jsx

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

src/pages/staff/list/RoleList.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 import { Card, Avatar } from 'antd';
 import request from '../../../utils/request'
 import Styles from './style.less';
+import apis from '../../../services/apis';
 
 const header = props => {
 // function confirm(id) {
@@ -40,30 +41,40 @@ const [data, setData] = useState({ data: [] })
 // 初始化角色
  useEffect(() => {
    localStorage.removeItem('value');
-    getList({ pageNum: 1, pageSize: 100 })
+    getRoleList({ pageNum: 1, pageSize: 100 })
  }, [])
 
- function getList(params) {
-   request({
-     url: '/api/admin/taRole',
-     method: 'GET',
-     params: { ...params },
- // eslint-disable-next-line no-shadow
- }).then(data => {
-     console.log(data)
-     setData(data)
- })
- }
-// 是否停用
-function stop(id) {
-  request({
-    url: `/api/admin/taRole/stop/${id}`,
-    method: 'PUT',
-// eslint-disable-next-line no-shadow
-}).then(data => {
-  getList({ pageNum: 1, pageSize: 100 })
+//  function getRoleList(params) {
+//    request({
+//      url: '/api/admin/taRole',
+//      method: 'GET',
+//      params: { ...params },
+//  // eslint-disable-next-line no-shadow
+//  }).then(data => {
+//      console.log(data)
+//      setData(data)
+//  })
+//  }
+
+ function getRoleList(params) {
+  request({ ...apis.role.getRoleList, params: { ...params } }).then((data) => {
+    setData(data)
+}).catch((err) => {
+    console.log(err)
+    message.info(err.msg || err.message)
+})
+}
+
+
+function stop(ids) {
+  request({ ...apis.role.stop, urlData: { id: ids } }).then((data) => {
+    getRoleList({ pageNum: 1, pageSize: 100 })
+}).catch((err) => {
+    console.log(err)
+    message.info(err.msg || err.message)
 })
 }
+
 const dataSource = [
   {
     name: '置业顾问',

src/pages/staff/list/addRole.jsx

@@ -6,6 +6,7 @@ import request from '../../../utils/request';
 import channels from './channelList.less';
 import { resolve, join } from 'path';
 import router from 'umi/router';
+import apis from '../../../services/apis';
 
 const { TextArea } = Input;
 
@@ -40,63 +41,85 @@ const Poster = props => {
     buttonList({ pageNum: 1, pageSize: 100 })
   }, [])
   // 当前所有的菜单
+  // function menuList(params) {
+  //   request({
+  //     url: '/api/admin/menuList',
+  //     method: 'GET',
+  //     params: { ...params },
+  //     // eslint-disable-next-line no-shadow
+  //   }).then(data => {
+  //     setData(data)
+  //   })
+  // }
   function menuList(params) {
-    request({
-      url: '/api/admin/menuList',
-      method: 'GET',
-      params: { ...params },
-      // eslint-disable-next-line no-shadow
-    }).then(data => {
+    request({ ...apis.role.menuList, params: { ...params } }).then((data) => {
       setData(data)
-    })
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+  })
   }
+
   // 所有按钮
+  // function buttonList(params) {
+  //   request({
+  //     url: '/api/admin/buttonList',
+  //     method: 'GET',
+  //     params: { ...params },
+  //     // eslint-disable-next-line no-shadow
+  //   }).then(data => {
+  //     console.log(data)
+  //     setBuutonDate(data)
+  //   })
+  // }
+
   function buttonList(params) {
-    request({
-      url: '/api/admin/buttonList',
-      method: 'GET',
-      params: { ...params },
-      // eslint-disable-next-line no-shadow
-    }).then(data => {
-      console.log(data)
+    request({ ...apis.role.buttonList, params: { ...params } }).then((data) => {
       setBuutonDate(data)
-    })
+  }).catch((err) => {
+      console.log(err)
+  })
   }
 
-  // 根据角色id查询当前的菜单及其按钮
-  function buttonAndMenuList(params, id) {
-    console.log('id: ', id)
-    request({
-      url: `/api/admin/taRole/details/${id}`,
-      method: 'GET',
-      params: { ...params },
-      // eslint-disable-next-line no-shadow
-    }).then(data => {
-      console.log('data.roleName: ', data)
-      props.form.setFieldsValue({ roleName: data.roleName })
-      console.log(data)
-      setData(data)
 
-      // 获取所有的权限Id
-      if (data.sysMenuList) {
-        setDataMenuId(data.sysMenuList.map(item => item.menuId))
-        setDataButtonId((data.sysMenuList.map(item => item.sysButtonInMenu && item.sysButtonInMenu.map(btn => btn.btnId).join(',')).filter(f => f !== '').join(',').split(',')).map(a => parseInt(a)))
-      }
-    })
-  }
-  // // 添加角色
-  // function addRole(params) {
+  // 根据角色id查询当前的菜单及其按钮
+  // function buttonAndMenuList(params, id) {
+  //   console.log('id: ', id)
   //   request({
-  //     url: '/api/admin/taRole/',
+  //     url: `/api/admin/taRole/details/${id}`,
   //     method: 'GET',
   //     params: { ...params },
   //     // eslint-disable-next-line no-shadow
   //   }).then(data => {
+  //     console.log('data.roleName: ', data)
+  //     props.form.setFieldsValue({ roleName: data.roleName })
   //     console.log(data)
   //     setData(data)
+
+  //     // 获取所有的权限Id
+  //     if (data.sysMenuList) {
+  //       setDataMenuId(data.sysMenuList.map(item => item.menuId))
+  //       setDataButtonId((data.sysMenuList.map(item => item.sysButtonInMenu && item.sysButtonInMenu.map(btn => btn.btnId).join(',')).filter(f => f !== '').join(',').split(',')).map(a => parseInt(a)))
+  //     }
   //   })
   // }
 
+  function buttonAndMenuList(params, ids) {
+    request({ ...apis.role.buttonAndMenuList, urlData: { id: ids }, params: { ...params } }).then(data => {
+      props.form.setFieldsValue({ roleName: data.roleName })
+      console.log(data)
+      setData(data)
+
+      // 获取所有的权限Id
+      if (data.sysMenuList) {
+        setDataMenuId(data.sysMenuList.map(item => item.menuId))
+        setDataButtonId((data.sysMenuList.map(item => item.sysButtonInMenu && item.sysButtonInMenu.map(btn => btn.btnId).join(',')).filter(f => f !== '').join(',').split(',')).map(a => parseInt(a)))
+      }
+  }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
+  })
+  }
 
   // const [menus, setMenus] = useState([]);
   // 判断menus是否有值
@@ -143,15 +166,23 @@ const Poster = props => {
       pathname: '/staff/RoleList',
     });
   }
-  function updateAuthMenu(params) {
-    request({
-      url: '/api/admin/updateAuthMenu',
-      method: 'POST',
-      data: { ...params },
-      // eslint-disable-next-line no-shadow
-    }).then(data => {
+  // function updateAuthMenu(params) {
+  //   request({
+  //     url: '/api/admin/updateAuthMenu',
+  //     method: 'POST',
+  //     data: { ...params },
+  //     // eslint-disable-next-line no-shadow
+  //   }).then(data => {
+  //     toRoleList()
+  //   })
+  // }
+
+  function updateAuthMenu(data) {
+    request({ ...apis.role.updateAuthMenu, data: { ...data } }).then((data) => {
       toRoleList()
-    })
+  }).catch((err) => {
+      console.log(err)
+  })
   }
 
 

src/services/apis.js

@@ -358,8 +358,65 @@ export default {
     change: {
       url: `${prefix}/turn/taUser/:id/:type`,
       method: 'PUT',
-    }
-  }
+    },
+  },
+
+  channelList: {
+    getList: {
+      url: `${prefix}/channel`,
+      method: 'GET',
+    },
+    addChannel: {
+      url: `${prefix}/channel`,
+      method: 'POST',
+    },
+    getById: {
+      url: `${prefix}/channel/:id`,
+      method: 'GET',
+    },
+    editChannel: {
+      url: `${prefix}/channel/:id`,
+      method: 'PUT',
+    },
+    getListBroker: {
+      url: `${prefix}/channel/broker`,
+      method: 'GET',
+    },
+    getListRecommend: {
+      url: `${prefix}/customer/recommend/:id`,
+      method: 'GET',
+    },
+    getListInvite: {
+      url: `${prefix}/InviteClientsList`,
+      method: 'GET',
+    },
+ },
+ role: {
+  getRoleList: {
+    url: `${prefix}/taRole`,
+    method: 'GET',
+  },
+  stop: {
+    url: `${prefix}/taRole/stop/:id`,
+    method: 'PUT',
+  },
+  menuList: {
+    url: `${prefix}/menuList`,
+    method: 'GET',
+  },
+  buttonList: {
+    url: `${prefix}/buttonList`,
+    method: 'GET',
+  },
+  buttonAndMenuList: {
+    url: `${prefix}/taRole/details/:id`,
+    method: 'GET',
+  },
+  updateAuthMenu: {
+    url: `${prefix}/updateAuthMenu`,
+    method: 'POST',
+  },
+ },
   // indexEcharts:{
   //   list:{
   //     method:'get',