1

package-lock.json

@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "axios": "^1.13.2",
-        "klinecharts": "^8.6.3",
+        "klinecharts": "^10.0.0-beta1",
         "vant": "^4.9.21",
         "vue": "^3.2.13",
         "vue-router": "^4.0.3",
@@ -4273,9 +4273,9 @@
       }
     },
     "node_modules/klinecharts": {
-      "version": "8.6.3",
-      "resolved": "https://registry.npmjs.org/klinecharts/-/klinecharts-8.6.3.tgz",
-      "integrity": "sha512-hGDtWiMNywEDneZFmt+vZ6tOYutCDWV5FPBcXcn7L8kGwe73Q5yJayk8UzP9pIQSBWyxswWIySKh/BVFA6GhuQ==",
+      "version": "10.0.0-beta1",
+      "resolved": "https://registry.npmjs.org/klinecharts/-/klinecharts-10.0.0-beta1.tgz",
+      "integrity": "sha512-5ZxFGjJeZqt9+q45lZDhApC3kdgrk51i27uSpIELgXJLNgfSc0anlb8XkU+52LVrBYnTv9dFr8/Q7lG81vIV1w==",
       "license": "Apache-2.0"
     },
     "node_modules/klona": {

src/router/index.js

@@ -1,4 +1,4 @@
-import { createRouter, createWebHistory } from "vue-router";
+import {createRouter, createWebHistory} from "vue-router";
 import HomeIndex from "../views/HomeIndex.vue";
 import AppIndex from "../views/index/Index.vue";
 import MarketIndex from "../views/market/Index.vue";
@@ -35,14 +35,8 @@ import FinancialIndex from "../views/index/financial/Index.vue";
 import FinancialBuy from "../views/index/financial/Buy.vue";
 import MyFinancial from "../views/index/financial/MyFinancial.vue";
 
-import TradeLayout from "@/views/bitcoin/TradeLayout.vue"; // 新建的公共父组件
-import TradeFutures from "@/views/bitcoin/TradeFutures.vue"; // （合约）
-import TradeSeconds from "@/views/bitcoin/lever/TradeSeconds.vue"; // 秒合约（占位）
-import TradeOptions from "@/views/bitcoin/TradeOptions.vue"; // 期权（占位）
-import TradeMargin from "@/views/bitcoin/lever/TradeMargin.vue";
-import Calculator from "../views/bitcoin/Calculator.vue"; // 新建的计算器页面
+
 import CommonFunctionsPopup from "@/views/bitcoin/CommonFunctionsPopup/CommonFunctionsPopup.vue"; // 子组件路径
-import TradeSettings from "@/views/bitcoin/CommonFunctionsPopup/GeneralLevel2/TradeSettings.vue"; // 新建
 import TradeRules from "@/views/bitcoin/CommonFunctionsPopup/GeneralLevel2/TradeRules.vue"; // 新建
 import TradeLayout from '@/views/bitcoin/TradeLayout.vue'; // 新建的公共父组件
 import TradeFutures from '@/views/bitcoin/TradeFutures.vue'; // （合约）
@@ -55,322 +49,322 @@ import OptionTrading from '@/views/bitcoin/lever/OptionTrading.vue'
 
 
 const routes = [
-  {
-    path: "/",
-    name: "home",
-    component: HomeIndex,
-    children: [
-      {
-        path: "",
-        name: "",
-        component: AppIndex,
-      },
-      {
-        path: "marketIndex",
-        name: "marketIndex",
-        component: MarketIndex,
-      },
-      {
-        path: "/bitcoin",
-        component: TradeLayout, // 而是布局组件
-        // 当访问 /bitcoin 时，自动重定向到 /bitcoin/contract
-        redirect: "/bitcoin/contract",
+    {
+        path: "/",
+        name: "home",
+        component: HomeIndex,
         children: [
-          // 1. 核心交易子路由
-          {
-            path: "contract",
-            name: "TradeContract",
-            component: TradeFutures, // 核心交易逻辑
-            meta: { title: "合约" },
-          },
-          {
-            path: "seconds",
-            name: "TradeSeconds",
-            component: TradeSeconds,
-            meta: { title: "秒合约" },
-          },
-          {
-            path: "options",
-            name: "TradeOptions",
-            component: TradeOptions,
-            meta: { title: "期权" },
-          },
-            meta: { title: '期权' },
-          },
+            {
+                path: "",
+                name: "",
+                component: AppIndex,
+            },
+            {
+                path: "marketIndex",
+                name: "marketIndex",
+                component: MarketIndex,
+            },
+            {
+                path: "/bitcoin",
+                component: TradeLayout, // 而是布局组件
+                // 当访问 /bitcoin 时，自动重定向到 /bitcoin/contract
+                redirect: "/bitcoin/contract",
+                children: [
+                    // 1. 核心交易子路由
+                    {
+                        path: "contract",
+                        name: "TradeContract",
+                        component: TradeFutures, // 核心交易逻辑
+                        meta: {title: "合约"},
+                    },
+                    {
+                        path: "seconds",
+                        name: "TradeSeconds",
+                        component: TradeSeconds,
+                        meta: {title: "秒合约"},
+                    },
+                    {
+                        path: "options",
+                        name: "TradeOptions",
+                        component: TradeOptions,
+                        meta: {title: "期权"},
+                    },
 
-          {
-            path: "margin",
-            name: "TradeMargin",
-            component: TradeMargin,
-            meta: { title: "杠杆" },
-          },
-          { path: 'settings',
-            name: 'TradeSettings',
-            component: TradeSettings },
+                    {
+                        path: "margin",
+                        name: "TradeMargin",
+                        component: TradeMargin,
+                        meta: {title: "杠杆"},
+                    },
+                    {
+                        path: 'settings',
+                        name: 'TradeSettings',
+                        component: TradeSettings
+                    },
 
-         ]
-        },
-        {
-            path: 'PnLAnalysis',
-            name: 'PnLAnalysis.vue',
-            component: () => import('@/views/bitcoin/lever/PnLAnalysis.vue'),
-            meta: { title: '' }
-         },
-         { path: 'calculator',
-            name: 'calculator',
-            component: Calculator },
-        {
-            path: 'OptionTrading',
-            name: 'OptionTrading',
-            component: OptionTrading,
-            meta: { title: '' }
-         },
-          { path: "settings", name: "TradeSettings", component: TradeSettings },
-          { path: "calculator", name: "calculator", component: Calculator },
-        ],
-      },
-      {
+                ]
+            },
+            {
+                path: 'PnLAnalysis',
+                name: 'PnLAnalysis.vue',
+                component: () => import('@/views/bitcoin/lever/PnLAnalysis.vue'),
+                meta: {title: ''}
+            },
+            {
+                path: 'calculator',
+                name: 'calculator',
+                component: Calculator
+            },
+            {
+                path: 'OptionTrading',
+                name: 'OptionTrading',
+                component: OptionTrading,
+                meta: {title: ''}
+            },
+            {path: "settings", name: "TradeSettings", component: TradeSettings},
+            {path: "calculator", name: "calculator", component: Calculator},
+        ]
+    },
+    {
         path: "assetIndex",
         name: "assetIndex",
         component: AssetIndex,
-      },
-      {
+    },
+    {
         path: "userIndex",
         name: "userIndex",
         component: UserIndex,
-      },
-    ],
-  },
-  {
-    path: "/applyPermission",
-    name: "applyPermission",
-    component: ApplyPermission,
-  },
-  {
-    path: "/splashScreen",
-    name: "splashScreen",
-    component: SplashScreen,
-  },
-  {
-    path: "/riskTips",
-    name: "riskTips",
-    component: RiskTips,
-  },
-  {
-    path: "/searchIcon",
-    name: "searchIcon",
-    component: SearchIcon,
-  },
-  {
-    path: "/notification",
-    name: "notification",
-    component: Notification,
-  },
-  {
-    path: "/indexUser",
-    name: "indexUser",
-    component: IndexUser,
-  },
-  {
-    path: "/userCenter",
-    name: "userCenter",
-    component: UserCenter,
-  },
-  {
-    path: "/marketDetails",
-    name: "marketDetails",
-    component: MarketDetails,
-  },
-  {
-    path: "/historyIndex",
-    name: "historyIndex",
-    component: HistoryIndex,
-  },
-  {
-    path: "/entrustDetails",
-    name: "entrustDetails",
-    component: EntrustDetails,
-  },
-  {
-    path: "/positionDetails",
-    name: "positionDetails",
-    component: PositionDetails,
-  },
-  {
-    path: "/icoIndex",
-    name: "icoIndex",
-    component: IcoIndex,
-  },
-  {
-    path: "/loanIndex",
-    name: "loanIndex",
-    component: LoanIndex,
-  },
-  {
-    path: "/loanRules",
-    name: "loanRules",
-    component: LoanRules,
-  },
-  {
-    path: "/userLoanIndex",
-    name: "userLoanIndex",
-    component: UserLoanIndex,
-  },
-  {
-    path: "/commitMessage",
-    name: "commitMessage",
-    component: CommitMessage,
-  },
-  {
-    path: "/contractTerms",
-    name: "contractTerms",
-    component: ContractTerms,
-  },
-  {
-    path: "/signature",
-    name: "signature",
-    component: Signature,
-  },
-  {
-    path: "/deleteAccount",
-    name: "deleteAccount",
-    component: DeleteAccount,
-  },
-  {
-    path: "/rechargeIndex",
-    name: "rechargeIndex",
-    component: RechargeIndex,
-  },
-  {
-    path: "/rechargeChangeCoin",
-    name: "rechargeChangeCoin",
-    component: RechargeChangeCoin,
-  },
-  {
-    path: "/withdrawIndex",
-    name: "withdrawIndex",
-    component: WithdrawIndex,
-  },
-  {
-    path: "/transfer",
-    name: "transfer",
-    component: Transfer,
-  },
-  {
-    path: "/transferHistory",
-    name: "transferHistory",
-    component: TransferHistory,
-  },
-  {
-    path: "/userAsset",
-    name: "userAsset",
-    component: UserAsset,
-  },
-  {
-    path: "/applyPermission",
-    name: "applyPermission",
-    component: ApplyPermission,
-  },
-  {
-    path: "/splashScreen",
-    name: "splashScreen",
-    component: SplashScreen,
-  },
-  {
-    path: "/riskTips",
-    name: "riskTips",
-    component: RiskTips,
-  },
-  {
-    path: "/searchIcon",
-    name: "searchIcon",
-    component: SearchIcon,
-  },
-  {
-    path: "/notification",
-    name: "notification",
-    component: Notification,
-  },
-  {
-    path: "/indexUser",
-    name: "indexUser",
-    component: IndexUser,
-  },
-  {
-    path: "/userCenter",
-    name: "userCenter",
-    component: UserCenter,
-  },
-  {
-    path: "/marketDetails",
-    name: "marketDetails",
-    component: MarketDetails,
-  },
-  {
-    path: "/historyIndex",
-    name: "historyIndex",
-    component: HistoryIndex,
-  },
-  {
-    path: "/entrustDetails",
-    name: "entrustDetails",
-    component: EntrustDetails,
-  },
-  {
-    path: "/positionDetails",
-    name: "positionDetails",
-    component: PositionDetails,
-  },
-  {
-    path: "/icoIndex",
-    name: "icoIndex",
-    component: IcoIndex,
-  },
-  {
-    path: "/loanIndex",
-    name: "loanIndex",
-    component: LoanIndex,
-  },
-  {
-    path: "/loanRules",
-    name: "loanRules",
-    component: LoanRules,
-  },
-  {
-    path: "/userLoanIndex",
-    name: "userLoanIndex",
-    component: UserLoanIndex,
-  },
-  {
-    path: "/rechargeHistory",
-    name: "rechargeHistory",
-    component: RechargeHistory,
-  },
-  {
-    path: "/withdrawHistory",
-    name: "withdrawHistory",
-    component: WithdrawHistory,
-  },
-  {
-    path: "/financialIndex",
-    name: "financialIndex",
-    component: FinancialIndex,
-  },
-  {
-    path: "/financialBuy",
-    name: "financialBuy",
-    component: FinancialBuy,
-  },
-  {
-    path: "/myFinancial",
-    name: "myFinancial",
-    component: MyFinancial,
-  },
+    },
+    {
+        path: "/applyPermission",
+        name: "applyPermission",
+        component: ApplyPermission,
+    },
+    {
+        path: "/splashScreen",
+        name: "splashScreen",
+        component: SplashScreen,
+    },
+    {
+        path: "/riskTips",
+        name: "riskTips",
+        component: RiskTips,
+    },
+    {
+        path: "/searchIcon",
+        name: "searchIcon",
+        component: SearchIcon,
+    },
+    {
+        path: "/notification",
+        name: "notification",
+        component: Notification,
+    },
+    {
+        path: "/indexUser",
+        name: "indexUser",
+        component: IndexUser,
+    },
+    {
+        path: "/userCenter",
+        name: "userCenter",
+        component: UserCenter,
+    },
+    {
+        path: "/marketDetails",
+        name: "marketDetails",
+        component: MarketDetails,
+    },
+    {
+        path: "/historyIndex",
+        name: "historyIndex",
+        component: HistoryIndex,
+    },
+    {
+        path: "/entrustDetails",
+        name: "entrustDetails",
+        component: EntrustDetails,
+    },
+    {
+        path: "/positionDetails",
+        name: "positionDetails",
+        component: PositionDetails,
+    },
+    {
+        path: "/icoIndex",
+        name: "icoIndex",
+        component: IcoIndex,
+    },
+    {
+        path: "/loanIndex",
+        name: "loanIndex",
+        component: LoanIndex,
+    },
+    {
+        path: "/loanRules",
+        name: "loanRules",
+        component: LoanRules,
+    },
+    {
+        path: "/userLoanIndex",
+        name: "userLoanIndex",
+        component: UserLoanIndex,
+    },
+    {
+        path: "/commitMessage",
+        name: "commitMessage",
+        component: CommitMessage,
+    },
+    {
+        path: "/contractTerms",
+        name: "contractTerms",
+        component: ContractTerms,
+    },
+    {
+        path: "/signature",
+        name: "signature",
+        component: Signature,
+    },
+    {
+        path: "/deleteAccount",
+        name: "deleteAccount",
+        component: DeleteAccount,
+    },
+    {
+        path: "/rechargeIndex",
+        name: "rechargeIndex",
+        component: RechargeIndex,
+    },
+    {
+        path: "/rechargeChangeCoin",
+        name: "rechargeChangeCoin",
+        component: RechargeChangeCoin,
+    },
+    {
+        path: "/withdrawIndex",
+        name: "withdrawIndex",
+        component: WithdrawIndex,
+    },
+    {
+        path: "/transfer",
+        name: "transfer",
+        component: Transfer,
+    },
+    {
+        path: "/transferHistory",
+        name: "transferHistory",
+        component: TransferHistory,
+    },
+    {
+        path: "/userAsset",
+        name: "userAsset",
+        component: UserAsset,
+    },
+    {
+        path: "/applyPermission",
+        name: "applyPermission",
+        component: ApplyPermission,
+    },
+    {
+        path: "/splashScreen",
+        name: "splashScreen",
+        component: SplashScreen,
+    },
+    {
+        path: "/riskTips",
+        name: "riskTips",
+        component: RiskTips,
+    },
+    {
+        path: "/searchIcon",
+        name: "searchIcon",
+        component: SearchIcon,
+    },
+    {
+        path: "/notification",
+        name: "notification",
+        component: Notification,
+    },
+    {
+        path: "/indexUser",
+        name: "indexUser",
+        component: IndexUser,
+    },
+    {
+        path: "/userCenter",
+        name: "userCenter",
+        component: UserCenter,
+    },
+    {
+        path: "/marketDetails",
+        name: "marketDetails",
+        component: MarketDetails,
+    },
+    {
+        path: "/historyIndex",
+        name: "historyIndex",
+        component: HistoryIndex,
+    },
+    {
+        path: "/entrustDetails",
+        name: "entrustDetails",
+        component: EntrustDetails,
+    },
+    {
+        path: "/positionDetails",
+        name: "positionDetails",
+        component: PositionDetails,
+    },
+    {
+        path: "/icoIndex",
+        name: "icoIndex",
+        component: IcoIndex,
+    },
+    {
+        path: "/loanIndex",
+        name: "loanIndex",
+        component: LoanIndex,
+    },
+    {
+        path: "/loanRules",
+        name: "loanRules",
+        component: LoanRules,
+    },
+    {
+        path: "/userLoanIndex",
+        name: "userLoanIndex",
+        component: UserLoanIndex,
+    },
+    {
+        path: "/rechargeHistory",
+        name: "rechargeHistory",
+        component: RechargeHistory,
+    },
+    {
+        path: "/withdrawHistory",
+        name: "withdrawHistory",
+        component: WithdrawHistory,
+    },
+    {
+        path: "/financialIndex",
+        name: "financialIndex",
+        component: FinancialIndex,
+    },
+    {
+        path: "/financialBuy",
+        name: "financialBuy",
+        component: FinancialBuy,
+    },
+    {
+        path: "/myFinancial",
+        name: "myFinancial",
+        component: MyFinancial,
+    },
 ];
 
 const router = createRouter({
-  history: createWebHistory(process.env.BASE_URL),
-  routes,
+    history: createWebHistory(process.env.BASE_URL),
+    routes,
 });
 
 export default router;

src/views/HomeIndex.vue

@@ -28,7 +28,7 @@
 
   const tabbarChange = (key, path) => {
     current.value = key;
-    router.push('/'+key);
+    router.push(path);
   };
 
   const tabbarList = [