f

public/config.js

@@ -1,5 +1,5 @@
 
-var SERVER_BASE = 'http://crm.njyunzhi.com';
+var SERVER_BASE = 'http://api.crm.njyunzhi.com';
 
 // 获取真实的上传文件地址
 function getRealPath(path) {

src/pages/login/LoginForm.jsx

@@ -7,14 +7,13 @@ export default (props) => {
   const { onSuccess, mode, appid } = props;
   const [form] = Form.useForm();
   const [loading, setLoading] = React.useState(false);
+  console.log(process.env.NODE_ENV);
   const onFinish = (values) => {
-
     setLoading(true);
     login(values)
       .then((res) => {
         setLoading(true);
-        // console.log('res.user', res.user)
-        onSuccess(res)
+        onSuccess(res.user);
         setLoading(false);
       })
       .catch((err) => {
@@ -25,11 +24,24 @@ export default (props) => {
     setLoading(false);
   };
   return (
-    <Form form={form} layout="vertical" onFinish={onFinish} style={{ width: '260px', marginTop: '24px', paddingBottom: '24px' }}>
-      <Form.Item label="账户" name="account" rules={[{ required: true, message: '请输入账户' }]}>
+    <Form
+      form={form}
+      layout="vertical"
+      onFinish={onFinish}
+      style={{ width: "260px", marginTop: "24px", paddingBottom: "24px" }}
+    >
+      <Form.Item
+        label="账户"
+        name="account"
+        rules={[{ required: true, message: "请输入账户" }]}
+      >
         <Input placeholder="请输入账户" style={{ borderRadius: "4px" }} />
       </Form.Item>
-      <Form.Item label="密 码" name="password" rules={[{ required: true, message: '请输入密码' }]}>
+      <Form.Item
+        label="密 码"
+        name="password"
+        rules={[{ required: true, message: "请输入密码" }]}
+      >
         <Input.Password
           placeholder="请输入密码"
           style={{ borderRadius: "4px" }}

src/pages/login/index.jsx

@@ -1,5 +1,5 @@
 import React, { useEffect } from "react";
-import { Button } from "antd";
+import { Button, message } from "antd";
 import { Helmet } from "react-helmet";
 import { useNavigate, useSearchParams } from "react-router-dom";
 import { useModel } from "@/store";
@@ -20,31 +20,13 @@ export default (props) => {
 
   const onChangeType = () => {
     setLoginType(loginType == 0 ? 1 : 0);
-  }
-
-
-  const onSuccess = ({ ticket }) => {
+  };
 
-    // console.log('ticket', ticket);
-    if (searchParams.get("redirect")) {
-      // console.log('爱', searchParams.get("redirect"));
-      const redirect = decodeURIComponent(searchParams.get("redirect"));
-      let href = "";
-      if (redirect.indexOf("#") === -1) {
-        href = redirect + `#/?ticket=${ticket}`;
-      } else if (redirect.indexOf("?") > -1) {
-        href = redirect + `ticket=${ticket}`;
-      } else {
-        href = redirect + `?ticket=${ticket}`;
-      }
-      window.location.href = href;
-    } else if (searchParams.get("back")) {
-      // console.log('else if', searchParams.get("back"));
-      navigate(-1);
-      // navigate("/");
-    } else {
-      console.log('else');
-      navigate("/");
+  const onSuccess = (row) => {
+    try {
+      navigate("/custom");
+    } catch (e) {
+      message.error(e);
     }
   };
 
@@ -68,9 +50,7 @@ export default (props) => {
                 <h2>
                   <span>密码登录</span>
                 </h2>
-                <LoginForm
-                  onSuccess={onSuccess}
-                />
+                <LoginForm onSuccess={onSuccess} />
               </div>
             </div>
           </div>

src/utils/request.js

@@ -4,9 +4,9 @@ import { message } from "antd";
 import { getToken, setToken } from "./token";
 
 const instance = axios.create({
-  baseURL: SERVER_BASE,
+  baseURL: process.env.NODE_ENV == "development" ? "" : SERVER_BASE,
   timeout: 10000,
-  withCredentials: true, // 跨域
+  // withCredentials: true, // 跨域
 });
 
 // 添加请求拦截器
@@ -21,7 +21,7 @@ instance.interceptors.request.use(
       params = {},
     } = config;
     let token = localStorage.getItem("token") || "";
-    const tokenB = (`Bearer ${token}`);
+    const tokenB = `Bearer ${token}`;
     // console.log('----tokenB---->', tokenB);
 
     let noTip = silent;
@@ -29,13 +29,12 @@ instance.interceptors.request.use(
       noTip = method.toLocaleLowerCase() === "get" ? true : false;
     }
 
-    const ticketOrigin = localStorage.getItem('ticket');
+    const ticketOrigin = localStorage.getItem("ticket");
     if (params.ticket && params.ticket != ticketOrigin) {
-      token = '';
-      localStorage.setItem('ticket', params.ticket);
+      token = "";
+      localStorage.setItem("ticket", params.ticket);
     } else {
-      params.ticket = undefined,
-        params.appid = undefined;
+      (params.ticket = undefined), (params.appid = undefined);
     }
 
     // 在发送请求之前做些什么
@@ -104,7 +103,7 @@ instance.interceptors.response.use(
 
 export default instance;
 
-export function queryTable (apiRequest) {
+export function queryTable(apiRequest) {
   return function (params) {
     const { pageSize } = params;
     return apiRequest({
@@ -127,7 +126,7 @@ export function queryTable (apiRequest) {
   };
 }
 
-export function queryDict (
+export function queryDict(
   apiRequest,
   { labelKey = "name", valueKey = "id" } = {}
 ) {
@@ -152,7 +151,7 @@ export function queryDict (
       });
   };
 }
-export function restful (url) {
+export function restful(url) {
   const list = (params) => instance.get(url, { params });
   const get = (id) => instance.get(`${url}/${id}`);
   const add = (data) => instance.post(url, data);
@@ -162,7 +161,7 @@ export function restful (url) {
   return [list, get, add, update, del];
 }
 
-export function useRequest (fn) {
+export function useRequest(fn) {
   const [loading, setLoading] = React.useState(false);
 
   const p = (...args) =>
@@ -182,7 +181,7 @@ export function useRequest (fn) {
   return [loading, p];
 }
 
-function downloadBlob (response) {
+function downloadBlob(response) {
   let fileName = "未知文件";
   const contentType = response.headers["content-type"];
   const contentDisposition = response.headers["content-disposition"];

vite.config.js

@@ -11,14 +11,10 @@ export default defineConfig({
     host: "0.0.0.0",
     proxy: {
       '/api': {
-        target: 'http://192.168.89.25:8090',
+        target: 'http://127.0.0.1:8090',
         changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/api/, '/')
-        // onProxyReq: function (request) {
-        //   request.setHeader("origin", "http://192.168.89.25:9999")
-        // }
       },
-      // '/': 'http://192.168.89.25:9999',
+      // '/': 'http://192.168.89.25:8090',
     },
   },
   plugins: [