linwu 1 年之前
父節點
當前提交
1590e38253

+ 8 - 3
app/admin/controller/Vote.php

@@ -17,13 +17,17 @@ class Vote extends AdminBaseController
      */
     public function index()
     {
-        return view();
+        return view('',[
+            'status_list' => VoteModel::STATUS,
+        ]);
     }
 
     public function listVote()
     {
-        $list  = VoteModel::limit(input('limit'))->page(input('page'))->select();
-        $count = VoteModel::count();
+        $map = $this->dealEqualInput([], ['status']);
+
+        $list  = VoteModel::where($map)->limit(input('limit'))->page(input('page'))->append(['status_text'])->select();
+        $count = VoteModel::where($map)->count();
         if ($count == 0) {
             ajax_return(1, '未查询到数据');
         }
@@ -40,6 +44,7 @@ class Vote extends AdminBaseController
 
         return view('', [
             'info' => $info,
+            'status_list' => VoteModel::STATUS,
         ]);
     }
 

+ 23 - 2
app/admin/view/vote/index.html

@@ -1,10 +1,30 @@
 <div class="layui-fluid">
     <div class="layui-card">
-        <div class="layui-form layui-card-header layuiadmin-card-header-auto">
-            <button class="layui-btn layuiadmin-btn" data-type="add">添加</button>
+        <div class="layui-form layui-form-pane layui-card-header layuiadmin-card-header-auto">
+            <div class="layui-form-item">
+                <div class="layui-inline">
+                    <label class="layui-form-label">状态</label>
+                    <div class="layui-input-block">
+                        <select name="status">
+                            <option value="">全部状态</option>
+                            {volist name="status_list" id="v"}
+                            <option value="{$key}">{$v}</option>
+                            {/volist}
+                        </select>
+                    </div>
+                </div>
+                <div class="layui-inline">
+                    <button class="layui-btn" lay-submit lay-filter="{$lay_btn}">
+                        <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+                    </button>
+                </div>
+            </div>
         </div>
 
         <div class="layui-card-body">
+            <div style="padding-bottom: 10px;">
+            <button class="layui-btn layuiadmin-btn" data-type="add">添加</button>
+        </div>
             <table id="{$lay_table}" lay-filter="{$lay_table}"></table>
             <script type="text/html" id="setOption">
                 {{# d.option.forEach(function(v){ }}
@@ -47,6 +67,7 @@
                 [
                     {field: 'title', title: '标题', width: 200},
                     {field: 'option', title: '选项', toolbar: '#setOption'},
+                    {field: 'status_text', title: '状态', width: 80, align: 'center'},
                     {field: 'start_time', title: '开始时间', width: 160, align: 'center'},
                     {field: 'end_time', title: '结束时间', width: 160, align: 'center'},
                     {field: 'create_time', title: '创建时间', width: 160, align: 'center'},

+ 8 - 0
app/admin/view/vote/vote_form.html

@@ -32,6 +32,14 @@
 								</textarea>
                             </div>
                         </div>
+                        <div class="layui-form-item">
+                            <label class="layui-form-label"><span style="color:#f90c05;">*</span>状态</label>
+                            <div class="layui-input-block">
+                                {volist name="status_list" id="v"}
+                                <input type="radio" name="status" value="{$key}" title="{$v}" {eq name="info.status|default=1" value="$key" }checked{/eq}>
+                                {/volist}
+                            </div>
+                        </div>
                         <div class="layui-form-item">
                             <label class="layui-form-label"><span style="color:#f90c05;">*</span>开始时间</label>
                             <div class="layui-input-block">

+ 10 - 0
app/common/model/VoteModel.php

@@ -17,4 +17,14 @@ class VoteModel extends BaseModel
         'option'     => 'array',
     ];
 
+    // 常量
+    const STATUS = [1 => '显示', 2 => '隐藏'];
+
+    const STATUS_SHOW = 1;
+    const STATUS_HIDE = 2;
+
+    public function getStatusTextAttr($value, $data)
+    {
+        return self::STATUS[$data['status']];
+    }
 }

+ 2 - 0
app/common/validate/VoteValidate.php

@@ -10,6 +10,7 @@ class VoteValidate extends Validate
         'title'      => 'require',
         'option'     => 'require',
         'content'    => 'require',
+        'status'     => 'require',
         'start_time' => 'require',
         'end_time'   => 'require',
     ];
@@ -18,6 +19,7 @@ class VoteValidate extends Validate
         'title'      => '标题不能为空',
         'option'     => '选项不能为空',
         'content'    => '内容不能为空',
+        'status'     => '请选择状态',
         'start_time' => '开始时间不能为空',
         'end_time'   => '结束时间不能为空',
     ];

+ 3 - 1
app/mobile/controller/Vote.php

@@ -10,7 +10,9 @@ class Vote extends MobileBaseController
 {
     public function listVote()
     {
-        $list = VoteModel::limit(input('limit', 10))
+        $list = VoteModel::where('status',VoteModel::STATUS_SHOW)
+            ->limit(input('limit', 10))
+            ->order('id','desc')
             ->page(input('page', 1))
             ->select();