Compare commits
2 Commits
7071ec408e
...
01f0638a37
| Author | SHA1 | Date | |
|---|---|---|---|
| 01f0638a37 | |||
| 197722adeb |
@@ -135,14 +135,14 @@ function getOrderActions(order: ShopOrder): { label: string; type: OpType }[] {
|
|||||||
if (!order.payStatus && order.payType === 9 && order.orderStatus === 0) {
|
if (!order.payStatus && order.payType === 9 && order.orderStatus === 0) {
|
||||||
actions.push({label: '确认收款', type: 'confirmPay'})
|
actions.push({label: '确认收款', type: 'confirmPay'})
|
||||||
}
|
}
|
||||||
// 确认完成:仅在确认收款后显示(已付款才能确认完成)
|
|
||||||
if (order.payStatus) {
|
|
||||||
actions.push({label: '确认完成', type: 'complete'})
|
|
||||||
}
|
|
||||||
// 发货:确认收款后、且尚未发货(deliveryStatus<20)时显示
|
// 发货:确认收款后、且尚未发货(deliveryStatus<20)时显示
|
||||||
if (order.payStatus && (order.deliveryStatus == null || order.deliveryStatus < 20) && order.orderStatus !== 1) {
|
if (order.payStatus && (order.deliveryStatus == null || order.deliveryStatus < 20) && order.orderStatus !== 1) {
|
||||||
actions.push({label: '发货', type: 'ship'})
|
actions.push({label: '发货', type: 'ship'})
|
||||||
}
|
}
|
||||||
|
// 确认完成:仅在确认收款后显示(已付款才能确认完成)
|
||||||
|
if (order.payStatus) {
|
||||||
|
actions.push({label: '确认完成', type: 'complete'})
|
||||||
|
}
|
||||||
return actions
|
return actions
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -462,7 +462,7 @@ export default function StoreOrdersPage() {
|
|||||||
setShowShipModal(true)
|
setShowShipModal(true)
|
||||||
setLoadingClerks(true)
|
setLoadingClerks(true)
|
||||||
try {
|
try {
|
||||||
const res = await listShopStoreUser({storeId: order.storeId})
|
const res = await listShopStoreUser()
|
||||||
setClerkList(res || [])
|
setClerkList(res || [])
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
Taro.showToast({title: '加载店员失败', icon: 'none'})
|
Taro.showToast({title: '加载店员失败', icon: 'none'})
|
||||||
|
|||||||
Reference in New Issue
Block a user