feat: 新增售后详情页面并优化售后列表交互
- 新增售后详情页面 aftersale-detail.vue - 优化售后列表 UI 样式,增加加载/空态/错误状态处理 - 修复售后列表跳转逻辑,新增下拉刷新功能 - 修复师傅入驻接口数组参数 500 崩溃问题 - 优化竞价单选定报价流程,修复订单状态错误问题 - 新增订单售后相关展示逻辑,包括售后状态、操作入口等 - 更新版本号至 1.0.88,配置微信小程序 AppID
这个提交包含在:
@@ -3,6 +3,7 @@
|
||||
namespace app\admin\controller;
|
||||
|
||||
use app\common\controller\Backend;
|
||||
use app\common\library\OrderDetailDisplay;
|
||||
use app\common\library\CommissionService;
|
||||
use app\common\library\OrderStatus;
|
||||
use think\Db;
|
||||
@@ -584,7 +585,14 @@ class Order extends Backend
|
||||
}
|
||||
|
||||
// 1. 多商品/多工项明细
|
||||
$goodsList = Db::name('order_goods')->where('order_id', $row['id'])->select();
|
||||
$goodsList = Db::name('order_goods')->where('order_id', $row['id'])->order('id asc')->select();
|
||||
$goodsPayload = json_decode((string)$row['goods_images'], true);
|
||||
$goodsSnapshots = is_array($goodsPayload) && isset($goodsPayload['goods_list']) && is_array($goodsPayload['goods_list']) ? $goodsPayload['goods_list'] : [];
|
||||
foreach ($goodsList as $index => &$goods) {
|
||||
$snapshot = isset($goodsSnapshots[$index]) && is_array($goodsSnapshots[$index]) ? $goodsSnapshots[$index] : [];
|
||||
$goods['service_text'] = OrderDetailDisplay::services($goods['addon_services'] ?? '', $snapshot);
|
||||
}
|
||||
unset($goods);
|
||||
|
||||
// 2. 现场施工取证图片 (区分签到、过程、完工、报损)
|
||||
$mediaList = Db::name('order_media')->where('order_id', $row['id'])->order('id asc')->select();
|
||||
@@ -594,6 +602,7 @@ class Order extends Backend
|
||||
$logList = Db::name('order_log')->where('order_id', $row['id'])->order('createtime asc, id asc')->select();
|
||||
foreach ($logList as &$lg) {
|
||||
$lg['status_label'] = isset($statusMap[(int)$lg['status']]) ? $statusMap[(int)$lg['status']] : '状态变更';
|
||||
$lg['operator_label'] = OrderDetailDisplay::operator($lg['operator_type'] ?? '');
|
||||
}
|
||||
unset($lg);
|
||||
|
||||
@@ -605,6 +614,10 @@ class Order extends Backend
|
||||
->where('q.order_id', $row['id'])
|
||||
->order('q.id desc')
|
||||
->select();
|
||||
foreach ($quoteList as &$quote) {
|
||||
$quote['display_status'] = OrderDetailDisplay::quoteStatus($quote['status'] ?? '');
|
||||
}
|
||||
unset($quote);
|
||||
|
||||
// 5. 客户评价与回复(兼容 JSON 数组或逗号分隔标签)
|
||||
$review = Db::name('review')->where('order_id', $row['id'])->find();
|
||||
@@ -650,6 +663,11 @@ class Order extends Backend
|
||||
->field('a.*, m.realname as master_name')
|
||||
->order('a.id desc')
|
||||
->select();
|
||||
$appealStatus = ['wait' => '待处理', 'handling' => '处理中', 'done' => '已处理', 'reject' => '已驳回'];
|
||||
foreach ($appealList as &$appeal) {
|
||||
$appeal['display_status'] = $appealStatus[$appeal['status']] ?? '未知状态';
|
||||
}
|
||||
unset($appeal);
|
||||
|
||||
// 10. 微信支付与原路退款交易流水(含失败错误码及中文诊断原因)
|
||||
$sceneMap = [
|
||||
@@ -666,11 +684,20 @@ class Order extends Backend
|
||||
$poItem['scene_text'] = $sceneMap[$poItem['scene'] ?? ''] ?? ($poItem['scene'] ?? '-');
|
||||
$poItem['status_text'] = \app\common\library\PaymentService::payOrderStatusLabel($poItem['status'] ?? '');
|
||||
$poItem['refund_status_text'] = \app\common\library\PaymentService::refundStatusLabel($poItem['refund_status'] ?? 'none');
|
||||
$poItem['payment_type_text'] = OrderDetailDisplay::paymentRecordType($poItem);
|
||||
$poItem['is_balance'] = $poItem['payment_type_text'] === '余额支付';
|
||||
}
|
||||
unset($poItem);
|
||||
$payGroups = OrderDetailDisplay::groupPaymentRecords($payOrders);
|
||||
$paySections = [
|
||||
['type' => 'settled', 'items' => $payGroups['settled']],
|
||||
['type' => 'attempts', 'items' => $payGroups['attempts']],
|
||||
];
|
||||
|
||||
$this->view->assign([
|
||||
'row' => $row,
|
||||
'amountLabel' => OrderDetailDisplay::amountLabel($row->toArray()),
|
||||
'paymentTypeLabel' => OrderDetailDisplay::paymentType($row['pay_type'] ?? ''),
|
||||
'goodsList' => $goodsList,
|
||||
'mediaList' => $mediaList,
|
||||
'logList' => $logList,
|
||||
@@ -682,6 +709,8 @@ class Order extends Backend
|
||||
'invoiceInfo' => $invoiceInfo,
|
||||
'appealList' => $appealList,
|
||||
'payOrders' => $payOrders,
|
||||
'payGroups' => $payGroups,
|
||||
'paySections' => $paySections,
|
||||
]);
|
||||
|
||||
return $this->view->fetch();
|
||||
|
||||
在新工单中引用
屏蔽一个用户