Merge branch 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong

* 'main' of http://git.njrzwl.cn:3000/wangmingchuan/yanzong:
  123123
  优化

app/admin/controller/Goods.php

@@ -65,7 +65,9 @@ class Goods extends Controller
                 ->where($where)
                 ->order($sort." ".$order)
                 ->paginate($this->request->param('per_page', 15))->each(function ($item, $key){
-                   
+                    $item['create_time'] = date("Y-m-d H:i:s", $item['create_time']);
+                    $item['update_time'] = date("Y-m-d H:i:s", $item['update_time']);
+                    $item['channel'] = config('app.platformList')[$item['channel']] ?? "";
                     return $item;
                 });
         return $this->renderSuccess(compact('list'));

app/admin/controller/Store.php

@@ -162,12 +162,7 @@ class Store extends Controller
      */
     public function platformList(): Json
     {
-        $platformList = [
+        $platformList = config('app.platformList');
-            'sn' => "苏宁",
-            'jd' => "京东",
-            'tb' => "淘宝",
-            'pdd' => "拼多多",
-        ];
         return $this->renderSuccess($platformList);
     }
     /**

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) {
+            foreach ($spe as $k => $v) {
-                $sku1 = $this->getSpecData($v)['skuList']->toArray()[0];
+                //$sku1 = $this->getSpecData($v)['skuList']->toArray()[0];
-
+                // $skuList[] = $sku1;
-//                foreach ($sku1['spec_value_ids'] as $k3 => &$v3) {
+                $spe1 = $this->getSpecData($v)['specList'][0];
-//                    $v3 = (int)$v3;
+                $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;
+                if ($aa == 0) {
-                $specList[] = $this->getSpecData($v)['specList'][0];
+                    $specList[] = $spe1;
+                }
             }
-            $newList = [
-                'skuList' => $skuList,
-                'specList' => $specList
-            ];
-            $goodsInfo->specifications = $newList;
         }
 
         $goodsInfo = $goodsInfo->toArray();
 
         //替换原规格数组
-        $goodsInfo['skuList2'] = $skuList;
+//        $goodsInfo['skuList2'] = $skuList;
-        $goodsInfo['specList2'] = $specList;
+        $goodsInfo['specList2'] = $specList ?? [];
+
         //加入足迹
         $userId = UserService::getCurrentLoginUserId(false) ?? '';
         if ($userId) {

app/common/model/Category.php

@@ -86,13 +86,11 @@ class Category extends BaseModel
         // 设置检索条件
         $filter = [];
         $params['status'] > -1 && $filter[] = ['status', '=', $params['status']];
-        if (!empty($params['is_hot'])) {
+
+        if (!empty($_GET['is_hot']) && $_GET['is_hot'] == 1) {
             $filter[] = ['is_hot', '=', $params['is_hot']];
         }
-//        if ($_GET['is_hot'] == 1) {
+        
-//            $filter[] = ['is_hot','=',1];
-//        }
-
         // 查询列表数据
         return $this->with(['image'])
             ->where($filter)

config/app.php

@@ -39,4 +39,10 @@ return [
     'error_message'    => '页面错误！请稍后再试～',
     // 显示错误信息
     'show_error_msg'   => true,
+    'platformList' => [
+            'sn' => "苏宁",
+            'jd' => "京东",
+            'tb' => "淘宝",
+            'pdd' => "拼多多",
+        ],
 ];