From 68fd6a922f8ebc64300e6dd4a0f56c198da7b218 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com>
Date: Thu, 27 Oct 2022 16:35:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20#10000=20=E5=B1=95=E7=A4=BA=E9=94=99?=
=?UTF-8?q?=E8=AF=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/Http/Controllers/Group/GroupsController.php | 2 +-
app/Imports/InventoryImport.php | 1 +
resources/frontend/src/views/group/addGroup.vue | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
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 @@
-
+