正在显示
1 个修改的文件
包含
20 行增加
和
8 行删除
| @@ -11,6 +11,7 @@ use App\Http\Logic\Bside\Product\ProductLogic; | @@ -11,6 +11,7 @@ use App\Http\Logic\Bside\Product\ProductLogic; | ||
| 11 | use App\Http\Requests\Bside\Product\ProductRequest; | 11 | use App\Http\Requests\Bside\Product\ProductRequest; |
| 12 | use App\Models\Product\Category; | 12 | use App\Models\Product\Category; |
| 13 | use App\Models\Product\CategoryRelated; | 13 | use App\Models\Product\CategoryRelated; |
| 14 | +use App\Models\Product\Extend; | ||
| 14 | use App\Models\Product\ExtendInfo; | 15 | use App\Models\Product\ExtendInfo; |
| 15 | use App\Models\Product\Keyword; | 16 | use App\Models\Product\Keyword; |
| 16 | use App\Models\Product\KeywordRelated; | 17 | use App\Models\Product\KeywordRelated; |
| @@ -282,25 +283,36 @@ class ProductController extends BaseController | @@ -282,25 +283,36 @@ class ProductController extends BaseController | ||
| 282 | * @time :2023/11/14 9:45 | 283 | * @time :2023/11/14 9:45 |
| 283 | */ | 284 | */ |
| 284 | public function getExtendInfo($product_id){ | 285 | public function getExtendInfo($product_id){ |
| 286 | + $extendModel = new Extend(); | ||
| 287 | + $list = $extendModel->list(); | ||
| 288 | + if(empty($list)){ | ||
| 289 | + return []; | ||
| 290 | + } | ||
| 285 | $extendInfoModel = new ExtendInfo(); | 291 | $extendInfoModel = new ExtendInfo(); |
| 286 | - $extend = $extendInfoModel->list(['product_id'=>$product_id],'created_at'); | ||
| 287 | - if(!empty($extend)){ | ||
| 288 | - foreach ($extend as $k=>$v){ | 292 | + foreach ($list as $k=>$v){ |
| 293 | + $info = $extendInfoModel->read(['key'=>$v['key'],'product_id'=>$product_id]); | ||
| 294 | + if($info === false){ | ||
| 295 | + if($v['type'] == 3 || $v['type'] == 4){$v['values'] == [];}else{$v['values'] = '';} | ||
| 296 | + }else{ | ||
| 289 | if($v['type'] == 3){ | 297 | if($v['type'] == 3){ |
| 290 | - foreach ($v['values'] as $k1=>$v1){ | 298 | + $arr = json_decode($info['values']); |
| 299 | + foreach ($arr as $k1=>$v1){ | ||
| 291 | $v1 = getImageUrl($v1); | 300 | $v1 = getImageUrl($v1); |
| 292 | $v['values'][$k1] = $v1; | 301 | $v['values'][$k1] = $v1; |
| 293 | } | 302 | } |
| 294 | }elseif ($v['type'] == 4){ | 303 | }elseif ($v['type'] == 4){ |
| 295 | - foreach ($v['values'] as $k1=>$v1){ | ||
| 296 | - $v1 = getFileUrl($v1); | 304 | + $arr1 = json_decode($info['values']); |
| 305 | + foreach ($arr1 as $k1=>$v1){ | ||
| 306 | + $v1 = getImageUrl($v1); | ||
| 297 | $v['values'][$k1] = $v1; | 307 | $v['values'][$k1] = $v1; |
| 298 | } | 308 | } |
| 309 | + }else{ | ||
| 310 | + $v['values'] = $info['values']; | ||
| 299 | } | 311 | } |
| 300 | - $extend[$k] = $v; | ||
| 301 | } | 312 | } |
| 313 | + $list[$k] = $v; | ||
| 302 | } | 314 | } |
| 303 | - return $extend; | 315 | + return $list; |
| 304 | } | 316 | } |
| 305 | 317 | ||
| 306 | /** | 318 | /** |
-
请 注册 或 登录 后发表评论