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

src/components/Massage/index.jsx

@@ -0,0 +1,33 @@
+import { ModalForm } from "@ant-design/pro-components";
+import { Button, Modal } from "antd";
+import React from "react";
+export default (props) => {
+  const { title = "提示", open, setOpen } = props;
+
+  const onChang = () => {
+    setOpen(false);
+  };
+  return (
+    <Modal
+      title={title}
+      open={open}
+      onCancel={onChang}
+      footer={[
+        <Button key="back" onClick={onChang}>
+          取消
+        </Button>,
+        <Button key="back">去申请</Button>,
+      ]}
+    >
+      <div style={{}}>
+        <img
+          height="98"
+          src="https://qbitnetwork.com/app/img/warn.03eb384a.png"
+          alt=""
+          style={{ margin: "0 auto" ,display:"block"}}
+        />
+        <div style={{textAlign:"center"}}>暂未开通全球账户功能</div>
+      </div>
+    </Modal>
+  );
+};

src/pages/accountmanagement/index.jsx

@@ -0,0 +1,14 @@
+import React from "react";
+export default (props) => {
+  return <div>11111111</div>;
+};
+                                               
+
+
+
+
+
+
+
+
+              

src/pages/accountsettings/index.jsx

@@ -0,0 +1,6 @@
+import React from 'react'
+export default (props) => {
+return (
+<div></div>
+)
+}

src/pages/ecologicalpartner/index.jsx

@@ -0,0 +1,6 @@
+import React from 'react'
+export default (props) => {
+return (
+<div></div>
+)
+}

src/pages/financialstatement/index.jsx

@@ -0,0 +1,6 @@
+import React from 'react'
+export default (props) => {
+return (
+<div></div>
+)
+}

src/pages/firstPage/index.less

@@ -658,7 +658,8 @@
             text-align: center;
             line-height: 20px;
             font-size: 14px;
-            a{
+
+            a {
                 color: #aeb4b8;
             }
         }
@@ -679,7 +680,15 @@
 
 @keyframes fadeOut {
     from {
-        opacity: 0;
+        opacity: 0.1;
+    }
+
+    50% {
+        opacity: 0.5;
+    }
+
+    80% {
+        opacity: 0.8;
     }
 
     to {

src/pages/fxuser/index.jsx → src/pages/homepage/index.jsx

@@ -1,11 +1,12 @@
 import List from "@/components/Page/List";
-import React from "react";
+import React, { useState } from "react";
 
 import { getFxUser, deleteFxUserAndLogin } from "@/services/fxuser";
 
 import { useNavigate } from "react-router-dom";
 import { Button } from "antd";
 import moment from "moment";
+import Massage from "@/components/Massage";
 export default (props) => {
   const navigate = useNavigate();
   const actionRef = React.useRef();
@@ -21,7 +22,7 @@ export default (props) => {
       dataIndex: "phone",
       key: "phone",
     },
-   
+
     {
       title: "创建时间",
       dataIndex: "createdAt",
@@ -29,7 +30,6 @@ export default (props) => {
       search: false,
       render: (t) => moment(t).format("YYYY-MM-DD HH:mm:ss"),
     },
-   
   ];
 
   const DeleteFxUser = (record) => {
@@ -37,25 +37,23 @@ export default (props) => {
       actionRef.current.reload();
     });
   };
+  const [open, setOpen] = useState(false);
   return (
-    <List
-      rowKey="userId"
-      actionRef={actionRef}
-      request={()=>{}}
-      onEdit={(record) => navigate(`/fxuser/edit?id=${record.userId}`)}
-      onDelete={DeleteFxUser}
-      toolBarRender={() => [
-        <Button
-          key="1"
-          type="primary"
-          onClick={() => {
-            navigate("edit");
-          }}
-        >
-          新增
-        </Button>,
-      ]}
-      columns={columns}
-    />
+    <>
+      <List
+        rowKey="userId"
+        actionRef={actionRef}
+        request={() => {}}
+        onEdit={(record) => navigate(`/fxuser/edit?id=${record.userId}`)}
+        onDelete={DeleteFxUser}
+        toolBarRender={() => [
+          <Button key="1" type="primary" onClick={() => setOpen(true)}>
+            新增
+          </Button>,
+        ]}
+        columns={columns}
+      />
+      <Massage open={open} setOpen={setOpen} />
+    </>
   );
 };

src/pages/incorporation/index.jsx

@@ -0,0 +1,6 @@
+import React from 'react'
+export default (props) => {
+return (
+<div></div>
+)
+}

src/pages/quickpass/index.jsx

@@ -0,0 +1,6 @@
+import React from 'react'
+export default (props) => {
+return (
+<div></div>
+)
+}

src/routes/routes.jsx

@@ -7,12 +7,16 @@ import { Outlet, Navigate } from "react-router-dom";
 import AuthLayout from "@/layouts/AuthLayout";
 import Login from "@/pages/login";
 import Page404 from "@/pages/404";
-import FxUser from "@/pages/fxuser";
-import FxUserEdit from "@/pages/fxuser/Edit";
-import Tenant from "@/pages/tenant";
-import TenantEdit from "@/pages/tenant/Edit";
+import HomePage from "@/pages/homepage";
+import AccountManagement from "@/pages/accountmanagement";
+import QuickPass from "@/pages/quickpass";
+import FinancialStatement from "@/pages/financialstatement";
+import Incorporation from "@/pages/incorporation";
+import EcologicalPartner from "@/pages/ecologicalpartner";
+import AccountSettings from "@/pages/accountsettings";
+import FirstPage from "@/pages/firstPage/index";
+
 
-import FirstPage from '@/pages/firstPage/index';
 import QLogin from '@/pages/qLogin/index';
 import QRegister from '@/pages/qRegister/index';
 
@@ -32,39 +36,73 @@ import QRegister from '@/pages/qRegister/index';
 export const authRoutes = [
   {
     // index: true,
-    element: <Navigate to="/fxuser" />,
+    element: <Navigate to="/homepage" />,
   },
 
   {
-    path: "fxuser",
-    element: <FxUser />,
+    path: "homepage",
+    element: <HomePage />,
+    meta: {
+      title: "首页",
+      icon: <SolutionOutlined />,
+    },
+  },
+  {
+    path: "/globalaccounts",
+    element: <Outlet />,
     meta: {
-      title: "用户管理",
+      title: "全球账户",
       icon: <SolutionOutlined />,
     },
+    children: [
+      {
+        path: `accountmanagement`,
+        element: <AccountManagement />,
+        meta: {
+          title: "账户管理",
+          icon: <SolutionOutlined />,
+        },
+      },
+    ],
   },
   {
-    path: "fxuser/edit",
-    element: <FxUserEdit />,
+    path: "quickpass",
+    element: <QuickPass />,
     meta: {
-      title: "用户维护",
-      hideInMenu: true,
+      title: "闪付",
+      icon: <SolutionOutlined />,
     },
   },
   {
-    path: "tenant",
-    element: <Tenant />,
+    path: "financialstatement",
+    element: <FinancialStatement />,
     meta: {
-      title: "租户管理",
-      icon: <UserOutlined />,
+      title: "财务对账单",
+      icon: <SolutionOutlined />,
     },
   },
   {
-    path: "tenant/edit",
-    element: <TenantEdit />,
+    path: "incorporation",
+    element: <Incorporation />,
     meta: {
-      title: "租户维护",
-      hideInMenu: true,
+      title: "公司注册",
+      icon: <SolutionOutlined />,
+    },
+  },
+  {
+    path: "ecologicalpartner",
+    element: <EcologicalPartner />,
+    meta: {
+      title: "生态伙伴",
+      icon: <SolutionOutlined />,
+    },
+  },
+  {
+    path: "accountsettings",
+    element: <AccountSettings />,
+    meta: {
+      title: "账号设置",
+      icon: <SolutionOutlined />,
     },
   },
 ];
@@ -104,7 +142,7 @@ export const defaultRoutes = [
   },
 ];
 
-export function mergeAuthRoutes (r1, r2) {
+export function mergeAuthRoutes(r1, r2) {
   const r = r1.slice();
   const children = r1[0].children.slice();
   r[0].children = children.concat(r2);
@@ -113,8 +151,8 @@ export function mergeAuthRoutes (r1, r2) {
 
 // 全部路由
 export const routes = mergeAuthRoutes(defaultRoutes, authRoutes);
-console.log(routes)
-function getPath (parent = "/", current = "") {
+console.log(routes);
+function getPath(parent = "/", current = "") {
   if (current.indexOf("/") === 0 || current.indexOf("http") === 0)
     return current;
   return `${parent}/${current}`.replace(/\/\//g, "/");

src/store/models/system.js

@@ -1,7 +1,7 @@
 import { useState, useCallback } from "react";
 export default function useSystem() {
   // 主题
-  const [theme, updateTheme] = useState("dark");
+  const [theme, updateTheme] = useState("light");
 
   // 其他配置
   const [app, setApp] = useState({