周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 15d5f4d50d6d89421b467443dd803407a84a64b3 2 个父辈 60674688 6c6c323e

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

内嵌 并排对比
正在显示 2 个修改的文件 包含 3 行增加 和 2 行删除
@@ -80,7 +80,7 @@ class ProductController extends BaseController @@ -80,7 +80,7 @@ class ProductController extends BaseController
80 */ 80 */
81 public function productNoPage(Product $product){ 81 public function productNoPage(Product $product){
82 $this->map['status'] = $product::STATUS_ON; 82 $this->map['status'] = $product::STATUS_ON;
83 - $lists = $product->list($this->map); 83 + $lists = $product->list($this->map,'id',['id','title']);
84 $this->response('success',Code::SUCCESS,$lists); 84 $this->response('success',Code::SUCCESS,$lists);
85 } 85 }
86 86
@@ -62,8 +62,9 @@ class KeywordLogic extends BaseLogic @@ -62,8 +62,9 @@ class KeywordLogic extends BaseLogic
62 $this->fail('当前title已存在'); 62 $this->fail('当前title已存在');
63 } 63 }
64 //TODO::不能修改路由 64 //TODO::不能修改路由
  65 + $route = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT_KEYWORD, $this->param['id'], $this->user['project_id']);
  66 + $this->param['route'] = $route;
65 $this->model->edit($this->param,['id'=>$this->param['id']]); 67 $this->model->edit($this->param,['id'=>$this->param['id']]);
66 - $route = RouteMap::getRoute(RouteMap::SOURCE_PRODUCT_KEYWORD,$this->param['id'], $this->user['project_id']);  
67 $data = ['id'=>$this->param['id']]; 68 $data = ['id'=>$this->param['id']];
68 }else{ 69 }else{
69 $info = $this->model->read(['title'=>$this->param['title']]); 70 $info = $this->model->read(['title'=>$this->param['title']]);