Commit 4abb29507d2d5358606019b24c32e39f8b3307f5
1 parent
8ac7918d
fix: 修改支付方式/渠道选择器
Showing
2 changed files
with
23 additions
and
18 deletions
src/pages/Order/OrderList/OrderDrawer.tsx
| @@ -309,22 +309,22 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -309,22 +309,22 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
| 309 | 309 | ||
| 310 | copyData.customerNameString = copyData.customerName; | 310 | copyData.customerNameString = copyData.customerName; |
| 311 | 311 | ||
| 312 | - // 清空支付方式和支付渠道 | ||
| 313 | - if ( | ||
| 314 | - copyData.paymentChannel === 'TAOBAO' || | ||
| 315 | - [ | ||
| 316 | - 'UNPAID', | ||
| 317 | - 'TAOBAO_ORDER_HAS_BEEN_PAID', | ||
| 318 | - 'OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID', | ||
| 319 | - 'WITHHOLDING_ADVANCE_DEPOSIT', | ||
| 320 | - 'PLATFORM_SETTLEMENT', | ||
| 321 | - 'PAYMENT_RECEIPT', | ||
| 322 | - 'PREPAID_NO_NEED_SEND', | ||
| 323 | - ].includes(copyData.paymentMethod) | ||
| 324 | - ) { | ||
| 325 | - copyData.paymentMethod = ''; | ||
| 326 | - copyData.paymentChannel = ''; | ||
| 327 | - } | 312 | + // // 清空支付方式和支付渠道 |
| 313 | + // if ( | ||
| 314 | + // copyData.paymentChannel === 'TAOBAO' || | ||
| 315 | + // [ | ||
| 316 | + // 'UNPAID', | ||
| 317 | + // 'TAOBAO_ORDER_HAS_BEEN_PAID', | ||
| 318 | + // 'OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID', | ||
| 319 | + // 'WITHHOLDING_ADVANCE_DEPOSIT', | ||
| 320 | + // 'PLATFORM_SETTLEMENT', | ||
| 321 | + // 'PAYMENT_RECEIPT', | ||
| 322 | + // 'PREPAID_NO_NEED_SEND', | ||
| 323 | + // ].includes(copyData.paymentMethod) | ||
| 324 | + // ) { | ||
| 325 | + // copyData.paymentMethod = ''; | ||
| 326 | + // copyData.paymentChannel = ''; | ||
| 327 | + // } | ||
| 328 | 328 | ||
| 329 | setPaymentMethod(copyData.paymentMethod); | 329 | setPaymentMethod(copyData.paymentMethod); |
| 330 | 330 | ||
| @@ -1901,11 +1901,16 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | @@ -1901,11 +1901,16 @@ export default ({ onClose, data, subOrders, orderOptType }) => { | ||
| 1901 | disabled: true, | 1901 | disabled: true, |
| 1902 | }, | 1902 | }, |
| 1903 | { | 1903 | { |
| 1904 | - label: '官网订单已付款', | 1904 | + label: '官网已付', |
| 1905 | value: 'OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID', | 1905 | value: 'OFFICIAL_WEBSITE_ORDER_HAS_BEEN_PAID', |
| 1906 | disabled: true, | 1906 | disabled: true, |
| 1907 | }, | 1907 | }, |
| 1908 | { | 1908 | { |
| 1909 | + label: '淘宝', | ||
| 1910 | + value: 'PAYMENT_IN_ADVANCE', | ||
| 1911 | + disabled: true, | ||
| 1912 | + }, | ||
| 1913 | + { | ||
| 1909 | label: '预付', | 1914 | label: '预付', |
| 1910 | value: 'WITHHOLDING_ADVANCE_DEPOSIT', | 1915 | value: 'WITHHOLDING_ADVANCE_DEPOSIT', |
| 1911 | disabled: true, | 1916 | disabled: true, |
src/pages/Order/constant.ts
| @@ -13,7 +13,7 @@ export const PAYMENT_CHANNEL_OPTIONS = { | @@ -13,7 +13,7 @@ export const PAYMENT_CHANNEL_OPTIONS = { | ||
| 13 | BALANCE: '扣预存', | 13 | BALANCE: '扣预存', |
| 14 | PLATFORM: '平台结算', | 14 | PLATFORM: '平台结算', |
| 15 | OFFLINE: '线下支付', | 15 | OFFLINE: '线下支付', |
| 16 | - TAOBAO: '淘宝', | 16 | + TAOBAO: '淘宝已付', |
| 17 | }; | 17 | }; |
| 18 | 18 | ||
| 19 | export const RECEIPTS_RECORD_TYPES = { | 19 | export const RECEIPTS_RECORD_TYPES = { |