From 270670773dc9ea5db3152a5f1192b23ccefdb088 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Sun, 13 Sep 2020 14:29:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E8=A7=84=E6=A0=BC=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E6=97=B6=EF=BC=8C=E8=AF=A6=E6=83=85=E9=A1=B5=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/v3/GoodsController.php    | 8 +++++---
 app/Admin/Controllers/v3/GoodsNewController.php | 6 ++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index 75c820c..0b0cd36 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -82,7 +82,7 @@ class GoodsController extends AdminController
                     return empty($item) ? '' : $item->title;
                 });
                 $show->width(6)->store_id->as(function ($storeId){
-                    $item = GoodsCategoryModel::getStoreInfo($storeId,'name');
+                    $item = storeModel::getStoreInfo($storeId,'name');
                     return empty($item) ? '' : $item->name;
                 });
                 $show->width(6)->goods_category_id->as(function ($goodsCategoryId){
@@ -110,8 +110,10 @@ class GoodsController extends AdminController
                 });
                 $show->width(6)->spec->as(function ($value){
                     $text = '';
-                    foreach ($value as $v){
-                        $text .= '【'.$v['spec_key'] .'：'.$v['spec_value'].'】  ';
+                    if($value){
+                        foreach ($value as $v){
+                            $text .= '【'.$v['spec_key'] .'：'.$v['spec_value'].'】  ';
+                        }
                     }
                     return $text;
                 });
diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php
index 0e69191..a32cfa8 100644
--- a/app/Admin/Controllers/v3/GoodsNewController.php
+++ b/app/Admin/Controllers/v3/GoodsNewController.php
@@ -127,8 +127,10 @@ class GoodsNewController extends AdminController
                 });
                 $show->width(6)->spec->as(function ($value){
                     $text = '';
-                    foreach ($value as $v){
-                        $text .= '【'.$v['spec_key'] .'：'.$v['spec_value'].'】  ';
+                    if($value){
+                        foreach ($value as $v){
+                            $text .= '【'.$v['spec_key'] .'：'.$v['spec_value'].'】  ';
+                        }
                     }
                     return $text;
                 });