Merge council/FrontendDev: complete admin views + export button fix
Resolves merge conflicts: - Verifier.php: keep parent (CONCAT fix, fetch-then-map pattern) - ticket/detail.html, verifier/list.html, verifier/save.html: stage as-is (no conflict markers)refactor/vr-ticket-20260416
commit
59928d1196
|
|
@ -102,10 +102,17 @@ class Ticket extends Base
|
||||||
// QR 码图片
|
// QR 码图片
|
||||||
$ticket['qr_code_url'] = \app\plugins\vr_ticket\service\TicketService::getQrCodeUrl($ticket['ticket_code']);
|
$ticket['qr_code_url'] = \app\plugins\vr_ticket\service\TicketService::getQrCodeUrl($ticket['ticket_code']);
|
||||||
|
|
||||||
|
// 核销员列表(用于手动核销)
|
||||||
|
$verifiers = \Db::name('plugins_vr_verifiers')
|
||||||
|
->where('status', 1)
|
||||||
|
->order('id', 'asc')
|
||||||
|
->select();
|
||||||
|
|
||||||
return view('', [
|
return view('', [
|
||||||
'ticket' => $ticket,
|
'ticket' => $ticket,
|
||||||
'goods' => $goods,
|
'goods' => $goods,
|
||||||
'verifier' => $verifier,
|
'verifier' => $verifier,
|
||||||
|
'verifiers' => $verifiers,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue