完善功能

app/admin/controller/goods/EntityGoodsController.php

@@ -4,6 +4,7 @@ namespace app\admin\controller\goods;
 
 use app\admin\service\goods\GoodsService;
 use app\admin\validate\goods\GoodsValidate;
+use app\model\GoodsDetail;
 use support\Request;
 use support\Response;
 

app/admin/controller/sys_manage/UploadController.php

@@ -21,8 +21,8 @@ class UploadController
             'single_limit' => 1024 * 1024 * 5,
             'nums' => 1,
             'include' => ['jpg', 'jpeg', 'png'],
-            'uri' => '/storage/images/',
-            'root' => public_path() . '/storage/images/',
+            'uri' => '/storage/new/images/',
+            'root' => public_path() . '/storage/new/images/',
         ];
 
         return UploadService::upload($config);
@@ -41,8 +41,8 @@ class UploadController
             'single_limit' => 1024 * 1024 * 50,
             'nums' => 1,
             'include' => ['mp4'],
-            'uri' => '/storage/videos/',
-            'root' => public_path() . '/storage/videos/',
+            'uri' => '/storage/new/videos/',
+            'root' => public_path() . '/storage/new/videos/',
         ];
 
         return UploadService::upload($config);
@@ -54,8 +54,8 @@ class UploadController
             'single_limit' => 1024 * 1024 * 50,
             'nums' => 1,
             'include' => ['pdf','doc','docx','xls','xlsx'],
-            'uri' => '/storage/files/',
-            'root' => public_path() . '/storage/files/',
+            'uri' => '/storage/new/files/',
+            'root' => public_path() . '/storage/new/files/',
         ];
 
         return UploadService::upload($config);

app/admin/service/goods/GoodsService.php

@@ -247,6 +247,11 @@ class GoodsService
             $data['goods_cover'] = getenv('STORAGE_DOMAIN') . $data['goods_cover'];
             if (!empty($data['goods_detail_slider_json'])) {
                 $data['goods_detail_slider_json'] = json_decode($data['goods_detail_slider_json'], true);
+                // ……
+                if (isset($data['goods_detail_slider_json']['slider'])) {
+                    $data['goods_detail_slider_json'] = explode(',', $data['goods_detail_slider_json']['slider']);
+                }
+
                 $slider = '';
                 foreach ($data['goods_detail_slider_json'] as $item) {
                     $slider .= getenv('STORAGE_DOMAIN') . $item . ',';
@@ -606,7 +611,7 @@ class GoodsService
     {
         if (!empty($params['goods_detail_slider_json'])) {
             $params['goods_detail_slider_json'] = str_replace(getenv('STORAGE_DOMAIN'), '', $params['goods_detail_slider_json']);
-            $params['goods_detail_slider_json'] = json_encode(explode(',', $params['goods_detail_slider_json']));
+            $params['goods_detail_slider_json'] = json_encode(['slider' => $params['goods_detail_slider_json']]);
         }
         try {
             $model = new GoodsDetail();
@@ -797,7 +802,7 @@ class GoodsService
             $data = self::inputFilter($params, new GoodsDetail());
             if (!empty($data['goods_detail_slider_json'])) {
                 $data['goods_detail_slider_json'] = str_replace(getenv('STORAGE_DOMAIN'), '', $data['goods_detail_slider_json']);
-                $data['goods_detail_slider_json'] = json_encode(explode(',', $data['goods_detail_slider_json']));
+                $data['goods_detail_slider_json'] = json_encode(['slider' => $data['goods_detail_slider_json']]);
             }
             // 根据goods_id 查详情ID
             $detail = GoodsDetail::where('join_detail_goods_id', $params['goods_id'])->first();

app/controller/Curd.php

@@ -198,7 +198,7 @@ class Curd
             ) {
                 unset($where[$column]);
             }
-            if (substr($value, 0,5) == 'like,') {
+            if (!is_array($value) && substr($value, 0,5) == 'like,') {
                 $where[$column] = explode(',',$value);
             }
         }

app/model/Adv.php

@@ -12,7 +12,7 @@ class Adv extends Model
 
     protected $dateFormat = 'U';
 
-    const CREATED_AT = 'content_addtimes';
+    const CREATED_AT = 'adv_addtimes';
 
     const UPDATED_AT = null;
 }