diff --git a/public/mycms/admin/js/shop.goods.js b/public/mycms/admin/js/shop.goods.js
index 2e9568b9..2a26a678 100644
--- a/public/mycms/admin/js/shop.goods.js
+++ b/public/mycms/admin/js/shop.goods.js
@@ -10,6 +10,7 @@ define(["jquery", "easy-admin"], function ($, ea) {
};
return {
+ specs: [],
index: function () {
ea.table.render({
@@ -39,10 +40,146 @@ define(["jquery", "easy-admin"], function ($, ea) {
ea.listen();
},
create: function () {
+
+ this.spec();
ea.listen();
},
edit: function () {
+
+ this.spec();
ea.listen();
},
+ spec: function () {
+
+ var that = this;
+
+ $('#add-spec-button').click(
+ function () {
+ var html = $('#spec-tpl').html();
+ $('#spec-button').before(html);
+
+ that.specJs();
+ }
+ );
+
+ this.specJs();
+
+ }, specJs: function () {
+
+ var that = this;
+
+ $('#make-spec-button').blur(function () {
+ that.specAction();
+ });
+
+ $('.delete-spec-item').click(function () {
+
+ $(this).parents(".layui-card").remove();
+ });
+ },
+ specAction: function () {
+
+ this.specs = [];
+ var items = [];
+ var values = [];
+
+ var tableEle = $('#spec-table');
+
+ $('.spec-item').each(function (index, item) {
+ if ($(item).val() && $('.spec-val').eq(index).val()) {
+ items.push($(item).val());
+ values.push($('.spec-val').eq(index).val().split("\n"));
+ }
+ });
+
+ var html = '';
+ var thead = ['商品规格', '图片', '库存', '销售价', '市场价'];
+
+ if (items.length > 0) {
+
+ html += '
';
+ for (var i in thead) {
+ html += i == 0 ? '| ' + thead[i] + ' | ' : '' + thead[i] + ' | ';
+ }
+ html += '
';
+
+ html += '
';
+ for (var i in items) {
+ html += '| ' + items[i] + ' | '
+ }
+ html += '
';
+
+
+ html += this.specTableHtml(values);
+
+
+ tableEle.html(html);
+ tableEle.show();
+
+ ea.api.upload();
+ }
+ }, specArray: function (index, subContext, values) {
+
+ let stringList = values[index];
+
+ for (let i in stringList) {
+
+ let e = stringList[i];
+
+ if (index !== 0) {
+ e = subContext + "!+!" + e;
+ }
+
+ if (values.length === 1) {
+ this.specs.push(e);
+ } else {
+ if (index === (values.length - 1) && index !== 0) {
+ this.specs.push(e);
+ } else {
+ this.specArray(index + 1, e, values);
+ }
+ }
+
+ }
+ }, specTableHtml: function (values) {
+
+ var html = '';
+
+ this.specArray(0, '', values);
+
+ if (this.specs.length > 0) {
+
+ for (var ii in this.specs) {
+
+ var item = specArray[ii];
+ var array = this.specs[ii].split("!+!");
+
+ html += '
';
+
+ for (var iii in array) {
+
+ html += '| ' + array[iii] + ' | ';
+ }
+
+ html += ' | ';
+
+ html += ' | ';
+
+ html += ' | ';
+
+ html += ' | ';
+
+ html += '
';
+ }
+ }
+
+ return html;
+ }
};
});
--
Gitee
From 4dcc5a9bd2152e54f223c0728a57af41187e4ac3 Mon Sep 17 00:00:00 2001
From: zhangbang <386654667@qq.com>
Date: Tue, 30 Aug 2022 22:08:09 +0800
Subject: [PATCH 13/47] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=BE=85=E5=8A=A9=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Modules/System/Service/SystemService.php | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/Modules/System/Service/SystemService.php b/Modules/System/Service/SystemService.php
index dd14fdf0..6742854e 100644
--- a/Modules/System/Service/SystemService.php
+++ b/Modules/System/Service/SystemService.php
@@ -75,12 +75,17 @@ class SystemService extends MyService
/**
* 获取系统辅助属性
- * @param $type
+ * @param string $type
* @return array
*/
- public function attributes($type): array
+ public function attributes(string $type = ''): array
{
- return Attr::where('type', $type)->get()->toArray();
+ if ($type) {
+
+ return Attr::where('type', $type)->get()->toArray();
+ }
+
+ return Attr::get()->toArray();
}
/**
--
Gitee
From 8b0fd52543ee7ed1e56515ab7c3136bd922675d5 Mon Sep 17 00:00:00 2001
From: zhangbang <386654667@qq.com>
Date: Wed, 31 Aug 2022 17:06:59 +0800
Subject: [PATCH 14/47] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96?=
=?UTF-8?q?=E5=B9=BF=E5=91=8A=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=AD=A3?=
=?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0=E9=BB=98?=
=?UTF-8?q?=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Addons/Ads/Controllers/AdApiController.php | 19 +++++++++++++
Addons/Ads/Providers/RouteProvider.php | 28 +++++++++++++++++++
Addons/Ads/Routes/api.php | 11 ++++++--
.../Api/Http/Controllers/SystemController.php | 4 ++-
app/Helpers/RequestHelpers.php | 2 +-
5 files changed, 59 insertions(+), 5 deletions(-)
create mode 100644 Addons/Ads/Controllers/AdApiController.php
diff --git a/Addons/Ads/Controllers/AdApiController.php b/Addons/Ads/Controllers/AdApiController.php
new file mode 100644
index 00000000..c0ae0e34
--- /dev/null
+++ b/Addons/Ads/Controllers/AdApiController.php
@@ -0,0 +1,19 @@
+success(['result' => ad($ident)]);
+ }
+}
diff --git a/Addons/Ads/Providers/RouteProvider.php b/Addons/Ads/Providers/RouteProvider.php
index a884e95d..1ee5c2e9 100644
--- a/Addons/Ads/Providers/RouteProvider.php
+++ b/Addons/Ads/Providers/RouteProvider.php
@@ -8,6 +8,14 @@ use Illuminate\Support\Facades\Route;
class RouteProvider extends RouteServiceProvider
{
+
+ /**
+ * The addon namespace to assume when generating URLs to actions.
+ *
+ * @var string
+ */
+ protected $moduleNamespace = 'Addons\Ads\Controllers';
+
/**
* Called before routes are registered.
*
@@ -28,6 +36,7 @@ class RouteProvider extends RouteServiceProvider
public function map()
{
$this->mapWebRoutes();
+ $this->mapApiRoutes();
$this->mapForbidRoutes();
}
@@ -44,7 +53,26 @@ class RouteProvider extends RouteServiceProvider
->group(addon_path('Ads', '/Routes/web.php'));
}
+ /**
+ * Define the "api" routes for the application.
+ *
+ * These routes are typically stateless.
+ *
+ * @return void
+ */
+ protected function mapApiRoutes()
+ {
+ Route::prefix('api')
+ ->middleware('api')
+ ->namespace($this->moduleNamespace)
+ ->group(addon_path('Ads', '/Routes/api.php'));
+ }
+
+ /**
+ * 防屏蔽路由
+ * @return void
+ */
protected function mapForbidRoutes()
{
Route::middleware('web')
diff --git a/Addons/Ads/Routes/api.php b/Addons/Ads/Routes/api.php
index 8dd0b71b..a0945759 100644
--- a/Addons/Ads/Routes/api.php
+++ b/Addons/Ads/Routes/api.php
@@ -13,6 +13,11 @@ use Illuminate\Http\Request;
|
*/
-Route::middleware('auth:api')->get('/ads', function (Request $request) {
- return $request->user();
-});
\ No newline at end of file
+Route::prefix('v1')->name('api.v1.')
+ ->group(function () {
+
+ Route::middleware('api.sign')->group(function () {
+
+ Route::post('/ad/{ident}', 'AdApiController@info');
+ });
+ });
diff --git a/Modules/Api/Http/Controllers/SystemController.php b/Modules/Api/Http/Controllers/SystemController.php
index 2124efac..b9662907 100644
--- a/Modules/Api/Http/Controllers/SystemController.php
+++ b/Modules/Api/Http/Controllers/SystemController.php
@@ -36,7 +36,9 @@ class SystemController extends ApiController
*/
public function attrs(): JsonResponse
{
- $attrs = app('system')->attributes();
+ $type = $this->request('type');
+
+ $attrs = app('system')->attributes($type);
return $this->success([
'result' => $this->collectFilterField(
diff --git a/app/Helpers/RequestHelpers.php b/app/Helpers/RequestHelpers.php
index 894b1623..7a2c5ce7 100644
--- a/app/Helpers/RequestHelpers.php
+++ b/app/Helpers/RequestHelpers.php
@@ -17,7 +17,7 @@ trait RequestHelpers
public function request($key, $filter = '', $default = '')
{
$value = $this->filter(request()->input($key), $filter);
- return $value === false ? $default : $value;
+ return $value === false || $value === '' ? $default : $value;
}
/**
--
Gitee
From 54090c84e654e943f718d9ed8c98a399add4be27 Mon Sep 17 00:00:00 2001
From: zhangbang <386654667@qq.com>
Date: Wed, 31 Aug 2022 22:30:29 +0800
Subject: [PATCH 15/47] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E6=8F=92=E4=BB=B6?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=BF=81=E7=A7=BB=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Migrations/2021_09_12_222419_create_my_ads_table.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Addons/Ads/Database/Migrations/2021_09_12_222419_create_my_ads_table.php b/Addons/Ads/Database/Migrations/2021_09_12_222419_create_my_ads_table.php
index ba637541..fabfe497 100644
--- a/Addons/Ads/Database/Migrations/2021_09_12_222419_create_my_ads_table.php
+++ b/Addons/Ads/Database/Migrations/2021_09_12_222419_create_my_ads_table.php
@@ -18,7 +18,7 @@ class CreateMyAdsTable extends Migration
$table->string('code',100)->unique();
$table->string('name');
$table->string('description')->nullable();
- $table->text('content');
+ $table->text('content')->nullable();
$table->timestamps();
$table->engine = 'InnoDB';
});
--
Gitee
From 1327eacbdbf553a0cf351f37e3b7db88d24fe5b9 Mon Sep 17 00:00:00 2001
From: zhangbang <386654667@qq.com>
Date: Thu, 1 Sep 2022 17:31:43 +0800
Subject: [PATCH 16/47] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=86=E7=B1=BB?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=9C=80=E5=A4=A7=E5=B1=82?=
=?UTF-8?q?=E7=BA=A7=E8=BF=94=E5=9B=9E=20=E5=95=86=E5=93=81=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=8B=93=E5=B1=95?=
=?UTF-8?q?=E7=AD=9B=E9=80=89=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Api/Http/Controllers/StoreController.php | 6 +-
Modules/Shop/Service/StoreService.php | 27 +++++++++
bootstrap/function.php | 55 ++++++++++++++-----
3 files changed, 73 insertions(+), 15 deletions(-)
diff --git a/Modules/Api/Http/Controllers/StoreController.php b/Modules/Api/Http/Controllers/StoreController.php
index 7ff3e959..96109e8c 100644
--- a/Modules/Api/Http/Controllers/StoreController.php
+++ b/Modules/Api/Http/Controllers/StoreController.php
@@ -19,7 +19,9 @@ class StoreController extends ApiController
'updated_at'
], true);
- return $this->success(['result' => $categories]);
+ $level = max(array_column(read_tree_recursively($categories), 'level'));
+
+ return $this->success(['result' => $categories, 'level' => $level]);
}
/**
@@ -51,7 +53,7 @@ class StoreController extends ApiController
$params = request()->input('params', '[]');
$result = [];
- $goods = goods($page, $limit, $tag, json_decode($params, true)) ?: [];
+ $goods = goods($page, $limit, $tag, is_array($params) ? $params : json_decode($params, true)) ?: [];
if ($goods) {
diff --git a/Modules/Shop/Service/StoreService.php b/Modules/Shop/Service/StoreService.php
index 3fea1324..82a9091c 100644
--- a/Modules/Shop/Service/StoreService.php
+++ b/Modules/Shop/Service/StoreService.php
@@ -19,6 +19,29 @@ use Modules\Shop\Models\PayLog;
class StoreService extends MyService
{
+ /**
+ * @var array
+ */
+ protected $condition = [];
+
+ /**
+ * 商品拓展过滤条件
+ * @param array $params
+ * @return StoreService
+ */
+ public function filterCondition(array $params = []): StoreService
+ {
+ if (isset($params['minPrice']) && $params['minPrice'] > -1) {
+ $this->condition[] = ['shop_price', '>=', $params['minPrice']];
+ }
+
+ if (isset($params['maxPrice']) && $params['maxPrice'] > -1) {
+ $this->condition[] = ['shop_price', '<', $params['maxPrice']];
+ }
+
+ return $this;
+ }
+
/**
* 分类树形结构数据
* @return array|mixed
@@ -71,6 +94,7 @@ class StoreService extends MyService
{
return Goods::with('category:id,name')
->orderBy($orderBy, $sort)
+ ->where($this->condition)
->paginate($limit, '*', 'page', $page);
}
@@ -89,6 +113,7 @@ class StoreService extends MyService
return Goods::with('category:id,name')
->where('goods_name', 'like', '%' . $keyword . '%')
->orderBy($orderBy, $sort)
+ ->where($this->condition)
->paginate($limit, '*', 'page', $page);
}
@@ -122,6 +147,7 @@ class StoreService extends MyService
return Goods::with('category:id,name')
->orderBy($orderBy, $sort)
->whereIn('category_id', $childIds)
+ ->where($this->condition)
->paginate($limit, '*', 'page', $page);
}
@@ -146,6 +172,7 @@ class StoreService extends MyService
return Goods::with("category:id,name")
->orderBy($orderBy, 'desc')
->whereIn('id', $goodsId)
+ ->where($this->condition)
->paginate($limit, '*', 'page', $page);
}
diff --git a/bootstrap/function.php b/bootstrap/function.php
index a3a5e19b..5701d719 100644
--- a/bootstrap/function.php
+++ b/bootstrap/function.php
@@ -446,7 +446,6 @@ if (!function_exists('get_resource_http_path')) {
}
-
if (!function_exists('create_pay_log')) {
/**
* 创建支付记录
@@ -742,7 +741,6 @@ if (!function_exists('category_hot_articles')) {
}
-
if (!function_exists('tag_articles')) {
/**
@@ -759,7 +757,6 @@ if (!function_exists('tag_articles')) {
}
-
if (!function_exists('search_articles')) {
/**
@@ -958,7 +955,7 @@ if (!function_exists('new_goods')) {
*/
function new_goods($page = 1, $limit = 10, $params = []): LengthAwarePaginator
{
- return app('store')->goodsList($page, $limit);
+ return app('store')->filterCondition($params)->goodsList($page, $limit);
}
}
@@ -974,7 +971,7 @@ if (!function_exists('hot_goods')) {
*/
function hot_goods($page = 1, $limit = 10, $params = []): LengthAwarePaginator
{
- return app('store')->goodsList($page, $limit, 'view');
+ return app('store')->filterCondition($params)->goodsList($page, $limit, 'view');
}
}
@@ -990,7 +987,7 @@ if (!function_exists('search_goods')) {
*/
function search_goods($page = 1, $limit = 10, $params = [])
{
- return app('store')->search($params['search'] ?? '', $page, $limit);
+ return app('store')->filterCondition($params)->search($params['search'] ?? '', $page, $limit);
}
}
@@ -1006,7 +1003,7 @@ if (!function_exists('attr_goods')) {
*/
function attr_goods($page = 1, $limit = 10, $params = [])
{
- return app('store')->goodsForAttr($params['name'] ?? '', $page, $limit);
+ return app('store')->filterCondition($params)->goodsForAttr($params['name'] ?? '', $page, $limit);
}
}
@@ -1022,7 +1019,13 @@ if (!function_exists('store_category_goods')) {
*/
function store_category_goods($page = 1, $limit = 10, $params = []): LengthAwarePaginator
{
- return app('store')->goodsForCategory($params['store_category_id'], $page, $limit);
+ return app('store')->filterCondition($params)->goodsForCategory(
+ $params['store_category_id'],
+ $page,
+ $limit,
+ $params['order'] ?? 'id',
+ $params['sort'] ?? 'desc'
+ );
}
}
@@ -1038,7 +1041,7 @@ if (!function_exists('store_category_hot_goods')) {
*/
function store_category_hot_goods($page = 1, $limit = 10, $params = []): LengthAwarePaginator
{
- return app('store')->goodsForCategory($params['store_category_id'], $page, $limit, 'view');
+ return app('store')->filterCondition($params)->goodsForCategory($params['store_category_id'], $page, $limit, 'view');
}
}
@@ -1056,7 +1059,6 @@ if (!function_exists('store_category')) {
}
-
if (!function_exists('created_at_date')) {
/**
* 格式化日期
@@ -1326,7 +1328,6 @@ if (!function_exists("swoole_reload")) {
}
-
if (!function_exists("order_status_text")) {
/**
@@ -1341,7 +1342,6 @@ if (!function_exists("order_status_text")) {
}
-
if (!function_exists("delivery_status_text")) {
/**
@@ -1405,7 +1405,6 @@ if (!function_exists("pay_type_to_text")) {
}
-
if (!function_exists("order_logistics_detail")) {
/**
@@ -1441,3 +1440,33 @@ if (!function_exists("myRoute")) {
return route($name, $parameters, $absolute);
}
}
+
+if (!function_exists('read_tree_recursively')) {
+
+ /**
+ * 读取树状结构数据
+ * @param $items
+ * @param $parent_id
+ * @param $result
+ * @param $level
+ * @return array|mixed
+ */
+ function read_tree_recursively($items, $parent_id = 0, $result = [], $level = 1)
+ {
+
+ foreach ($items as $child) {
+
+ $result[$child['id']] = [
+ 'id' => $child['id'],
+ 'parent_id' => $parent_id,
+ 'level' => $level
+ ];
+
+ if (!empty($child['child'])) {
+ $result = read_tree_recursively($child['child'], $child['id'], $result, $level + 1);
+ }
+ }
+
+ return $result;
+ }
+}
--
Gitee
From 959583182b021f182caf314037d856077452c443 Mon Sep 17 00:00:00 2001
From: zhangbang <386654667@qq.com>
Date: Thu, 1 Sep 2022 22:24:26 +0800
Subject: [PATCH 17/47] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Modules/Shop/Service/StoreService.php | 5 ++--
bootstrap/function.php | 36 ++++++++++++++++++++-------
2 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/Modules/Shop/Service/StoreService.php b/Modules/Shop/Service/StoreService.php
index 82a9091c..f242f19f 100644
--- a/Modules/Shop/Service/StoreService.php
+++ b/Modules/Shop/Service/StoreService.php
@@ -156,9 +156,10 @@ class StoreService extends MyService
* @param int $page
* @param int $limit
* @param string $orderBy
+ * @param string $sort
* @return bool|LengthAwarePaginator
*/
- public function goodsForAttr($attr, $page = 1, $limit = 10, $orderBy = 'id')
+ public function goodsForAttr($attr, $page = 1, $limit = 10, $orderBy = 'id', $sort = 'desc')
{
$metas = GoodsMeta::where('meta_key', $attr)
->orderBy('goods_id', 'desc')
@@ -170,7 +171,7 @@ class StoreService extends MyService
$goodsId = array_column($metas, 'goods_id');
return Goods::with("category:id,name")
- ->orderBy($orderBy, 'desc')
+ ->orderBy($orderBy, $sort)
->whereIn('id', $goodsId)
->where($this->condition)
->paginate($limit, '*', 'page', $page);
diff --git a/bootstrap/function.php b/bootstrap/function.php
index 5701d719..1a2c5232 100644
--- a/bootstrap/function.php
+++ b/bootstrap/function.php
@@ -987,7 +987,15 @@ if (!function_exists('search_goods')) {
*/
function search_goods($page = 1, $limit = 10, $params = [])
{
- return app('store')->filterCondition($params)->search($params['search'] ?? '', $page, $limit);
+ return app('store')
+ ->filterCondition($params)
+ ->search(
+ $params['search'] ?? '',
+ $page,
+ $limit,
+ $params['order'] ?? 'id',
+ $params['sort'] ?? 'desc'
+ );
}
}
@@ -1003,7 +1011,15 @@ if (!function_exists('attr_goods')) {
*/
function attr_goods($page = 1, $limit = 10, $params = [])
{
- return app('store')->filterCondition($params)->goodsForAttr($params['name'] ?? '', $page, $limit);
+ return app('store')
+ ->filterCondition($params)
+ ->goodsForAttr(
+ $params['name'] ?? '',
+ $page,
+ $limit,
+ $params['order'] ?? 'id',
+ $params['sort'] ?? 'desc'
+ );
}
}
@@ -1019,13 +1035,15 @@ if (!function_exists('store_category_goods')) {
*/
function store_category_goods($page = 1, $limit = 10, $params = []): LengthAwarePaginator
{
- return app('store')->filterCondition($params)->goodsForCategory(
- $params['store_category_id'],
- $page,
- $limit,
- $params['order'] ?? 'id',
- $params['sort'] ?? 'desc'
- );
+ return app('store')
+ ->filterCondition($params)
+ ->goodsForCategory(
+ $params['store_category_id'],
+ $page,
+ $limit,
+ $params['order'] ?? 'id',
+ $params['sort'] ?? 'desc'
+ );
}
}
--
Gitee
From 6bb6b9c8271b341724a5a988c41bb8fc204ad3f4 Mon Sep 17 00:00:00 2001
From: zhangbang <386654667@qq.com>
Date: Fri, 2 Sep 2022 17:22:41 +0800
Subject: [PATCH 18/47] =?UTF-8?q?=E5=95=86=E5=93=81=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Modules/Shop/Service/StoreService.php | 30 +++++++++++++++------------
1 file changed, 17 insertions(+), 13 deletions(-)
diff --git a/Modules/Shop/Service/StoreService.php b/Modules/Shop/Service/StoreService.php
index f242f19f..4154ca68 100644
--- a/Modules/Shop/Service/StoreService.php
+++ b/Modules/Shop/Service/StoreService.php
@@ -82,6 +82,19 @@ class StoreService extends MyService
return GoodsCategory::find($id);
}
+
+ /**
+ * @param $orderBy
+ * @param $sort
+ * @return \Illuminate\Database\Eloquent\Builder
+ */
+ protected function goodsQuery($orderBy, $sort): \Illuminate\Database\Eloquent\Builder
+ {
+ return Goods::with('category:id,name')
+ ->where($this->condition)->orderBy($orderBy, $sort);
+ }
+
+
/**
* 商品列表
* @param $page
@@ -92,10 +105,7 @@ class StoreService extends MyService
*/
public function goodsList($page = 1, $limit = 10, $orderBy = 'id', $sort = 'desc'): LengthAwarePaginator
{
- return Goods::with('category:id,name')
- ->orderBy($orderBy, $sort)
- ->where($this->condition)
- ->paginate($limit, '*', 'page', $page);
+ return $this->goodsQuery($orderBy, $sort)->paginate($limit, '*', 'page', $page);
}
@@ -110,10 +120,8 @@ class StoreService extends MyService
*/
public function search($keyword, $page = 1, $limit = 10, $orderBy = 'id', $sort = 'desc'): LengthAwarePaginator
{
- return Goods::with('category:id,name')
+ return $this->goodsQuery($orderBy, $sort)
->where('goods_name', 'like', '%' . $keyword . '%')
- ->orderBy($orderBy, $sort)
- ->where($this->condition)
->paginate($limit, '*', 'page', $page);
}
@@ -144,10 +152,8 @@ class StoreService extends MyService
{
$childIds = $this->categoryChildIds($categoryId);
- return Goods::with('category:id,name')
- ->orderBy($orderBy, $sort)
+ return $this->goodsQuery($orderBy, $sort)
->whereIn('category_id', $childIds)
- ->where($this->condition)
->paginate($limit, '*', 'page', $page);
}
@@ -170,10 +176,8 @@ class StoreService extends MyService
$goodsId = array_column($metas, 'goods_id');
- return Goods::with("category:id,name")
- ->orderBy($orderBy, $sort)
+ return $this->goodsQuery($orderBy, $sort)
->whereIn('id', $goodsId)
- ->where($this->condition)
->paginate($limit, '*', 'page', $page);
}
--
Gitee
From d8216aef19328d886db3b16c5b818241befa9335 Mon Sep 17 00:00:00 2001
From: zhangbang <386654667@qq.com>
Date: Sat, 3 Sep 2022 23:00:08 +0800
Subject: [PATCH 19/47] =?UTF-8?q?=E5=95=86=E5=93=81=E6=96=B0=E5=A2=9E?=
=?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
...09_03_220234_CreateMyGoodsMoblieImages.php | 33 +++++++++++
.../Controllers/Admin/GoodsController.php | 57 ++++++++++++++++---
.../Shop/Models/GoodsMobileImagesModel.php | 12 ++++
.../views/admin/goods/create.blade.php | 56 +++++++++++++++++-
.../views/admin/goods/edit.blade.php | 55 ++++++++++++++++++
Modules/Shop/Service/StoreService.php | 11 ++++
public/mycms/admin/js/shop.goods.js | 22 +++++++
7 files changed, 236 insertions(+), 10 deletions(-)
create mode 100644 Modules/Shop/Database/Migrations/2022_09_03_220234_CreateMyGoodsMoblieImages.php
create mode 100644 Modules/Shop/Models/GoodsMobileImagesModel.php
diff --git a/Modules/Shop/Database/Migrations/2022_09_03_220234_CreateMyGoodsMoblieImages.php b/Modules/Shop/Database/Migrations/2022_09_03_220234_CreateMyGoodsMoblieImages.php
new file mode 100644
index 00000000..084ebee1
--- /dev/null
+++ b/Modules/Shop/Database/Migrations/2022_09_03_220234_CreateMyGoodsMoblieImages.php
@@ -0,0 +1,33 @@
+id();
+ $table->integer('goods_id')->index();
+ $table->string('path')->default('');
+ $table->engine = 'InnoDB';
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::dropIfExists('my_shop_goods_mobile_images');
+ }
+}
diff --git a/Modules/Shop/Http/Controllers/Admin/GoodsController.php b/Modules/Shop/Http/Controllers/Admin/GoodsController.php
index ef686d37..701d6f56 100644
--- a/Modules/Shop/Http/Controllers/Admin/GoodsController.php
+++ b/Modules/Shop/Http/Controllers/Admin/GoodsController.php
@@ -11,6 +11,7 @@ use Modules\Shop\Models\Goods;
use Modules\Shop\Models\GoodsAlbums;
use Modules\Shop\Models\GoodsCategory;
use Modules\Shop\Models\GoodsMeta;
+use Modules\Shop\Models\GoodsMobileImagesModel;
use Modules\Shop\Models\GoodsSpecItemModel;
use Modules\Shop\Models\GoodsSpecModel;
use Modules\Shop\Models\GoodsSpecValueModel;
@@ -65,9 +66,7 @@ class GoodsController extends MyController
if ($result) {
- $this->updateMeta($goods->id);
- $this->updateAlbums($goods->id);
- $this->updateSpec($goods->id);
+ $this->goodsAction($goods->id);
}
return $this->result($result);
@@ -108,6 +107,8 @@ class GoodsController extends MyController
];
}
+ $mobileImages = app('store')->goodsMobileImages($id);
+
return $this->view('admin.goods.edit',
compact(
'categories',
@@ -115,7 +116,9 @@ class GoodsController extends MyController
'attributes',
'meta',
'specItems',
- 'specArray')
+ 'specArray',
+ 'mobileImages',
+ )
);
}
@@ -133,9 +136,7 @@ class GoodsController extends MyController
if ($result) {
- $this->updateMeta($id);
- $this->updateAlbums($id);
- $this->updateSpec($id);
+ $this->goodsAction($id);
}
return $this->result($result);
@@ -153,6 +154,18 @@ class GoodsController extends MyController
return $this->result($result);
}
+ /**
+ * 商品拓展操作
+ * @param $id
+ * @return void
+ */
+ protected function goodsAction($id)
+ {
+ $this->updateMeta($id);
+ $this->updateAlbums($id);
+ $this->updateSpec($id);
+ $this->updateMobileImages($id);
+ }
/**
* 更新拓展信息
@@ -208,6 +221,34 @@ class GoodsController extends MyController
}
+ /**
+ * 更新商品手机端详情
+ * @param $id
+ * @return void
+ */
+ protected function updateMobileImages($id)
+ {
+ $images = $this->request('mobile_images');
+
+ GoodsMobileImagesModel::where('goods_id', $id)->delete();
+
+ if ($images) {
+
+ $data = [];
+
+ foreach ($images as $image) {
+
+ $data[] = [
+ 'goods_id' => $id,
+ 'path' => $image,
+ ];
+ }
+
+ GoodsMobileImagesModel::insertAll($data);
+ }
+ }
+
+
/**
* 更新规格
* @param $id
@@ -221,7 +262,7 @@ class GoodsController extends MyController
$specTextArray = [];
$date = date('Y-m-d H:i:s');
- $specItem = $this->request('spec');
+ $specItem = $this->request('spec', '', []);
$specValue = $this->request('specVal');
$img = $this->request('spec_img');
$stock = $this->request('spec_stock');
diff --git a/Modules/Shop/Models/GoodsMobileImagesModel.php b/Modules/Shop/Models/GoodsMobileImagesModel.php
new file mode 100644
index 00000000..06d03b0c
--- /dev/null
+++ b/Modules/Shop/Models/GoodsMobileImagesModel.php
@@ -0,0 +1,12 @@
+
基本信息
规格配置
+
移动端详情
自定义配置
@@ -159,11 +160,45 @@
+
+