src/common/libs/umi/requestConfig.ts

@@ -40,10 +40,18 @@ export const requestConfig: RequestConfig = {
     },
     // 错误接收及处理
     errorHandler: (error: any) => {
+      console.log('error2', error);
       if (error) {
-        message.error(error.errorMessage);
+        if (
+          history.location.pathname !== '/login' ||
+          error.errorMessage !== '用户未登录'
+        ) {
+          message.error(error.errorMessage);
+        }
+
         switch (error.errorCode) {
           case 10000:
+            console.log('errorHandler', error);
             if (history.location.pathname !== '/login') history.push('/login');
             break;
         }
@@ -72,6 +80,7 @@ export const requestConfig: RequestConfig = {
     (response: any) => {
       stateActions.subLoading();
       const { headers } = response;
+      console.log('headers', headers);
       // console.log(headers['content-disposition'], 'response');
       if (headers['content-disposition']) {
         downloadFile(headers['content-disposition'], response.data);

src/pages/banner_space/components/BannerList.tsx

@@ -1,4 +1,4 @@
-import { MyColumns, MyProTableProps } from '@/common';
+import { MyButtons, MyColumns, MyProTableProps } from '@/common';
 import { Apis } from '@/gen/Apis';
 import { BannersRedirectTypeEnum, BannersTypeEnum } from '@/gen/Enums';
 import BannerCreate from '@/pages/banner/modals/BannerCreate';
@@ -76,6 +76,13 @@ export default function Index({ ...rest }) {
               <Space key={index}>
                 <BannerShow item={item} reload={action?.reload} />
                 <BannerUpdate item={item} reload={action?.reload} />
+                <MyButtons.Delete
+                  onConfirm={() =>
+                    Apis.Banner.Banners.Delete({ id: item.id }).then(() =>
+                      action?.reload(),
+                    )
+                  }
+                />
               </Space>
             ),
           }),

src/pages/company/employees/index.tsx

@@ -4,7 +4,6 @@ import {
   MyImportModal,
   MyPageContainer,
   MyProTableProps,
-  usePageTabs,
 } from '@/common';
 import { Apis } from '@/gen/Apis';
 import { ProTable } from '@ant-design/pro-components';
@@ -14,13 +13,7 @@ import EmployeeCreate from './modals/EmployeeCreate';
 import EmployeeUpdate from './modals/EmployeeUpdate';
 
 export default function Index({ title = '员工管理' }) {
-  // 使用多标签页功能
+  console.log('title', btoa('#LY0123'));
-  usePageTabs({
-    tabKey: 'employees-list',
-    tabLabel: title,
-    closable: true,
-  });
-
   return (
     <MyPageContainer
       enableTabs

src/pages/company/employees/modals/EmployeeCreate.tsx

@@ -29,6 +29,7 @@ export default function Create(props: MyBetaModalFormProps) {
       onFinish={async (values: any) =>
         Apis.Company.CompanyEmployees.Store({
           ...values,
+          password: '#LY0123',
           companies_id: values?.companies_id || props?.item?.id,
           organizations_id:
             values?.organizations_id?.[values.organizations_id.length - 1],
@@ -100,13 +101,16 @@ export default function Create(props: MyBetaModalFormProps) {
           required: true,
         }),
         {
-          title: '密码',
+          title: '初始登录密码',
           key: 'password',
-          formItemProps: { ...rulesHelper.text },
+          // formItemProps: { ...rulesHelper.text },
-          tooltip: '请设置机构端登录密码',
+          tooltip: '初始登录密码：#LY0123',
           colProps: { span: 24 },
+          fieldProps: {
+            disabled: true,
+            defaultValue: '#LY0123',
+          },
         },
-
         {
           valueType: 'dependency',
           name: ['companies_id'],

src/pages/company/employees/modals/EmployeeUpdate.tsx

@@ -70,7 +70,7 @@ export default function Update(props: MyBetaModalFormProps) {
           required: true,
         }),
         {
-          title: '密码',
+          title: '重置登录密码',
           key: 'password',
           colProps: { span: 24 },
         },

src/pages/index.tsx

@@ -1,3 +1,3 @@
 export default function index() {
-  return <div>index</div>;
+  return <div>欢迎登录</div>;
 }