|
@@ -124,11 +124,11 @@ class ATemplateLogic extends BaseLogic |
|
@@ -124,11 +124,11 @@ class ATemplateLogic extends BaseLogic |
|
124
|
if(!empty($info['image'])){
|
124
|
if(!empty($info['image'])){
|
|
125
|
$info['image_link'] = getImageUrl($info['image']);
|
125
|
$info['image_link'] = getImageUrl($info['image']);
|
|
126
|
}
|
126
|
}
|
|
127
|
- if(!empty($info['design_manager'])){
|
|
|
|
128
|
- $info['design_manager'] = (new Manage())->getName($info['design_manager']);
|
127
|
+ if(!empty($info['design_msg'])){
|
|
|
|
128
|
+ $info['design_msg'] = json_decode($info['design_msg']);
|
|
129
|
}
|
129
|
}
|
|
130
|
- if(!empty($info['front_manager'])){
|
|
|
|
131
|
- $info['front_manager'] = (new Manage())->getName($info['front_manager']);
|
130
|
+ if(!empty($info['front_msg'])){
|
|
|
|
131
|
+ $info['front_msg'] = json_decode($info['front_msg']);
|
|
132
|
}
|
132
|
}
|
|
133
|
return $this->success($info);
|
133
|
return $this->success($info);
|
|
134
|
}
|
134
|
}
|
|
@@ -261,15 +261,11 @@ class ATemplateLogic extends BaseLogic |
|
@@ -261,15 +261,11 @@ class ATemplateLogic extends BaseLogic |
|
261
|
*/
|
261
|
*/
|
|
262
|
public function auditingStatus(){
|
262
|
public function auditingStatus(){
|
|
263
|
//获取当前数据详情
|
263
|
//获取当前数据详情
|
|
264
|
- $info = $this->model->read(['id'=>$this->param['id']]);
|
|
|
|
265
|
- if(isset($this->param['front_status']) && $this->param['front_status'] == 1){
|
|
|
|
266
|
- if($info['design_status'] == 0){
|
|
|
|
267
|
- $this->fail('请先提交设计审核');
|
|
|
|
268
|
- }
|
|
|
|
269
|
- $this->param['design_manager'] = $this->manager['id'];
|
|
|
|
270
|
- $this->param['test_model'] = 0;
|
|
|
|
271
|
- }else{
|
|
|
|
272
|
- $this->param['front_manager'] = $this->manager['id'];
|
264
|
+ if(isset($this->param['design_msg']) && !empty($this->param['design_msg'])){
|
|
|
|
265
|
+ $this->param['design_msg'] = json_decode($this->param['design_msg']);
|
|
|
|
266
|
+ }
|
|
|
|
267
|
+ if(isset($this->param['front_msg']) && !empty($this->param['front_msg'])){
|
|
|
|
268
|
+ $this->param['front_msg'] = json_decode($this->param['front_msg']);
|
|
273
|
}
|
269
|
}
|
|
274
|
$rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
|
270
|
$rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
|
|
275
|
if($rs === false){
|
271
|
if($rs === false){
|