From fa18b54944b830b4f7b3eca6485d518aef0637ce Mon Sep 17 00:00:00 2001 From: From-wh Date: Mon, 3 Apr 2023 16:42:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?improve:=20=E5=AE=A2=E6=9C=8D=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- template/uni-app/pages/extension/customer_list/chat.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/template/uni-app/pages/extension/customer_list/chat.vue b/template/uni-app/pages/extension/customer_list/chat.vue index 4434f8838..e2552b5df 100644 --- a/template/uni-app/pages/extension/customer_list/chat.vue +++ b/template/uni-app/pages/extension/customer_list/chat.vue @@ -80,7 +80,7 @@ - {{$t(`订单号`)}}: {{ item.orderInfo.order_id }} From 0908c205895b0b973d91910f47d37efa9658c678 Mon Sep 17 00:00:00 2001 From: evoxwht <442384644@qq.com> Date: Mon, 3 Apr 2023 17:58:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=A2=E6=9C=8D?= =?UTF-8?q?=E8=81=8A=E5=A4=A9=E8=AE=B0=E5=BD=95=E9=94=99=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- crmeb/app/services/kefu/service/StoreServiceLogServices.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crmeb/app/services/kefu/service/StoreServiceLogServices.php b/crmeb/app/services/kefu/service/StoreServiceLogServices.php index 527ab9cb4..7bbe381f0 100644 --- a/crmeb/app/services/kefu/service/StoreServiceLogServices.php +++ b/crmeb/app/services/kefu/service/StoreServiceLogServices.php @@ -120,7 +120,7 @@ class StoreServiceLogServices extends BaseServices foreach ($list as &$item) { $item['_add_time'] = $item['add_time']; $item['add_time'] = strtotime($item['_add_time']); - $item['productInfo'] = $item['orderInfo'] = []; + $item['productInfo'] = $item['orderInfo'] = null; if ($item['msn_type'] == self::MSN_TYPE_GOODS && $item['msn']) { $productIds[] = $item['msn']; } elseif ($item['msn_type'] == self::MSN_TYPE_ORDER && $item['msn']) { @@ -155,7 +155,7 @@ class StoreServiceLogServices extends BaseServices foreach ($list as &$item) { if ($item['msn_type'] == self::MSN_TYPE_GOODS && $item['msn']) { - $item['productInfo'] = $productList[$item['msn']] ?? []; + $item['productInfo'] = $productList[$item['msn']] ?? null; } elseif ($item['msn_type'] == self::MSN_TYPE_ORDER && $item['msn']) { $order = $orderInfo[$item['msn']] ?? null; if ($order) { @@ -164,7 +164,7 @@ class StoreServiceLogServices extends BaseServices $order['add_time_h'] = date('H:i:s', $order['add_time']); $item['orderInfo'] = $order; } else { - $item['orderInfo'] = []; + $item['orderInfo'] = null; } } $item['msn_type'] = (int)$item['msn_type'];