周海龙 / globalso · 提交

转到一个项目

作者 赵彬吉
提交 a0649446f72226ecae9c995046e92e3dc679d5ca 2 个父辈 f6baf9d7 581b243b

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

内嵌 并排对比
正在显示 3 个修改的文件 包含 9 行增加 和 3 行删除
@@ -27,7 +27,6 @@ class InquiryController extends BaseController @@ -27,7 +27,6 @@ class InquiryController extends BaseController
27 }else{ 27 }else{
28 $data = $logic->getApiList(); 28 $data = $logic->getApiList();
29 } 29 }
30 -  
31 return $this->success($data); 30 return $this->success($data);
32 } 31 }
33 32
@@ -63,6 +63,9 @@ class BTemplateLogLogic extends BaseLogic @@ -63,6 +63,9 @@ class BTemplateLogLogic extends BaseLogic
63 //更新所有界面的other 63 //更新所有界面的other
64 if(!empty($info['other'])){ 64 if(!empty($info['other'])){
65 $commonTemplateModel->edit(['other'=>$info['other']],['project_id'=>$this->user['project_id'],'template_id'=>$info['template_id']]); 65 $commonTemplateModel->edit(['other'=>$info['other']],['project_id'=>$this->user['project_id'],'template_id'=>$info['template_id']]);
  66 + }else{
  67 + $other = str_replace('<header','',characterTruncation($info['text'],"/<link id=\"google-fonts-link\"(.*?)<header/s"));
  68 + $commonTemplateModel->edit(['other'=>$other],['project_id'=>$this->user['project_id'],'template_id'=>$info['template_id']]);
66 } 69 }
67 }catch (\Exception $e){ 70 }catch (\Exception $e){
68 $this->fail('系统错误，请联系管理员'); 71 $this->fail('系统错误，请联系管理员');
@@ -115,7 +118,7 @@ class BTemplateLogLogic extends BaseLogic @@ -115,7 +118,7 @@ class BTemplateLogLogic extends BaseLogic
115 $this->fail('当前数据不存在，或已被删除'); 118 $this->fail('当前数据不存在，或已被删除');
116 } 119 }
117 if(empty($info['other'])){ 120 if(empty($info['other'])){
118 - $info['other'] = str_replace('<header','',characterTruncation($info['text'],"/<link id=\"google-fonts-link\"(.*?)<header/s"));; 121 + $info['other'] = str_replace('<header','',characterTruncation($info['text'],"/<link id=\"google-fonts-link\"(.*?)<header/s"));
119 } 122 }
120 $html = $info['head_css'].$info['main_css'].$info['footer_css'].$info['other']. 123 $html = $info['head_css'].$info['main_css'].$info['footer_css'].$info['other'].
121 $info['head_html'].$info['main_html'].$info['footer_html']; 124 $info['head_html'].$info['main_html'].$info['footer_html'];
@@ -31,7 +31,11 @@ class InquiryLogic extends BaseLogic @@ -31,7 +31,11 @@ class InquiryLogic extends BaseLogic
31 31
32 public function getApiList($export = false) 32 public function getApiList($export = false)
33 { 33 {
34 - $page_size = $export ? 1000 : 20; 34 + if(isset($this->request['row'])){
  35 + $page_size = $this->request['row'];
  36 + }else{
  37 + $page_size = $export ? 1000 : 20;
  38 + }
35 $search = $this->request['search'] ?: ''; 39 $search = $this->request['search'] ?: '';
36 $page = $this->request['page'] ?: 1; 40 $page = $this->request['page'] ?: 1;
37 $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']); 41 $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']);