修改

config/cacheRoutes.js

@@ -6,7 +6,8 @@ const routes = [
   '/system/center',
   '/demo/tabcrud',
   '/demo/tabcrud/add',
-  '/demo/tabcrud/edit'
+  '/demo/tabcrud/edit',
+  '/tenantsys/tenant',      // xx
 ]
 
 export default {

config/config.js

@@ -134,6 +134,21 @@ export default defineConfig({
                 },
               ],
             },
+            // 添加商户
+            {
+              path: '/tenantsys',
+              name: 'tenantsys',
+              icon: 'setting',
+              routes: [
+                {
+                  path: '/tenantsys/tenant',
+                  name: 'tenant',
+                  icon: 'SolutionOutlined',
+                  component: './tenant/index',
+                }
+              ]
+            },
+            // -----
             {
               path: '*',
               component: './exception/404',

config/proxy.js

@@ -8,8 +8,9 @@
 export default {
   dev: {
     '/ebd/': {
-      target: 'http://47.103.50.109:9051',
+      // target: 'http://47.103.50.109:9051',
       // target: 'http://47.103.50.109:9050',
+      target: 'http://192.168.1.247:8040',
       changeOrigin: true,
       pathRewrite: {
         '^/ebd': '',

src/components/Business/MenuTree/index.jsx

 import React, { useEffect, useState, useImperativeHandle } from 'react'
 import { SageTree } from '@/components/Common'
-import { getMenu } from '@/services/menu'
+import { queryMenu } from '@/pages/menu/service'
 
 // 遍历所有子节点数组改变结构
 function loopTree(arr) {
@@ -24,8 +24,8 @@ const MenuTree = (props, ref) => {
   const [autoExpandParent, setAutoExpandParent] = useState(true);
   const [checkStrictly, setCheckStrictly] = useState(true)
 
-  const queryMenu = async () => {
-    const res = await getMenu()
+  const getMenu = async () => {
+    const res = await queryMenu()
     const { data } = res
     const treeDataArr = data ? data.slice() : []
     loopTree(treeDataArr)
@@ -60,7 +60,7 @@ const MenuTree = (props, ref) => {
   }
 
   useEffect(() => {
-    queryMenu()
+    getMenu()
   }, [])
 
   // 暴露给外部的方法

src/components/Common/TableTool/index.jsx

@@ -80,7 +80,7 @@ const SageTableTool = (props) => {
   return (
     <div className="sage-table-toolbar">
       <div className="sage-table-toolbar-button">
-        {toolBarRender()}
+        {toolBarRender ? toolBarRender() : null}
       </div>
       <div className="sage-table-toolbar-option">
         {toolDom}

src/components/Loading/index.jsx

+import React from 'react';
+
+export default () => {
+  return <div>加载中...</div>;
+}

src/layouts/BasicLayout.jsx

@@ -162,7 +162,8 @@ const BasicLayout = (props) => {
         }
       })
     } else {
-      const localMenuTree = JSON.parse(localStorage.menuTree)
+      // const localMenuTree = JSON.parse(localStorage.menuTree)
+      const localMenuTree = currentUser.menuTree
       localMenuTree.forEach(item => {
         menuList.push(item)
       })

src/layouts/SecurityLayout.jsx

@@ -32,6 +32,7 @@ class SecurityLayout extends React.Component {
     });
 
     if ((!isLogin && loading) || !isReady) {
+      // return <div>1</div>
       return <PageLoading />;
     }
 

src/models/login.js

@@ -23,7 +23,9 @@ const Model = {
         }); // Login successfully
 
         // 菜单赋值
-        localStorage.menuTree = JSON.stringify(response.data.menuTree)
+        // localStorage.menuTree = JSON.stringify(response.data.menuTree)
+        // 赋值token
+        localStorage.systemToken = response.data
 
         const urlParams = new URL(window.location.href);
         const params = getPageQuery();
@@ -63,6 +65,9 @@ const Model = {
       if (response.isSuccess) {
         const { redirect } = getPageQuery(); // Note: There may be security issues, please note
 
+        // 取消token
+        localStorage.systemToken = ''
+
         if (window.location.pathname !== '/user/login' && !redirect) {
           history.replace({
             pathname: '/user/login',

src/models/user.js

@@ -20,7 +20,7 @@ const UserModel = {
         const userInfo = response.data
 
         userInfo.name = userInfo.loginName || '创世者'
-        userInfo.avatar = `/ebd/sys/file/showImage?imageId=${userInfo.user.headImage}`
+        userInfo.avatar = userInfo.user.headImage ? `/ebd/sys/file/showImage?imageId=${userInfo.user.headImage}` : 'http://static.titian365.com/person_logo.png'
 
         yield put({
           type: 'saveCurrentUser',

src/pages/demo/crud/components/CreateForm.jsx

@@ -19,12 +19,12 @@ const CreateForm = (props, ref) => {
       code: 'DEVICE_CONTROL_TYPE,DEVICE_FUNCTION_TYPE'
     })
     if (res.isSuccess) {
-      const { DEVICE_CONTROL_TYPE, DEVICE_FUNCTION_TYPE } = res.data
-      DEVICE_CONTROL_TYPE.forEach(item => {
+      const { DEVICE_CONTROL_TYPE = [], DEVICE_FUNCTION_TYPE = [] } = res.data
+      DEVICE_CONTROL_TYPE && DEVICE_CONTROL_TYPE.forEach(item => {
         item.text = item.dictValue
         item.value = item.dictKey
       })
-      DEVICE_FUNCTION_TYPE.forEach(item => {
+      DEVICE_FUNCTION_TYPE && DEVICE_FUNCTION_TYPE.forEach(item => {
         item.text = item.dictValue
         item.value = item.dictKey
       })

src/pages/demo/crud/components/UpdateForm.jsx

@@ -21,7 +21,7 @@ const UpdateForm = (props, ref) => {
       code: 'DEVICE_CONTROL_TYPE,DEVICE_FUNCTION_TYPE'
     })
     if (res.isSuccess) {
-      const { DEVICE_CONTROL_TYPE, DEVICE_FUNCTION_TYPE } = res.data
+      const { DEVICE_CONTROL_TYPE = [], DEVICE_FUNCTION_TYPE = [] } = res.data
       DEVICE_CONTROL_TYPE && DEVICE_CONTROL_TYPE.forEach(item => {
         item.text = item.dictValue
         item.value = item.dictKey

src/pages/demo/crud/service.js

@@ -2,25 +2,25 @@ import request from '@/utils/request';
 import { requestPrefix } from '@/services/prefix'
 
 export async function queryCrud(params) {
-  return request(`/${requestPrefix}/party/test/queryList`, {
+  return request(`/${requestPrefix}/sage-party/party/test/queryList`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function removeCrud(params) {
-  return request(`/${requestPrefix}/party/test/deleteBatch`, {
+  return request(`/${requestPrefix}/sage-party/party/test/deleteBatch`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function addCrud(params) {
-  return request(`/${requestPrefix}/party/test/saveOrEdit`, {
+  return request(`/${requestPrefix}/sage-party/party/test/saveOrEdit`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function updateCrud(params) {
-  return request(`/${requestPrefix}/party/test/saveOrEdit`, {
+  return request(`/${requestPrefix}/sage-party/party/test/saveOrEdit`, {
     method: 'POST',
     data: { ...params },
   });
@@ -28,7 +28,7 @@ export async function updateCrud(params) {
 
 // 查询
 export function getCrudDetail(params) {
-  return request(`/${requestPrefix}/party/test/selectById`, {
+  return request(`/${requestPrefix}/sage-party/party/test/selectById`, {
     method: 'POST',
     data: { ...params },
   })

src/pages/demo/tabcrud/service.js

@@ -2,25 +2,25 @@ import request from '@/utils/request';
 import { requestPrefix } from '@/services/prefix'
 
 export async function queryCrud(params) {
-  return request(`/${requestPrefix}/party/test/queryList`, {
+  return request(`/${requestPrefix}/sage-party/party/test/queryList`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function removeCrud(params) {
-  return request(`/${requestPrefix}/party/test/deleteBatch`, {
+  return request(`/${requestPrefix}/sage-party/party/test/deleteBatch`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function addCrud(params) {
-  return request(`/${requestPrefix}/party/test/saveOrEdit`, {
+  return request(`/${requestPrefix}/sage-party/party/test/saveOrEdit`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function updateCrud(params) {
-  return request(`/${requestPrefix}/party/test/saveOrEdit`, {
+  return request(`/${requestPrefix}/sage-party/party/test/saveOrEdit`, {
     method: 'POST',
     data: { ...params },
   });
@@ -28,7 +28,7 @@ export async function updateCrud(params) {
 
 // 查询
 export function getCrudDetail(params) {
-  return request(`/${requestPrefix}/party/test/selectById`, {
+  return request(`/${requestPrefix}/sage-party/party/test/selectById`, {
     method: 'POST',
     data: { ...params },
   })

src/pages/dept/service.js

@@ -2,28 +2,28 @@ import request from '@/utils/request';
 import { requestPrefix } from '@/services/prefix'
 
 export async function queryDept(params) {
-  return request(`/${requestPrefix}/party/orgn/queryOrgn`, {
+  return request(`/${requestPrefix}/sage-party/party/orgn/queryOrgn`, {
     method: 'POST',
     data: { ...params },
   });
 }
 
 export async function removeDept(params) {
-  return request(`/${requestPrefix}/party/orgn/delete`, {
+  return request(`/${requestPrefix}/sage-party/party/orgn/delete`, {
     method: 'POST',
     data: { ...params },
   });
 }
 
 export async function addDept(params) {
-  return request(`/${requestPrefix}/party/orgn/save`, {
+  return request(`/${requestPrefix}/sage-party/party/orgn/save`, {
     method: 'POST',
     data: { ...params },
   });
 }
 
 export async function updateDept(params) {
-  return request(`/${requestPrefix}/party/orgn/edit`, {
+  return request(`/${requestPrefix}/sage-party/party/orgn/edit`, {
     method: 'POST',
     data: { ...params },
   });
@@ -31,14 +31,14 @@ export async function updateDept(params) {
 
 // 查询
 export function getDeptDetail(params) {
-  return request(`/${requestPrefix}/party/orgn/selectById`, {
+  return request(`/${requestPrefix}/sage-party/party/orgn/selectById`, {
     method: 'POST',
     data: { ...params },
   })
 }
 
 export function openOrClose(params) {
-  return request(`/${requestPrefix}/party/orgn/openOrClose`, {
+  return request(`/${requestPrefix}/sage-party/party/orgn/openOrClose`, {
     method: 'POST',
     data: { ...params },
   })

src/pages/menu/service.js

@@ -2,25 +2,25 @@ import request from '@/utils/request';
 import { requestPrefix } from '@/services/prefix'
 
 export async function queryMenu(params) {
-  return request(`/${requestPrefix}/party/menu/menu`, {
+  return request(`/${requestPrefix}/sage-party/party/menu/menu`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function removeMenu(params) {
-  return request(`/${requestPrefix}/party/menu/delete`, {
+  return request(`/${requestPrefix}/sage-party/party/menu/delete`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function addMenu(params) {
-  return request(`/${requestPrefix}/party/menu/save`, {
+  return request(`/${requestPrefix}/sage-party/party/menu/save`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function updateMenu(params) {
-  return request(`/${requestPrefix}/party/menu/edit`, {
+  return request(`/${requestPrefix}/sage-party/party/menu/edit`, {
     method: 'POST',
     data: { ...params },
   });
@@ -28,7 +28,7 @@ export async function updateMenu(params) {
 
 // 查询
 export function getMenuDetail(params) {
-  return request(`/${requestPrefix}/party/menu/selectById`, {
+  return request(`/${requestPrefix}/sage-party/party/menu/selectById`, {
     method: 'POST',
     data: { ...params },
   })
@@ -36,7 +36,7 @@ export function getMenuDetail(params) {
 
 // 更新缓存
 export function clearMenu() {
-  return request(`/${requestPrefix}/party/menu/clearMenu`, {
+  return request(`/${requestPrefix}/sage-party/party/menu/clearMenu`, {
     method: 'GET'
   })
 }

src/pages/role/service.js

@@ -2,25 +2,25 @@ import request from '@/utils/request';
 import { requestPrefix } from '@/services/prefix'
 
 export async function queryRule(params) {
-  return request(`/${requestPrefix}/party/role/queryList`, {
+  return request(`/${requestPrefix}/sage-party/party/role/queryList`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function removeRule(params) {
-  return request(`/${requestPrefix}/party/role/delete`, {
+  return request(`/${requestPrefix}/sage-party/party/role/delete`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function addRule(params) {
-  return request(`/${requestPrefix}/party/role/save`, {
+  return request(`/${requestPrefix}/sage-party/party/role/save`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function updateRule(params) {
-  return request(`/${requestPrefix}/party/role/edit`, {
+  return request(`/${requestPrefix}/sage-party/party/role/edit`, {
     method: 'POST',
     data: { ...params },
   });
@@ -28,14 +28,14 @@ export async function updateRule(params) {
 
 // 查询
 export function getRuleDetail(params) {
-  return request(`/${requestPrefix}/party/role/selectById`, {
+  return request(`/${requestPrefix}/sage-party/party/role/selectById`, {
     method: 'POST',
     data: { ...params },
   })
 }
 
 export function openOrClose(params) {
-  return request(`/${requestPrefix}/party/role/openOrClose`, {
+  return request(`/${requestPrefix}/sage-party/party/role/openOrClose`, {
     method: 'POST',
     data: { ...params },
   })

src/pages/tenant/components/CreateForm.jsx

+import React, { useState, useRef, useEffect, useImperativeHandle } from 'react'
+import { Form, Input, InputNumber, Select, AutoComplete } from 'antd'
+import { SageForm } from '@/components/Common'
+import { getEnumDropDownList } from '@/services/enum'
+
+const { Option } = Select
+
+const CreateForm = (props, ref) => {
+
+  const formRef = useRef()
+
+  useEffect(() => {
+
+  }, [])
+
+  const onFinish = (values) => {
+    if (props.onFinish) {
+      props.onFinish(values)
+    }
+  }
+
+  const onFinishFailed = ({ values }) => {
+    console.log(values)
+  }
+
+  // 表单字段设置
+  const formFields = [
+    {
+      name: 'field1',
+      label: '商户logo',
+      type: 'input',
+      rules: [{ required: true }],
+      props: {
+        placeholder: '请输入'
+      }
+    },
+    {
+      name: 'field2',
+      label: '商户名称',
+      type: 'input',
+      rules: [{ required: true }],
+      props: {
+        placeholder: '请输入'
+      }
+    },
+    {
+      name: 'field3',
+      label: '商户简称',
+      type: 'input',
+      rules: [{ required: true }],
+      props: {
+        placeholder: '请输入'
+      }
+    },
+    {
+      name: 'field4',
+      label: '商户分类',
+      type: 'input',
+      rules: [{ required: true }],
+      props: {
+        placeholder: '请输入'
+      }
+    }
+  ]
+
+  // 暴露外部方法
+  useImperativeHandle(ref, () => ({
+    submit: () => formRef.current.submit(),
+    validateFields: (nameList) => formRef.current.validateFields(nameList),
+    getFieldsValue: (nameList) => formRef.current.getFieldsValue(nameList),
+    setFieldsValue: (values) => formRef.current.setFieldsValue(values),
+    resetFields: (fields) => formRef.current.resetFields(fields)
+  }))
+
+  return (
+    <SageForm
+      ref={formRef}
+      formFields={formFields}
+      onFinish={onFinish}
+      onFinishFailed={onFinishFailed}
+    />
+  )
+}
+
+export default React.forwardRef(CreateForm)

src/pages/tenant/components/UpdateForm.jsx

+import React, { useState, useRef, useEffect, useImperativeHandle } from 'react'
+import { Form, Input, InputNumber, Select, AutoComplete } from 'antd'
+import { SageForm } from '@/components/Common'
+import { getEnumDropDownList } from '@/services/enum'
+
+const { Option } = Select
+
+const UpdateForm = (props, ref) => {
+
+  const { detail } = props
+
+  const formRef = useRef()
+
+  useEffect(() => {
+
+  }, [])
+
+  const onFinish = (values) => {
+    if (props.onFinish) {
+      props.onFinish(values)
+    }
+  }
+
+  // 表单字段设置
+  const formFields = [
+    {
+      name: 'field1',
+      label: '商户logo',
+      type: 'input',
+      rules: [{ required: true }],
+      props: {
+        placeholder: '请输入'
+      }
+    },
+    {
+      name: 'field2',
+      label: '商户名称',
+      type: 'input',
+      rules: [{ required: true }],
+      props: {
+        placeholder: '请输入'
+      }
+    },
+    {
+      name: 'field3',
+      label: '商户简称',
+      type: 'input',
+      rules: [{ required: true }],
+      props: {
+        placeholder: '请输入'
+      }
+    },
+    {
+      name: 'field4',
+      label: '商户分类',
+      type: 'input',
+      rules: [{ required: true }],
+      props: {
+        placeholder: '请输入'
+      }
+    }
+  ]
+
+  // 暴露外部方法
+  useImperativeHandle(ref, () => ({
+    submit: () => formRef.current.submit(),
+    validateFields: (nameList) => formRef.current.validateFields(nameList),
+    getFieldsValue: (nameList) => formRef.current.getFieldsValue(nameList),
+    setFieldsValue: (values) => formRef.current.setFieldsValue(values),
+    resetFields: (fields) => formRef.current.resetFields(fields)
+  }))
+
+  return (
+    <SageForm
+      ref={formRef}
+      formFields={formFields}
+      // colNum={2}
+      onFinish={onFinish}
+    />
+  )
+}
+
+export default React.forwardRef(UpdateForm)

src/pages/tenant/index.jsx

+import React, { useState, useEffect, useRef } from 'react'
+import { PageHeaderWrapper } from '@ant-design/pro-layout'
+import { SageTable, SageModal, SageButton, SageMessage, ActionSet } from '@/components/Common'
+import { PlusOutlined, EditOutlined, DeleteOutlined, VerticalAlignBottomOutlined, VerticalAlignTopOutlined } from '@ant-design/icons';
+import moment from 'moment';
+import { queryTenant, updateTenant, addTenant, removeCrud, getTenantDetail } from './service';
+import CreateForm from './components/CreateForm'
+import UpdateForm from './components/UpdateForm'
+
+
+// 详情数据
+const initDetail = {
+  id: null
+}
+
+const CrudList = () => {
+
+  // 状态数据
+  const [detail, setDetail] = useState(initDetail) // 详情
+  const [editable, setEditable] = useState(true)   // 编辑按钮状态
+  const [removeable, setRemoveable] = useState(true)   // 删除按钮状态
+  const [status, setStatus] = useState('') // 状态 1、add 2、update 3、detail
+  const [modalLoading, setModalLoading] = useState(false) // 窗口loading
+
+
+  // ref对象
+  const tableRef = useRef();
+  const modalRef = useRef();
+  const createFormRef = useRef();
+  const updateFormRef = useRef();
+
+  useEffect(() => {
+
+  }, [])
+
+  // 查询条件
+  const searchFields = [
+    {
+      name: 'field2',
+      label: '商户名称',
+      type: 'input',
+      props: {
+        placeholder: '请输入'
+      }
+    }
+  ]
+
+  // 查询
+  const onSearchTable = (params) => {
+    if (tableRef.current) {
+      const postParams = Object.assign({ pageNum: 1 }, params)
+      // 处理查询条件
+      // if (postParams.field19) {
+      //   postParams.field19 = [
+      //     moment(postParams.field19[0]).format('YYYY-MM-DD'),
+      //     moment(postParams.field19[1]).format('YYYY-MM-DD'),
+      //   ]
+      // }
+
+      tableRef.current.queryTable(postParams)
+    }
+  }
+
+  // 重置
+  const onResetTable = () => {
+    if (tableRef.current) {
+      tableRef.current.queryTable({ pageNum: 1 }, 'reset')
+    }
+  }
+
+  const tableSearchFormProps = {
+    searchFields,
+    onSearchTable,
+    onResetTable
+  }
+
+  // 编辑
+  const handleEdit = async (event, record) => {
+    event.stopPropagation()
+
+    setStatus('update')
+    const res = await getTenantDetail({ id: record.id })
+    const { data } = res
+    setDetail(data)
+
+    modalRef.current.setTitle('编辑')
+    modalRef.current.setVisible(true)
+    updateFormRef.current.setFieldsValue({
+      field1: data.field1,
+      field2: data.field2,
+      field3: data.field3,
+      field4: data.field4,
+      field5: data.field5
+    })
+  }
+
+  // 删除
+  const handleDelete = async (event, record) => {
+    event.stopPropagation()
+
+    const res = await removeCrud({ idArr: [record.id] })
+    if (res.isSuccess) {
+      SageMessage.success('删除成功')
+      tableRef.current.reloadTable()
+    }
+  }
+
+  // 表格
+  const columns = [
+    {
+      title: '商户logo',
+      dataIndex: 'field1',
+      key: 'field1',
+      width: 200,
+    },
+    {
+      title: '商户名称',
+      dataIndex: 'field2',
+      key: 'field2',
+      width: 200,
+    },
+    {
+      title: '商户简称',
+      dataIndex: 'field3',
+      key: 'field3',
+      width: 200,
+    },
+    {
+      title: '商户分类',
+      dataIndex: 'field4',
+      key: 'field4',
+      width: 200,
+    },
+    {
+      title: '状态',
+      dataIndex: 'field5',
+      key: 'field5',
+      width: 200,
+      // render: (text, record) => {
+      //   return record.field4
+      // }
+    },
+    {
+      title: '操作',
+      fixed: 'right',
+      dataIndex: 'button',
+      key: 'action',
+      align: 'center',
+      render: (button, record) => {
+
+        const actionList = [
+          { title: '编辑', method: (e) => handleEdit(e, record) },
+          { title: '删除', method: (e) => handleDelete(e, record), isConfirm: true, confirmInfo: '确认删除该角色?' },
+        ]
+
+        return <ActionSet actionList={actionList} record={record} />
+      },
+      width: 120
+    }
+  ]
+
+  const tableProps = {
+    rowKey: 'id',
+    hasNumber: true,
+    hasCheck: true,
+    columns,
+    scroll: { x: '100vw' },
+    rowSelection: {
+      onChange: (selectedrowkeys, selectedrows) => {
+        tableRef.current.setSelectedRowKeys(selectedrowkeys)
+        tableRef.current.setSelectedRows(selectedrows)
+        setEditable(selectedrowkeys.length !== 1)
+        setRemoveable(selectedrowkeys.length === 0)
+      }
+    }
+  }
+
+  // 新建按钮
+  const onAdd = () => {
+    if (modalRef.current) {
+      setStatus('add')
+      modalRef.current.setTitle('新增')
+      modalRef.current.setVisible(true)
+      if (createFormRef.current) {
+        createFormRef.current.resetFields()
+      }
+    }
+  }
+
+  // 编辑按钮
+  const onEdit = (e) => {
+    const rowRecords = tableRef.current.getSelectedRows()
+    handleEdit(e, rowRecords[0])
+  }
+
+  // 删除按钮
+  const onDelete = async (e) => {
+    e.stopPropagation()
+
+    const rowRecords = tableRef.current.getSelectedRowKeys()
+    const res = await removeCrud({ idArr: rowRecords })
+    if (res.isSuccess) {
+      SageMessage.success('删除成功')
+      tableRef.current.reloadTable()
+    }
+  }
+
+  // 导入按钮
+  const onImport = (e) => {
+    alert('待实现')
+  }
+
+  // 导出按钮
+  const onExport = (e) => {
+    alert('待实现')
+  }
+
+  // 表格按钮操作
+  const tableToolProps = {
+    toolBarRender: () => {
+      return (
+        <>
+          <SageButton type="primary" icon={<PlusOutlined />} onClick={onAdd}>新增</SageButton>
+        </>
+      )
+    },
+    toolOptionConfig: ['reload', 'hiddensearch', 'density', 'fullScreen']
+  }
+
+  // 窗口确认按钮
+  const onOk = async () => {
+    if (status === 'add' && createFormRef.current) {
+      createFormRef.current.submit();
+    }
+    if (status === 'update' && updateFormRef.current) {
+      updateFormRef.current.submit();
+    }
+  }
+
+  // 表单提交成功
+  const onFinish = async (values) => {
+    const formData = Object.assign({}, values)
+
+    console.log('提交数据:', formData)
+
+    // 处理赋值表单数据
+
+    let res = null
+    setModalLoading(true)
+    switch (status) {
+      case 'add':
+        res = await addTenant(formData)
+        break;
+      case 'update':
+        formData.id = detail.id
+        res = await updateTenant(formData)
+        break
+      default:
+        break;
+    }
+    setModalLoading(false)
+
+    if (res.isSuccess) {
+      SageMessage.success('保存成功')
+      modalRef.current.setVisible(false)
+      tableRef.current.reloadTable()
+    }
+  }
+
+  return (
+    <PageHeaderWrapper>
+
+      <SageTable
+        ref={tableRef}
+        // {...tableSearchFormProps}
+        // {...tableToolProps}
+        {...tableProps}
+        request={(params) => queryTenant(params)}
+      />
+
+      <SageModal
+        ref={modalRef}
+        onOk={onOk}
+        width={600}
+        confirmLoading={modalLoading}
+      >
+        {
+          status === 'add' ?
+          <CreateForm
+            ref={createFormRef}
+            onFinish={onFinish}
+          /> : null
+        }
+        {
+          status === 'update' ?
+          <UpdateForm
+            ref={updateFormRef}
+            detail={detail}
+            onFinish={onFinish}
+          /> : null
+        }
+      </SageModal>
+
+    </PageHeaderWrapper>
+  )
+}
+
+export default CrudList

src/pages/tenant/service.js

+import request from '@/utils/request';
+import { requestPrefix } from '@/services/prefix'
+
+export async function queryTenant(params) {
+  return request(`/${requestPrefix}/sage-party/party/test/queryList`, {
+    method: 'POST',
+    data: { ...params },
+  });
+}
+export async function removeCrud(params) {
+  return request(`/${requestPrefix}/sage-party/party/test/deleteBatch`, {
+    method: 'POST',
+    data: { ...params },
+  });
+}
+export async function addTenant(params) {
+  return request(`/${requestPrefix}/sage-party/party/test/saveOrEdit`, {
+    method: 'POST',
+    data: { ...params },
+  });
+}
+export async function updateTenant(params) {
+  return request(`/${requestPrefix}/sage-party/party/test/saveOrEdit`, {
+    method: 'POST',
+    data: { ...params },
+  });
+}
+
+// 查询
+export function getTenantDetail(params) {
+  return request(`/${requestPrefix}/sage-party/party/test/selectById`, {
+    method: 'POST',
+    data: { ...params },
+  })
+}

src/pages/user/manage/service.js

 import request from '@/utils/request';
-import { requestPrefix } from '@/services/prefix'
+import { requestPrefix } from '@/services/prefix';
 
 export async function queryUser(params) {
-  return request(`/${requestPrefix}/party/person/queryList`, {
+  return request(`/${requestPrefix}/sage-party/party/person/queryList`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function removeUser(params) {
-  return request(`/${requestPrefix}/party/person/delete`, {
+  return request(`/${requestPrefix}/sage-party/party/person/delete`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function addUser(params) {
-  return request(`/${requestPrefix}/party/person/save`, {
+  return request(`/${requestPrefix}/sage-party/party/person/save`, {
     method: 'POST',
     data: { ...params },
   });
 }
 export async function updateUser(params) {
-  return request(`/${requestPrefix}/party/person/edit`, {
+  return request(`/${requestPrefix}/sage-party/party/person/edit`, {
     method: 'POST',
     data: { ...params },
   });
@@ -28,21 +28,21 @@ export async function updateUser(params) {
 
 // 查询
 export function getUserDetail(params) {
-  return request(`/${requestPrefix}/party/person/selectById`, {
+  return request(`/${requestPrefix}/sage-party/party/person/selectById`, {
     method: 'POST',
     data: { ...params },
   })
 }
 
 export function openOrClose(params) {
-  return request(`/${requestPrefix}/party/person/openOrClose`, {
+  return request(`/${requestPrefix}/sage-party/party/person/openOrClose`, {
     method: 'POST',
     data: { ...params },
   })
 }
 
 export function modifyPwd(params) {
-  return request(`/${requestPrefix}/party/modifyPwd`, {
+  return request(`/${requestPrefix}/sage-party/party/modifyPwd`, {
     method: 'POST',
     data: { ...params },
   })

src/services/enum.js

 import request from '@/utils/request';
+import { requestPrefix } from '@/services/prefix'
 
 // 查询
 export function getEnumDropDownList(params) {
-  return request('/ebd/sys/common/getEnumDropDownList', {
+  return request(`/${requestPrefix}/sage-party/sys/common/getEnumDropDownList`, {
     method: 'POST',
     data: { ...params },
   })

src/services/login.js

 import request from '@/utils/request';
+import { requestPrefix } from '@/services/prefix'
 
 export async function fakeAccountLogin(params) {
-  return request(`/ebd/party/login?username=${params.username}&password=${params.password}`, {
+  return request(`/${requestPrefix}/sage-party/party/login?username=${params.username}&password=${params.password}&sysType=01.platform`, {
     method: 'POST',
     data: params,
   });
 }
 
 export async function fakeAccountLogout() {
-  return request('/ebd/party/logout', {
+  return request(`/${requestPrefix}/sage-party/party/logout`, {
     method: 'GET',
   });
 }

src/services/menu.js

-import request from '@/utils/request';
-
-// 获取菜单
-export function getMenu(params) {
-  return request('/ebd/party/menu/menu', {
-      method: 'POST',
-      data: { ...params }
-  })
-}

src/services/user.js

-import request from '@/utils/request';
+import sageRequest from '@/utils/request';
 import { requestPrefix } from '@/services/prefix'
 
 export async function query() {
-  return request('/api/users');
+  return sageRequest('/api/users');
 }
 export async function queryCurrent() {
-  return request(`/${requestPrefix}/party/userInfo`);
+  return sageRequest(`/${requestPrefix}/sage-party/party/userInfo`);
 }
 export async function queryNotices() {
-  return request('/api/notices');
+  return sageRequest('/api/notices');
 }

src/utils/request.js

@@ -52,7 +52,7 @@ const errorHandler = error => {
 const request = extend({
   errorHandler,
   // 默认错误处理
-  credentials: 'include', // 默认请求是否带上cookie
+  // credentials: 'include', // 默认请求是否带上cookie
 });
 
 request.interceptors.response.use(async (response) => {
@@ -68,4 +68,12 @@ request.interceptors.response.use(async (response) => {
   return response
 })
 
-export default request;
+export default function sageRequest(url, options) {
+  request.extendOptions({
+    headers: {
+      Authorization: localStorage.systemToken || ''
+    }
+  })
+
+  return request(url, options)
+};