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

src/components/Page/LeftIcon.jsx

@@ -0,0 +1,43 @@
+import React from "react";
+import { ArrowLeftOutlined, LeftCircleFilled } from "@ant-design/icons";
+import { Typography } from "antd";
+import { useLocation, useNavigate } from "react-router-dom";
+import useRoute from "@/routes/hooks/useRoute";
+
+const titleStyle = {
+  display: "flex",
+  alignItems: "center",
+  padding: "12px 0",
+};
+const IconStyle = {
+  fontSize: "20px",
+  color: "#333",
+  padding: "0 0.5em",
+  display: "inlineBlack",
+  cursor: "pointer",
+};
+
+export default (props) => {
+  const { children, back } = props;
+  const navigate = useNavigate();
+  const goBack = (e) => {
+ 
+    const router = useRoute();
+    console.log(router);
+    e.preventDefault();
+    e.stopPropagation();
+
+    navigate(-1);
+  };
+  return (
+    <Typography.Title
+      level={3}
+      style={{ fontWeight: 400, flex: "none", margin: "0" }}
+    >
+      <div style={titleStyle}>
+        {back ? <LeftCircleFilled onClick={goBack} style={IconStyle} /> : ""}
+        {children}
+      </div>
+    </Typography.Title>
+  );
+};

src/components/Page/index.jsx

@@ -1,43 +1,25 @@
 import React from "react";
 import { Typography } from "antd";
 import useRoute from "@/routes/hooks/useRoute";
-import { ArrowLeftOutlined, LeftCircleFilled } from "@ant-design/icons";
-import { useNavigate } from "react-router-dom";
+import LeftIcon from "./LeftIcon";
 
 const pageStyle = {
   // margin: "0 24px 24px 24px",
   margin: "24px",
   minHeight: "calc(100% - 24px)",
 };
-const { Title } = Typography;
-const titleStyle = {
-  display: "flex",
-  alignItems: "flex-end",
-  padding: "12px 0",
-};
-const IconStyle = {
-  fontSize: "20px",
-  color: "#333",
-  padding: "0 0.5em",
-  display: "inlineBlack",
-  cursor: "pointer",
-};
+
+
 export default (props) => {
   const { meta = {} } = useRoute() || {};
   const style = meta.noLayout ? { height: "100%" } : pageStyle;
+
   const title = props.title || meta.title;
-  const navigator = useNavigate();
+
   return (
     <div style={style}>
       {title && !meta.noLayout && (
-        // <div style={titleStyle}>
-        //   <div>
-        //     <LeftCircleFilled onClick={()=>navigator(-1)} style={IconStyle} />
-        //   </div>
-        /* </div> */
-        <Title level={3} style={{ fontWeight: 400, flex: "none", margin: "0" }}>
-          {title}
-        </Title>
+        <LeftIcon back={props?.back}> {title}</LeftIcon>
       )}
       {props.children}
     </div>

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

@@ -18,7 +18,9 @@ export default (props) => {
         logout(); // 调用接口
         localStorage.removeItem("token");
         // setUser();
-        navigate("/login");
+        const tenantId = localStorage.getItem("tenantId");
+
+        navigate(`/login?id=${tenantId}`);
       },
     });
   };

src/pages/custom/Edit.jsx

@@ -1,5 +1,5 @@
-import React, { useRef, useState } from 'react'
-import { Button, Card, Form, Input, Select, Row, Col, Radio } from 'antd'
+import React, { useRef, useState } from "react";
+import { Button, Card, Form, Input, Select, Row, Col, Radio } from "antd";
 import {
   ProForm,
   ProFormDateTimeRangePicker,
@@ -10,7 +10,7 @@ import {
 } from "@ant-design/pro-components";
 import useBool from "@/utils/hooks/useBool";
 import { useSearchParams, useNavigate } from "react-router-dom";
-import Page from "@/components/Page";
+import Page from "@/components/Page/index";
 import { formItemLayout, tailFormItemLayout } from "@/utils/form";
 import { postTaCustom, putTaCustom, getTaCustomId } from "@/services/taCustom";
 const { Option } = Select;
@@ -19,9 +19,9 @@ export default (props) => {
   const formRef = useRef();
   const [submiting, startSubmit, cancelSubmit] = useBool();
 
-  const [searchParams] = useSearchParams()
-  const navigate = useNavigate()
-  const [isOrg, setIsOrg] = useState(0)
+  const [searchParams] = useSearchParams();
+  const navigate = useNavigate();
+  const [isOrg, setIsOrg] = useState(0);
 
   const id = searchParams.get("id");
 
@@ -32,20 +32,20 @@ export default (props) => {
         setIsOrg(res?.isOrg);
       });
     }
-  }, [])
+  }, []);
   const onChange = (e) => {
-    setIsOrg(e.target.value)
-  }
+    setIsOrg(e.target.value);
+  };
 
   const onFinish = (values) => {
-    startSubmit()
-    let dutyParagraph = values?.isOrg
+    startSubmit();
+    let dutyParagraph = values?.isOrg;
     if (isOrg == 0) {
-      dutyParagraph = null
+      dutyParagraph = null;
     }
     if (id) {
       //修改
-      const customId = id
+      const customId = id;
       putTaCustom(id, { customId, dutyParagraph, isOrg, ...values })
         .then((res) => {
           cancelSubmit();
@@ -66,9 +66,8 @@ export default (props) => {
         });
     }
   };
-
   return (
-    <Page>
+    <Page back>
       <Card>
         <ProForm
           formRef={formRef}

src/pages/login/LoginForm.jsx

@@ -11,16 +11,15 @@ export default (props) => {
   const [loading, setLoading] = React.useState(false);
   const { user, getCurrentUser } = useModel("user");
 
-  var path = window.location.pathname;
-  var tenantId = path.split('/')[1];
-
-  // useEffect(() => {
-  //   pathTenantId();
-  // }, [pathTenantId()]);
+  // var path = window.location.pathname;
+  // var tenantIds = path.split("/")[1];
 
+  useEffect(() => {
+    pathTenantId();
+  }, [pathTenantId()]);
+  
   const onFinish = (values) => {
-    // const tenantId = localStorage.getItem("tenantId");
-
+    const tenantId = localStorage.getItem("tenantId");
     const data = {
       loginType: "admin.pc",
       loginName: values.loginName,
@@ -46,7 +45,7 @@ export default (props) => {
       form={form}
       layout="vertical"
       onFinish={onFinish}
-    // style={{ width: "260px", marginTop: "24px", paddingBottom: "24px" }}
+      // style={{ width: "260px", marginTop: "24px", paddingBottom: "24px" }}
     >
       <Form.Item
         label="用户名"

src/pages/member/Edit.jsx

@@ -6,6 +6,7 @@ import Page from "@/components/Page";
 import MemberInfo from "./components/MemberInfo";
 import MemberCardInfo from "./components/MemberCardInfo";
 import "./index.less";
+// import Pages from "./components/Pages";
 export default (props) => {
   const [params] = useSearchParams();
   const [activeTabKey, setActiveTabKey] = useState("tab1");
@@ -13,11 +14,11 @@ export default (props) => {
   const id = params.get("id");
 
   useEffect(() => {
-  if(id){
-    getTaMemberId(id).then((res) => {
+    if (id) {
+      getTaMemberId(id).then((res) => {
         setMemberList(res || {});
       });
-  }
+    }
   }, []);
 
   const tabList = [
@@ -34,10 +35,12 @@ export default (props) => {
     // 会员基本信息
     tab1: <MemberInfo key="1" memberList={memberList} />,
     // 会员卡信息
-    tab2: <MemberCardInfo key="2" taMemberCardList={memberList?.taMemberCardList} />,
+    tab2: (
+      <MemberCardInfo key="2" taMemberCardList={memberList?.taMemberCardList} />
+    ),
   };
   return (
-    <Page>
+    <Page back>
       <Card
         className="scorll"
         style={{ width: "100%", overflowY: "scroll", maxHeight: "700px" }}

src/pages/project/Edit.jsx

@@ -35,7 +35,7 @@ export default (props) => {
   }
 
   return (
-    <Page>
+    <Page back>
       <Card
         style={{ backgroundColor: '#F0F2F5' }}
         tabList={tabList}

src/routes/routes.jsx

@@ -138,7 +138,7 @@ export const authRoutes = [
         path: 'member/edit',
         element: <MemberEdit />,
         meta: {
-          title: '会员管理',
+          title: '会员详情',
           hideInMenu: true,
         },
       }