feat(dealer): 更新提现功能并优化请求配置
- 移除开户行名称、银行开户名和银行卡号的输入长度限制 - 在提现数据模型中新增备注字段 comments- 提现时自动生成包含手续费和预计到账金额的备注信息 -优化提现记录展示,显示备注信息而非账户信息 -修复开发环境请求地址配置注释问题,启用本地代理地址
This commit is contained in:
@@ -30,6 +30,8 @@ export interface ShopDealerWithdraw {
|
|||||||
rejectReason?: string;
|
rejectReason?: string;
|
||||||
// 来源客户端(APP、H5、小程序等)
|
// 来源客户端(APP、H5、小程序等)
|
||||||
platform?: string;
|
platform?: string;
|
||||||
|
// 备注
|
||||||
|
comments?: string;
|
||||||
// 租户id
|
// 租户id
|
||||||
tenantId?: number;
|
tenantId?: number;
|
||||||
// 创建时间
|
// 创建时间
|
||||||
|
|||||||
@@ -122,13 +122,13 @@ const AddUserAddress = () => {
|
|||||||
>
|
>
|
||||||
<CellGroup style={{padding: '4px 0'}}>
|
<CellGroup style={{padding: '4px 0'}}>
|
||||||
<Form.Item name="bankName" label="开户行名称" initialValue={FormData?.bankName} required>
|
<Form.Item name="bankName" label="开户行名称" initialValue={FormData?.bankName} required>
|
||||||
<Input placeholder="开户行名称" maxLength={10}/>
|
<Input placeholder="开户行名称"/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item name="bankAccount" label="银行开户名" initialValue={FormData?.bankAccount} required>
|
<Form.Item name="bankAccount" label="银行开户名" initialValue={FormData?.bankAccount} required>
|
||||||
<Input placeholder="银行开户名" maxLength={10}/>
|
<Input placeholder="银行开户名"/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
<Form.Item name="bankCard" label="银行卡号" initialValue={FormData?.bankCard} required>
|
<Form.Item name="bankCard" label="银行卡号" initialValue={FormData?.bankCard} required>
|
||||||
<Input placeholder="银行卡号" maxLength={11}/>
|
<Input placeholder="银行卡号"/>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
</CellGroup>
|
</CellGroup>
|
||||||
</Form>
|
</Form>
|
||||||
|
|||||||
@@ -252,7 +252,8 @@ const DealerWithdraw: React.FC = () => {
|
|||||||
platform: 'MiniProgram',
|
platform: 'MiniProgram',
|
||||||
bankCard: bank.bankCard,
|
bankCard: bank.bankCard,
|
||||||
bankAccount: bank.bankAccount,
|
bankAccount: bank.bankAccount,
|
||||||
bankName: bank.bankName
|
bankName: bank.bankName,
|
||||||
|
comments: `提现费3元/笔,预计到账金额¥${calculateExpectedAmount(withdrawAmount)}`,
|
||||||
}
|
}
|
||||||
|
|
||||||
await addShopDealerWithdraw(withdrawData)
|
await addShopDealerWithdraw(withdrawData)
|
||||||
@@ -403,10 +404,10 @@ const DealerWithdraw: React.FC = () => {
|
|||||||
<View className="flex justify-between items-start mb-3">
|
<View className="flex justify-between items-start mb-3">
|
||||||
<Space direction={'vertical'}>
|
<Space direction={'vertical'}>
|
||||||
<Text className="font-semibold text-gray-800 mb-1">
|
<Text className="font-semibold text-gray-800 mb-1">
|
||||||
提现金额:¥{record.money}
|
提现金额:¥{Number(record.money).toFixed(2)}
|
||||||
</Text>
|
</Text>
|
||||||
<Text className="text-sm text-gray-500">
|
<Text className="text-sm text-gray-500">
|
||||||
提现账户:{record.accountDisplay}
|
{record.comments}
|
||||||
</Text>
|
</Text>
|
||||||
</Space>
|
</Space>
|
||||||
<Tag type={getStatusColor(record.applyStatus)}>
|
<Tag type={getStatusColor(record.applyStatus)}>
|
||||||
|
|||||||
@@ -57,7 +57,7 @@ let baseUrl = Taro.getStorageSync('ApiUrl') || BaseUrl;
|
|||||||
|
|
||||||
// 开发环境配置
|
// 开发环境配置
|
||||||
if (process.env.NODE_ENV === 'development') {
|
if (process.env.NODE_ENV === 'development') {
|
||||||
// baseUrl = 'http://localhost:9200/api'
|
baseUrl = 'http://localhost:9200/api'
|
||||||
}
|
}
|
||||||
|
|
||||||
// 请求拦截器
|
// 请求拦截器
|
||||||
|
|||||||
Reference in New Issue
Block a user