Merge branch 'master-lyh-edit' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -55,7 +55,7 @@ class ProductController extends BaseController
         if(!empty($lists)){
         if(!empty($lists)){
             $lists = $lists->toArray();
             $lists = $lists->toArray();
             $cate_data = $this->getCategoryList();//分类
             $cate_data = $this->getCategoryList();//分类
-            $key_data = $this->getKeywordsList();//关键字
+            $key_data = $this->keywordNameLists($lists['list']);//关键字
             $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);//获取模版id
             $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);//获取模版id
             $userModel = new User();
             $userModel = new User();
             foreach ($lists['list'] as $k=>$v){
             foreach ($lists['list'] as $k=>$v){
@@ -72,6 +72,30 @@ class ProductController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @remark :获取当前页的所有关键字名称
+     * @name   :keywordNameLists
+     * @author :lyh
+     * @method :post
+     * @time   :2024/6/3 14:24
+     */
+    public function keywordNameLists($lists){
+        $keywordId = [];
+        foreach ($lists as $v){
+            $keywordId = array_merge($keywordId,$v['keyword_id']);
+        }
+        $keywordId = array_values(array_unique($keywordId));
+        $keywordModel = new Keyword();
+        $data = [];
+        $cateList = $keywordModel->list(['id' => ['in',$keywordId]], ['id', 'title']);
+        if (!empty($cateList)) {
+            foreach ($cateList as $value) {
+                $data[$value['id']] = $value['title'];
+            }
+        }
+        return $data;
+    }
+
+    /**
      * @remark :不分页产品列表
      * @remark :不分页产品列表
      * @name   :productNoPage
      * @name   :productNoPage
      * @author :lyh
      * @author :lyh

@@ -244,12 +244,6 @@ class CategoryLogic extends  BaseLogic
             $str = ','.implode(',',$category).',';
             $str = ','.implode(',',$category).',';
         }
         }
         return $str;
         return $str;
-//        if(isset($category) && !empty($category)){
-//            foreach ($category as $v){
-//                $str .= $v.',';
-//            }
-//        }
-//        return !empty(trim($str,',')) ? ','.$str.',' : '';
     }
     }
 
 
     /**
     /**