|
@@ -10,6 +10,7 @@ |
|
@@ -10,6 +10,7 @@ |
|
10
|
namespace App\Http\Controllers\Bside\Setting;
|
10
|
namespace App\Http\Controllers\Bside\Setting;
|
|
11
|
|
11
|
|
|
12
|
use App\Enums\Common\Code;
|
12
|
use App\Enums\Common\Code;
|
|
|
|
13
|
+use App\Helper\Arr;
|
|
13
|
use App\Http\Controllers\Bside\BaseController;
|
14
|
use App\Http\Controllers\Bside\BaseController;
|
|
14
|
use App\Models\WebSetting\AggregationSetting;
|
15
|
use App\Models\WebSetting\AggregationSetting;
|
|
15
|
|
16
|
|
|
@@ -42,8 +43,6 @@ class AggregationSettingController extends BaseController |
|
@@ -42,8 +43,6 @@ class AggregationSettingController extends BaseController |
|
42
|
];
|
43
|
];
|
|
43
|
$aggSettingModel->add($data);
|
44
|
$aggSettingModel->add($data);
|
|
44
|
}
|
45
|
}
|
|
45
|
- $info['top_banner'] = json_decode($info['top_banner']);
|
|
|
|
46
|
- $info['foot_banner'] = json_decode($info['foot_banner']);
|
|
|
|
47
|
$this->response('success',Code::SUCCESS,$info);
|
46
|
$this->response('success',Code::SUCCESS,$info);
|
|
48
|
}
|
47
|
}
|
|
49
|
|
48
|
|
|
@@ -56,8 +55,12 @@ class AggregationSettingController extends BaseController |
|
@@ -56,8 +55,12 @@ class AggregationSettingController extends BaseController |
|
56
|
*/
|
55
|
*/
|
|
57
|
public function edit(){
|
56
|
public function edit(){
|
|
58
|
$aggSettingModel = new AggregationSetting();
|
57
|
$aggSettingModel = new AggregationSetting();
|
|
59
|
- $this->param['top_banner'] = json_encode($this->param['top_banner']);
|
|
|
|
60
|
- $this->param['foot_banner'] = json_encode($this->param['foot_banner']);
|
58
|
+ if(isset($this->param['top_banner']) && !empty($this->param['top_banner'])){
|
|
|
|
59
|
+ $this->param['top_banner'] = Arr::a2s($this->param['top_banner']);
|
|
|
|
60
|
+ }
|
|
|
|
61
|
+ if(isset($this->param['foot_banner']) && !empty($this->param['foot_banner'])){
|
|
|
|
62
|
+ $this->param['foot_banner'] = Arr::a2s($this->param['foot_banner']);
|
|
|
|
63
|
+ }
|
|
61
|
$rs = $aggSettingModel->edit($this->param,['project_id'=>$this->user['project_id']]);
|
64
|
$rs = $aggSettingModel->edit($this->param,['project_id'=>$this->user['project_id']]);
|
|
62
|
if($rs === false){
|
65
|
if($rs === false){
|
|
63
|
$this->response('系统错误请联系管理员',Code::SYSTEM_ERROR);
|
66
|
$this->response('系统错误请联系管理员',Code::SYSTEM_ERROR);
|