This commit is contained in:
@@ -50,9 +50,10 @@ test('creation defaults and reset never select the hidden original route', () =>
|
|||||||
const { resolveRefundMethod } = evaluate(
|
const { resolveRefundMethod } = evaluate(
|
||||||
`const RefundMethod = ${JSON.stringify(RefundMethod)}; export ${resolver}`
|
`const RefundMethod = ${JSON.stringify(RefundMethod)}; export ${resolver}`
|
||||||
)
|
)
|
||||||
for (const payment_method of ['wechat', 'alipay', 'offline']) {
|
for (const payment_method of ['wechat', 'alipay', 'fuiou', 'offline']) {
|
||||||
assert.equal(resolveRefundMethod({ payment_method }), RefundMethod.CUSTOMER_ACCOUNT)
|
assert.equal(resolveRefundMethod({ payment_method }), RefundMethod.CUSTOMER_ACCOUNT)
|
||||||
}
|
}
|
||||||
|
assert.match(dialogSource, /fuiou: '富友支付'/)
|
||||||
assert.equal(
|
assert.equal(
|
||||||
resolveRefundMethod({ payment_method: 'wallet', buyer_type: 'agent' }),
|
resolveRefundMethod({ payment_method: 'wallet', buyer_type: 'agent' }),
|
||||||
RefundMethod.AGENT_WALLET
|
RefundMethod.AGENT_WALLET
|
||||||
|
|||||||
@@ -245,6 +245,7 @@
|
|||||||
wallet: '预存款支付',
|
wallet: '预存款支付',
|
||||||
wechat: '微信支付',
|
wechat: '微信支付',
|
||||||
alipay: '支付宝支付',
|
alipay: '支付宝支付',
|
||||||
|
fuiou: '富友支付',
|
||||||
offline: '线下支付'
|
offline: '线下支付'
|
||||||
}
|
}
|
||||||
return selectedOrder.value ? labels[selectedOrder.value.payment_method] : '-'
|
return selectedOrder.value ? labels[selectedOrder.value.payment_method] : '-'
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ export type OrderType = 'single_card' | 'device'
|
|||||||
export type BuyerType = 'personal' | 'agent'
|
export type BuyerType = 'personal' | 'agent'
|
||||||
|
|
||||||
// 订单支付方式
|
// 订单支付方式
|
||||||
export type OrderPaymentMethod = 'wallet' | 'wechat' | 'alipay' | 'offline'
|
export type OrderPaymentMethod = 'wallet' | 'wechat' | 'alipay' | 'fuiou' | 'offline'
|
||||||
|
|
||||||
// 订单操作者类型
|
// 订单操作者类型
|
||||||
export type OrderOperatorType = 'platform' | 'agent' | 'enterprise' | 'personal_customer'
|
export type OrderOperatorType = 'platform' | 'agent' | 'enterprise' | 'personal_customer'
|
||||||
|
|||||||
@@ -807,6 +807,7 @@
|
|||||||
wallet: '钱包',
|
wallet: '钱包',
|
||||||
wechat: '微信',
|
wechat: '微信',
|
||||||
alipay: '支付宝',
|
alipay: '支付宝',
|
||||||
|
fuiou: '富友支付',
|
||||||
offline: '线下'
|
offline: '线下'
|
||||||
}
|
}
|
||||||
return methodMap[method] || method
|
return methodMap[method] || method
|
||||||
|
|||||||
Reference in New Issue
Block a user