合并分支 'lyh-server' 到 'master'

gx数据



查看合并请求 !1501

@@ -85,17 +85,17 @@ class CategoryController extends BaseController
             }
             }
         }else{
         }else{
             $list = $category->list($this->map,['sort','id'],$filed);
             $list = $category->list($this->map,['sort','id'],$filed);
-            $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST);//获取模版id
-            foreach ($list as $k =>$v){
-                $v['url'] = $this->user['domain'] . $v['route'].'/';
-                $v['product_num'] = $category->getProductNum($list,$v['id']);
-                $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
-                $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST,$template_id,$v['id']);
-                $list[$k] = $v;
-            }
-            if(!isset($this->map['title'])){
-                $list = $this->getListSon($list);
-            }
+//            $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST);//获取模版id
+//            foreach ($list as $k =>$v){
+//                $v['url'] = $this->user['domain'] . $v['route'].'/';
+//                $v['product_num'] = $category->getProductNum($list,$v['id']);
+//                $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
+//                $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST,$template_id,$v['id']);
+//                $list[$k] = $v;
+//            }
+//            if(!isset($this->map['title'])){
+//                $list = $this->getListSon($list);
+//            }
             Cache::put('category_list_'.$this->user['project_id'],$list,3600);
             Cache::put('category_list_'.$this->user['project_id'],$list,3600);
         }
         }
         return $this->success($list);
         return $this->success($list);