Merge branch 'v2' of http://git.ycjcjy.com/yunzhi/crm_pc into v2

.env

@@ -1 +1 @@
-VITE_SERVER_BASE=/api
+VITE_SERVER_BASE=/api/admin

.env.production

@@ -1 +1 @@
-VITE_SERVER_BASE=http://api.crm2.njyunzhi.com/api/admin
+VITE_SERVER_BASE=https://api.crm2.njyunzhi.com/api/admin

src/layouts/AuthLayout/components/Header/Exit.jsx

@@ -20,7 +20,7 @@ export default (props) => {
         // setUser();
         const tenantId = localStorage.getItem("tenantId");
 
-        navigate(`/login?id=${tenantId}`);
+        navigate(`${tenantId}/login`);
       },
     });
   };

src/layouts/AuthLayout/components/Header/User.jsx

@@ -45,8 +45,7 @@ const ChangePassword = forwardRef((props, ref) => {
     };
     await changePassword(data);
     const tenantId = localStorage.getItem("tenantId");
-    navigate(`/login?id=${tenantId}`);
-    localStorage.removeItem("token");
+    navigate(`${tenantId}/login`);
     return true;
   };
 

src/pages/login/LoginForm.jsx

@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 import md5 from "md5";
 import { Button, Form, Input, Radio } from "antd";
-import { useNavigate, useSearchParams } from "react-router-dom";
+import { useNavigate,useParams, useSearchParams } from "react-router-dom";
 import { login } from "@/services/login";
 import { useModel } from "@/store";
 
@@ -11,15 +11,10 @@ export default (props) => {
   const [loading, setLoading] = React.useState(false);
   const { user, getCurrentUser } = useModel("user");
 
-  // var path = window.location.pathname;
-  // var tenantIds = path.split("/")[1];
-
-  useEffect(() => {
-    pathTenantId();
-  }, [pathTenantId()]);
-  
+ 
+  const {tenantId} = useParams();
   const onFinish = (values) => {
-    const tenantId = localStorage.getItem("tenantId");
+    localStorage.setItem("tenantId",tenantId)
     const data = {
       loginType: "admin.pc",
       loginName: values.loginName,

src/routes/routes.jsx

@@ -298,7 +298,7 @@ export const defaultRoutes = [
     ],
   },
   {
-    path: "/login",
+    path: "/:tenantId/login",
     element: <Login />,
   },
   {

src/utils/request.js

@@ -4,10 +4,10 @@ import { message } from "antd";
 import { getToken, setToken } from "./token";
 
 const instance = axios.create({
-  baseURL: process.env.NODE_ENV == "development" ? "/api/admin" : SERVER_BASE,
+  baseURL:  import.meta.env.VITE_SERVER_BASE,
   timeout: 10000,
+  // withCredentials: true, // 跨域
 });
-console.log(process.env.NODE_ENV)
 // 添加请求拦截器
 instance.interceptors.request.use(
   function (config) {