Merge branch 'antshop' into kernel

backend/modules/file/logic/file/FileManager.php

@@ -61,13 +61,11 @@ class FileManager
             foreach ($temFileIdArr as $key => $value) {
                 $temFile = TemFile::findOne($value);
 
-                if (!$temFile) {
-                    throw new \Exception('存在查找不到的文件');
-                }
-
-                $res = self::saveNewFile($temFile, $ownId, $ownType);
-                if ($key == 0) {
-                    $firstFileId = $res['file_id'];
+                if ($temFile) {
+                    $res = self::saveNewFile($temFile, $ownId, $ownType);
+                    if ($key == 0) {
+                        $firstFileId = $res['file_id'];
+                    }
                 }
             }
 

backend/modules/goods/models/searchs/GoodsSearch.php

@@ -63,7 +63,7 @@ class GoodsSearch extends Goods
                 'width'=>'10%',
                 'format' => 'raw',
                 'value' => function ($model) {
-                    return $model->image ?
+                    return $model->imageFile ?
                         Html::img(['/'.$model->imageFile->path], ['style' => 'width:80px'])
                         : '<div class="table_not_setting">未设置</div>';
 

backend/modules/goods/views/goods/view.php

@@ -77,7 +77,7 @@ $this->params['breadcrumbs'][] = $this->title;
             ['attribute' => 'image',
                 'format' => 'raw',
                 'value' => function ($model) {
-                    return $model->image ?
+                    return $model->imageFile ?
                         Html::img(['/'.$model->imageFile->path], ['style' => 'width:80px'])
                         : '<div class="table_not_setting">未设置</div>';