feat(order): 优化订单备注结构及线下付款状态显示

- 门店订单修改金额时,修改原因从追加 comments 改为保存 merchantRemarks 字段
- ShopOrder 和 OrderCreateRequest 接口新增 buyerRemarks 和 merchantRemarks 字段,实现订单备注字段分离
- 结算页由 comments 注入变更为 buyerRemarks,门店订单列表新增买家备注展示块
- 修复线下付款订单状态显示:统一线下付款(payType=9)与货到付款(payType=8)的待发货状态显示
- 取消按钮逻辑优化,已付款订单不显示取消按钮,文案由"关闭订单"改为"取消订单"
- 订单列表和详情页弹窗标题及提示文案更新,确保状态描述准确,提升用户体验
This commit is contained in:
2026-07-15 03:07:35 +08:00
parent e47a0d3d3e
commit ad3c209fe5
8 changed files with 60 additions and 18 deletions

View File

@@ -293,7 +293,7 @@ export default function StoreOrdersPage() {
await updateShopOrder({
orderId: currentOrder.orderId,
payPrice: newPrice.toFixed(2),
comments: (currentOrder.comments || '') + `\n${changeRecord}`,
merchantRemarks: (currentOrder.merchantRemarks || '') + `\n${changeRecord}`,
} as ShopOrder)
Taro.showToast({title: '修改成功', icon: 'success'})
@@ -450,6 +450,14 @@ export default function StoreOrdersPage() {
</View>
)}
{/* 买家备注 */}
{order.buyerRemarks && (
<View className='bg-orange-50 rounded-lg p-3 mb-3'>
<Text className='text-xs text-orange-500 mb-1 block'></Text>
<Text className='text-sm text-gray-600 block'>{order.buyerRemarks}</Text>
</View>
)}
{/* 送达凭证(已完成订单) */}
{order.sendEndImg && (() => {
const imgs = parseSendEndImg(order.sendEndImg)