周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 d3a6c4a36bad4734f5c7a18b41a2f2740cca2339 1 个父辈 4121ab3d

gx

内嵌 并排对比
正在显示 3 个修改的文件 包含 21 行增加 和 24 行删除
@@ -105,7 +105,7 @@ class BTemplateLogic extends BaseLogic @@ -105,7 +105,7 @@ class BTemplateLogic extends BaseLogic
105 $TemplateInfo = $ATemplateModel->read(['id'=>$info['template_id']]); 105 $TemplateInfo = $ATemplateModel->read(['id'=>$info['template_id']]);
106 }else{ 106 }else{
107 $commonTemplateModel = new BTemplateCommon(); 107 $commonTemplateModel = new BTemplateCommon();
108 - $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id']]); 108 + $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id'],'type'=>$source]);
109 if($commonInfo !== false){ 109 if($commonInfo !== false){
110 $TemplateInfo['html'] = $commonInfo['head_css'].$TemplateInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other']. 110 $TemplateInfo['html'] = $commonInfo['head_css'].$TemplateInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other'].
111 $commonInfo['head_html'].$TemplateInfo['main_html'].$commonInfo['footer_html']; 111 $commonInfo['head_html'].$TemplateInfo['main_html'].$commonInfo['footer_html'];
@@ -134,27 +134,21 @@ class BTemplateLogic extends BaseLogic @@ -134,27 +134,21 @@ class BTemplateLogic extends BaseLogic
134 //查看当前模板是否已编辑保存web_template 134 //查看当前模板是否已编辑保存web_template
135 $TemplateInfo = $this->webTemplateInfo($info['template_id'],$source,$source_id); 135 $TemplateInfo = $this->webTemplateInfo($info['template_id'],$source,$source_id);
136 if($TemplateInfo === false){ 136 if($TemplateInfo === false){
137 - //兼容老数据  
138 - $commonTemplateModel = new BTemplateCommon();  
139 - $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id']]);  
140 - if($commonInfo !== false){  
141 - $html = $commonInfo['head_css']."<style id='globalsojs-styles'></style>".$commonInfo['footer_css'].$commonInfo['other'].  
142 - $commonInfo['head_html']."<main>{$this->getProductModule()}</main>".$commonInfo['footer_html'];  
143 - }else{  
144 - $html = preg_replace('/<style id="globalsojs-styles">(.*?)<\/style>/s', "<style id='globalsojs-styles'></style>", $homeTemplateInfo['html']);  
145 - $html = preg_replace('/<main\b[^>]*>(.*?)<\/main>/s', "<main>{$this->getProductModule()}</main>", $html);  
146 - } 137 + $main_html = "<main>{$this->getProductModule()}</main>";
  138 + $main_style = "<style id='globalsojs-styles'></style>";
147 }else{ 139 }else{
148 - //兼容老数据  
149 - $commonTemplateModel = new BTemplateCommon();  
150 - $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id']]);  
151 - if($commonInfo !== false){  
152 - $html = $commonInfo['head_css'].$TemplateInfo['main_css'].$commonInfo['footer_css'].$commonInfo['other'].  
153 - $commonInfo['head_html'].$TemplateInfo['main_html'].$commonInfo['footer_html'];  
154 - }else{  
155 - $html = preg_replace('/<style id="globalsojs-styles">(.*?)<\/style>/s', $TemplateInfo['main_css'], $homeTemplateInfo['html']);  
156 - $html = preg_replace('/<main\b[^>]*>(.*?)<\/main>/s',$TemplateInfo['main_html'] , $html);  
157 - } 140 + $main_html = $TemplateInfo['main_html'];
  141 + $main_style = $TemplateInfo['main_css'];
  142 + }
  143 + //兼容老数据
  144 + $commonTemplateModel = new BTemplateCommon();
  145 + $commonInfo = $commonTemplateModel->read(['template_id'=>$info['template_id'],'project_id'=>$this->user['project_id'],'type'=>$source]);
  146 + if($commonInfo !== false){
  147 + $html = $commonInfo['head_css'].$main_style.$commonInfo['footer_css'].$commonInfo['other'].
  148 + $commonInfo['head_html'].$main_html.$commonInfo['footer_html'];
  149 + }else{
  150 + $html = preg_replace('/<style id="globalsojs-styles">(.*?)<\/style>/s', $main_style, $homeTemplateInfo['html']);
  151 + $html = preg_replace('/<main\b[^>]*>(.*?)<\/main>/s', $main_html, $html);
158 } 152 }
159 $TemplateInfo['html'] = $this->getHeadFooter($html);//组装数据 153 $TemplateInfo['html'] = $this->getHeadFooter($html);//组装数据
160 return $this->success($TemplateInfo); 154 return $this->success($TemplateInfo);
@@ -231,8 +225,7 @@ class BTemplateLogic extends BaseLogic @@ -231,8 +225,7 @@ class BTemplateLogic extends BaseLogic
231 */ 225 */
232 public function saveCommonTemplate($param){ 226 public function saveCommonTemplate($param){
233 $templateCommonModel = new BTemplateCommon(); 227 $templateCommonModel = new BTemplateCommon();
234 - $info = $templateCommonModel->read(['template_id'=>$param['template_id'],'project_id'=>$this->user['project_id']]);  
235 -// @file_put_contents(storage_path('logs/lyh_error.log'), var_export($param['html'], true) . PHP_EOL, FILE_APPEND); 228 + $info = $templateCommonModel->read(['template_id'=>$param['template_id'],'project_id'=>$this->user['project_id'],'type'=>$param['source']]);
236 $data = [ 229 $data = [
237 'head_html'=>$param['head_html'], 230 'head_html'=>$param['head_html'],
238 'head_css'=>$param['head_css'], 231 'head_css'=>$param['head_css'],
@@ -243,6 +236,7 @@ class BTemplateLogic extends BaseLogic @@ -243,6 +236,7 @@ class BTemplateLogic extends BaseLogic
243 if($info === false){ 236 if($info === false){
244 $data['template_id'] = $param['template_id']; 237 $data['template_id'] = $param['template_id'];
245 $data['project_id'] = $this->user['project_id']; 238 $data['project_id'] = $this->user['project_id'];
  239 + $data['type'] = $param['source'];
246 $templateCommonModel->add($data); 240 $templateCommonModel->add($data);
247 }else{ 241 }else{
248 $templateCommonModel->edit($data,['id'=>$info['id']]); 242 $templateCommonModel->edit($data,['id'=>$info['id']]);
@@ -35,6 +35,9 @@ class ProjectCountryLogic extends BaseLogic @@ -35,6 +35,9 @@ class ProjectCountryLogic extends BaseLogic
35 * @time :2023/4/28 17:42 35 * @time :2023/4/28 17:42
36 */ 36 */
37 public function country_save(){ 37 public function country_save(){
  38 + if(!isset($this->param['country_lists']) || empty($this->param['country_lists'])){
  39 + $this->param['country_lists'] = '';
  40 + }
38 $info = $this->model->read(['project_id'=>$this->user['project_id']]); 41 $info = $this->model->read(['project_id'=>$this->user['project_id']]);
39 if($info === false){ 42 if($info === false){
40 $this->param['project_id'] = $this->user['project_id']; 43 $this->param['project_id'] = $this->user['project_id'];
@@ -45,7 +48,6 @@ class ProjectCountryLogic extends BaseLogic @@ -45,7 +48,6 @@ class ProjectCountryLogic extends BaseLogic
45 if($rs === false){ 48 if($rs === false){
46 $this->fail('当前数据不存在'); 49 $this->fail('当前数据不存在');
47 } 50 }
48 - //TODO::配置多语言翻译api接口  
49 return $this->success(); 51 return $this->success();
50 } 52 }
51 } 53 }
@@ -196,6 +196,7 @@ class UserLoginLogic @@ -196,6 +196,7 @@ class UserLoginLogic
196 $info['is_customized'] = $project['is_customized']; 196 $info['is_customized'] = $project['is_customized'];
197 $info['is_upload_manage'] = $project['is_upload_manage']; 197 $info['is_upload_manage'] = $project['is_upload_manage'];
198 $info['upload_config'] = $project['upload_config']; 198 $info['upload_config'] = $project['upload_config'];
  199 + $info['configuration'] = $project['deploy_build']['configuration'];
199 //保存项目缓存 200 //保存项目缓存
200 Cache::put('user-'.$info['project_id'],$project,$minutes = null); 201 Cache::put('user-'.$info['project_id'],$project,$minutes = null);
201 return $this->success($info); 202 return $this->success($info);