linwu hace 9 meses
padre
commit
888f19bf29

+ 4 - 1
app/mobile/controller/Soldier.php

@@ -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');

+ 1 - 1
app/mobile/view/soldier/index.html

@@ -49,7 +49,7 @@
                             ></van-image>
                             ></van-image>
                         </section>
                         </section>
                         <section class="s-left image">
                         <section class="s-left image">
-                            <div class="s-title">{{video.title}}</div>
+                            <div class="s-title">{{video.title}}【{{video.is_must_text}}】</div>
                             <div class="s-time" :class="'s-color'+video.watch_status">{{video.watch_text}}</div>
                             <div class="s-time" :class="'s-color'+video.watch_status">{{video.watch_text}}</div>
                         </section>
                         </section>
                     </article>
                     </article>

+ 1 - 1
app/mobile/view/soldier/series.html

@@ -46,7 +46,7 @@
                     ></van-image>
                     ></van-image>
                 </section>
                 </section>
                 <section class="s-left image">
                 <section class="s-left image">
-                    <div class="s-title">{{video.title}}</div>
+                    <div class="s-title">{{video.title}}【{{video.is_must_text}}】</div>
                     <div class="s-time" :class="'s-color'+video.watch_status">{{video.watch_text}}</div>
                     <div class="s-time" :class="'s-color'+video.watch_status">{{video.watch_text}}</div>
                 </section>
                 </section>
             </article>
             </article>

+ 8 - 5
app/mobile/view/soldier/video.html

@@ -13,9 +13,9 @@
     .lw-list article .s-left .s-color2{color:var(--red);}
     .lw-list article .s-left .s-color2{color:var(--red);}
     .lw-list article .s-right {width:110px;}
     .lw-list article .s-right {width:110px;}
 
 
-    .s-status {font-size: 14px;color:#999;margin-top:auto;text-align:right;padding-right:20px;}
-    .s-status.s-color3{color:var(--blue);}
-    .s-status.s-color2{color:var(--red);}
+    .s-status {font-size: 14px;margin-top:auto;text-align:right;padding:0 20px;display:flex;justify-content:space-between;color:#666;}
+    .s-status .s-color3{color:var(--blue);}
+    .s-status .s-color2{color:var(--red);}
 
 
     .lw-header {background:white;padding:5px 10px;}
     .lw-header {background:white;padding:5px 10px;}
 </style>
 </style>
@@ -33,7 +33,10 @@
     </template>
     </template>
 </van-nav-bar>
 </van-nav-bar>
 <h3 style="text-align:center;">{$video.title}</h3>
 <h3 style="text-align:center;">{$video.title}</h3>
-<div class="s-status" :class="'s-color'+video.watch_status">{{video.watch_text}}</div>
+<div class="s-status">
+    <span>{{video.is_must_text}}</span>
+    <span :class="'s-color'+video.watch_status">{{video.watch_text}}</span>
+</div>
 <video src="{$video.video}"
 <video src="{$video.video}"
        style="width:100%;margin:20px auto;"
        style="width:100%;margin:20px auto;"
        id="myVideo"
        id="myVideo"
@@ -53,7 +56,7 @@
             ></van-image>
             ></van-image>
         </section>
         </section>
         <section class="s-left image">
         <section class="s-left image">
-            <div class="s-title">{{video.title}}</div>
+            <div class="s-title">{{video.title}}【{{video.is_must_text}}】</div>
             <div class="s-time" :class="'s-color'+video.watch_status">{{video.watch_text}}</div>
             <div class="s-time" :class="'s-color'+video.watch_status">{{video.watch_text}}</div>
         </section>
         </section>
     </article>
     </article>