From 11f263fdf1cf9064c34235b0bf7ecc460507c834 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Sat, 25 Feb 2023 17:36:53 +0800
Subject: [PATCH] 1

---
 app/Admin/Controllers/Store/DeviceController.php | 2 +-
 app/Listeners/OrderPrint.php                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/Admin/Controllers/Store/DeviceController.php b/app/Admin/Controllers/Store/DeviceController.php
index 0ab38fee..76d9d575 100644
--- a/app/Admin/Controllers/Store/DeviceController.php
+++ b/app/Admin/Controllers/Store/DeviceController.php
@@ -86,7 +86,7 @@ class DeviceController extends AdminController
 
                 $grid->column('status')->using(DeviceRecord::$statusMap)->label(DeviceRecord::$statusColor);
                 $grid->column('data')->display(fn($v) => json_encode($v, JSON_UNESCAPED_UNICODE));
-                // $grid->column('result')->display(fn($v) => json_encode($v, JSON_UNESCAPED_UNICODE));
+                $grid->column('result')->display(fn($v) => json_encode($v, JSON_UNESCAPED_UNICODE));
                 $grid->column('created_at');
 
                 $grid->disableActions();
diff --git a/app/Listeners/OrderPrint.php b/app/Listeners/OrderPrint.php
index e762d023..3b6edcab 100644
--- a/app/Listeners/OrderPrint.php
+++ b/app/Listeners/OrderPrint.php
@@ -40,7 +40,7 @@ class OrderPrint
                     'sn' => $order->sn,
                     'time' => $order->created_at->format('Y-m-d H:i:s'),
                     'desk' => $desk->name,
-                    'products' => $products,
+                    'products' => json_encode($products),
                     'total' => round($order->total_amount, 2, PHP_ROUND_HALF_DOWN),
                     'remarks' => $order->note,
                 ];