专题调整

app/admin/controller/content/SubjectController.php

@@ -63,9 +63,9 @@ class SubjectController extends Curd
                     ->get()
                     ->toArray();
                 $formGoods = [];
-                foreach ($goodsList as $key => $goods){
-                    foreach ($contentConfigJson['goods'] as $cateGoods){
-                        if($cateGoods['goods_id'] == $goods['goods_id']){
+                foreach ($goodsList as $key => $goods) {
+                    foreach ($contentConfigJson['goods'] as $cateGoods) {
+                        if ($cateGoods['goods_id'] == $goods['goods_id']) {
                             $goodsList[$key]['cate'] = $cateGoods['cate'];
                             $formGoods[] = [
                                 'cate' => $cateGoods['cate'],
@@ -73,7 +73,7 @@ class SubjectController extends Curd
                             ];
                         }
                     }
-                    $goodsList[$key]['goods_cover'] = getenv('STORAGE_DOMAIN').$goods['goods_cover'];
+                    $goodsList[$key]['goods_cover'] = getenv('STORAGE_DOMAIN') . $goods['goods_cover'];
                 }
                 $item->goods = $formGoods;
                 $item->goodsList = $goodsList;
@@ -82,8 +82,13 @@ class SubjectController extends Curd
                 $sliders = [];
                 $originSliders = [];
                 foreach ($contentConfigJson['slider'] as $slider) {
-                    $sliders[] = getenv('STORAGE_DOMAIN') . $slider['url'];
-                    $originSliders[] = getenv('STORAGE_DOMAIN').str_replace('/thumb','',$slider['url']);
+                    if (!empty($slider['url'])) {
+                        $sliders[] = [
+                            'url' => getenv('STORAGE_DOMAIN') . $slider['url'],
+                            'href' => $slider['href'] ?? ''
+                        ];
+                        $originSliders[] = getenv('STORAGE_DOMAIN') . str_replace('/thumb', '', $slider['url']);
+                    }
                 }
                 $item->sliders = $sliders;
                 $item->originSliders = $originSliders;
@@ -99,9 +104,12 @@ class SubjectController extends Curd
         $data = $this->inputFilter($request->post());
         $contentConfigJson = [];
         if (!empty($params['sliders'])) {
-            $sliders = explode(',', $params['sliders']);
-            foreach ($sliders as $slider) {
-                $contentConfigJson['slider'][] = ['url' => str_replace(getenv('STORAGE_DOMAIN'), '', $slider)];
+            $contentConfigJson['slider'] = [];
+            foreach ($params['sliders'] as $slider) {
+                $contentConfigJson['slider'][] = [
+                    'url' => str_replace(getenv('STORAGE_DOMAIN'), '', $slider['url']),
+                    'href' => $slider['href']
+                ];
             }
         }
         if (!empty($params['cate'])) {
@@ -128,14 +136,16 @@ class SubjectController extends Curd
             throw new BusinessException('记录不存在', 2);
         }
         $contentConfigJson = [];
-        if (!empty($model->content_config_json)){
-            $contentConfigJson = json_decode($model->content_config_json,true);
+        if (!empty($model->content_config_json)) {
+            $contentConfigJson = json_decode($model->content_config_json, true);
         }
         if (!empty($params['sliders'])) {
             $contentConfigJson['slider'] = [];
-            $sliders = explode(',', $params['sliders']);
-            foreach ($sliders as $slider) {
-                $contentConfigJson['slider'][] = ['url' => str_replace(getenv('STORAGE_DOMAIN'), '', $slider)];
+            foreach ($params['sliders'] as $slider) {
+                $contentConfigJson['slider'][] = [
+                    'url' => str_replace(getenv('STORAGE_DOMAIN'), '', $slider['url']),
+                    'href' => $slider['href']
+                ];
             }
         }
         if (!empty($params['cate'])) {