Merge branch 'dev_wf' of wufeng/fuse into version1.5

app/admin/logic/VideoGroupLogic.php

@@ -152,7 +152,7 @@ class VideoGroupLogic extends BaseLogic
             foreach ($data['video_list'] as $item) {
                 if (isset($item['id']) && $item['id'] != 0) {
                     if ($item['is_del'] == CommonModel::$del_deleted) $del[] = $item['id'];
-                    else Db::name('video_group_item')->where('is_del', CommonModel::$del_normal)->where('id', $item['id'])->save($item);
+                    else Db::name('video_group_item')->where('is_del', CommonModel::$del_normal)->where('id', $item['id'])->save(array_merge($item, ['updatetime' => $date]));
                 } else $ins[] = [
                     'video_group_id' => $data['id'],
                     'video_id' => $item['video_id'],
@@ -208,7 +208,7 @@ class VideoGroupLogic extends BaseLogic
                 'updatetime' => date('Y-m-d H:i:s'),
             ]);
 
-        return $res ? json_show(CommonModel::$success, '删除成功') : json_show(CommonModel::$success, '删除失败');
+        return $res ? json_show(CommonModel::$success, '删除成功') : json_show(CommonModel::$error_param, '删除失败');
 
     }