Commit 3e251647 authored by 前端-钟卫鹏's avatar 前端-钟卫鹏

fix:处理商品跳转过来的下单会员折扣显示异常

parent eea7495c
...@@ -175,13 +175,13 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn ...@@ -175,13 +175,13 @@ export const useOrderFormInitEffect = (ctx: ISchemaFormActions | ISchemaFormAsyn
prev[next.range] = next.price prev[next.range] = next.price
return prev return prev
}, {}), }, {}),
isMemberPrice: !!v.memberDiscount, isMemberPrice: v.isMemberPrice,
purchaseCount: v.count, purchaseCount: v.count,
money: v.count * v.unitPrice, money: v.count * v.unitPrice,
productId: v.id, productId: v.id,
memberId: initValue.supplyMembersId, // 添加 memberId 字段 memberId: initValue.supplyMembersId, // 添加 memberId 字段
commodityId: v.id, // 添加commodityId用于判断是商品价格是使用price字段还是unitPrice字段(也可判断是报价订单还是其他) commodityId: v.id, // 添加commodityId用于判断是商品价格是使用price字段还是unitPrice字段(也可判断是报价订单还是其他)
memberPrice: v.memberDiscount !== 1 ? toPercent(v.memberDiscount) : 1, // 添加会员折扣 memberPrice: v.memberDiscount !== 1 ? v.memberDiscount : 1, // 添加会员折扣
} }
}))) })))
} }
......
...@@ -12,7 +12,6 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte ...@@ -12,7 +12,6 @@ import { useStateFilterSearchLinkageEffect } from '@/formSchema/effects/useFilte
import { FORM_FILTER_PATH } from '@/formSchema/const' import { FORM_FILTER_PATH } from '@/formSchema/const'
import Submit from '@/components/NiceForm/components/Submit' import Submit from '@/components/NiceForm/components/Submit'
import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix' import DateRangePickerUnix from '@/components/NiceForm/components/DateRangePickerUnix'
// 待确认支付结果订单 // 待确认支付结果订单
export interface FirstApprovedOrderProps {} export interface FirstApprovedOrderProps {}
......
...@@ -64,7 +64,13 @@ export const useSelfTable = () => { ...@@ -64,7 +64,13 @@ export const useSelfTable = () => {
}, },
{ title: '发货批次', align: 'center', dataIndex: 'shipmentBatch', key: 'shipmentBatch', render: text => text ? `第${text}次` : '' }, { title: '发货批次', align: 'center', dataIndex: 'shipmentBatch', key: 'shipmentBatch', render: text => text ? `第${text}次` : '' },
// @todo 发货单号跳转 // @todo 发货单号跳转
{ title: '发货单号', align: 'center', dataIndex: 'invoiceNumber', key: 'invoiceNumber', render: text => <Link to={'/'}>{text}</Link> }, {
title: '发货单号',
align: 'center',
dataIndex: 'invoiceNumber',
key: 'invoiceNumber',
render: (text, record) => <Link to={`/memberCenter/tranactionAbility/stockSellStorage/bills/detail?id=${record.invoiceId}&preview=1`}>{text}</Link>
},
// { title: '当前支付', align: 'center', dataIndex: 'currentPayments', render: (text, record) => text}, // { title: '当前支付', align: 'center', dataIndex: 'currentPayments', render: (text, record) => text},
{ {
title: '订单类型', title: '订单类型',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment