From deacdedb012351d2fadcc7c45823d306ad632129 Mon Sep 17 00:00:00 2001 From: Council Date: Wed, 15 Apr 2026 14:23:16 +0800 Subject: [PATCH] council(execute): BackendArchitect - restore view files from merge conflict Resolve Round 4 merge conflict by restoring verifier views and ticket detail from commit 6f49b8355. All 7 admin view files now confirmed on main. Co-Authored-By: Claude Sonnet 4.6 --- .../vr_ticket/admin/view/ticket/detail.html | 205 +++++++++--------- .../vr_ticket/admin/view/verifier/list.html | 16 +- .../vr_ticket/admin/view/verifier/save.html | 48 ++-- 3 files changed, 135 insertions(+), 134 deletions(-) diff --git a/shopxo/app/plugins/vr_ticket/admin/view/ticket/detail.html b/shopxo/app/plugins/vr_ticket/admin/view/ticket/detail.html index e2df7f7..30ee4d7 100644 --- a/shopxo/app/plugins/vr_ticket/admin/view/ticket/detail.html +++ b/shopxo/app/plugins/vr_ticket/admin/view/ticket/detail.html @@ -5,119 +5,126 @@ 票详情 - VR票务 {include file="public/head" /}
-
票详情
+
+ 票详情 + + {{$ticket['verify_status']==1 ? '已核销' : ($ticket['verify_status']==2 ? '已退款' : '未核销')}} + + 返回 +
- {if !empty($msg)} -
{$msg}
- - {else} -
- -
-
-
- -
{$ticket.ticket_code}
-
-
- -
- - {switch name="$ticket.verify_status"} - {case value="0"}未核销{/case} - {case value="1"}已核销{/case} - {case value="2"}已退款{/case} - {default /}未知 - {/switch} - -
-
-
- -
{$ticket.real_name|default='-'}
-
-
- -
{$ticket.phone|default='-'}
-
-
- -
{$ticket.seat_info|default='-'}
-
-
- -
{$ticket.order_no|default='-'}
-
-
- -
- {$ticket.issued_at > 0 ? date('Y-m-d H:i:s', $ticket.issued_at) : '-'} -
-
-
-
+ +
+
票码
+
{$ticket.ticket_code}
+
- -
-
- {if !empty($ticket.qr_code_url)} - 票二维码 - {else} -
暂无二维码
- {/if} -
-
-
- -
- {$goods.title|default='已删除商品'|raw} -
-
-
- -
- {if !empty($verifier)} - {$verifier.name} (ID:{$verifier.id}) - {else /} - - - {/if} -
-
-
- -
- {$ticket.verify_time > 0 ? date('Y-m-d H:i:s', $ticket.verify_time) : '-'} -
-
-
-
+ +
+
二维码
+
+ 票二维码 +
扫描核销
+
-
- 返回列表 + +
+
关联商品
+
{$goods['title']|default='已删除商品'}
+
+
+
订单号
+
{$ticket.order_no}
+
+
+
座位信息
+
{$ticket.seat_info|default='无'}
+
+ + +
+
观演人
+
{$ticket.real_name|default='-'}
+
+
+
手机号
+
{$ticket.phone|default='-'}
+
+
+
身份证
+
{$ticket.id_card|default='-'}
+
+ + +
+
发放时间
+
{$ticket.issued_at > 0 ? date('Y-m-d H:i:s', $ticket.issued_at) : '-'}
+
+ {if $ticket['verify_status'] == 1} +
+
核销时间
+
{$ticket.verify_time > 0 ? date('Y-m-d H:i:s', $ticket.verify_time) : '-'}
+
+
+
核销员
+
{$verifier['name']|default='-'}
+
+ {/if} + + + {if $ticket['verify_status'] == 0} +
+
手动核销
+
+
+ + +
+
{/if}
- {include file="public/footer" /} + diff --git a/shopxo/app/plugins/vr_ticket/admin/view/verifier/list.html b/shopxo/app/plugins/vr_ticket/admin/view/verifier/list.html index 2804b20..7d55ba4 100644 --- a/shopxo/app/plugins/vr_ticket/admin/view/verifier/list.html +++ b/shopxo/app/plugins/vr_ticket/admin/view/verifier/list.html @@ -16,7 +16,7 @@
- +
@@ -31,7 +31,7 @@
- 添加核销员 + 添加核销员
@@ -48,7 +48,7 @@ @@ -63,17 +63,17 @@ layui.use('table', function() { table.render({ elem: '#table', - url: '{:PluginsAdminUrl("vr_ticket", "verifier", "list")}', + url: '{:MyUrl("plugins_vr_ticket/admin/verifier/list")}', cols: [[ {field: 'id', title: 'ID', width: 80}, {field: 'name', title: '核销员名称', minWidth: 120}, - {field: 'user_id', title: '关联用户ID', width: 120}, - {field: 'user_name', title: '用户昵称', width: 150}, + {field: 'user_id', title: '用户ID', width: 100}, + {field: 'user_name', title: '关联用户', minWidth: 150}, {field: 'status', title: '状态', width: 100, templet: '#statusTpl'}, {field: 'created_at', title: '创建时间', width: 180, templet: function(d) { return d.created_at > 0 ? layui.util.toDateString(d.created_at * 1000) : '-'; }}, - {field: 'action', title: '操作', width: 180, templet: '#actionTpl'}, + {field: 'action', title: '操作', width: 150, templet: '#actionTpl'}, ]] }); @@ -85,7 +85,7 @@ layui.use('table', function() { $(document).on('click', '[lay-fn="del"]', function() { var id = $(this).data('id'); layer.confirm('确认禁用该核销员？', function(index) { - $.post('{:PluginsAdminUrl("vr_ticket", "verifier", "delete")}', {id: id}, function(res) { + $.post('{:MyUrl("plugins_vr_ticket/admin/verifier/delete")}', {id: id}, function(res) { if (res.code == 0) { layer.msg('操作成功'); table.reload('table'); diff --git a/shopxo/app/plugins/vr_ticket/admin/view/verifier/save.html b/shopxo/app/plugins/vr_ticket/admin/view/verifier/save.html index d62cc37..05c55fc 100644 --- a/shopxo/app/plugins/vr_ticket/admin/view/verifier/save.html +++ b/shopxo/app/plugins/vr_ticket/admin/view/verifier/save.html @@ -2,70 +2,64 @@ - 核销员 - VR票务 + {$info ? '编辑' : '添加'}核销员 - VR票务 {include file="public/head" /}
-
{$info.id > 0 ? '编辑' : '添加'}核销员
+
{$info ? '编辑' : '添加'}核销员
-
- - +
- -
- 0}disabled{/if}> {foreach $users as $u} {/foreach}
- {if $info.id > 0} -
用户关联后不可更改，如需变更请禁用后重新添加
+ {if isset($info.id) && $info.id > 0} + +
用户关联后不可修改
{/if}
-
- -
- + +
+
-
-
- +
+
-
- - 返回列表 + + + 返回
- {include file="public/footer" /}