From 32aeb7d1971efc080d150b1d731e289a614af7b6 Mon Sep 17 00:00:00 2001 From: mac Date: Thu, 11 Jul 2024 18:01:01 +0800 Subject: [PATCH] commit --- src/components/layout/Slider.tsx | 4 ++-- src/http/service.ts | 12 ++++++++---- src/pages/record/assets/index.tsx | 26 +++++++++++++++++++++++++- src/pages/withdraw/index.tsx | 1 - 4 files changed, 35 insertions(+), 8 deletions(-) diff --git a/src/components/layout/Slider.tsx b/src/components/layout/Slider.tsx index cc32cc1..3067952 100644 --- a/src/components/layout/Slider.tsx +++ b/src/components/layout/Slider.tsx @@ -32,10 +32,10 @@ const Slider = () => { const handleLeftMenu = (id: number) => { switch (id) { case 1: - window.open("https://m.swissquotecn.com/mt5") + window.open("https://www.metatrader4.com/zh/download") break; case 2: - window.open("https://m.swissquotecn.com/mt5") + window.open("https://www.metatrader4.com/zh/download") break; case 3: push('/') diff --git a/src/http/service.ts b/src/http/service.ts index e3b95e0..4e315ff 100644 --- a/src/http/service.ts +++ b/src/http/service.ts @@ -18,7 +18,7 @@ service.interceptors.request.use( timestamp: timestamp, args: ps, }; - + let sign = signGenerator(signData); (config.headers as any).sign = sign; (config.headers as any).timestamp = timestamp; @@ -43,14 +43,18 @@ service.interceptors.response.use( (res: any) => { let data = JSON.parse(res.data); + + if (data && data.code === 101) { + store.setToken('') + return data + } + if (data && data.code !== 0) { notification.warning({ message: data.msg }) } - if (data && data.code === 101) { - store.setToken('') - } + return data; }, error => { diff --git a/src/pages/record/assets/index.tsx b/src/pages/record/assets/index.tsx index cc7d82d..90ff2e6 100644 --- a/src/pages/record/assets/index.tsx +++ b/src/pages/record/assets/index.tsx @@ -93,6 +93,10 @@ const AssetsRecords = () => { title: '描述', dataIndex: 'describe', }, + { + title: '金额', + dataIndex: 'amount' + }, { title: '剩余', dataIndex: 'balance', @@ -100,6 +104,10 @@ const AssetsRecords = () => { ${val} ) }, + { + title: '状态', + dataIndex: 'status' + }, ]} /> @@ -127,6 +135,10 @@ const AssetsRecords = () => { title: '描述', dataIndex: 'describe', }, + { + title: '金额', + dataIndex: 'amount' + }, { title: '剩余', dataIndex: 'balance', @@ -134,6 +146,10 @@ const AssetsRecords = () => { ${val} ) }, + { + title: '状态', + dataIndex: 'status' + }, ]} /> @@ -161,6 +177,10 @@ const AssetsRecords = () => { title: '描述', dataIndex: 'describe', }, + { + title: '金额', + dataIndex: 'amount' + }, { title: '剩余', dataIndex: 'balance', @@ -168,6 +188,10 @@ const AssetsRecords = () => { ${val} ) }, + { + title: '状态', + dataIndex: 'status' + }, ]} /> @@ -185,7 +209,7 @@ const AssetsRecords = () => { } } }}> - { return } - return const res: any = await http_withdraw({ ...values, receiving_account_id: Number(values.receiving_account_id)