gx数据

@@ -12,6 +12,7 @@ use App\Http\Logic\Bside\Product\ProductLogic;
 use App\Http\Requests\Bside\Product\ProductRequest;
 use App\Http\Requests\Bside\Product\ProductRequest;
 use App\Models\Product\Category;
 use App\Models\Product\Category;
 use App\Models\Product\CategoryRelated;
 use App\Models\Product\CategoryRelated;
+use App\Models\Product\Detail;
 use App\Models\Product\Extend;
 use App\Models\Product\Extend;
 use App\Models\Product\ExtendInfo;
 use App\Models\Product\ExtendInfo;
 use App\Models\Product\Keyword;
 use App\Models\Product\Keyword;
@@ -678,7 +679,14 @@ class ProductController extends BaseController
             $new_content = htmlentities($contents);
             $new_content = htmlentities($contents);
         }
         }
         if (!empty($new_content)){
         if (!empty($new_content)){
-            $productInfo['content'] = $new_content . $productInfo['content'];
+            $detailModel = new Detail();
+            $detailInfo = $detailModel->read(['column_id'=>1]);
+            if($detailInfo !== false && !empty($detailInfo['content'])){
+                $contentData = json_decode($detailInfo['content'],true);
+                if(!empty($contentData['content'])){
+                    $productInfo['content'] = $new_content . $contentData['content'];
+                }
+            }
         }
         }
         $this->response('success',Code::SUCCESS,$productInfo);
         $this->response('success',Code::SUCCESS,$productInfo);
     }
     }