feat: merge

config/proxy.ts

@@ -9,14 +9,14 @@
 export default {
   dev: {
     '/api': {
-      // target: 'http://192.168.32.28:8844/',
-      // ws: 'ws://192.168.32.28:8844/',
+      target: 'http://192.168.32.28:8844/',
+      ws: 'ws://192.168.32.28:8844/',
       // 开发环境
       // target: 'http://120.79.18.123:8844/',
       // ws: 'ws://120.79.18.123:8844/',
       // 测试环境
-      target: 'http://120.77.179.54:8844/',
-      ws: 'ws://120.77.179.54:8844/',
+      // target: 'http://120.77.179.54:8844/',
+      // ws: 'ws://120.77.179.54:8844/',
       // target: 'http://192.168.32.65:8850/',
       // ws: 'ws://192.168.32.65:8850/',
       //v2环境

src/pages/account/Center/bind/index.tsx

@@ -40,7 +40,7 @@ const Bind = () => {
   };
   const goRedirect = () => {
     const urlParams = new URLSearchParams(window.location.hash);
-    const redirectUrl = urlParams.get('redirect');
+    const redirectUrl = urlParams.get('redirect') || window.location.href.split('redirect=')?.[1];
     // const url = window.location.href.split('redirect=')?.[1];
     console.log(redirectUrl);
     if (redirectUrl) {

src/pages/iot-card/CardManagement/index.tsx

@@ -0,0 +1,4 @@
+const CardManagement = () => {
+  return <>物联卡管理</>;
+};
+export default CardManagement;

src/pages/iot-card/Dashboard/index.tsx

@@ -0,0 +1,4 @@
+const Dashboard = () => {
+  return <>仪表盘</>;
+};
+export default Dashboard;

src/pages/iot-card/Home/index.tsx

@@ -0,0 +1,4 @@
+const Home = () => {
+  return <>首页</>;
+};
+export default Home;

src/pages/iot-card/Platform/index.tsx

@@ -0,0 +1,4 @@
+const Platform = () => {
+  return <>平台对接</>;
+};
+export default Platform;

src/pages/iot-card/Recharge/index.tsx

@@ -0,0 +1,4 @@
+const Recharge = () => {
+  return <>充值管理</>;
+};
+export default Recharge;

src/pages/iot-card/Record/index.tsx

@@ -0,0 +1,4 @@
+const Record = () => {
+  return <>操作记录</>;
+};
+export default Record;

src/utils/menu/router.ts

@@ -137,6 +137,12 @@ export enum MENUS_CODE {
   'system/Apply/Api' = 'system/Apply/Api',
   'system/Apply/View' = 'system/Apply/View',
   'system/License' = 'system/License',
+  'iot-card/Home' = 'iot-card/Home',
+  'iot-card/Platform' = 'iot-card/Platform',
+  'iot-card/Recharge' = 'iot-card/Recharge',
+  'iot-card/Dashboard' = 'iot-card/Dashboard',
+  'iot-card/CardManagement' = 'iot-card/CardManagement',
+  'iot-card/Record' = 'iot-card/Record',
 }
 
 export type MENUS_CODE_TYPE = keyof typeof MENUS_CODE | string;