diff --git a/app/Http/Controllers/Group/GroupsController.php b/app/Http/Controllers/Group/GroupsController.php index b3d46fc..598bd01 100644 --- a/app/Http/Controllers/Group/GroupsController.php +++ b/app/Http/Controllers/Group/GroupsController.php @@ -32,7 +32,7 @@ class GroupsController extends Controller ->filter() ->paginate($request->get('per_page')); foreach ($groups as &$group) { - $group['children'] = Groups::query()->with(['shop:id,name'])->where('parent_id', $group->id)->get(); + $group['children'] = Groups::query()->with(['shop:id,name'])->where('parent_id', $group->id)->get(); } return GroupsResource::collection($groups); diff --git a/app/Imports/InventoryImport.php b/app/Imports/InventoryImport.php index c43bd58..a1c99e2 100644 --- a/app/Imports/InventoryImport.php +++ b/app/Imports/InventoryImport.php @@ -52,6 +52,7 @@ class InventoryImport implements ToCollection, SkipsEmptyRows if ('下架' === $goodsSku->status) { $goodsSku->status = 1; } + $goodsSku->cost = $row[8]; $goodsSku->save(); event(new StockUpdateEvent($goodsSku)); $updateIds[] = $goodsSku->id; diff --git a/resources/frontend/src/views/group/addGroup.vue b/resources/frontend/src/views/group/addGroup.vue index ed01c1a..1f01a9b 100644 --- a/resources/frontend/src/views/group/addGroup.vue +++ b/resources/frontend/src/views/group/addGroup.vue @@ -134,7 +134,7 @@ - +