1

app/Http/Controllers/V1/UserFolderController.php

@@ -55,7 +55,18 @@ class UserFolderController extends Controller
     public function folderList(Request $request){
 
         $type = $request->get('type',1);
-        $list = UserFolder::query()->withCount('images')->where('type',$type)->where('user_id','=',$this->userId)->get();
+
+        $sort = $request->get('sort');
+        $query = UserFolder::query();
+        if($sort == "time"){
+            $query->orderByDesc("created_at");
+        }elseif ($sort == "letter"){
+            $query->orderByRaw("CONVERT(`name` USING gbk) COLLATE gbk_chinese_ci");
+        }
+        $list = $query->withCount('images')
+            ->where('type',$type)
+            ->where('user_id','=',$this->userId)
+            ->get();
         return $this->success($list);
     }