|
...
|
...
|
@@ -682,10 +682,7 @@ class ProductController extends BaseController |
|
|
|
$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'];
|
|
|
|
}
|
|
|
|
$productInfo['content'] = $new_content . $detailInfo['content']['content'];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$this->response('success',Code::SUCCESS,$productInfo);
|
...
|
...
|
|