diff --git a/shopxo/app/plugins/vr_ticket/admin/Admin.php b/shopxo/app/plugins/vr_ticket/admin/Admin.php index 72aa27d..bfc5a09 100644 --- a/shopxo/app/plugins/vr_ticket/admin/Admin.php +++ b/shopxo/app/plugins/vr_ticket/admin/Admin.php @@ -243,9 +243,10 @@ class Admin extends Common } if ($hardDelete) { + // 检查是否有关联商品(ShopXO 使用 is_delete_time 做软删除判断) $goods = \think\facade\Db::name('Goods') ->where('vr_goods_config', 'like', '%"template_id":' . $id . '%') - ->where('is_delete', 0) + ->where('is_delete_time', 0) ->find(); \think\facade\Db::name('vr_seat_templates')->where('id', $id)->delete(); \app\plugins\vr_ticket\service\AuditService::log( @@ -850,7 +851,9 @@ class Admin extends Common } /** - * 删除场馆(软删除) + * 删除场馆(软删除/硬删除) + * @param hard_delete: 0=软删除(禁用), 1=硬删除 (兼容旧的自定义JS调用) + * @param value: 'hard'=硬删除 (submit-ajax新方式) */ public function VenueDelete() { @@ -863,16 +866,24 @@ class Admin extends Common return DataReturn('参数错误', -1); } + // 兼容旧方式: hard_delete=1 为硬删除 $hardDelete = input('hard_delete', 0, 'intval'); + // 新方式: value='hard' 为硬删除 + $value = input('value', '', null, 'trim'); + if ($value === 'hard') { + $hardDelete = 1; + } + $template = \think\facade\Db::name('vr_seat_templates')->where('id', $id)->find(); if (empty($template)) { return DataReturn('记录不存在', -1); } if ($hardDelete) { + // 检查是否有关联商品(使用 is_delete_time 而不是 is_delete) $goods = \think\facade\Db::name('Goods') ->where('vr_goods_config', 'like', '%"template_id":' . $id . '%') - ->where('is_delete', 0) + ->where('is_delete_time', 0) ->find(); \think\facade\Db::name('vr_seat_templates')->where('id', $id)->delete(); \app\plugins\vr_ticket\service\AuditService::log( diff --git a/shopxo/app/plugins/vr_ticket/view/venue/list.html b/shopxo/app/plugins/vr_ticket/view/venue/list.html index 98bc2be..e29e1fc 100644 --- a/shopxo/app/plugins/vr_ticket/view/venue/list.html +++ b/shopxo/app/plugins/vr_ticket/view/venue/list.html @@ -118,10 +118,11 @@ - - {{else}} + {{if $v.status eq 0}} @@ -137,61 +138,7 @@ - -
-
-
- - 确定删除此场馆? - × -
-
-

⚠️ 删除后,关联商品的场馆信息将被自动清除。

-

删除前已购买的用户不受影响(已有购买快照)。

-
- -
-
-
{{if !empty($list)}} {{$page|raw}}