@@ -1388,6 +1389,7 @@ const Detail = (props) => {
) : (
typeof item === 'string');
} catch (error) {
diff --git a/web/src/pages/Setting/Operation/ModelRatioSettings.js b/web/src/pages/Setting/Ratio/ModelRatioSettings.js
similarity index 100%
rename from web/src/pages/Setting/Operation/ModelRatioSettings.js
rename to web/src/pages/Setting/Ratio/ModelRatioSettings.js
diff --git a/web/src/pages/Setting/Operation/ModelRationNotSetEditor.js b/web/src/pages/Setting/Ratio/ModelRationNotSetEditor.js
similarity index 100%
rename from web/src/pages/Setting/Operation/ModelRationNotSetEditor.js
rename to web/src/pages/Setting/Ratio/ModelRationNotSetEditor.js
diff --git a/web/src/pages/Setting/Operation/ModelSettingsVisualEditor.js b/web/src/pages/Setting/Ratio/ModelSettingsVisualEditor.js
similarity index 100%
rename from web/src/pages/Setting/Operation/ModelSettingsVisualEditor.js
rename to web/src/pages/Setting/Ratio/ModelSettingsVisualEditor.js
diff --git a/web/src/pages/Setting/index.js b/web/src/pages/Setting/index.js
index dc48c8dc..5572e540 100644
--- a/web/src/pages/Setting/index.js
+++ b/web/src/pages/Setting/index.js
@@ -10,6 +10,7 @@ import OperationSetting from '../../components/settings/OperationSetting.js';
import RateLimitSetting from '../../components/settings/RateLimitSetting.js';
import ModelSetting from '../../components/settings/ModelSetting.js';
import DashboardSetting from '../../components/settings/DashboardSetting.js';
+import RatioSetting from '../../components/settings/RatioSetting.js';
const Setting = () => {
const { t } = useTranslation();
@@ -24,6 +25,11 @@ const Setting = () => {
content: ,
itemKey: 'operation',
});
+ panes.push({
+ tab: t('倍率设置'),
+ content: ,
+ itemKey: 'ratio',
+ });
panes.push({
tab: t('速率限制设置'),
content: ,
@@ -45,7 +51,7 @@ const Setting = () => {
itemKey: 'other',
});
panes.push({
- tab: t('仪表盘配置'),
+ tab: t('仪表盘设置'),
content: ,
itemKey: 'dashboard',
});
diff --git a/web/src/pages/TopUp/index.js b/web/src/pages/TopUp/index.js
index cb32bca2..e327178d 100644
--- a/web/src/pages/TopUp/index.js
+++ b/web/src/pages/TopUp/index.js
@@ -7,7 +7,7 @@ import {
renderQuota,
renderQuotaWithAmount,
copy,
- getQuotaPerUnit
+ getQuotaPerUnit,
} from '../../helpers';
import {
Avatar,
@@ -34,7 +34,7 @@ import {
Copy,
Users,
User,
- Coins
+ Coins,
} from 'lucide-react';
const { Text, Title } = Typography;
@@ -49,9 +49,15 @@ const TopUp = () => {
const [topUpCode, setTopUpCode] = useState('');
const [amount, setAmount] = useState(0.0);
const [minTopUp, setMinTopUp] = useState(statusState?.status?.min_topup || 1);
- const [topUpCount, setTopUpCount] = useState(statusState?.status?.min_topup || 1);
- const [topUpLink, setTopUpLink] = useState(statusState?.status?.top_up_link || '');
- const [enableOnlineTopUp, setEnableOnlineTopUp] = useState(statusState?.status?.enable_online_topup || false);
+ const [topUpCount, setTopUpCount] = useState(
+ statusState?.status?.min_topup || 1,
+ );
+ const [topUpLink, setTopUpLink] = useState(
+ statusState?.status?.top_up_link || '',
+ );
+ const [enableOnlineTopUp, setEnableOnlineTopUp] = useState(
+ statusState?.status?.enable_online_topup || false,
+ );
const [priceRatio, setPriceRatio] = useState(statusState?.status?.price || 1);
const [userQuota, setUserQuota] = useState(0);
const [isSubmitting, setIsSubmitting] = useState(false);
@@ -61,6 +67,7 @@ const TopUp = () => {
const [amountLoading, setAmountLoading] = useState(false);
const [paymentLoading, setPaymentLoading] = useState(false);
const [confirmLoading, setConfirmLoading] = useState(false);
+ const [payMethods, setPayMethods] = useState([]);
// 邀请相关状态
const [affLink, setAffLink] = useState('');
@@ -76,7 +83,7 @@ const TopUp = () => {
{ value: 100 },
{ value: 300 },
{ value: 500 },
- { value: 1000 }
+ { value: 1000 },
]);
const [selectedPreset, setSelectedPreset] = useState(null);
@@ -126,7 +133,7 @@ const TopUp = () => {
if (userState.user) {
const updatedUser = {
...userState.user,
- quota: userState.user.quota + data
+ quota: userState.user.quota + data,
};
userDispatch({ type: 'login', payload: updatedUser });
}
@@ -283,6 +290,34 @@ const TopUp = () => {
}
getAffLink().then();
setTransferAmount(getQuotaPerUnit());
+
+ let payMethods = localStorage.getItem('pay_methods');
+ try {
+ payMethods = JSON.parse(payMethods);
+ if (payMethods && payMethods.length > 0) {
+ // 检查name和type是否为空
+ payMethods = payMethods.filter((method) => {
+ return method.name && method.type;
+ });
+ // 如果没有color，则设置默认颜色
+ payMethods = payMethods.map((method) => {
+ if (!method.color) {
+ if (method.type === 'zfb') {
+ method.color = 'rgba(var(--semi-blue-5), 1)';
+ } else if (method.type === 'wx') {
+ method.color = 'rgba(var(--semi-green-5), 1)';
+ } else {
+ method.color = 'rgba(var(--semi-primary-5), 1)';
+ }
+ }
+ return method;
+ });
+ setPayMethods(payMethods);
+ }
+ } catch (e) {
+ console.log(e);
+ showError(t('支付方式配置错误, 请联系管理员'));
+ }
}, []);
useEffect(() => {
@@ -347,12 +382,12 @@ const TopUp = () => {
};
return (
-
+
{/* 划转模态框 */}
-
+
+
{t('划转邀请额度')}
}
@@ -360,22 +395,22 @@ const TopUp = () => {
onOk={transfer}
onCancel={handleTransferCancel}
maskClosable={false}
- size="small"
+ size='small'
centered
>
-
+
@@ -393,8 +428,8 @@ const TopUp = () => {
{/* 充值确认模态框 */}
-
+
+
{t('充值确认')}
}
@@ -402,57 +437,80 @@ const TopUp = () => {
onOk={onlineTopUp}
onCancel={handleCancel}
maskClosable={false}
- size="small"
+ size='small'
centered
confirmLoading={confirmLoading}
>
-
-
+
+
{t('充值数量')}：
{renderQuotaWithAmount(topUpCount)}
-
+
{t('实付金额')}：
{amountLoading ? (
) : (
- {renderAmount()}
+
+ {renderAmount()}
+
)}
-
+
{t('支付方式')}：
- {payWay === 'zfb' ? (
-
-
- {t('支付宝')}
-
- ) : (
-
-
- {t('微信')}
-
- )}
+ {(() => {
+ const payMethod = payMethods.find(
+ (method) => method.type === payWay,
+ );
+ if (payMethod) {
+ return (
+
+ {payMethod.type === 'zfb' ? (
+
+ ) : payMethod.type === 'wx' ? (
+
+ ) : (
+
+ )}
+ {payMethod.name}
+
+ );
+ } else {
+ // 默认充值方式
+ return payWay === 'zfb' ? (
+
+
+ {t('支付宝')}
+
+ ) : (
+
+
+ {t('微信')}
+
+ );
+ }
+ })()}
-
+
{/* 左侧充值区域 */}
-
+
{/* 在线充值卡片 */}
-
-
+
+
+
@@ -460,21 +518,23 @@ const TopUp = () => {
{t('在线充值')}
-
+
{t('快速方便的充值方式')}
-
+
{userDataLoading ? (
) : (
-
-
-
-
{getUsername()} ({getUserRole()})
-
{getUsername()}
+
+
+
+
+ {getUsername()} ({getUserRole()})
+
+ {getUsername()}
)}
@@ -483,29 +543,33 @@ const TopUp = () => {
+
{/* 账户余额信息 */}
-
-
-
+
+
+
{t('当前余额')}
{userDataLoading ? (
-
+
) : (
-
+
{renderQuota(userState?.user?.quota || userQuota)}
)}
-
-
+
+
{t('历史消耗')}
{userDataLoading ? (
-
+
) : (
-
+
{renderQuota(userState?.user?.used_quota || 0)}
)}
@@ -516,47 +580,59 @@ const TopUp = () => {
<>
{/* 预设充值额度卡片网格 */}
-
{t('选择充值额度')}
-
+
+ {t('选择充值额度')}
+
+
{presetAmounts.map((preset, index) => (
selectPresetAmount(preset)}
- className={`cursor-pointer !rounded-2xl transition-all hover:shadow-md ${selectedPreset === preset.value
- ? 'border-blue-500'
- : 'border-gray-200 hover:border-gray-300'
- }`}
+ className={`cursor-pointer !rounded-2xl transition-all hover:shadow-md ${
+ selectedPreset === preset.value
+ ? 'border-blue-500'
+ : 'border-gray-200 hover:border-gray-300'
+ }`}
bodyStyle={{ textAlign: 'center' }}
>
-
-
+
+
{formatLargeNumber(preset.value)}
-
- {t('实付')} ￥{(preset.value * priceRatio).toFixed(2)}
+
+ {t('实付')} ￥
+ {(preset.value * priceRatio).toFixed(2)}
))}
+
- {t('或输入自定义金额')}
+
+ {t('或输入自定义金额')}
+
-
+
{t('充值数量')}
{amountLoading ? (
-
+
) : (
- {t('实付金额：') + renderAmount()}
+
+ {t('实付金额：') + renderAmount()}
+
)}
{
getAmount(1);
}
}}
- size="large"
- className="w-full"
- formatter={(value) => value ? `${value}` : ''}
- parser={(value) => value ? parseInt(value.replace(/[^\d]/g, '')) : 0}
+ size='large'
+ className='w-full'
+ formatter={(value) => (value ? `${value}` : '')}
+ parser={(value) =>
+ value ? parseInt(value.replace(/[^\d]/g, '')) : 0
+ }
/>
-
-
*/}
+ {payMethods.map((payMethod) => (
+
+ ))}
@@ -613,39 +716,41 @@ const TopUp = () => {
{!enableOnlineTopUp && (
)}
- {t('兑换码充值')}
+ {t('兑换码充值')}
-
-
-
+
+
+
{t('使用兑换码快速充值')}
-
+
setRedemptionCode(value)}
- size="large"
+ size='large'
/>
-
+
{topUpLink && (
}
style={{ height: '40px' }}
>
@@ -653,12 +758,12 @@ const TopUp = () => {
)}
{/* 右侧邀请信息卡片 */}
-
+
-
-
+
+
+
@@ -689,7 +794,7 @@ const TopUp = () => {
{t('邀请奖励')}
-
+
{t('邀请好友获得额外奖励')}
@@ -698,53 +803,56 @@ const TopUp = () => {
}
>
-
-
-
-
-
{t('待使用收益')}
+
+
+
+
+ {t('待使用收益')}
-
+
{renderQuota(userState?.user?.aff_quota || 0)}
-
-
- {t('总收益')}
-
+
+
+ {t('总收益')}
+
{renderQuota(userState?.user?.aff_history_quota || 0)}
-
- {t('邀请人数')}
-
-
+
+ {t('邀请人数')}
+
+
{userState?.user?.aff_count || 0}
-
+
{t('邀请链接')}
}
>
@@ -753,24 +861,24 @@ const TopUp = () => {
}
/>
-
-
-
-
-
-
+
+
+
+
+
+
{t('邀请好友注册，好友充值后您可获得相应奖励')}
-
-
-
+
+
+
{t('通过划转功能将奖励额度转入到您的账户余额中')}
-
-
+
+
+
{t('邀请的好友越多，获得的奖励越多')}
-
+
+
-
+
{t('充值数量')}
{amountLoading ? (
) : (
- {t('实付金额：') + renderAmount()}
+
+ {t('实付金额：') + renderAmount()}
+
)}
{
getAmount(1);
}
}}
- className="w-full"
- formatter={(value) => value ? `${value}` : ''}
- parser={(value) => value ? parseInt(value.replace(/[^\d]/g, '')) : 0}
+ className='w-full'
+ formatter={(value) => (value ? `${value}` : '')}
+ parser={(value) =>
+ value ? parseInt(value.replace(/[^\d]/g, '')) : 0
+ }
/>
-
-
*/}
+ {payMethods.map((payMethod) => (
+
+ ))}