|
@@ -56,6 +56,7 @@ class Soldier extends MobileBaseController
|
|
foreach ($list as $v) {
|
|
foreach ($list as $v) {
|
|
$video_list = SoldierVideoModel::where('series_id', $v['id'])
|
|
$video_list = SoldierVideoModel::where('series_id', $v['id'])
|
|
->where('status', SoldierVideoModel::STATUS_SHOW)
|
|
->where('status', SoldierVideoModel::STATUS_SHOW)
|
|
|
|
+ ->append(['is_must_text'])
|
|
->limit(3)
|
|
->limit(3)
|
|
->order('priority desc')
|
|
->order('priority desc')
|
|
->select();
|
|
->select();
|
|
@@ -98,6 +99,7 @@ class Soldier extends MobileBaseController
|
|
$list = SoldierVideoModel::where('series_id', $id)
|
|
$list = SoldierVideoModel::where('series_id', $id)
|
|
->where('status', SoldierVideoModel::STATUS_SHOW)
|
|
->where('status', SoldierVideoModel::STATUS_SHOW)
|
|
->order(['priority' => 'desc'])
|
|
->order(['priority' => 'desc'])
|
|
|
|
+ ->append(['is_must_text'])
|
|
->limit(input('limit', 10))
|
|
->limit(input('limit', 10))
|
|
->page(input('page', 1))
|
|
->page(input('page', 1))
|
|
->select();
|
|
->select();
|
|
@@ -125,7 +127,7 @@ class Soldier extends MobileBaseController
|
|
empty($id) && jump('参数错误');
|
|
empty($id) && jump('参数错误');
|
|
|
|
|
|
//视频信息
|
|
//视频信息
|
|
- $video = SoldierVideoModel::find($id);
|
|
|
|
|
|
+ $video = SoldierVideoModel::where('id',$id)->append(['is_must_text'])->find();
|
|
$watch_status = SoldierVideoWatchModel::where('user_id', $soldier['id'])
|
|
$watch_status = SoldierVideoWatchModel::where('user_id', $soldier['id'])
|
|
->where('video_id', $id)
|
|
->where('video_id', $id)
|
|
->value('status');
|
|
->value('status');
|
|
@@ -145,6 +147,7 @@ class Soldier extends MobileBaseController
|
|
$video_list = SoldierVideoModel::where('series_id', $video['series_id'])
|
|
$video_list = SoldierVideoModel::where('series_id', $video['series_id'])
|
|
->where('priority', '<', $video['priority'])
|
|
->where('priority', '<', $video['priority'])
|
|
->order(['priority' => 'desc'])
|
|
->order(['priority' => 'desc'])
|
|
|
|
+ ->append(['is_must_text'])
|
|
->limit(5)
|
|
->limit(5)
|
|
->select();
|
|
->select();
|
|
$video_ids = $video_list->column('id');
|
|
$video_ids = $video_list->column('id');
|