root/cxgj
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://app.git.1nww.com:8188/gitlab-instance-db4ab2e7/cxgj

Browse Source
This commit is contained in:
尖叫 2024-02-02 10:31:30 +08:00
commit c4115546ce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/admin/models/SlideEditForm.php
View File

@ -81,7 +81,7 @@ class SlideEditForm extends AdminModel
$this->model->url_type = $this->url_type; $this->model->url_type = $this->url_type;
$this->model->img_url = $this->img_url; $this->model->img_url = $this->img_url;
$this->model->title = $this->title; $this->model->title = $this->title;
$this->model->sort = $this->sort; $this->model->sort = $this->sort??0;
$this->model->type = $this->type; $this->model->type = $this->type;
$this->model->other_img_url = $this->other_img_url; $this->model->other_img_url = $this->other_img_url;
$this->model->text = $this->text; $this->model->text = $this->text;
@ -94,7 +94,7 @@ class SlideEditForm extends AdminModel
} else if($this->url_type == Banner::URL_TYPE_LINK){ } else if($this->url_type == Banner::URL_TYPE_LINK){
$this->model->page_url = $this->page_url; $this->model->page_url = $this->page_url;
} }
$this->model->media = $this->media; $this->model->media = $this->media??0;
if($this->media == Banner::MEDIA_IMG){ if($this->media == Banner::MEDIA_IMG){
$this->model->img_url = $this->img_url; $this->model->img_url = $this->img_url;
} }

2
modules/admin/views/wechat/mp-slide-edit.php
View File

@ -276,7 +276,7 @@ $type = Banner::type();
if('<?=$id?>' == 12){ if('<?=$id?>' == 12){
data.url_type = 6 data.url_type = 6
} }
data.type = 1; data.type = '<?=$is?>'?1:2;
data.status = 1; data.status = 1;
data._csrf = _csrf; data._csrf = _csrf;
$.ajax(url, { $.ajax(url, {