From 8b96d068c9b376314f39ab88725da2045ee73321 Mon Sep 17 00:00:00 2001
From: CaIon <1808837298@qq.com>
Date: Fri, 1 Dec 2023 01:30:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E8=A7=89=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/components/MjLogsTable.js      |  4 ++--
 web/src/components/RedemptionsTable.js | 14 +++++++++++++-
 web/src/components/TokensTable.js      | 14 +++++++++++++-
 web/src/pages/Token/EditToken.js       |  4 ++--
 web/src/pages/TopUp/index.js           |  7 +++----
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/web/src/components/MjLogsTable.js b/web/src/components/MjLogsTable.js
index e6b13c2..2673542 100644
--- a/web/src/components/MjLogsTable.js
+++ b/web/src/components/MjLogsTable.js
@@ -23,7 +23,7 @@ function renderType(type) {
     case 'DESCRIBE':
       return <Tag color="yellow" size='large'>图生文</Tag>;
     case 'BLEAND':
-      return <Tag color="olive" size='large'>图混合</Tag>;
+      return <Tag color="lime" size='large'>图混合</Tag>;
     default:
       return <Tag color="black" size='large'>未知</Tag>;
   }
@@ -35,7 +35,7 @@ function renderCode(code) {
     case 1:
       return <Tag color="green" size='large'>已提交</Tag>;
     case 21:
-      return <Tag color="olive" size='large'>排队中</Tag>;
+      return <Tag color="lime" size='large'>排队中</Tag>;
     case 22:
       return <Tag color="orange" size='large'>重复提交</Tag>;
     default:
diff --git a/web/src/components/RedemptionsTable.js b/web/src/components/RedemptionsTable.js
index e314b5f..ae9b219 100644
--- a/web/src/components/RedemptionsTable.js
+++ b/web/src/components/RedemptionsTable.js
@@ -324,6 +324,18 @@ const RedemptionsTable = () => {
         },
     };
 
+    const handleRow = (record, index) => {
+        if (record.status !== 1) {
+            return {
+                style: {
+                    background: 'var(--semi-color-disabled-border)',
+                },
+            };
+        } else {
+            return {};
+        }
+    };
+
     return (
         <>
             <EditRedemption refresh={refresh} editingRedemption={editingRedemption} visiable={showEdit}
@@ -353,7 +365,7 @@ const RedemptionsTable = () => {
                 //   setActivePage(1);
                 // },
                 onPageChange: handlePageChange,
-            }} loading={loading} rowSelection={rowSelection}>
+            }} loading={loading} rowSelection={rowSelection} onRow={handleRow}>
             </Table>
             <Button theme='light' type='primary' style={{marginRight: 8}} onClick={
                 () => {
diff --git a/web/src/components/TokensTable.js b/web/src/components/TokensTable.js
index d44e606..53883d6 100644
--- a/web/src/components/TokensTable.js
+++ b/web/src/components/TokensTable.js
@@ -437,6 +437,18 @@ const TokensTable = () => {
         },
     };
 
+    const handleRow = (record, index) => {
+        if (record.status !== 1) {
+            return {
+                style: {
+                    background: 'var(--semi-color-disabled-border)',
+                },
+            };
+        } else {
+            return {};
+        }
+    };
+
     return (
         <>
             <EditToken refresh={refresh} editingToken={editingToken} visiable={showEdit} handleClose={closeEdit}></EditToken>
@@ -473,7 +485,7 @@ const TokensTable = () => {
                     setActivePage(1);
                 },
                 onPageChange: handlePageChange,
-            }} loading={loading} rowSelection={rowSelection}>
+            }} loading={loading} rowSelection={rowSelection} onRow={handleRow}>
             </Table>
             <Button theme='light' type='primary' style={{marginRight: 8}} onClick={
                 () => {
diff --git a/web/src/pages/Token/EditToken.js b/web/src/pages/Token/EditToken.js
index dc21e93..0784c7a 100644
--- a/web/src/pages/Token/EditToken.js
+++ b/web/src/pages/Token/EditToken.js
@@ -151,13 +151,13 @@ const EditToken = (props) => {
 
             if (successCount > 0) {
                 showSuccess(`${successCount}个令牌创建成功，请在列表页面点击复制获取令牌！`);
+                props.refresh();
+                props.handleClose();
             }
         }
         setLoading(false);
         setInputs(originInputs); // 重置表单
         setTokenCount(1); // 重置数量为默认值
-        props.refresh();
-        props.handleClose();
     };
 
 
diff --git a/web/src/pages/TopUp/index.js b/web/src/pages/TopUp/index.js
index 125cd8c..42c2ad2 100644
--- a/web/src/pages/TopUp/index.js
+++ b/web/src/pages/TopUp/index.js
@@ -1,5 +1,4 @@
 import React, {useEffect, useState} from 'react';
-import {Confirm} from 'semantic-ui-react';
 import {API, isMobile, showError, showInfo, showSuccess} from '../../helpers';
 import {renderNumber, renderQuota} from '../../helpers/render';
 import {Col, Layout, Row, Typography, Card, Button, Form, Divider, Space, Modal} from "@douyinfe/semi-ui";
@@ -179,8 +178,8 @@ const TopUp = () => {
                         size={'small'}
                         centered={true}
                     >
-                        <p>充值数量：{topUpCount}</p>
-                        <p>充值金额：{renderAmount()}</p>
+                        <p>充值数量：{topUpCount}$</p>
+                        <p>实付金额：{renderAmount()}</p>
                         <p>是否确认充值？</p>
                     </Modal>
                     <div style={{marginTop: 20, display: 'flex', justifyContent: 'center'}}>
@@ -224,7 +223,7 @@ const TopUp = () => {
                                 <Form>
                                     <Form.Input
                                         field={'redemptionCount'}
-                                        label={'充值金额：' + renderAmount()}
+                                        label={'实付金额：' + renderAmount()}
                                         placeholder='充值数量'
                                         name='redemptionCount'
                                         type={'number'}