作者 张关杰

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into develop

@@ -212,18 +212,6 @@ class BTemplateLogic extends BaseLogic @@ -212,18 +212,6 @@ class BTemplateLogic extends BaseLogic
212 ], 212 ],
213 ], 213 ],
214 ], 214 ],
215 - "productCategory"=>[  
216 - "category"=>[  
217 - [  
218 - "id"=>"all",  
219 - "title"=>"全部",  
220 - ],  
221 - [  
222 - "id"=>"recommend",  
223 - "title"=>"推荐",  
224 - ],  
225 - ],  
226 - ]  
227 ]; 215 ];
228 //产品,新闻,博客,一级分类数据 216 //产品,新闻,博客,一级分类数据
229 $productCategory = Category::where("pid",0)->get(); 217 $productCategory = Category::where("pid",0)->get();