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

src/index.less

@@ -87,4 +87,9 @@ body,
 .ant-btn-primary:hover {
   border-color: #389da2;
   background-color: #389da2;
+}
+
+.ant-btn-primary:hover, .ant-btn-primary:focus {
+  border-color: #389da2;
+  background-color: #389da2;
 }

src/locale/zh.json

@@ -2,7 +2,7 @@
   "language": "语言",
   "switch": "选择",
   "accountmanagement": {
-    "title": "qqq"
+    "title": "账户管理"
   },
   "authentication": {
     "titleLeft": "实名认证流程",

src/pages/qRegister/QRegister.jsx

@@ -20,7 +20,7 @@ export default (props) => {
     setLoading(true);
     register({
       userName: values.userName,
-      loginType: "platform.pc",
+      loginType: "admin.pc",
       password: values.password,
       phone: values.phone
     })

src/routes/routes.jsx

@@ -44,19 +44,16 @@ import QRegister from "@/pages/qRegister/index";
 export const authRoutes = [
   {
     index: true,
-    element: <Navigate to="/authentication" />,
+    element: <Navigate to="/firstPage" replace="/firstPage" />,
   },
-  // {
-  //   path: "/qLogin",
-  //   element: <QLogin />,
-  // },
+
   // 实名认证流程
   {
     path: "/authentication",
     element: <Authentication />,
     meta: {
       title: "",
-      hideInMenu: true
+      hideInMenu: true,
     },
   },
   {
@@ -216,7 +213,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);
@@ -226,7 +223,7 @@ export function mergeAuthRoutes (r1, r2) {
 // 全部路由
 export const routes = mergeAuthRoutes(defaultRoutes, authRoutes);
 console.log(routes);
-function getPath (parent = "/", current = "") {
+function getPath(parent = "/", current = "") {
   if (current.indexOf("/") === 0 || current.indexOf("http") === 0)
     return current;
   return `${parent}/${current}`.replace(/\/\//g, "/");