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

src/components/SelectButton/NewTypeSelect.jsx

@@ -23,7 +23,7 @@ const NewsTypeSelect = (props) => {
         url: '/api/admin/taNewsType',
         method: 'GET',
         params: {pageNum: 1,pageSize: 999},
-        action: 'select',
+        action: 'admin.taNewsType.get',
     }).then((data) => {
         setData(data.records)
     })

src/pages/staff/list/addRole.jsx

@@ -29,7 +29,7 @@ const Poster = props => {
   const [dataMenuId, setDataMenuId] = useState([])
   const [dataButtonId, setDataButtonId] = useState([])
 
-  const [loading, setLoading] = useState(true);
+  const [loading, setLoading] = useState(false);
 
   useEffect(() => {
     // 新增和编辑用一个页面
@@ -64,6 +64,7 @@ const Poster = props => {
 
   // 根据角色id查询当前的菜单及其按钮
   function buttonAndMenuList(params, ids) {
+    setLoading(true)
     request({ ...apis.role.buttonAndMenuList, urlData: { id: ids }, params: { ...params } }).then(data => {
       setLoading(false)
       props.form.setFieldsValue({ roleName: data.roleName })

src/services/apis.js

@@ -546,7 +546,7 @@ export default {
     getListInvite: {
       url: `${prefix}/channel/InviteClientsList`,
       method: 'GET',
-      action: 'admin.InviteClientsList.get',
+      action: 'admin.channel.InviteClientsList.get',
     },
  },
  role: {