From 1a3bd12ee25d1854b5b4d0bc6f08147e3ae6b58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E4=B8=96=E7=95=8C?= <642747453@qq.com> Date: Tue, 25 Apr 2023 18:11:55 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20#10000=20=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Http/Controllers/Goods/GoodsCombinationController.php | 2 +- public/dist/css/chunk-2225440f.839b850a.css | 1 + public/dist/css/chunk-300db14a.2653662c.css | 1 - public/dist/index.html | 2 +- public/dist/js/{app.7135d5e1.js => app.ccd3e7a6.js} | 4 ++-- public/dist/js/{app.7135d5e1.js.map => app.ccd3e7a6.js.map} | 2 +- public/dist/js/chunk-2225440f.1c72527f.js | 2 ++ public/dist/js/chunk-2225440f.1c72527f.js.map | 1 + public/dist/js/chunk-300db14a.84662a69.js | 2 -- public/dist/js/chunk-300db14a.84662a69.js.map | 1 - resources/frontend/src/views/goods/combination.vue | 4 +++- 11 files changed, 12 insertions(+), 10 deletions(-) create mode 100644 public/dist/css/chunk-2225440f.839b850a.css delete mode 100644 public/dist/css/chunk-300db14a.2653662c.css rename public/dist/js/{app.7135d5e1.js => app.ccd3e7a6.js} (83%) rename public/dist/js/{app.7135d5e1.js.map => app.ccd3e7a6.js.map} (98%) create mode 100644 public/dist/js/chunk-2225440f.1c72527f.js create mode 100644 public/dist/js/chunk-2225440f.1c72527f.js.map delete mode 100644 public/dist/js/chunk-300db14a.84662a69.js delete mode 100644 public/dist/js/chunk-300db14a.84662a69.js.map diff --git a/app/Http/Controllers/Goods/GoodsCombinationController.php b/app/Http/Controllers/Goods/GoodsCombinationController.php index 1e1d91c..819a5a0 100644 --- a/app/Http/Controllers/Goods/GoodsCombinationController.php +++ b/app/Http/Controllers/Goods/GoodsCombinationController.php @@ -37,7 +37,7 @@ class GoodsCombinationController extends Controller 'cost' => 0, 'external_sku_id' => $combinationItem['goodsSkuItem']['external_sku_id'], 'goods_id' => $combinationItem['goodsSkuItem']['goods_id'], - 'id' => $combinationItem['item_id'], + 'id' => $combinationItem['id'], 'is_combination' => 0, 'num' => $combinationItem['item_num'], 'reference_price' => $combinationItem['goodsSkuItem']['reference_price'], diff --git a/public/dist/css/chunk-2225440f.839b850a.css b/public/dist/css/chunk-2225440f.839b850a.css new file mode 100644 index 0000000..505feb0 --- /dev/null +++ b/public/dist/css/chunk-2225440f.839b850a.css @@ -0,0 +1 @@ +.table[data-v-78ea60ca]{margin-top:20px;position:relative}.btn[data-v-78ea60ca]{float:right}[data-v-78ea60ca] .cell{display:flex;align-items:center}.commodityimg[data-v-78ea60ca]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-78ea60ca]{width:100%;height:100%}[data-v-78ea60ca] .btn11{padding:0;width:14px;height:14px}[data-v-78ea60ca] .btn11 img{width:100%;height:100%}.page[data-v-78ea60ca]{margin-top:20px} \ No newline at end of file diff --git a/public/dist/css/chunk-300db14a.2653662c.css b/public/dist/css/chunk-300db14a.2653662c.css deleted file mode 100644 index 1bbb13b..0000000 --- a/public/dist/css/chunk-300db14a.2653662c.css +++ /dev/null @@ -1 +0,0 @@ -.table[data-v-1ad624b7]{margin-top:20px;position:relative}.btn[data-v-1ad624b7]{float:right}[data-v-1ad624b7] .cell{display:flex;align-items:center}.commodityimg[data-v-1ad624b7]{width:59px;height:59px;background:hsla(0,0%,89%,.39);opacity:1;display:block;margin-right:12px}.Img[data-v-1ad624b7]{width:100%;height:100%}[data-v-1ad624b7] .btn11{padding:0;width:14px;height:14px}[data-v-1ad624b7] .btn11 img{width:100%;height:100%}.page[data-v-1ad624b7]{margin-top:20px} \ No newline at end of file diff --git a/public/dist/index.html b/public/dist/index.html index 2907317..19e55de 100644 --- a/public/dist/index.html +++ b/public/dist/index.html @@ -1 +1 @@ -
{{ scope.row.title }}
\n{{ scope.row.external_sku_id }}
\n{{ scope.row.updated_at }}
\n{{ scope.row.title }}
\n{{ scope.row.external_sku_id }}
\n{{ scope.row.updated_at }}
\n