From ea0e4cf47d0a6448ec868d0c0ad69abdbb06e97e Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Tue, 8 Sep 2020 14:40:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/service/GoodsService.php       | 17 ++++++++++++++++
 app/data/view/news_item/form.html       | 10 ----------
 app/data/view/news_mark/form.html       |  7 -------
 app/data/view/news_mark/index.html      |  5 -----
 app/data/view/shop_goods_cate/form.html | 26 ++++++++++++-------------
 app/data/view/shop_goods_mark/form.html |  7 -------
 6 files changed, 30 insertions(+), 42 deletions(-)

diff --git a/app/data/service/GoodsService.php b/app/data/service/GoodsService.php
index c95448e89..978e61d88 100644
--- a/app/data/service/GoodsService.php
+++ b/app/data/service/GoodsService.php
@@ -2,6 +2,7 @@
 
 namespace app\data\service;
 
+use think\admin\extend\DataExtend;
 use think\admin\Service;
 
 /**
@@ -12,6 +13,22 @@ use think\admin\Service;
 class GoodsService extends Service
 {
 
+    /**
+     * 获取分类数据
+     * @return array
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    public function getCateList(): array
+    {
+        $map = ['deleted' => 0, 'status' => 1];
+        $query = $this->app->db->name('ShopGoodsCate');
+        $query->where($map)->order('sort desc,id desc');
+        $query->withoutField('sort,status,deleted,create_at');
+        return DataExtend::arr2tree($query->select()->toArray());
+    }
+
     /**
      * 最大分类级别
      * @return integer
diff --git a/app/data/view/news_item/form.html b/app/data/view/news_item/form.html
index a7604fee0..aaa6dc00c 100644
--- a/app/data/view/news_item/form.html
+++ b/app/data/view/news_item/form.html
@@ -2,9 +2,7 @@
 
 {block name='content'}
 <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-
     <div class="layui-card-body padding-40">
-
         <div class="layui-form-item relative block">
             <span class="color-green font-w7 label-required-prev">文章标签</span>
             <div class="markbox layui-textarea">
@@ -15,7 +13,6 @@
                 {/if}{/foreach}
             </div>
         </div>
-
         <div class="layui-form-item relative block">
             <span class="color-green font-w7 label-required-prev">文章图片</span>
             <label class="relative block label-required-null">
@@ -24,34 +21,27 @@
                 <script>$('[name="cover"]').uploadOneImage()</script>
             </label>
         </div>
-
         <label class="layui-form-item relative block">
             <span class="color-green font-w7">文章标题</span>
             <input required name="title" value='{$vo.title|default=""}' placeholder="请输入文章标题" class="layui-input">
         </label>
-
         <label class="layui-form-item relative block">
             <span class="color-green font-w7">文章描述</span>
             <textarea required class="layui-textarea" placeholder="请输入文章描述" name="remark">{$vo.remark|default=''}</textarea>
         </label>
-
         <div class="layui-form-item relative block">
             <span class="color-green font-w7 label-required-prev">文章内容</span>
             <label class="relative block">
                 <textarea class="layui-textarea" placeholder="请输入文章内容" name="content">{$vo.content|default=''}</textarea>
             </label>
         </div>
-
         <div class="hr-line-dashed"></div>
         {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-
         <div class="layui-form-item text-center">
             <button class="layui-btn" type='submit'>保存数据</button>
             <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
         </div>
-
     </div>
-
 </form>
 
 <script>
diff --git a/app/data/view/news_mark/form.html b/app/data/view/news_mark/form.html
index 09362b795..42c3890cb 100644
--- a/app/data/view/news_mark/form.html
+++ b/app/data/view/news_mark/form.html
@@ -1,27 +1,20 @@
 <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-
     <div class="layui-card-body padding-left-40">
-
         <label class="layui-form-item relative block">
             <span class="color-green font-w7">标签名称</span>
             <input class="layui-input" required placeholder="请输入标签名称" name="title" value="{$vo.title|default=''}"/>
         </label>
-
         <div class="layui-form-item relative block">
             <span class="color-green font-w7">标签描述</span>
             <label class="relative block">
                 <textarea class="layui-textarea" placeholder="请输入文档描述" name="desc">{$vo.desc|default=''}</textarea>
             </label>
         </div>
-
     </div>
-
     <div class="hr-line-dashed"></div>
     {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-
     <div class="layui-form-item text-center">
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
     </div>
-
 </form>
\ No newline at end of file
diff --git a/app/data/view/news_mark/index.html b/app/data/view/news_mark/index.html
index 2197110f7..f1764fd11 100644
--- a/app/data/view/news_mark/index.html
+++ b/app/data/view/news_mark/index.html
@@ -45,23 +45,18 @@
             <td>{if $vo.status eq 0}<span class="color-red">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">使用中</span>{/if}</td>
             <td class="text-left nowrap">{$vo.create_at|format_datetime}</td>
             <td class='text-left nowrap'>
-
                 {if auth("edit")}
                 <a data-dbclick class="layui-btn layui-btn-sm layui-btn-xs" data-title="编辑标签" data-modal="{:url('edit')}?id={$vo.id}">编 辑</a>
                 {/if}
-
                 {if auth("state") and $vo.status eq 1}
                 <a class="layui-btn layui-btn-sm layui-btn-xs layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">禁 用</a>
                 {/if}
-
                 {if auth("state") and $vo.status eq 0}
                 <a class="layui-btn layui-btn-sm layui-btn-xs layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">启 用</a>
                 {/if}
-
                 {if auth("remove")}
                 <a class="layui-btn layui-btn-xs layui-btn-danger" data-confirm="确定要删除该标签吗？" data-action="{:url('remove')}" data-value="id#{$vo.id}">删 除</a>
                 {/if}
-
             </td>
         </tr>
         {/foreach}
diff --git a/app/data/view/shop_goods_cate/form.html b/app/data/view/shop_goods_cate/form.html
index 3c0dbb429..cf65aaba7 100644
--- a/app/data/view/shop_goods_cate/form.html
+++ b/app/data/view/shop_goods_cate/form.html
@@ -1,7 +1,5 @@
 <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-
     <div class="layui-card-body padding-left-40">
-
         <label class="layui-form-item relative block">
             <span class="color-green font-w7 label-required-prev">绑定上级分类</span>
             <span class="color-desc margin-left-5">Category Parent</span>
@@ -13,32 +11,34 @@
                 <option value='{$cate.id}'>{$cate.spl|raw}{$cate.name}</option>
                 {/eq}{/foreach}
             </select>
-            <span class="help-block"><b>必选，</b>请选择上级分类或顶级分类（目前最多支持二级分类）</span>
+            <span class="help-block"><b>必选，</b>请选择上级分类或顶级分类（目前最多支持{$cateLevel|default=0}级分类）</span>
         </label>
-
         <label class="layui-form-item relative block">
-            <span class="color-green font-w7 label-required-prev">商品分类名称</span>
+            <span class="color-green font-w7">商品分类名称</span>
             <span class="color-desc margin-left-5">Category Name</span>
             <input name="name" value='{$vo.name|default=""}' required placeholder="请输入分类名称" class="layui-input">
-            <span class="help-block"><b>必填，</b>请填写分类名称，建议字符不要太长，一般4-6个汉字（如：系统管理）</span>
+            <span class="help-block"><b>必填，</b>请填写商品分类名称，建议字符不要太长，一般4-6个汉字（如：系统管理）</span>
         </label>
-
+        <div class="layui-form-item relative block">
+            <span class="color-green font-w7">商品分类图标</span>
+            <span class="color-desc margin-left-5">Category Icon</span>
+            <label class="relative block">
+                <input name="cover" value='{$vo.cover|default=""}' placeholder="请上传商品分类图标&nbsp;&nbsp;&nbsp;&nbsp;" class="layui-input">
+                <a data-file data-field="cover" data-type="png,jpg,gif" class="input-right-icon layui-icon layui-icon-upload"></a>
+            </label>
+            <span class="help-block"><b>可选，</b>请上传商品分类图标，需要是 http 可访问的图片资源链接</span>
+        </div>
         <label class="layui-form-item relative block">
-            <span class="color-green font-w7 label-required-prev">商品分类描述</span>
+            <span class="color-green font-w7">商品分类描述</span>
             <span class="color-desc margin-left-5">Category Remark</span>
             <textarea class="layui-textarea" name="remark" placeholder="请输入分类描述">{$vo.remark|default=''}</textarea>
         </label>
-
     </div>
-
     <div class="hr-line-dashed"></div>
     {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-
     <div class="layui-form-item text-center">
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
     </div>
-
     <script>form.render()</script>
-
 </form>
diff --git a/app/data/view/shop_goods_mark/form.html b/app/data/view/shop_goods_mark/form.html
index c3232180e..95a944dae 100644
--- a/app/data/view/shop_goods_mark/form.html
+++ b/app/data/view/shop_goods_mark/form.html
@@ -1,14 +1,11 @@
 <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-
     <div class="layui-card-body padding-left-40">
-
         <label class="layui-form-item relative block">
             <span class="color-green font-w7">标签名称</span>
             <span class="color-desc margin-left-5">Label Name</span>
             <input class="layui-input" required placeholder="请输入标签名称" name="name" value="{$vo.name|default=''}">
             <span class="help-block"><b>必填，</b>请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字</span>
         </label>
-
         <div class="layui-form-item relative block">
             <span class="color-green font-w7">标签描述</span>
             <span class="color-desc margin-left-5">Label Remark</span>
@@ -16,15 +13,11 @@
                 <textarea class="layui-textarea" placeholder="请输入标签描述" name="remark">{$vo.remark|default=''}</textarea>
             </label>
         </div>
-
     </div>
-
     <div class="hr-line-dashed"></div>
     {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-
     <div class="layui-form-item text-center">
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
     </div>
-
 </form>
\ No newline at end of file