退役军人

app/mobile/controller/Soldier.php

@@ -143,9 +143,8 @@ class Soldier extends MobileBaseController
 
         //相关视频
         $video_list = SoldierVideoModel::where('series_id', $video['series_id'])
-            ->where(function ($query) use ($video) {
-                $query->where('id', '>', $video['id'])->whereOr('priority', '<', $video['priority']);
-            })->order(['priority' => 'desc'])
+            ->where('priority', '<', $video['priority'])
+            ->order(['priority' => 'desc'])
             ->limit(5)
             ->select();
         $video_ids  = $video_list->column('id');

app/mobile/view/soldier/series.html

@@ -98,7 +98,7 @@
         };
 
         base.onBack = () => {
-            history.back();
+            location.href = "{:url('soldier/index')}";
         };
 
 

app/mobile/view/soldier/video.html

@@ -98,7 +98,7 @@
         };
 
         base.onBack = () => {
-            history.back();
+            location.href = "{:url('soldier/series')}?id={$video.series_id}";
         };
 
         Vue.onMounted(() => {