周海龙 / globalso · 提交

转到一个项目

作者 李宇航
提交 2cf7f99acd7ccbbf5bdd7e56482eaf6c1711d127 2 个父辈 238265ec 5afecf5b

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

gx



查看合并请求 !544
内嵌 并排对比
正在显示 2 个修改的文件 包含 4 行增加 和 1 行删除
@@ -31,7 +31,7 @@ class TutorialController extends BaseController @@ -31,7 +31,7 @@ class TutorialController extends BaseController
31 * @time :2024/5/13 17:36 31 * @time :2024/5/13 17:36
32 */ 32 */
33 public function lists(Tutorial $tutorial){ 33 public function lists(Tutorial $tutorial){
34 - $data = $tutorial->lists($this->map,$this->page,$this->row,$this->order); 34 + $data = $tutorial->lists($this->map,$this->page,$this->row,$this->order = ['sort','id']);
35 $this->response('success',Code::SUCCESS,$data); 35 $this->response('success',Code::SUCCESS,$data);
36 } 36 }
37 37
@@ -70,6 +70,9 @@ class CustomTemplateLogic extends BaseLogic @@ -70,6 +70,9 @@ class CustomTemplateLogic extends BaseLogic
70 $six_read = $this->param['six_read'] ?? 0;//5.0数据时，是否按6.0显示 70 $six_read = $this->param['six_read'] ?? 0;//5.0数据时，是否按6.0显示
71 if($is_upgrade == 0 || $six_read == 1) { 71 if($is_upgrade == 0 || $six_read == 1) {
72 $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']); 72 $this->param['url'] = RouteMap::setRoute($this->param['url'], RouteMap::SOURCE_PAGE, $id, $this->user['project_id']);
  73 + if($this->param['url'] == 'news' || $this->param['url'] == 'product' || $this->param['url'] == 'blog'){
  74 + $this->fail('不允许创建'.$this->param['news']);
  75 + }
73 } 76 }
74 $this->editCustomRoute($this->param['url']); 77 $this->editCustomRoute($this->param['url']);
75 $rs = $this->model->edit($this->param,['id'=>$id]); 78 $rs = $this->model->edit($this->param,['id'=>$id]);