优惠券

@@ -22,7 +22,7 @@ class Tick extends Backend
     {
     {
         parent::_initialize();
         parent::_initialize();
         $this->model = new \app\admin\model\Tick;
         $this->model = new \app\admin\model\Tick;
-
+        $this->view->assign("statusList", $this->model->getStatusList());
     }
     }
 
 
     public function import()
     public function import()

@@ -5,5 +5,8 @@ return [
     'Title'     => '优惠券名称',
     'Title'     => '优惠券名称',
     'You_time'  => '有效期(天)',
     'You_time'  => '有效期(天)',
     'Door'      => '使用门槛(元)',
     'Door'      => '使用门槛(元)',
-    'Del_price' => '优惠金额(元)'
+    'Del_price' => '优惠金额(元)',
+    'Status'    => '类型',
+    'Status 1'  => '新人券',
+    'Status 2'  => '拉新券'
 ];
 ];

@@ -25,12 +25,16 @@ class Tick extends Model
 
 
     // 追加属性
     // 追加属性
     protected $append = [
     protected $append = [
-        'you_time_text'
+        'you_time_text',
+        'status_text'
     ];
     ];
     
     
 
 
     
     
-
+    public function getStatusList()
+    {
+        return ['1' => __('Status 1'), '2' => __('Status 2')];
+    }
 
 
 
 
     public function getYouTimeTextAttr($value, $data)
     public function getYouTimeTextAttr($value, $data)
@@ -39,6 +43,14 @@ class Tick extends Model
         return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
         return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
     }
     }
 
 
+
+    public function getStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
+        $list = $this->getStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
     protected function setYouTimeAttr($value)
     protected function setYouTimeAttr($value)
     {
     {
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);
         return $value === '' ? null : ($value && !is_numeric($value) ? strtotime($value) : $value);

@@ -24,6 +24,18 @@
             <input id="c-del_price" data-rule="required" class="form-control" step="0.01" name="row[del_price]" type="number">
             <input id="c-del_price" data-rule="required" class="form-control" step="0.01" name="row[del_price]" type="number">
         </div>
         </div>
     </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="1"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
     <div class="form-group layer-footer">
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">

@@ -9,7 +9,7 @@
     <div class="form-group">
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('You_time')}:</label>
         <label class="control-label col-xs-12 col-sm-2">{:__('You_time')}:</label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">
-            <input id="c-you_time" data-rule="required" class="form-control"  data-use-current="true" name="row[you_time]" type="number" value="{:$row.you_time}">
+            <input id="c-you_time" data-rule="required" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[you_time]" type="text" value="{:$row.you_time?datetime($row.you_time):''}">
         </div>
         </div>
     </div>
     </div>
     <div class="form-group">
     <div class="form-group">
@@ -24,6 +24,18 @@
             <input id="c-del_price" data-rule="required" class="form-control" step="0.01" name="row[del_price]" type="number" value="{$row.del_price|htmlentities}">
             <input id="c-del_price" data-rule="required" class="form-control" step="0.01" name="row[del_price]" type="number" value="{$row.del_price|htmlentities}">
         </div>
         </div>
     </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="statusList" item="vo"}
+            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </div>
+    </div>
     <div class="form-group layer-footer">
     <div class="form-group layer-footer">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">
         <div class="col-xs-12 col-sm-8">

 <div class="panel panel-default panel-intro">
 <div class="panel panel-default panel-intro">
-    {:build_heading()}
+    
+    <div class="panel-heading">
+        {:build_heading(null,FALSE)}
+        <ul class="nav nav-tabs" data-field="status">
+            <li class="{:$Think.get.status === null ? 'active' : ''}"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
+            {foreach name="statusList" item="vo"}
+            <li class="{:$Think.get.status === (string)$key ? 'active' : ''}"><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
+            {/foreach}
+        </ul>
+    </div>
+
 
 
     <div class="panel-body">
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
         <div id="myTabContent" class="tab-content">
@@ -7,18 +17,18 @@
                 <div class="widget-body no-padding">
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                     <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-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-<!--                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('tick/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
+                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('tick/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('tick/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('tick/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('tick/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
-<!--                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('tick/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
-<!---->
-<!--                        <div class="dropdown btn-group {:$auth->check('tick/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>-->
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('tick/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('tick/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
+
+                        <div class="dropdown btn-group {:$auth->check('tick/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>
                     </div>

@@ -8,7 +8,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     index_url: 'tick/index' + location.search,
                     index_url: 'tick/index' + location.search,
                     add_url: 'tick/add',
                     add_url: 'tick/add',
                     edit_url: 'tick/edit',
                     edit_url: 'tick/edit',
-                    // del_url: 'tick/del',
+                    del_url: 'tick/del',
                     multi_url: 'tick/multi',
                     multi_url: 'tick/multi',
                     import_url: 'tick/import',
                     import_url: 'tick/import',
                     table: 'tick',
                     table: 'tick',
@@ -30,6 +30,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'you_time', title: __('You_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'you_time', title: __('You_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'door', title: __('Door')},
                         {field: 'door', title: __('Door')},
                         {field: 'del_price', title: __('Del_price'), operate:'BETWEEN'},
                         {field: 'del_price', title: __('Del_price'), operate:'BETWEEN'},
+                        {field: 'status', title: __('Status'), searchList: {"1":__('Status 1'),"2":__('Status 2')}, formatter: Table.api.formatter.status},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                     ]
                 ]
                 ]