Forráskód Böngészése

feat: 优化小程序

xiansin 2 éve
szülő
commit
acba6e8041

+ 3 - 3
mini/pages/index/rank.vue

xqd xqd
@@ -19,7 +19,7 @@ export default {
   components: { Episode },
   data() {
     return {
-      limit: 30,
+      limit: 12,
       page: 1,
       isMore: true,
       episodes: []
@@ -44,8 +44,8 @@ export default {
   },
   onReachBottom(e) {
     if (!this.isMore) return
-    this.page += 1
-    this.getRank()
+    // this.page += 1
+    // this.getRank()
   }
 }
 </script>

+ 1 - 6
mini/utils/index.js

xqd
@@ -51,15 +51,10 @@ const tranNumber = (num, point = 2) => {
   if (numStr.length < 5) {
     return numStr;
   }
-  //大于6位数是百万
-  else if (numStr.length > 6) {
-    let decimal = numStr.substring(numStr.length - 5, numStr.length - 5 + point);
-    return parseFloat(parseInt(num / 100000) + '.' + decimal) + 'M';
-  }
   //大于5位数是万 (以1W分割 1W以下全部显示)
   else if (numStr.length > 4) {
     let decimal = numStr.substring(numStr.length - 4, numStr.length - 4 + point)
-    return parseFloat(parseInt(num / 1000) + '.' + decimal) + 'K';
+    return parseFloat(parseInt(num / 10000) + '.' + decimal) + '万';
   }
 }
 

+ 2 - 2
server/app/Http/Controllers/V1/EpisodeController.php

xqd
@@ -215,8 +215,8 @@ class EpisodeController extends Controller
 
             /* @var Episode $episode*/
             foreach ($episodes as $episode){
-                $count = $episode->withCount('lists')->first()->toArray();
-                $episode->total = $count['lists_count'];
+                $count = EpisodesList::where('episodes_id',$episode->id)->count();
+                $episode->total = $count;
                 $episode->status_text = $episode->status;
             }
             $item->episodes = $episodes;

+ 3 - 2
server/app/Http/Controllers/V1/User/CollectController.php

xqd xqd
@@ -2,6 +2,7 @@
 namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\V1\Controller;
+use App\Models\EpisodesList;
 use App\Models\UserCollect;
 use App\Models\UserConsumeRecord;
 use App\Models\UserEpisodesRecord;
@@ -29,8 +30,8 @@ class CollectController extends Controller
             ->get();
 
         foreach ($lists as $list){
-            $count = $list->episode->withCount('lists')->first()->toArray();
-            $list->episode->total = $count['lists_count'];
+            $count = EpisodesList::where('episodes_id',$list->episode->id)->count();
+            $list->episode->total = $count;
             $list->episode->status_text = $list->episode->status;
         }
 

+ 3 - 2
server/app/Http/Controllers/V1/User/ConsumeController.php

xqd xqd
@@ -2,6 +2,7 @@
 namespace App\Http\Controllers\V1\User;
 
 use App\Http\Controllers\V1\Controller;
+use App\Models\EpisodesList;
 use App\Models\UserConsumeRecord;
 use App\Models\UserEpisodesRecord;
 use App\Models\UserWatchRecord;
@@ -31,8 +32,8 @@ class ConsumeController extends Controller
 
         foreach ($lists as $list){
             if($list->detail && $list->detail->episodes_id){
-                $count = $list->detail->episode->withCount('lists')->first()->toArray();
-                $list->detail->episode->total = $count['lists_count'];
+                $count = EpisodesList::where('episodes_id',$list->detail->episode->id)->count();
+                $list->detail->episode->total = $count;
                 $list->detail->episode->status_text = $list->detail->episode->status;
             }else{
                 $list->detail->episode->total = 0;

+ 2 - 2
server/app/Http/Controllers/V1/User/WatchRecordsController.php

xqd
@@ -27,8 +27,8 @@ class WatchRecordsController extends Controller
             ->get();
 
         foreach ($lists as $list){
-            $count = $list->detail->episode->withCount('lists')->first()->toArray();
-            $list->detail->episode->total = $count['lists_count'];
+            $count = EpisodesList::where('episodes_id',$list->detail->episode->id)->count();
+            $list->detail->episode->total = $count;
             $list->detail->episode->status_text = $list->detail->episode->status;
         }