Merge branch 'master' of http://app.git.1nww.com:8188/gitlab-instance-db4ab2e7/cxgj
This commit is contained in:
commit
c4115546ce
@ -81,7 +81,7 @@ class SlideEditForm extends AdminModel
|
||||
$this->model->url_type = $this->url_type;
|
||||
$this->model->img_url = $this->img_url;
|
||||
$this->model->title = $this->title;
|
||||
$this->model->sort = $this->sort;
|
||||
$this->model->sort = $this->sort??0;
|
||||
$this->model->type = $this->type;
|
||||
$this->model->other_img_url = $this->other_img_url;
|
||||
$this->model->text = $this->text;
|
||||
@ -94,7 +94,7 @@ class SlideEditForm extends AdminModel
|
||||
} else if($this->url_type == Banner::URL_TYPE_LINK){
|
||||
$this->model->page_url = $this->page_url;
|
||||
}
|
||||
$this->model->media = $this->media;
|
||||
$this->model->media = $this->media??0;
|
||||
if($this->media == Banner::MEDIA_IMG){
|
||||
$this->model->img_url = $this->img_url;
|
||||
}
|
||||
|
||||
@ -276,7 +276,7 @@ $type = Banner::type();
|
||||
if('<?=$id?>' == 12){
|
||||
data.url_type = 6
|
||||
}
|
||||
data.type = 1;
|
||||
data.type = '<?=$is?>'?1:2;
|
||||
data.status = 1;
|
||||
data._csrf = _csrf;
|
||||
$.ajax(url, {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user