Browse Source

视频列表

liuzejian 2 years ago
parent
commit
e7caf84feb

+ 4 - 1
modules/Video/Http/Controllers/VideoController.php

@@ -41,12 +41,15 @@ class VideoController extends CatchController
                 return $query->where('category_id', $categoryId);
                 return $query->where('category_id', $categoryId);
             })->orderBy('id', 'desc')
             })->orderBy('id', 'desc')
             ->paginate($request->integer('per_page', 15));
             ->paginate($request->integer('per_page', 15));
-        $userContext = $this->getUserContext($request->input('operateUserIdßßß'));
+        $userContext = $this->getUserContext($request->input('operateUserId'));
         $allVideoCategory =  DB::table('video_category')
         $allVideoCategory =  DB::table('video_category')
             ->get()->keyBy('id');
             ->get()->keyBy('id');
         foreach ($videos as $video) {
         foreach ($videos as $video) {
             $this->updateVideoInfo($video, $userContext);
             $this->updateVideoInfo($video, $userContext);
             $video->category_str = $this->getCategoryStr($allVideoCategory, $video->category_id);
             $video->category_str = $this->getCategoryStr($allVideoCategory, $video->category_id);
+            $video->shelf_type_str = $video->shelf_type == 1 ? '未上架':'上架';
+            $video->update_type_str = $video->update_type == 1 ? '连载中' : '完结';
+            $video->cp_share_type_str = ([1 => '分成', 2=>'保底', 3=>'买断'])[$video->cp_share_type] ?? '';
         }
         }
 
 
         return $videos;
         return $videos;

+ 2 - 2
tests/Video/Http/Controllers/VideoControllerTest.php

@@ -64,8 +64,8 @@ class VideoControllerTest extends UsedTestCase
 //        'categoryId' => 4,
 //        'categoryId' => 4,
             'operateUserId' =>10
             'operateUserId' =>10
         ]);
         ]);
-        $this->dumpJson($res);
-//        $res->dump();
+//        $this->dumpJson($res);
+        $res->dump();
     }
     }
 
 
     public function testsetChargeConfig() {
     public function testsetChargeConfig() {