From 9bba6cf5b2ad4bc4673b81003977a8c7c622a400 Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Sat, 12 Sep 2020 21:11:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=BF=AB=E6=8D=B7=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=9C=89bug?=
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 | 8 ++++----
 app/Admin/Forms/GoodsCopyForm.php               | 3 ++-
 app/Admin/Forms/GoodsNewCopyForm.php            | 3 ++-
 app/Admin/Forms/GoodsNewImageForm.php           | 3 ++-
 5 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index ba18762..75c820c 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -82,12 +82,12 @@ class GoodsController extends AdminController
                     return empty($item) ? '' : $item->title;
                 });
                 $show->width(6)->store_id->as(function ($storeId){
-                    $item = GoodsCategoryModel::getInfo($storeId,'name');
+                    $item = GoodsCategoryModel::getStoreInfo($storeId,'name');
                     return empty($item) ? '' : $item->name;
                 });
-                $show->width(6)->store_id->as(function ($goodsCategoryId){
-                    $item = StoreModel::getStoreInfo($goodsCategoryId,'name');
-                    return empty($item) ? '' : $item->name;
+                $show->width(6)->goods_category_id->as(function ($goodsCategoryId){
+                    $item = GoodsCategoryModel::getInfo($goodsCategoryId,'title');
+                    return empty($item) ? '' : $item->title;
                 });
                 $show->width(6)->cover_img->image();
                 $show->width(6)->price;
diff --git a/app/Admin/Controllers/v3/GoodsNewController.php b/app/Admin/Controllers/v3/GoodsNewController.php
index 07b9fbe..0e69191 100644
--- a/app/Admin/Controllers/v3/GoodsNewController.php
+++ b/app/Admin/Controllers/v3/GoodsNewController.php
@@ -99,12 +99,12 @@ class GoodsNewController extends AdminController
                     return empty($item) ? '' : $item->title;
                 });
                 $show->width(6)->store_id->as(function ($storeId){
-                    $item = GoodsCategoryModel::getInfo($storeId,'name');
+                    $item = StoreModel::getStoreInfo($storeId,'name');
                     return empty($item) ? '' : $item->name;
                 });
-                $show->width(6)->store_id->as(function ($goodsCategoryId){
-                    $item = StoreModel::getStoreInfo($goodsCategoryId,'name');
-                    return empty($item) ? '' : $item->name;
+                $show->width(6)->goods_category_id->as(function ($goodsCategoryId){
+                    $item = GoodsCategoryModel::getInfo($goodsCategoryId,'title');
+                    return empty($item) ? '' : $item->title;
                 });
                 $show->width(6)->cover_img->image();
                 $show->width(6)->price;
diff --git a/app/Admin/Forms/GoodsCopyForm.php b/app/Admin/Forms/GoodsCopyForm.php
index aa8906f..1c09275 100644
--- a/app/Admin/Forms/GoodsCopyForm.php
+++ b/app/Admin/Forms/GoodsCopyForm.php
@@ -87,7 +87,8 @@ class GoodsCopyForm extends Form
         $id = $this->getKey();
         $goods = GoodsModel::select('name')->find($id);
         $this->hidden('goods_id')->value($id);
-        $this->display('name')->value($goods->name);
+        $name = empty($goods->name)?'':$goods->name;
+        $this->display('name')->value($name);
         $stores = StoreModel::getStoreArray();
         $this->multipleSelect('store_ids','选择店铺')->required()->options($stores)->help('选择店铺，将当前商品复制到所选店铺。注意选择重复店铺问题！！！');
     }
diff --git a/app/Admin/Forms/GoodsNewCopyForm.php b/app/Admin/Forms/GoodsNewCopyForm.php
index 52e1abb..8ca431c 100644
--- a/app/Admin/Forms/GoodsNewCopyForm.php
+++ b/app/Admin/Forms/GoodsNewCopyForm.php
@@ -87,7 +87,8 @@ class GoodsNewCopyForm extends Form
         $id = $this->getKey();
         $goods = GoodsModel::select('name')->find($id);
         $this->hidden('goods_id')->value($id);
-        $this->display('name')->value($goods->name);
+        $name = empty($goods->name)?'':$goods->name;
+        $this->display('name')->value($name);
         $stores = StoreModel::getStoreArray();
         $this->multipleSelect('store_ids','选择店铺')->required()->options($stores)->help('选择店铺，将当前商品复制到所选店铺。注意选择重复店铺问题！！！');
     }
diff --git a/app/Admin/Forms/GoodsNewImageForm.php b/app/Admin/Forms/GoodsNewImageForm.php
index f4e1e7f..f418ff0 100644
--- a/app/Admin/Forms/GoodsNewImageForm.php
+++ b/app/Admin/Forms/GoodsNewImageForm.php
@@ -55,7 +55,8 @@ class GoodsNewImageForm extends Form
         $goods = GoodsModel::select('name')->find($id);
         $goodName = empty($goods->name)?'':$goods->name;
         $this->hidden('goods_id')->value($id);
-        $this->image('cover_img','封面图')->url('ops/files')->help('商品名称：'.$goodName);
+        $this->display('name','商品名称')->value($goodName);
+        $this->image('cover_img','封面图')->url('ops/files');
         $this->image('img_banner','轮播图')->url('ops/files');
     }