From 1eb3752b40dcc7117691bc55c95114fb95a6a4c7 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Thu, 23 Mar 2023 14:49:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=96=87=E5=AD=97=E4=BC=98=E5=8C=96=EF=BC=8Cpc=E9=80=80?=
 =?UTF-8?q?=E6=AC=BE=E8=AE=A2=E5=8D=95=E6=97=A5=E6=9C=9F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/StoreOrderRefundServices.php    | 2 +-
 .../src/pages/marketing/live/components/live_detail.vue  | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php
index d850b6cb8..3fd06be86 100644
--- a/crmeb/app/services/order/StoreOrderRefundServices.php
+++ b/crmeb/app/services/order/StoreOrderRefundServices.php
@@ -1064,7 +1064,7 @@ class StoreOrderRefundServices extends BaseServices
         if ($list) {
             foreach ($list as &$item) {
                 $item['paid'] = 1;
-                $item['add_time'] = $item['_add_time'] = isset($item['add_time']) ? date('Y-m-d H:i', (int)$item['add_time']) : '';
+                $item['add_time'] = $item['_add_time'] = isset($item['add_time']) ? date('Y-m-d H:i:s', (int)$item['add_time']) : '';
                 $item['cartInfo'] = $item['cart_info'];
                 if (in_array($item['refund_type'], [1, 2, 4, 5])) {
                     $item['refund_status'] = 1;
diff --git a/template/admin/src/pages/marketing/live/components/live_detail.vue b/template/admin/src/pages/marketing/live/components/live_detail.vue
index 267362404..8c44c64ec 100644
--- a/template/admin/src/pages/marketing/live/components/live_detail.vue
+++ b/template/admin/src/pages/marketing/live/components/live_detail.vue
@@ -12,7 +12,8 @@
         </div>
         <div class="list sp">
           <label class="name">直播间ID：</label>
-          <span class="info">{{ FormData.room_id }}</span>
+          <span class="info">{{ FormData.id }}</span>
+          <span class="info">（微信直播间ID：{{ FormData.room_id }}）</span>
         </div>
         <div class="list sp">
           <label class="name">主播昵称：</label>
@@ -51,15 +52,15 @@
           <img style="max-width: 150px; height: 80px" :src="FormData.share_img" />
         </div>
         <div class="list sp">
-          <label class="name">是否关闭点赞：</label>
+          <label class="name">是否开启点赞：</label>
           <span class="info blue">{{ FormData.close_like | filterClose }}</span>
         </div>
         <div class="list sp">
-          <label class="name">是否关闭货架：</label>
+          <label class="name">是否开启货架：</label>
           <span class="info blue">{{ FormData.close_goods | filterClose }}</span>
         </div>
         <div class="list sp">
-          <label class="name">是否关闭评论：</label>
+          <label class="name">是否开启评论：</label>
           <span class="info blue">{{ FormData.close_comment | filterClose }}</span>
         </div>