Merge branch 'refs/heads/master' into stable

app/Admin/Controllers/SiteAlbumController.php

@@ -348,6 +348,7 @@ JS
                     $imgArray = "";
                     if ($videos) {
                         $videos = json_decode($videos,true);
+                        $videos = CommonHelper::orderByAlbumVideo($videos);
                         foreach ($videos as $key => $value) {
                             if ($value['cover'] && $key == $count-1) {
                                 $imgArray = [$value['cover']];
@@ -381,17 +382,7 @@ JS
                 })->useTable()
                     ->customFormat(function ($data) {
                         $arr =  json_decode($data,true);
-                        foreach ($arr as $key => $value) {
-                            if (isset($arr[$key]['order']) == false) {
-                                $arr[$key]['order'] = 0;
-                            }
-                        }
-                        // 按 order 字段对数组进行排序
-                        usort($arr, function($a, $b) {
-                            #return $a['order'] <=> $b['order']; // 升序排序
-                            // 如需降序排序：return $b['order'] <=> $a['order'];
-                            return $b['order'] <=> $a['order'];
-                        });
+                        $arr = CommonHelper::orderByAlbumVideo($arr);
                         return $arr;
                     })
                     ->setView('admin.form_custom.hasmanytable')

app/Libraries/CommonHelper.php

@@ -150,5 +150,21 @@ JS
 
     }
 
+    public static function orderByAlbumVideo($arr)
+    {
+        foreach ($arr as $key => $value) {
+            if (isset($arr[$key]['order']) == false) {
+                $arr[$key]['order'] = 0;
+            }
+        }
+        // 按 order 字段对数组进行排序
+        usort($arr, function($a, $b) {
+            #return $a['order'] <=> $b['order']; // 升序排序
+            // 如需降序排序：return $b['order'] <=> $a['order'];
+            return $b['order'] <=> $a['order'];
+        });
+        return $arr;
+    }
+
 }