From d590a9035059267658c0e102d5a8d7f9b7573924 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Mon, 11 Apr 2022 17:34:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=A0=8D=E4=BB=B7=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/BargainOrderController.php | 2 +-
 resources/lang/zh_CN/bargain-order.php           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Controllers/BargainOrderController.php b/app/Admin/Controllers/BargainOrderController.php
index cc946e66..7f2ba2bc 100644
--- a/app/Admin/Controllers/BargainOrderController.php
+++ b/app/Admin/Controllers/BargainOrderController.php
@@ -110,7 +110,7 @@ class BargainOrderController extends AdminController
                         ]);
 
                         $show->field('mall_order.sn', '关联订单编号')->unescape()->as(function ($value) {
-                            if (Admin::user()->can('dcat.admin.orders.show')) {
+                            if (Admin::user()->can('dcat.admin.orders.show') && !empty($value)) {
                                 return '<a href="'.admin_route('orders.show', ['order'=>$this->mallOrder]).'" target="_blank">'.$value.'</a>';
                             }
                             return $value;
diff --git a/resources/lang/zh_CN/bargain-order.php b/resources/lang/zh_CN/bargain-order.php
index 9b435a79..0bcf72b1 100644
--- a/resources/lang/zh_CN/bargain-order.php
+++ b/resources/lang/zh_CN/bargain-order.php
@@ -2,8 +2,8 @@
 
 return [
     'labels' => [
-        'BargainOrder' => 'BargainOrder',
-        'bargain-order' => 'BargainOrder',
+        'BargainOrder' => '砍价记录',
+        'bargain-orders' => '砍价记录',
     ],
     'fields' => [
         'activity' => [