afa 6 ヶ月 前
コミット
09b93417d3

+ 1 - 1
application/admin/controller/general/Announcement.php

@@ -18,7 +18,7 @@ class Announcement extends Backend
      */
     protected $model = null;
 
-    protected $multiFields = 'status,is_show' ;
+    protected $multiFields = 'status,is_show,is_top' ;
 
     public function _initialize()
     {

+ 37 - 0
application/admin/controller/general/Announcementtype.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace app\admin\controller\general;
+
+use app\common\controller\Backend;
+
+/**
+ * 信息子分类
+ *
+ * @icon fa fa-circle-o
+ */
+class Announcementtype extends Backend
+{
+
+    /**
+     * Announcementtype模型对象
+     * @var \app\admin\model\general\Announcementtype
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\common\model\AnnouncementType;
+
+    }
+
+
+
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+
+
+}

+ 2 - 1
application/admin/lang/zh-cn/general/announcement.php

@@ -1,7 +1,8 @@
 <?php
 
 return [
-    'Type_id'        => '类型',
+    'Type_id'        => '分类',
+    'Sub_type_id'    => '二级分类',
     'Title'          => '标题',
     'Introduction'=> '信息导读',
     'Body'        => '内容',

+ 7 - 0
application/admin/lang/zh-cn/general/announcementtype.php

@@ -0,0 +1,7 @@
+<?php
+
+return [
+    'Pid'   => '一级分类',
+    'Title' => '标题',
+    'Color' => '颜色'
+];

+ 27 - 0
application/admin/validate/general/Announcementtype.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace app\admin\validate\general;
+
+use think\Validate;
+
+class Announcementtype extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

+ 9 - 1
application/admin/view/general/announcement/add.html

@@ -4,13 +4,21 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-type_id" data-rule="required" data-source='[{"id":"1","title":"公告"},{"id":"4","title":"合成公告"},{"id":"2","title":"轮播图"},{"id":"3","title":"茶说"}]' data-field="title" class="form-control selectpage" name="row[type_id]" type="text" value="">
+            <input id="c-type_id" data-rule="required" data-source='[{"id":"1","title":"官方公告"},{"id":"4","title":"新闻中心"},{"id":"2","title":"系统信息"},{"id":"3","title":"茶说"}]' data-field="title" class="form-control selectpage" name="row[type_id]" type="text" value="">
         </div>
         <label class="control-label col-xs-12 col-sm-2">{:__('所属语言')}:</label>
         <div class="col-xs-12 col-sm-3">
             <input id="c-to_lang" data-rule="required" data-source='[{"id":"zh","title":"中文"},{"id":"en","title":"英文"}]' data-field="title" class="form-control selectpage" name="row[to_lang]" type="text" value="">
         </div>
     </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Sub_type_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-sub_type_id"  data-source="general/announcementtype/index" data-multiple="true" data-field="title" class="form-control selectpage" name="row[sub_type_id]" type="text" value="">
+        </div>
+    </div>
+
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 7 - 1
application/admin/view/general/announcement/edit.html

@@ -4,13 +4,19 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type_id')}:</label>
         <div class="col-xs-12 col-sm-3">
-            <input id="c-type_id" data-rule="required" data-source='[{"id":"1","title":"公告"},{"id":"4","title":"合成公告"},{"id":"2","title":"轮播图"},{"id":"3","title":"茶说"}]' data-field="title" class="form-control selectpage" name="row[type_id]" type="text" value="{$row.type_id|htmlentities}">
+            <input id="c-type_id" data-rule="required" data-source='[{"id":"1","title":"官方公告"},{"id":"4","title":"新闻中心"},{"id":"2","title":"系统信息"},{"id":"3","title":"茶说"}]' data-field="title" class="form-control selectpage" name="row[type_id]" type="text" value="{$row.type_id|htmlentities}">
         </div>
         <label class="control-label col-xs-12 col-sm-2">{:__('所属语言')}:</label>
         <div class="col-xs-12 col-sm-3">
             <input id="c-to_lang" data-rule="required" data-source='[{"id":"zh","title":"中文"},{"id":"en","title":"英文"}]' data-field="title" class="form-control selectpage" name="row[to_lang]" type="text" value="{$row.to_lang|htmlentities}">
         </div>
     </div>
+    <div class="form-group"> 
+        <label class="control-label col-xs-12 col-sm-2">{:__('Sub_type_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-sub_type_id"  data-source="general/announcementtype/index" data-multiple="true" data-field="title" class="form-control selectpage" name="row[sub_type_id]" type="text" value="{$row.sub_type_id|htmlentities}">
+        </div>
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
         <div class="col-xs-12 col-sm-8">

+ 47 - 0
application/admin/view/general/announcementtype/add.html

@@ -0,0 +1,47 @@
+<form id="add-form"  role="form" data-toggle="validator" method="POST" action="">
+    <div class="form-horizontal">
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pid')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-pid" data-rule="required" data-source='[{"id":"1","title":"官方公告"},{"id":"4","title":"新闻中心"},{"id":"2","title":"系统信息"},{"id":"3","title":"茶说"}]' data-field="title" class="form-control selectpage" name="row[pid]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="">
+        </div>
+    </div>
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Color')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="layui-form-item">
+                <div class="layui-input-inline" style="width: 120px;">
+                    <input type="text" value="" name="row[color]" placeholder="请选择颜色" class="layui-input" id="c-color">
+                </div>
+                <div class="layui-inline" style="left: -11px;">
+                    <div id="color-select-btn" class="layui-inline">
+                            <div class="layui-unselect layui-colorpicker">
+                            <span>
+                                <span class="layui-colorpicker-trigger-span" lay-type="" style="background: #1c97f5">
+                                    <i class="layui-icon layui-colorpicker-trigger-i layui-icon-down"></i>
+                                </span>
+                            </span>
+                            </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</div>
+</form>

+ 45 - 0
application/admin/view/general/announcementtype/edit.html

@@ -0,0 +1,45 @@
+<form id="edit-form" role="form" data-toggle="validator" method="POST" action="">
+    <div class="form-horizontal">
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Pid')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-pid" data-rule="required" data-source='[{"id":"1","title":"官方公告"},{"id":"4","title":"新闻中心"},{"id":"2","title":"系统信息"},{"id":"3","title":"茶说"}]' data-field="title" class="form-control selectpage" name="row[pid]" type="text" value="{$row.pid|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
+        </div>
+    </div>
+
+    
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Color')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <div class="layui-form-item">
+                <div class="layui-input-inline" style="width: 120px;">
+                    <input type="text" value="{$row.color|htmlentities}" name="row[color]" placeholder="请选择颜色" class="layui-input" id="c-color">
+                </div>
+                <div class="layui-inline" style="left: -11px;">
+                    <div id="color-select-btn" class="layui-inline">
+                            <div class="layui-unselect layui-colorpicker">
+                            <span>
+                                <span class="layui-colorpicker-trigger-span" lay-type="" style="background: #1c97f5">
+                                    <i class="layui-icon layui-colorpicker-trigger-i layui-icon-down"></i>
+                                </span>
+                            </span>
+                            </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-primary btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div></div>
+</form>

+ 35 - 0
application/admin/view/general/announcementtype/index.html

@@ -0,0 +1,35 @@
+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <div class="widget-body no-padding">
+                    <div id="toolbar" class="toolbar">
+                        <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('general/announcementtype/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('general/announcementtype/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('general/announcementtype/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        
+
+                        <div class="dropdown btn-group {:$auth->check('general/announcementtype/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
+                            </ul>
+                        </div>
+
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('general/announcementtype/edit')}"
+                           data-operate-del="{:$auth->check('general/announcementtype/del')}"
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

+ 8 - 1
application/api/controller/Announcement.php

@@ -8,7 +8,7 @@ use app\common\model\AnnouncementModel;
 class Announcement extends Api
 {
 
-    protected array $noNeedLogin = ['list','show'];
+    protected array $noNeedLogin = ['gettype','list','show'];
 
     protected string $lan = '';
 
@@ -18,6 +18,12 @@ class Announcement extends Api
         $this->lan = $this->request->getLan();
     }
 
+    //获取大分类
+    public function gettype(AnnouncementModel $announcementModel){
+
+        $this->success('', $announcementModel::getTypeList());
+    }
+
     //列表
     public function list(AnnouncementModel $announcementModel)
     {
@@ -27,6 +33,7 @@ class Announcement extends Api
             ->field('id,to_lang,weigh,img_url,createtime,title as title,introduction,body')
             ->order('weigh desc, id desc')
             ->paginate($this->pageSize);
+
         $this->success('', $this->buildResp($paginator->total(), $paginator->currentPage(), $paginator->items()));
     }
 

+ 1 - 2
application/common/model/AnnouncementModel.php

@@ -46,10 +46,9 @@ class AnnouncementModel  extends Model
     }
 
 
-    //1":__('公告'),"2":__('轮播图'),"3":__('茶说'),"4":__('合成公告'
     public static function getTypeList()
     {
-        return [1 => __('公告'), 2 => __('轮播图'), 3 => __('茶说'), 4 => __('合成公告')];
+        return [1 => __('官方公告'), 2 => __('系统信息'), 3 => __('茶说'), 4 => __('新闻中心')];
     }
 
 

+ 56 - 0
application/common/model/AnnouncementType.php

@@ -0,0 +1,56 @@
+<?php
+
+namespace app\common\model;
+
+use Exception;
+use fast\Action;
+use fast\Asset;
+use fast\RechargeOrderType;
+use fast\RechargeStatus;
+use think\Db;
+use think\Model;
+
+class AnnouncementType extends Model
+{
+
+    protected $name = "announcement_type";
+
+   
+    // 开启自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+    //定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    
+    // 追加属性
+    protected $append = [
+        'createtime_text',
+        'updatetime_text'
+    ];
+
+
+
+
+    public function getCreatetimeTextAttr($value, $data)
+    {
+          $value = $value ? $value : (isset($data['createtime']) ? $data['createtime'] : '');
+          return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+
+    public function getUpdatetimeTextAttr($value, $data)
+    {
+          $value = $value ? $value : (isset($data['updatetime']) ? $data['updatetime'] : '');
+          return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
+    }
+
+    protected function setCreatetimeAttr($value)
+    {
+          return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+
+    protected function setUpdatetimeAttr($value)
+    {
+          return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
+    }
+}

+ 14 - 2
public/assets/js/backend-init.js

@@ -1,3 +1,15 @@
 define(['backend'], function (Backend) {
-    
-});
+      require.config({
+          paths: {
+              'layui': '../layui/layui',
+          },
+          shim: {
+              'layui': {
+                  deps: ['css!../layui/css/layui.css'],
+                  init: function () {
+                      return this.layui.config({dir: '/assets/js/layui/'});
+                  }
+              }
+          }
+      });
+  });

+ 7 - 3
public/assets/js/backend/general/announcement.js

@@ -26,12 +26,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [   
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 'type_id', title: __('Type_id'), operate: 'LIKE',  searchList: {"1":__('公告'),"2":__('轮播图'),"3":__('茶说'),"4":__('合成公告') }, formatter: Table.api.formatter.flag},
+                        {field: 'type_id', title: __('Type_id'), operate: 'LIKE',  searchList: {"1":__('官方公告'),"2":__('系统信息'),"3":__('茶说'),"4":__('新闻中心') }, formatter: Table.api.formatter.flag},
                         {field: 'title', title: __('Title'), operate: 'LIKE'},
                         {field: 'img_url', title: __('Images'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.images},
                         {field: 'weigh', title: __('Weigh'), operate: false},
                         {field: 'status', title: __('Status'), searchList: {"1":__('上架'),"2":__('下架')}, formatter: Table.api.formatter.toggle},
                         {field: 'is_show', title: __('推荐'), searchList: {'0':__('否'), '1':__('是')}, formatter: Table.api.formatter.toggle},
+                        {field: 'is_top', title: __('置顶'), searchList: {'0':__('否'), '1':__('是')}, formatter: Table.api.formatter.toggle},
                         {field: 'to_lang', title: __('所属语言'), operate: false,  searchList: {'zh':__('中文'), 'en':__('英文')}, formatter: Table.api.formatter.flag},
                         {field: 'createtime', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'updatetime', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
@@ -49,12 +50,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
 
             $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
-                // var options = table.bootstrapTable(tableOptions);
                 var typeStr = $(this).attr("href").replace('#', '');
                 var options = table.bootstrapTable('getOptions');
                 options.pageNumber = 1;
                 options.queryParams = function (params) {
-                    // params.filter = JSON.stringify({type: typeStr});
                     params.type_id = typeStr;
                     return params;
                 };
@@ -64,6 +63,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             });
         },
         add: function () {
+
             Controller.api.bindevent();
         },
         edit: function () {
@@ -71,6 +71,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
         },
         api: {
             bindevent: function () {
+                $("#c-sub_type_id").data("params", function (obj) {
+                    //obj为SelectPage对象
+                    return {custom: {pid: $("#c-type_id").val()}};
+                });
                 Form.api.bindevent($("form[role=form]"));
             }
         }

+ 85 - 0
public/assets/js/backend/general/announcementtype.js

@@ -0,0 +1,85 @@
+define(['jquery', 'bootstrap', 'backend', 'table', 'form','layui'], function ($, undefined, Backend, Table, Form, layui) {
+
+    var Controller = {
+        index: function () {
+            // 初始化表格参数配置
+            Table.api.init({
+                extend: {
+                    index_url: 'general/announcementtype/index' + location.search,
+                    add_url: 'general/announcementtype/add',
+                    edit_url: 'general/announcementtype/edit',
+                    del_url: 'general/announcementtype/del',
+                    multi_url: 'general/announcementtype/multi',
+                    import_url: 'general/announcementtype/import',
+                    table: 'announcement_type',
+                }
+            });
+
+            var table = $("#table");
+
+            // 初始化表格
+            table.bootstrapTable({
+                url: $.fn.bootstrapTable.defaults.extend.index_url,
+                pk: 'id',
+                sortName: 'id',
+                columns: [
+                    [
+                        {checkbox: true},
+                        {field: 'id', title: __('Id')},
+                        {field: 'pid', title: __('Pid'), operate: 'LIKE',  searchList: {"1":__('官方公告'),"2":__('系统信息'),"3":__('茶说'),"4":__('新闻中心') }, formatter: Table.api.formatter.flag},
+                        {field: 'title', title: __('Title'), operate: 'LIKE'},
+                        {field: 'color', title: __('Color'), operate: false,
+                            formatter: function (value, row, index, field) {
+                                return '<span class="label " style="background:'+value+'">'+value+'</span>';
+                            },
+                        },
+                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+                    ]
+                ]
+            });
+
+            // 为表格绑定事件
+            Table.api.bindevent(table);
+        },
+        add: function () {
+            layui.use(function () {
+                var colorpicker = layui.colorpicker;
+                // 初始化颜色选择器
+                colorpicker.render({
+                    elem: '#color-select-btn', // 绑定按钮
+                    color: "#1c97f5", // 默认颜色
+                    done: function(color){
+                        // 将选择的色值填入目标输入框
+                        $('#c-color').val(color);
+                    }
+                });
+            });
+   
+            Controller.api.bindevent();
+        },
+        edit: function () {
+            var color = $('#c-color').val();
+            layui.use(function () {
+                var colorpicker = layui.colorpicker;
+                // 初始化颜色选择器
+                colorpicker.render({
+                    elem: '#color-select-btn', // 绑定按钮
+                    color: color, // 默认颜色
+                    done: function(color){
+                        // 将选择的色值填入目标输入框
+                        $('#c-color').val(color);
+                    }
+                });
+            });
+            Controller.api.bindevent();
+        },
+        api: {
+            bindevent: function () {
+                Form.api.bindevent($("form[role=form]"));
+            }
+        }
+    };
+    return Controller;
+});

ファイルの差分が大きいため隠しています
+ 0 - 0
public/assets/layui/css/layui.css


BIN
public/assets/layui/font/iconfont.eot


ファイルの差分が大きいため隠しています
+ 16 - 0
public/assets/layui/font/iconfont.svg


BIN
public/assets/layui/font/iconfont.ttf


BIN
public/assets/layui/font/iconfont.woff


BIN
public/assets/layui/font/iconfont.woff2


ファイルの差分が大きいため隠しています
+ 0 - 0
public/assets/layui/layui.js


ファイルの差分が大きいため隠しています
+ 0 - 5
public/assets/libs/vue/vue.js


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません