周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 cc02211fa87af4fb2b891e47c9496663b0fbc454 1 个父辈 e69e1e79

update

内嵌 并排对比
正在显示 2 个修改的文件 包含 10 行增加 和 3 行删除
@@ -852,7 +852,7 @@ function getCustomRouteMap($module_route,$route = '') @@ -852,7 +852,7 @@ function getCustomRouteMap($module_route,$route = '')
852 * @method :post 852 * @method :post
853 * @time :2023/11/10 14:29 853 * @time :2023/11/10 14:29
854 */ 854 */
855 -function getRouteMap($source,$source_id,$is_upgrade = 0){ 855 +function getRouteMap($source,$source_id,$is_upgrade = 0, $returnModel = false){
856 $route = ''; 856 $route = '';
857 $routeMapModel = new RouteMap(); 857 $routeMapModel = new RouteMap();
858 $info = $routeMapModel->read(['source'=>$source,'source_id'=>$source_id]); 858 $info = $routeMapModel->read(['source'=>$source,'source_id'=>$source_id]);
@@ -879,6 +879,9 @@ function getRouteMap($source,$source_id,$is_upgrade = 0){ @@ -879,6 +879,9 @@ function getRouteMap($source,$source_id,$is_upgrade = 0){
879 $route = $info['route']; 879 $route = $info['route'];
880 } 880 }
881 } 881 }
  882 + if($returnModel){
  883 + return $info;
  884 + }
882 return $route; 885 return $route;
883 } 886 }
884 887
@@ -61,7 +61,9 @@ class ProductController extends BaseController @@ -61,7 +61,9 @@ class ProductController extends BaseController
61 $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);//获取模版id 61 $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);//获取模版id
62 $userModel = new User(); 62 $userModel = new User();
63 foreach ($lists['list'] as $k=>$v){ 63 foreach ($lists['list'] as $k=>$v){
64 - $v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id']); 64 + $route = getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id'], 0, true);
  65 + $v['url'] = $this->user['domain'] . $route['route'];
  66 + $v['pv'] = $route['pv'];
65 $v['category_id_text'] = $this->categoryName($v['id'],$cate_data); 67 $v['category_id_text'] = $this->categoryName($v['id'],$cate_data);
66 $v['keyword_id_text'] = $this->keywordName($v['keyword_id'],$key_data); 68 $v['keyword_id_text'] = $this->keywordName($v['keyword_id'],$key_data);
67 $v['created_uid_text'] = $userModel->getName($v['created_uid']); 69 $v['created_uid_text'] = $userModel->getName($v['created_uid']);
@@ -97,7 +99,9 @@ class ProductController extends BaseController @@ -97,7 +99,9 @@ class ProductController extends BaseController
97 $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);//获取模版id 99 $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);//获取模版id
98 $userModel = new User(); 100 $userModel = new User();
99 foreach ($lists['list'] as $k=>$v){ 101 foreach ($lists['list'] as $k=>$v){
100 - $v['url'] = $this->user['domain'] . getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id']); 102 + $route = getRouteMap(RouteMap::SOURCE_PRODUCT,$v['id'], 0, true);
  103 + $v['url'] = $this->user['domain'] . $route['route'];
  104 + $v['pv'] = $route['pv'];
101 $v['category_id_text'] = $this->categoryName($v['id'],$cate_data); 105 $v['category_id_text'] = $this->categoryName($v['id'],$cate_data);
102 $v['keyword_id_text'] = $this->keywordName($v['keyword_id'],$key_data); 106 $v['keyword_id_text'] = $this->keywordName($v['keyword_id'],$key_data);
103 $v['created_uid_text'] = $userModel->getName($v['created_uid']); 107 $v['created_uid_text'] = $userModel->getName($v['created_uid']);