diff --git a/src/Form/Goods/ImportForm.php b/src/Form/Goods/ImportForm.php
index e937342..633b9d0 100644
--- a/src/Form/Goods/ImportForm.php
+++ b/src/Form/Goods/ImportForm.php
@@ -59,7 +59,14 @@ class ImportForm extends Form
             if (!$category) {
                 throw new \Exception('分类必填');
             }
-            $category = GoodsCategory::firstOrCreate(['name' => $category]);
+            // 分类: 电脑-电脑整机-笔记本
+            $exts = explode('-', $category);
+            $category = null;
+            $level = 1;
+            foreach($exts as $item) {
+                $category = GoodsCategory::firstOrCreate(['name' => $item, 'parent_id' => $category ? $category->id : 0, 'level' => $level]);
+                $level++;
+            }
             if ($brand) {
                 $brand = GoodsBrand::firstOrCreate(['name' => $brand]);
             }
@@ -115,7 +122,7 @@ class ImportForm extends Form
         return $attr;
     }
 
-    protected function parseFile($path = null)
+    protected function parseFile($path = null, $disk = 'public')
     {
         if (!$path) {
             return null;
@@ -123,9 +130,9 @@ class ImportForm extends Form
         if (Str::startsWith($path, ['http://', 'https://'])) {
             return $path;
         }
-        $disk = Storage::disk('public');
+        $storage = Storage::disk($disk);
 
-        return $disk->url($path);
+        return $storage->url($path);
     }
 
     protected function parseFiles($paths = null)
diff --git a/src/Http/Admin/GoodsController.php b/src/Http/Admin/GoodsController.php
index c0307ca..a69ec33 100644
--- a/src/Http/Admin/GoodsController.php
+++ b/src/Http/Admin/GoodsController.php
@@ -104,7 +104,7 @@ class GoodsController extends AdminController
             $grid->selector(function (Selector $selector) {
                 $brands = GoodsBrand::get();
                 $types = GoodsType::get();
-                $categories = GoodsCategory::where('level', 3)->where('path', 'like', '-1-%')->get();
+                $categories = GoodsCategory::where('level', 3)->get();
                 $prices = ['0-999', '1000-1999', '2000-4999', '5000+'];
                 $selector->selectOne('category_id', __('dcat-admin-goods::goods.fields.category_id'), $categories->pluck('name', 'id'));
                 $selector->selectOne('brand_id', __('dcat-admin-goods::goods.fields.brand_id'), $brands->pluck('name', 'id'));