123123

app/api/model/Goods.php

@@ -197,28 +197,32 @@ class Goods extends GoodsModel
                 'store_id' => request()->header()['storeid'],
                 'is_delete' => 0
             ])->column('goods_id');
-            foreach ($spe as $v) {
-                $sku1 = $this->getSpecData($v)['skuList']->toArray()[0];
-
-//                foreach ($sku1['spec_value_ids'] as $k3 => &$v3) {
-//                    $v3 = (int)$v3;
-//                }
+            foreach ($spe as $k => $v) {
+                //$sku1 = $this->getSpecData($v)['skuList']->toArray()[0];
+                // $skuList[] = $sku1;
+                $spe1 = $this->getSpecData($v)['specList'][0];
+                $spe1['valueList'][0]['goods_id'] = $v;
+                $aa = 0;
+                foreach ($specList as &$v2) {
+                    if ($v2['spec_name'] == $spe1['spec_name']) {
+                        $aa = 1;
+                        $v2['valueList'][] = $spe1['valueList'];
+                        break;
+                    }
+                }
 
-                $skuList[] = $sku1;
-                $specList[] = $this->getSpecData($v)['specList'][0];
+                if ($aa == 0) {
+                    $specList[] = $spe1;
+                }
             }
-            $newList = [
-                'skuList' => $skuList,
-                'specList' => $specList
-            ];
-            $goodsInfo->specifications = $newList;
         }
 
         $goodsInfo = $goodsInfo->toArray();
 
         //替换原规格数组
-        $goodsInfo['skuList2'] = $skuList;
-        $goodsInfo['specList2'] = $specList;
+//        $goodsInfo['skuList2'] = $skuList;
+        $goodsInfo['specList2'] = $specList ?? [];
+
         //加入足迹
         $userId = UserService::getCurrentLoginUserId(false) ?? '';
         if ($userId) {

app/common/model/Category.php

@@ -86,7 +86,7 @@ class Category extends BaseModel
         // 设置检索条件
         $filter = [];
         $params['status'] > -1 && $filter[] = ['status', '=', $params['status']];
-        if ($_GET['is_hot'] == 1) {
+        if (!empty($_GET['is_hot']) && $_GET['is_hot'] == 1) {
             $filter[] = ['is_hot','=',1];
         }