diff --git a/app/Admin/Controllers/Store/ProductController.php b/app/Admin/Controllers/Store/ProductController.php index 412206d9..f6686119 100644 --- a/app/Admin/Controllers/Store/ProductController.php +++ b/app/Admin/Controllers/Store/ProductController.php @@ -59,7 +59,7 @@ class ProductController extends AdminController $grid->column('productSku.sell_price', '销售价')->display(function ($value) { return bcdiv($value, 100, 2);; }); - $grid->column('amount', '库存')->sortable(); + $grid->column('amount', '库存')->editable(); $grid->column('status', '状态')->switch(); $grid->paginate(10); @@ -120,6 +120,7 @@ class ProductController extends AdminController $form->select('product_sku_id')->options(ProductSku::class)->ajax('api/product-skus'); $form->hidden('product_spu_id'); $form->switch('status', '状态')->default(1); + $form->number('amount'); $form->saving(function (Form $form) { if ($form->isCreating()) { $store_id = $form->input('store_id'); diff --git a/app/Admin/Forms/Store/ExportGoodsForm.php b/app/Admin/Forms/Store/ExportGoodsForm.php index 76733700..a2e968e1 100644 --- a/app/Admin/Forms/Store/ExportGoodsForm.php +++ b/app/Admin/Forms/Store/ExportGoodsForm.php @@ -36,6 +36,7 @@ class ExportGoodsForm extends Form ProductSku::create([ 'store_id' => $store->id, 'product_sku_id' => $sku->id, + 'product_spu_id' => $sku->spu_id, 'status' => 1, 'amount' => $amount, ]); diff --git a/app/Admin/Imports/StoreProduct.php b/app/Admin/Imports/StoreProduct.php index 09902257..bbf34555 100644 --- a/app/Admin/Imports/StoreProduct.php +++ b/app/Admin/Imports/StoreProduct.php @@ -110,7 +110,7 @@ class StoreProduct if ($rowAttrs) { $format_specs = $this->formatAttr($rowAttrs); $format_attrs = $this->formatAttr($rowSpecs); - $spec_group = $this->getSpec($cells[0], $rowAttrs, $rowSpecs); + $spec_group = $this->getSpec($goodsName, $rowAttrs, $rowSpecs); $attrs = []; foreach($spec_group->attrs as $index => $item) { diff --git a/app/Endpoint/Api/Http/Controllers/ArticleController.php b/app/Endpoint/Api/Http/Controllers/ArticleController.php index 8740ba60..902f071e 100644 --- a/app/Endpoint/Api/Http/Controllers/ArticleController.php +++ b/app/Endpoint/Api/Http/Controllers/ArticleController.php @@ -80,9 +80,11 @@ class ArticleController extends Controller */ public function show($id, Request $request) { - $article = Article::with(['likesInfo'=>function ($q) use ($request) { - return $q->where('user_id', $request->user()->id); - }])->where('is_show', 1)->findOrFail($id); + $article = Article::with([ + 'likesInfo' => function ($q) use ($request) { + return $q->where('user_id', $request->user()?->id); + } + ])->where('is_show', 1)->findOrFail($id); return ArticleResource::make($article); }