Merge remote-tracking branch 'origin/master'

app/adminapi/lists/goods_category/GoodsCategoryLists.php

@@ -1,78 +1,79 @@
-<?php
-// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
-// | author: likeadminTeam
-// +----------------------------------------------------------------------
-
-namespace app\adminapi\lists\goods_category;
-
-
-use app\adminapi\lists\BaseAdminDataLists;
-use app\common\model\goods_category\GoodsCategory;
-use app\common\lists\ListsSearchInterface;
-
-
-/**
- * GoodsCategory列表
- * Class GoodsCategoryLists
- * @package app\adminapi\listsgoods_category
- */
-class GoodsCategoryLists extends BaseAdminDataLists implements ListsSearchInterface
-{
-
-
-    /**
-     * @notes 设置搜索条件
-     * @return \string[][]
-     * @author likeadmin
-     * @date 2024/07/07 18:23
-     */
-    public function setSearch(): array
-    {
-        return [
-            '=' => ['category_type', 'name', 'is_goods', 'status'],
-        ];
-    }
-
-
-    /**
-     * @notes 获取列表
-     * @return array
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @author likeadmin
-     * @date 2024/07/07 18:23
-     */
-    public function lists(): array
-    {
-        $lists = GoodsCategory::where($this->searchWhere)
-            ->field(['id', 'pid', 'category_type', 'name', 'is_goods', 'status', 'weigh'])
-            ->order(['id' => 'desc'])
-            ->select()
-            ->toArray();
-
-        return linear_to_tree($lists, 'children', 'id', 'pid');
-    }
-
-
-    /**
-     * @notes 获取数量
-     * @return int
-     * @author likeadmin
-     * @date 2024/07/07 18:23
-     */
-    public function count(): int
-    {
-        return GoodsCategory::where($this->searchWhere)->count();
-    }
-
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\lists\goods_category;
+
+
+use app\adminapi\lists\BaseAdminDataLists;
+use app\common\model\goods_category\GoodsCategory;
+use app\common\lists\ListsSearchInterface;
+
+
+/**
+ * GoodsCategory列表
+ * Class GoodsCategoryLists
+ * @package app\adminapi\listsgoods_category
+ */
+class GoodsCategoryLists extends BaseAdminDataLists implements ListsSearchInterface
+{
+
+
+    /**
+     * @notes 设置搜索条件
+     * @return \string[][]
+     * @author likeadmin
+     * @date 2024/07/07 18:23
+     */
+    public function setSearch(): array
+    {
+        return [
+            '=' => ['category_type', 'name', 'is_goods', 'status'],
+
+        ];
+    }
+
+
+    /**
+     * @notes 获取列表
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author likeadmin
+     * @date 2024/07/07 18:23
+     */
+    public function lists(): array
+    {
+        $lists = GoodsCategory::where($this->searchWhere)
+            ->field(['id', 'pid', 'category_type' ,'picture', 'name', 'is_goods', 'status', 'weigh'])
+            ->order(['weigh' => 'desc'])
+            ->select()
+            ->toArray();
+
+        return linear_to_tree($lists, 'children', 'id', 'pid');
+    }
+
+
+    /**
+     * @notes 获取数量
+     * @return int
+     * @author likeadmin
+     * @date 2024/07/07 18:23
+     */
+    public function count(): int
+    {
+        return GoodsCategory::where($this->searchWhere)->count();
+    }
+
 }

app/adminapi/logic/goods_category/GoodsCategoryLogic.php

@@ -43,6 +43,7 @@ class GoodsCategoryLogic extends BaseLogic
             GoodsCategory::create([
                 'pid' => $params['pid'],
                 'category_type' => $params['category_type'],
+                'picture' => $params['picture'],
                 'name' => $params['name'],
                 'is_goods' => $params['is_goods'],
                 'status' => $params['status'],
@@ -73,6 +74,7 @@ class GoodsCategoryLogic extends BaseLogic
             GoodsCategory::where('id', $params['id'])->update([
                 'pid' => $params['pid'],
                 'category_type' => $params['category_type'],
+                'picture' => $params['picture'],
                 'name' => $params['name'],
                 'is_goods' => $params['is_goods'],
                 'status' => $params['status'],

app/adminapi/validate/goods_category/GoodsCategoryValidate.php

@@ -1,106 +1,108 @@
-<?php
-// +----------------------------------------------------------------------
-// | likeadmin快速开发前后端分离管理后台（PHP版）
-// +----------------------------------------------------------------------
-// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
-// | 开源版本可自由商用，可去除界面版权logo
-// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
-// | github下载：https://github.com/likeshop-github/likeadmin
-// | 访问官网：https://www.likeadmin.cn
-// | likeadmin团队 版权所有 拥有最终解释权
-// +----------------------------------------------------------------------
-// | author: likeadminTeam
-// +----------------------------------------------------------------------
-
-namespace app\adminapi\validate\goods_category;
-
-
-use app\common\validate\BaseValidate;
-
-
-/**
- * GoodsCategory验证器
- * Class GoodsCategoryValidate
- * @package app\adminapi\validate\goods_category
- */
-class GoodsCategoryValidate extends BaseValidate
-{
-
-     /**
-      * 设置校验规则
-      * @var string[]
-      */
-    protected $rule = [
-        'id' => 'require',
-        'pid' => 'require',
-        'category_type' => 'require',
-        'name' => 'require',
-        'is_goods' => 'require',
-        'status' => 'require',
-        'weigh' => 'require',
-    ];
-
-
-    /**
-     * 参数描述
-     * @var string[]
-     */
-    protected $field = [
-        'id' => 'id',
-        'pid' => '父级ID',
-        'category_type' => '服务类型',
-        'name' => '名称',
-        'is_goods' => '服务产品',
-        'status' => '状态',
-        'weigh' => '权重',
-    ];
-
-
-    /**
-     * @notes 添加场景
-     * @return GoodsCategoryValidate
-     * @author likeadmin
-     * @date 2024/07/07 18:23
-     */
-    public function sceneAdd()
-    {
-        return $this->only(['pid','category_type','name','is_goods','status','weigh']);
-    }
-
-
-    /**
-     * @notes 编辑场景
-     * @return GoodsCategoryValidate
-     * @author likeadmin
-     * @date 2024/07/07 18:23
-     */
-    public function sceneEdit()
-    {
-        return $this->only(['id','pid','category_type','name','is_goods','status','weigh']);
-    }
-
-
-    /**
-     * @notes 删除场景
-     * @return GoodsCategoryValidate
-     * @author likeadmin
-     * @date 2024/07/07 18:23
-     */
-    public function sceneDelete()
-    {
-        return $this->only(['id']);
-    }
-
-
-    /**
-     * @notes 详情场景
-     * @return GoodsCategoryValidate
-     * @author likeadmin
-     * @date 2024/07/07 18:23
-     */
-    public function sceneDetail()
-    {
-        return $this->only(['id']);
-    }
-
+<?php
+// +----------------------------------------------------------------------
+// | likeadmin快速开发前后端分离管理后台（PHP版）
+// +----------------------------------------------------------------------
+// | 欢迎阅读学习系统程序代码，建议反馈是我们前进的动力
+// | 开源版本可自由商用，可去除界面版权logo
+// | gitee下载：https://gitee.com/likeshop_gitee/likeadmin
+// | github下载：https://github.com/likeshop-github/likeadmin
+// | 访问官网：https://www.likeadmin.cn
+// | likeadmin团队 版权所有 拥有最终解释权
+// +----------------------------------------------------------------------
+// | author: likeadminTeam
+// +----------------------------------------------------------------------
+
+namespace app\adminapi\validate\goods_category;
+
+
+use app\common\validate\BaseValidate;
+
+
+/**
+ * GoodsCategory验证器
+ * Class GoodsCategoryValidate
+ * @package app\adminapi\validate\goods_category
+ */
+class GoodsCategoryValidate extends BaseValidate
+{
+
+     /**
+      * 设置校验规则
+      * @var string[]
+      */
+    protected $rule = [
+        'id' => 'require',
+        'pid' => 'require',
+        'category_type' => 'require',
+        'name' => 'require',
+        'is_goods' => 'require',
+        'status' => 'require',
+        'weigh' => 'require',
+
+    ];
+
+
+    /**
+     * 参数描述
+     * @var string[]
+     */
+    protected $field = [
+        'id' => 'id',
+        'pid' => '父级ID',
+        'category_type' => '服务类型',
+        'name' => '名称',
+        'is_goods' => '服务产品',
+        'status' => '状态',
+        'weigh' => '权重',
+
+    ];
+
+
+    /**
+     * @notes 添加场景
+     * @return GoodsCategoryValidate
+     * @author likeadmin
+     * @date 2024/07/07 18:23
+     */
+    public function sceneAdd()
+    {
+        return $this->only(['pid','category_type','picture','name','is_goods','status','weigh']);
+    }
+
+
+    /**
+     * @notes 编辑场景
+     * @return GoodsCategoryValidate
+     * @author likeadmin
+     * @date 2024/07/07 18:23
+     */
+    public function sceneEdit()
+    {
+        return $this->only(['id','pid','category_type','picture','name','is_goods','status','weigh']);
+    }
+
+
+    /**
+     * @notes 删除场景
+     * @return GoodsCategoryValidate
+     * @author likeadmin
+     * @date 2024/07/07 18:23
+     */
+    public function sceneDelete()
+    {
+        return $this->only(['id']);
+    }
+
+
+    /**
+     * @notes 详情场景
+     * @return GoodsCategoryValidate
+     * @author likeadmin
+     * @date 2024/07/07 18:23
+     */
+    public function sceneDetail()
+    {
+        return $this->only(['id']);
+    }
+
 }