diff --git a/admin/controllers/app/material/Template.php b/admin/controllers/app/material/Template.php index 3cd53e94..3c1bf699 100644 --- a/admin/controllers/app/material/Template.php +++ b/admin/controllers/app/material/Template.php @@ -150,7 +150,7 @@ class Template extends HD_Controller $value['img'] = $value['img_url'] = ''; } else { $value['img_url'] = $value['img'] ? build_qiniu_image_url($value['img']) : ''; - $value['video_file_url'] = $value['video_url'] = $value['video_cover'] = ''; + $value['video_file_url'] = $value['video_url'] = $value['video_cover'] = $value['width'] = $value['height'] = ''; } } else if ($re['type'] == 2 || $re['type'] == 4) { $value['img_url'] = $value['img'] ? build_qiniu_image_url($value['img']) : ''; @@ -242,6 +242,9 @@ class Template extends HD_Controller if ($value['video_type'] == 1) { $value['video'] = $value['video_file_url']; unset($value['img']); + } else { + unset($value['width']); + unset($value['height']); } unset($value['video_file_url']); unset($value['video_url']); @@ -299,6 +302,9 @@ class Template extends HD_Controller if ($value['video_type'] == 1) { $value['video'] = $value['video_file_url']; unset($value['img']); + } else { + unset($value['width']); + unset($value['height']); } unset($value['video_file_url']); unset($value['video_url']); diff --git a/admin/views/app/material/template/edit.php b/admin/views/app/material/template/edit.php index 33ae02f4..0748fc55 100644 --- a/admin/views/app/material/template/edit.php +++ b/admin/views/app/material/template/edit.php @@ -195,7 +195,18 @@ -