Merge branch 'master' of https://git.yunzer.cn/yunzerwebsite/yunzer

app/admin/controller/ResourcesController.php

@@ -139,25 +139,20 @@ class ResourcesController extends BaseController
                 $this->error('添加失败');
             }
             Log::record('添加资源', 1, '', '资源管理');
-            return View::fetch('lists');
-        }
-
-        try {
-            // 获取资源列表
-            $lists = Resource::where('delete_time', null)
-                ->where('status', '<>', 3)
+            return json(['code' => 0, 'msg' => '添加成功', 'data' => []]);
+        } else {
+            // 获取所有分类
+            $allCategories = ResourceCategory::where('delete_time', null)
+                ->where('status', 1)
+                ->field('id, name, cid, icon, number')
+                ->order('sort asc, id asc')
                 ->select()
                 ->toArray();
 
-            // 确保变量存在且不为空
-            if (!isset($lists) || empty($lists)) {
-                $lists = [];
-            }
+            $categories = $this->buildParentChild($allCategories);
 
-            // 传递数据到视图
             View::assign([
-                'lists' => $lists,
-                'categories' => [] // 添加空的分类数组
+                'categories' => $categories
             ]);
 
             return View::fetch();