作者 赵彬吉

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

@@ -6,6 +6,8 @@ use App\Enums\Common\Code; @@ -6,6 +6,8 @@ use App\Enums\Common\Code;
6 use App\Http\Controllers\Bside\BaseController; 6 use App\Http\Controllers\Bside\BaseController;
7 use App\Http\Logic\Bside\BTemplate\BTemplateLogic; 7 use App\Http\Logic\Bside\BTemplate\BTemplateLogic;
8 use App\Http\Requests\Bside\Template\TemplateRequest; 8 use App\Http\Requests\Bside\Template\TemplateRequest;
  9 +use App\Models\Template\BTemplate;
  10 +use App\Models\Template\Template;
9 11
10 class BTemplateController extends BaseController 12 class BTemplateController extends BaseController
11 { 13 {
@@ -71,10 +73,6 @@ class BTemplateController extends BaseController @@ -71,10 +73,6 @@ class BTemplateController extends BaseController
71 * @time :2023/6/29 10:02 73 * @time :2023/6/29 10:02
72 */ 74 */
73 public function save(TemplateRequest $templateRequest,BTemplateLogic $BTemplateLogic){ 75 public function save(TemplateRequest $templateRequest,BTemplateLogic $BTemplateLogic){
74 - //演示项目,不允许其他号码编辑$this->user['mobile'] != '15928018676' ||  
75 - if(($this->user['project_id'] == 1) && ($this->user['mobile'] != '15680871314') && ($this->param['source'] == 1)){  
76 - $this->response('演示项目仅支持演示功能,无法更改首页',Code::USER_ERROR);  
77 - }  
78 $templateRequest->validated(); 76 $templateRequest->validated();
79 $BTemplateLogic->templateSave(); 77 $BTemplateLogic->templateSave();
80 $this->response('success'); 78 $this->response('success');
@@ -35,6 +35,11 @@ class BTemplateLogLogic extends BaseLogic @@ -35,6 +35,11 @@ class BTemplateLogLogic extends BaseLogic
35 if($info === false){ 35 if($info === false){
36 $this->fail('error'); 36 $this->fail('error');
37 } 37 }
  38 + $bTemplateModel = new BTemplate();
  39 + //演示项目,不允许其他号码编辑
  40 + if(($this->user['project_id'] == 1) && (in_array($this->user['mobile'],$bTemplateModel->mobile)) && ($info['source'] == 1)){
  41 + $this->fail('演示项目仅支持演示功能,无法更改首页');
  42 + }
38 $data = $this->setParam($info); 43 $data = $this->setParam($info);
39 $BTemplateModel = new BTemplate(); 44 $BTemplateModel = new BTemplate();
40 $rs = $BTemplateModel->edit($data,['template_id'=>$info['template_id'],'source'=>$info['source'],'source_id'=>$info['source_id']]); 45 $rs = $BTemplateModel->edit($data,['template_id'=>$info['template_id'],'source'=>$info['source'],'source_id'=>$info['source_id']]);
@@ -174,6 +174,10 @@ class BTemplateLogic extends BaseLogic @@ -174,6 +174,10 @@ class BTemplateLogic extends BaseLogic
174 * @time :2023/6/29 11:05 174 * @time :2023/6/29 11:05
175 */ 175 */
176 public function templateSave(){ 176 public function templateSave(){
  177 + //演示项目,不允许其他号码编辑
  178 + if(($this->user['project_id'] == 1) && (in_array($this->user['mobile'],$this->model->mobile)) && ($this->param['source'] == 1)){
  179 + $this->fail('演示项目仅支持演示功能,无法更改首页');
  180 + }
177 //查询当前模版是否已保存 181 //查询当前模版是否已保存
178 DB::beginTransaction(); 182 DB::beginTransaction();
179 try { 183 try {
@@ -18,5 +18,14 @@ class BTemplate extends Base @@ -18,5 +18,14 @@ class BTemplate extends Base
18 protected $table = 'gl_web_template'; 18 protected $table = 'gl_web_template';
19 //连接数据库 19 //连接数据库
20 protected $connection = 'custom_mysql'; 20 protected $connection = 'custom_mysql';
  21 +
  22 + //网站装修可操作手机号
  23 + public $mobile = [
  24 + '15928018676',
  25 + '15680871314',
  26 + '18328465854',
  27 + '18008059100',
  28 + '18583337995'
  29 + ];
21 } 30 }
22 31