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

@@ -27,7 +27,6 @@ class InquiryController extends BaseController
         }else{
             $data = $logic->getApiList();
         }
-
         return $this->success($data);
     }
 

@@ -63,6 +63,9 @@ class BTemplateLogLogic extends BaseLogic
             //更新所有界面的other
             if(!empty($info['other'])){
                 $commonTemplateModel->edit(['other'=>$info['other']],['project_id'=>$this->user['project_id'],'template_id'=>$info['template_id']]);
+            }else{
+                $other = str_replace('<header','',characterTruncation($info['text'],"/<link id=\"google-fonts-link\"(.*?)<header/s"));
+                $commonTemplateModel->edit(['other'=>$other],['project_id'=>$this->user['project_id'],'template_id'=>$info['template_id']]);
             }
         }catch (\Exception $e){
             $this->fail('系统错误，请联系管理员');
@@ -115,7 +118,7 @@ class BTemplateLogLogic extends BaseLogic
             $this->fail('当前数据不存在，或已被删除');
         }
         if(empty($info['other'])){
-            $info['other'] = str_replace('<header','',characterTruncation($info['text'],"/<link id=\"google-fonts-link\"(.*?)<header/s"));;
+            $info['other'] = str_replace('<header','',characterTruncation($info['text'],"/<link id=\"google-fonts-link\"(.*?)<header/s"));
         }
         $html = $info['head_css'].$info['main_css'].$info['footer_css'].$info['other'].
             $info['head_html'].$info['main_html'].$info['footer_html'];

@@ -31,7 +31,11 @@ class InquiryLogic extends BaseLogic
 
     public function getApiList($export = false)
     {
+        if(isset($this->request['row'])){
+            $page_size = $this->request['row'];
+        }else{
             $page_size = $export ? 1000 : 20;
+        }
         $search = $this->request['search'] ?: '';
         $page = $this->request['page'] ?: 1;
         $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']);