修复：路由缓存，加盟入驻地址可选

src/api/interface/systemManageType.ts

@@ -130,6 +130,8 @@ export type listCompanyPage = InterListFunction<
     phoneNum: string;
     province: string;
     remark: string;
+    lat: number;
+    lon: number;
   }
 >;
 // 单位-新增
@@ -147,6 +149,8 @@ export type listCompanyAdd = InterFunction<
     province?: string;
     remark?: string;
     area?: string[];
+    lat: number;
+    lon: number;
   },
   NonNullable<unknown>
 >;
@@ -165,6 +169,8 @@ export type listCompanyUpdate = InterFunction<
     province?: string;
     remark?: string;
     area?: string[];
+    lat: number;
+    lon: number;
   },
   NonNullable<unknown>
 >;

src/components/layout/title/index.tsx

@@ -5,7 +5,6 @@ import { Button, Dropdown, MenuProps, Modal } from 'antd';
 import Logo from '../../../assets/icon/logo_big.png';
 import './index.scss';
 import { REMOVE_MENU, REMOVE_MENU_ID, SET_COLLAPSE } from '~/store/module/menu';
-import { REMOVE_ROLE_ID } from '~/store/module/userInfo';
 import { useDispatch, useSelector } from 'react-redux';
 import { useNavigate } from 'react-router-dom';
 import Cookies from 'js-cookie';
@@ -42,7 +41,6 @@ export function TitleView() {
                 Cookies.remove('SHAREFLY-TOKEN');
                 dispatch(REMOVE_MENU());
                 dispatch(REMOVE_MENU_ID());
-                dispatch(REMOVE_ROLE_ID());
               },
             });
           }}
@@ -62,8 +60,8 @@ export function TitleView() {
       }}
     >
       <div className='layout-logo'>
-        <img className='logo-img' src={Logo} alt='云享飞' />
-        <div className='logo-text'>云享飞后台管理</div>
+        <img src={userInfo.companyInfoVO.brandLogo || Logo} className='logo-img' alt='云享飞' />
+        <div className='logo-text'>{userInfo.companyInfoVO.brandName || '云享飞管理后台'}</div>
         <div onClick={setMenuCollapsed}>
           <svg
             className={`hamburger ${isActive ? 'is-active' : ''}`}

src/pages/systemManage/companyManage/companyList/comp/addEditModal/index.tsx

-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import { InterListType, InterReqType } from '~/api/interface';
 import { listCompanyAdd, listCompanyPage } from '~/api/interface/systemManageType';
-import { Form, Input, message, Modal } from 'antd';
+import { Button, Col, Form, Input, message, Modal, Row } from 'antd';
 import { SystemManageAPI } from '~/api';
+import { EnvironmentOutlined } from '@ant-design/icons';
+import SelectMap from '~/components/select-map';
 
 // 列表的类型
 type TableType = InterListType<listCompanyPage>;
 // 请求的表单类型
-type ReqType = InterReqType<listCompanyAdd>;
+type ReqType = Exclude<InterReqType<listCompanyAdd>, undefined>;
 // 传参类型
 interface propType {
   title: string;
@@ -20,6 +22,15 @@ const AddEditModal: React.FC<propType> = (props) => {
   const { title, open, closed, data } = props;
   /// 表单钩子
   const [form] = Form.useForm<ReqType>();
+  //选点信息
+  const [position, setPosition] = useState<{
+    lat: number;
+    lon: number;
+    address: string;
+  }>();
+  //地图选点弹窗
+  const [selectMapShow, setSelectMapShow] = useState<boolean>(false);
+
   // 关闭弹窗
   const handleCancel = () => {
     form.resetFields();
@@ -30,13 +41,14 @@ const AddEditModal: React.FC<propType> = (props) => {
     form
       .validateFields()
       .then(async (values) => {
-        await handleSubmit({
-          ...values,
-          province: values?.area?.at(0),
-          city: values?.area?.at(1),
-          district: values?.area?.at(2),
-          companyType: data?.id === 1 ? 0 : 1,
-        });
+        if (position) {
+          await handleSubmit({
+            ...values,
+            lat: position.lat,
+            lon: position.lon,
+            companyType: data?.id === 1 ? 0 : 1,
+          });
+        }
       })
       .catch((err) => {
         message
@@ -57,6 +69,26 @@ const AddEditModal: React.FC<propType> = (props) => {
       handleCancel();
     }
   };
+
+  const selectMapShowClick = () => {
+    setSelectMapShow(true);
+  };
+  const selectMapClose = () => {
+    setSelectMapShow(false);
+  };
+  const selectMapSubmit = (value: { lat: number; lon: number; address: string }) => {
+    form.setFieldValue('address', value.address);
+    setPosition(value);
+    setSelectMapShow(false);
+  };
+  const addressInputEvent = (e: any) => {
+    if (position) {
+      position.address = e.target.value;
+      form.setFieldValue('address', e.target.value || undefined);
+      setPosition({ ...position });
+    }
+  };
+
   // componentDidMount
   useEffect(() => {
     if (!open) return;
@@ -65,9 +97,12 @@ const AddEditModal: React.FC<propType> = (props) => {
     // @ts-ignore
     form.setFieldsValue({
       ...data,
-      area: [data?.province, data?.city, data?.district],
     });
-    // console.log('data --->', data);
+    setPosition({
+      address: data.address,
+      lat: data.lat,
+      lon: data.lon,
+    });
   }, [open]);
   return (
     <Modal
@@ -114,7 +149,27 @@ const AddEditModal: React.FC<propType> = (props) => {
           name='address'
           rules={[{ required: true, message: '请输入详细地址' }]}
         >
-          <Input.TextArea placeholder='请输入详细地址' maxLength={50} showCount />
+          {/*<Input.TextArea placeholder='请输入详细地址' maxLength={50} showCount />*/}
+          <Row justify='space-between'>
+            {position ? (
+              <Col span={21}>
+                <Input
+                  placeholder='请输入详细地址'
+                  value={position.address}
+                  onChange={addressInputEvent}
+                />
+              </Col>
+            ) : (
+              ''
+            )}
+            <Col span={2}>
+              <Button
+                icon={<EnvironmentOutlined />}
+                type='primary'
+                onClick={selectMapShowClick}
+              ></Button>
+            </Col>
+          </Row>
         </Form.Item>
         <Form.Item label='联系人' name='companyUserName'>
           <Input placeholder='请输入联系人' maxLength={15} />
@@ -138,6 +193,7 @@ const AddEditModal: React.FC<propType> = (props) => {
         <Form.Item label='备注' name='remark'>
           <Input.TextArea placeholder='请输入备注' maxLength={50} showCount />
         </Form.Item>
+        <SelectMap open={selectMapShow} closed={selectMapClose} submit={selectMapSubmit} />
       </Form>
     </Modal>
   );

src/router/index.ts

@@ -3,15 +3,15 @@ import { RouteObjectType, routerList } from '~/router/router';
 import { InterDataType } from '~/api/interface';
 import { listMenuInfoType } from '~/api/interface/systemManageType';
 import { SystemManageAPI } from '~/api';
+import { store } from '~/store';
+import { SET_MENU } from '~/store/module/menu';
 //菜单类型
 type menuType = InterDataType<listMenuInfoType>;
 
-// 缓存路由列表
-let routerListStore: any[] = [];
 // 获取用户权限路由列表
 export const authRouterList = async () => {
   // 如果缓存中没有数据
-  if (routerListStore.length === 0) {
+  if (store.getState().Menu.menuList.length === 0) {
     // 加载路由数据
     const { result } = await SystemManageAPI.getListRoleMenuInfo({
       roleId: Number(localStorage.getItem('roleId')),
@@ -31,11 +31,11 @@ export const authRouterList = async () => {
     };
     const arr = [...getRouteList(routerList)];
     // 将路由数据存到store中
-    routerListStore = arr;
+    store.dispatch(SET_MENU(arr));
     // 完成后返回路由数据
     return Promise.resolve(arr);
   } else {
-    return Promise.resolve(routerListStore);
+    return Promise.resolve(store.getState().Menu.menuList);
   }
 };
 //获取全部节点

src/router/privateRouter.tsx

@@ -26,7 +26,7 @@ function PrivateRouter() {
           const routes = [...value, ...whiteRouterList];
           setRouter(routes);
           if (path === '/') {
-            navigate({ pathname: value[0].children.find((v: any) => !v.meta.hidden)?.path });
+            navigate({ pathname: value[0].children?.find((v: any) => !v.meta.hidden)?.path });
           }
         } else {
           message.warning('该账号暂无权限');

src/store/module/menu/index.ts

 import { createSlice } from '@reduxjs/toolkit';
 
 const initialState = {
-  menuList: JSON.parse(localStorage.getItem('SXTB-ADMIN-MENU-LIST') as string) || [],
+  menuList: [],
   collapsedActive: false,
-  menuId: JSON.parse(localStorage.getItem('SXTB-ADMIN-MENU-ID') as string) || null,
+  roleId: localStorage.getItem('roleId') || -1,
 };
 
 export const menuSlice = createSlice({
@@ -12,22 +12,19 @@ export const menuSlice = createSlice({
   reducers: {
     SET_MENU(state, action) {
       state.menuList = action.payload;
-      localStorage.setItem('SXTB-ADMIN-MENU-LIST', JSON.stringify(action.payload));
     },
     SET_COLLAPSE(state, action) {
       state.collapsedActive = action.payload;
     },
     REMOVE_MENU(state) {
-      localStorage.setItem('SXTB-ADMIN-MENU-LIST', JSON.stringify([]));
       state.menuList = [];
     },
     SET_MENU_ID(state, action) {
-      localStorage.setItem('SXTB-ADMIN-MENU-ID', JSON.stringify(action.payload));
-      state.menuId = action.payload;
+      state.roleId = action.payload;
+      localStorage.setItem('roleId', action.payload);
     },
-    REMOVE_MENU_ID(state) {
-      localStorage.setItem('SXTB-ADMIN-MENU-ID', JSON.stringify(null));
-      state.menuId = null;
+    REMOVE_MENU_ID() {
+      localStorage.removeItem('roleId');
     },
   },
 });

src/store/module/userInfo/index.ts

@@ -2,8 +2,6 @@ import { createSlice } from '@reduxjs/toolkit';
 
 const initialState = {
   userInfo: JSON.parse(localStorage.getItem('SXTB-ADMIN-USER-INFO') as string) || [],
-  roleId: -1,
-  roleList: [],
 };
 
 export const userInfoSlice = createSlice({
@@ -14,24 +12,9 @@ export const userInfoSlice = createSlice({
       state.userInfo = action.payload;
       localStorage.setItem('SXTB-ADMIN-USER-INFO', JSON.stringify(action.payload));
     },
-    SET_ROLE_ID(state, action) {
-      state.roleId = action.payload;
-      localStorage.setItem('roleId', action.payload);
-    },
-    REMOVE_ROLE_ID() {
-      localStorage.removeItem('roleId');
-    },
-    SET_ROLE_LIST(state, action) {
-      state.roleList = action.payload;
-      localStorage.setItem('roleObj', JSON.stringify(action.payload));
-    },
-    REMOVE_ROLE_LIST() {
-      localStorage.removeItem('roleObj');
-    },
   },
 });
 
-export const { SET_USERINFO, SET_ROLE_ID, SET_ROLE_LIST, REMOVE_ROLE_LIST, REMOVE_ROLE_ID } =
-  userInfoSlice.actions;
+export const { SET_USERINFO } = userInfoSlice.actions;
 
 export const UserInfo = userInfoSlice.reducer;