Merge branch 'master' of http://git.ycjcjy.com/kypay/global_funding-pc-merchant

src/index.less

@@ -39,6 +39,7 @@ body,
 .layout-sidebar {
   width: var(--siderbar-width);
   color: var(--theme-front);
+  background: #ffffff !important;
 }
 
 .ant-card,
@@ -76,4 +77,14 @@ body,
 
 .pointer {
   cursor: pointer;
+}
+
+.ant-btn-primary {
+  border-color: #3eaeb4;
+  background: #3eaeb4;
+}
+
+.ant-btn-primary:hover {
+  border-color: #389da2;
+  background-color: #389da2;
 }

src/layouts/AuthLayout/components/Footer.jsx

@@ -1,15 +1,23 @@
-import React from 'react';
-import { Layout } from 'antd';
-import { useModel } from '@/store';
+import React from "react";
+import { Layout } from "antd";
+import { useModel } from "@/store";
 
 const { Footer } = Layout;
 
 const year = new Date().getFullYear();
 export default React.forwardRef((props, ref) => {
-  const { app } = useModel('system');
-  const copyRight = `${app.company || '南京云致'} @ ${year}`;
+  const { app } = useModel("system");
+  const copyRight = `${app.company || "南京云致"} @ ${year}`;
 
-  return (
-    <Footer ref={ref} style={{ textAlign: 'center', color: 'rgba(0,0,0, 0.3)' }}>{copyRight}</Footer>
-  )
-})
+  return ( 
+    <Footer
+      ref={ref}
+      style={{
+        textAlign: "center", 
+        color: "rgba(0,0,0, 0.3)",
+      }}
+    >
+      {copyRight}
+    </Footer>
+  );
+});

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

@@ -1,30 +1,39 @@
-import React, { useMemo } from 'react';
-import { Layout, Space } from 'antd';
-import classNames from 'classnames';
-import Title from './Title';
-import User from './User';
-import Exit from './Exit';
-import Logo from '../Logo';
-import Language from './Language';
+import React, { useMemo } from "react";
+import { Layout, Space } from "antd";
+import classNames from "classnames";
+import Title from "./Title";
+import User from "./User";
+import Exit from "./Exit";
+import Logo from "../Logo";
+import Language from "./Language";
 
 const { Header } = Layout;
+// const style = {
+//   background: "#f7fafa !important",
+//   display: "flex",
+//   justifyContent: "flex-end",
+// };
 
 export default (props) => {
   const { user } = props;
 
-  const className = useMemo(() => classNames({
-    'layout-header': true,
-    'light': props.theme === 'light',
-  }), [props.theme]);
-
+  const className = useMemo(
+    () =>
+      classNames({
+        "layout-header": true,
+        light: props.theme === "light",
+      }),
+    [props.theme]
+  );
   return (
-    <Header className={className}>
+    <Header className={className} >
       <Logo />
+
       <Space>
         <Language />
         <User user={user} />
         <Exit />
       </Space>
     </Header>
-  )
-}
+  );
+};

src/layouts/AuthLayout/components/SiderBar.jsx

@@ -1,21 +1,21 @@
-import React, { useMemo } from 'react';
-import { Layout, Spin } from 'antd';
-import { getPropertyValue } from '@/utils/css';
-import Menus from './Menus';
+import React, { useMemo } from "react";
+import { Layout, Spin } from "antd";
+import { getPropertyValue } from "@/utils/css";
+import Menus from "./Menus";
+import Logo from "./Logo";
 
 const { Sider } = Layout;
 
-
 export default (props) => {
   const { theme, location, menus } = props;
 
   const width = useMemo(() => {
-    return /\d+/.exec(getPropertyValue('--siderbar-width'))[0] - 0;
+    return /\d+/.exec(getPropertyValue("--siderbar-width"))[0] - 0;
   }, []);
 
   return (
-    <Sider className='layout-sidebar' theme={theme} collapsible width={width}>
+    <Sider className="layout-sidebar" theme={theme} collapsible width={width}>
       <Menus theme={theme} items={menus} location={location} />
     </Sider>
   );
-}
+};

src/layouts/AuthLayout/index.jsx

@@ -13,6 +13,9 @@ import { authRoutes } from "@/routes/routes";
 import { getMenuItems } from "@/routes/menus";
 import RequireLogin from "./RequireLogin";
 import "./style.less";
+import Sider from "antd/lib/layout/Sider";
+import Login from "@/pages/login";
+import Logo from "./components/Logo";
 
 const Spinner = () => (
   <div
@@ -42,7 +45,7 @@ export default (props) => {
       {/* <React.Suspense fallback={<Spinner />}> */}
       <RequireLogin>
         <Layout className={theme} style={{ height: "100vh" }}>
-          <Header theme={theme} user={user} />
+            <Header theme={theme} user={user} />
           <Layout style={{ height: "calc(100vh - var(--header-height))" }}>
             <SiderBar theme="light" menus={menus} location={location} />
             <Container location={location} />

src/layouts/AuthLayout/style.less

@@ -46,7 +46,7 @@
   padding-left: 1em;
   color: inherit;
 
-  & > * {
+  &>* {
     color: inherit;
     margin: 0;
   }
@@ -68,6 +68,7 @@
   overflow-y: auto;
   scrollbar-width: none;
   -ms-overflow-style: none;
+  background-color: #f7fafa !important;
 
   &::--webkit-scrollbar {
     display: none;
@@ -75,7 +76,9 @@
 
   padding-top: 0; // 避免子元素的 margin 影响
 }
-
+.ant-layout-footer {
+  background: none;
+}
 .ant-menu-vertical {
   border: none;
-}
+}

src/theme.less

@@ -6,6 +6,7 @@
   .ant-layout-sider-trigger,
   .ant-menu
    {
-    background: transparent !important;
+    // background: transparent !important;
+    background: #FFF !important;
   }
 }

src/utils/request.js

@@ -36,7 +36,7 @@ instance.interceptors.request.use(
         "Content-Type": "application/json;charset=utf-8",
         ...headers,
         Authorization: token,
-        "x-client-type": "pc.admin",
+        // "x-client-type": "pc.admin",
       },
       responseType: download ? "blob" : responseType,
     };