fix: 收口退款鉴权、核销目标和微信退款占额
管理员退款只认管理员令牌。通用核销锁定具体票据,同码多目标时拒绝。已结算订单不再覆盖退款状态。微信退款先落库并占用处理中额度,未到账不把订单标成已退款。
这个提交包含在:
@@ -95,7 +95,7 @@
|
||||
<template v-else-if="order.status === 'IN_SERVICE'">
|
||||
<button class="action-btn chat-btn btn-active" @click="contactExpert(order)">联系客服</button>
|
||||
<button class="action-btn refund-btn btn-active" @click="openRefundModal(order)">申请退款</button>
|
||||
<button class="action-btn success-btn btn-active" @click="confirmComplete(order.id)">确认验收</button>
|
||||
<button v-if="order.rawStatus === '待确认'" class="action-btn success-btn btn-active" @click="confirmComplete(order.id)">确认验收</button>
|
||||
</template>
|
||||
|
||||
<template v-else-if="order.status === 'COMPLETED'">
|
||||
@@ -598,15 +598,18 @@ const payOrder = async (id) => {
|
||||
scene: 'ORDER',
|
||||
userId: uid
|
||||
});
|
||||
await payOrderApi(id, {
|
||||
targetStatus: '履约中',
|
||||
const paid = await payOrderApi(id, {
|
||||
payType: 'WECHAT',
|
||||
buyerId: uid
|
||||
});
|
||||
uni.hideLoading();
|
||||
applyOrderStatus(o, 'IN_SERVICE');
|
||||
if (o) o.rawStatus = '履约中';
|
||||
uni.showToast({ title: '支付成功,服务已开始', icon: 'success' });
|
||||
const nextStatus = paid && paid.status ? paid.status : 'IN_SERVICE';
|
||||
applyOrderStatus(o, nextStatus);
|
||||
if (o) o.rawStatus = (paid && paid.rawStatus) || (nextStatus === 'PENDING_ACCEPT' ? '待接单' : '履约中');
|
||||
uni.showToast({
|
||||
title: nextStatus === 'PENDING_ACCEPT' ? '支付成功,等待大神接单' : '支付成功,服务已开始',
|
||||
icon: 'success'
|
||||
});
|
||||
} catch (err) {
|
||||
uni.hideLoading();
|
||||
if (err && err.cancelled) {
|
||||
|
||||
在新工单中引用
屏蔽一个用户