后台商品管理

application/api/controller/Goods.php

@@ -28,7 +28,7 @@ class Goods extends Base
      * @Apidoc\Param("search", type="string", require=false, desc="搜索 商品名称")
      * @Apidoc\Returned("id", type="integer", desc="商品ID")
      * @Apidoc\Returned("goods_name", type="integer", desc="商品名称")
-     * @Apidoc\Returned("weigh", type="integer", desc="权重")
+     * @Apidoc\Returned("sort", type="integer", desc="权重")
      * @Apidoc\Returned("goods_stock", type="array", desc="规格列表",
      *     @Apidoc\Returned("id", type="integer", desc="规格ID"),
      *     @Apidoc\Returned("goods_id", type="integer", desc="商品ID"),

application/approve/controller/Goods.php

@@ -49,7 +49,7 @@ class Goods extends Controller
      */
     public function index()
     {
-        $this->title = '维修人员列表';
+        $this->title = '商品列表';
         $query = $this->_query($this->table)
             ->field('is_deleted', true)
             ->where('is_deleted', CommonConstant::IS_DELETED_0)

application/approve/controller/GoodsCategory.php

@@ -37,7 +37,7 @@ class GoodsCategory extends Controller
      */
     protected function initialize()
     {
-        $this->get_type_title_list = MaintainConstant::get_type_title_list();
+
     }
 
     /**
@@ -115,7 +115,8 @@ class GoodsCategory extends Controller
     protected function _form_filter(&$data)
     {
         if ($this->request->isGet()) {
-            $this->cate_list = GoodsCategoryService::get_list([]);
+            $cate_list = GoodsCategoryService::get_list([]);
+            $this->cate_list = array_merge([['id' => '0', 'pid' => '-1', 'name' => '顶级']],$cate_list ? $cate_list->toArray() : []);
         }
         if ($this->request->isPost()) {
 

application/approve/view/goods/form.html

@@ -0,0 +1,79 @@
+{extend name='admin@main'}
+
+{block name="button"}{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+        <div class="layui-card-body">
+            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+
+            {notempty name='vo.id'}
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">类型</label>
+                <div class="layui-input-block">
+                    <select class="layui-select" name="type" required>
+                        <option value="">请选择</option>
+                        {foreach $get_type_title_list as $k=>$v}
+                        {eq name='vo.type' value='$k.""'}
+                        <option selected value="{$k}">{$v}</option>
+                        {else}
+                        <option value="{$k}">{$v}</option>
+                        {/eq}
+                        {/foreach}
+                    </select>
+                    <p class="help-block"></p>
+                </div>
+            </div>
+            {else/}
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">类型</label>
+                <div class="layui-input-block">
+                    <select class="layui-select" name="type" required>
+                        {foreach $get_type_title_list as $k=>$v}
+                        <option value="{$k}">{$v}</option>
+                        {/foreach}
+                    </select>
+                    <p class="help-block"></p>
+                </div>
+            </div>
+            {/notempty}
+
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">姓名</label>
+                <div class="layui-input-block">
+                    <input type="text" name="name" placeholder="请输入姓名" value="{$vo.name|default=''}" class="layui-input" required>
+                    <p class="help-block"></p>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">手机号码</label>
+                <div class="layui-input-block">
+                    <input type="text" name="mobile" placeholder="请输入手机号码" value="{$vo.mobile|default=''}" class="layui-input" required>
+                    <p class="help-block"></p>
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label color-green font-w7">生日</label>
+                <div class="layui-input-block">
+                    <input type="text" name="birthday" placeholder="请选择日期" value="{$vo.birthday|default=''}" class="layui-input" required>
+                </div>
+            </div>
+        </div>
+        <div class="hr-line-dashed"></div>
+        <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>
+<script>
+    window.form.render();
+    //日期时间选择器
+    laydate.render({elem: '[name="birthday"]',type: 'date'})
+</script>
+</div>
+{/block}
+{block name="style"}{/block}
+{block name='script'}
+<script></script>
+{/block}

application/approve/view/goods/index.html

@@ -0,0 +1,60 @@
+{extend name='admin@main'}
+
+{block name="button"}
+
+{if auth("add")}
+<button class='layui-btn layui-btn-sm layui-btn-primary' data-modal='{:url("add")}'>添 加</button>
+{/if}
+
+{if auth("remove")}
+<button class="layui-btn layui-btn-sm layui-btn-primary" data-confirm="确定要删除吗？" data-action="{:url('remove')}" data-rule="id#{key}" data-csrf="{:systoken('remove')}">删 除</button>
+{/if}
+
+{/block}
+
+{block name="content"}
+<div class="think-box-shadow">
+    {include file='approve_maintain_user/index_search'}
+    <table class="layui-table margin-top-10" lay-skin="line">
+        {notempty name='list'}
+        <thead>
+        <tr>
+            <th class='list-table-check-td think-checkbox'>
+                <input data-auto-none data-check-target='.list-check-box' type='checkbox'>
+            </th>
+            <th class='text-left nowrap'>类型</th>
+            <th class='text-left nowrap'>姓名</th>
+            <th class='text-left nowrap'>手机号码</th>
+            <th class='text-left nowrap'>生日</th>
+            <th class="text-left nowrap">操作</th>
+        </tr>
+        </thead>
+        {/notempty}
+        <tbody>
+        {foreach $list as $key=>$vo}
+        <tr>
+            <td class='list-table-check-td think-checkbox'>
+                <input class="list-check-box" value='{$vo.id}' type='checkbox'>
+            </td>
+            <td class='text-left nowrap'>{$get_type_title_list[$vo.type]}</td>
+            <td class='text-left nowrap'>{$vo.name|default=''}</td>
+            <td class='text-left nowrap'>{$vo.mobile|default='--'}</td>
+            <td class='text-left nowrap'>{$vo.birthday|default='--'}</td>
+            <td class='text-left nowrap'>
+
+                {if auth("edit")}
+                <a class="layui-btn layui-btn-xs" data-modal="{:url('edit')}?id={$vo.id}">编 辑</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}" data-csrf="{:systoken('remove')}">删 除</a>
+                {/if}
+
+            </td>
+        </tr>
+        {/foreach}
+        </tbody>
+    </table>
+    {empty name='list'}<span class="notdata">没 有 记 录 哦！</span>{else}{$pagehtml|raw|default=''}{/empty}
+</div>
+{/block}

application/approve/view/goods/index_search.html

@@ -0,0 +1,25 @@
+<fieldset>
+    <legend>条件搜索</legend>
+    <form class="layui-form layui-form-pane form-search" onsubmit="return false" action="{:request()->url()}" method="get" autocomplete="off">
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">姓名</label>
+            <div class="layui-input-inline">
+                <input name="name" value="{$Think.get.name|default=''}" placeholder="请输入姓名" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline">
+            <label class="layui-form-label">手机号码</label>
+            <div class="layui-input-inline">
+                <input name="mobile" value="{$Think.get.mobile|default=''}" placeholder="请输入手机号码" class="layui-input">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline">
+            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+            <button type="button" data-export-list class="layui-btn layui-btn-primary layui-hide"><i class="layui-icon layui-icon-export"></i> 导 出</button>
+        </div>
+    </form>
+    <script>
+        form.render();
+        // laydate.render({range: true, elem: '[name="create_at"]'})
+    </script>
+</fieldset>

application/approve/view/goods_category/form.html

@@ -13,7 +13,6 @@
                 <label class="layui-form-label color-green font-w7">上级分类</label>
                 <div class="layui-input-block">
                     <select class="layui-select" name="pid" required>
-                        <option value="">请选择</option>
                         {foreach $cate_list as $k=>$v}
                         {eq name='vo.pid' value='$v.id.""'}
                         <option selected value="{$v.id}">{$v.name}</option>

application/common/model/GoodsCategory.php

@@ -24,7 +24,7 @@ class GoodsCategory extends Model
     {
         return $this->hasMany(GoodsCategory::class, 'pid', 'id')
             ->where('is_deleted', CommonConstant::IS_DELETED_0)
-            ->order('weigh desc,id asc');
+            ->order('sort desc,id asc');
     }
 
 }

application/common/service/GoodsService.php

@@ -36,7 +36,7 @@ class GoodsService
             ->with([
                 'goodsStock'
             ])
-            ->order('weigh desc,id desc')
+            ->order('sort desc,id desc')
             ->select();
         return $list;
     }