礼物重建

application/admin/controller/Gift.php

@@ -22,8 +22,8 @@ class Gift extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\Gift;
-        $this->view->assign("statusList", $this->model->getStatusList());
-        $this->view->assign("wallettypeList", $this->model->getWallettypeList());
+        $this->view->assign("isVipList", $this->model->getIsVipList());
+        $this->view->assign("isShowList", $this->model->getIsShowList());
     }
 
     public function import()
@@ -38,38 +38,4 @@ class Gift extends Backend
      */
     
 
-    /**
-     * 查看
-     */
-    public function index()
-    {
-        //当前是否为关联查询
-        $this->relationSearch = true;
-        //设置过滤方法
-        $this->request->filter(['strip_tags', 'trim']);
-        if ($this->request->isAjax()) {
-            //如果发送的来源是Selectpage，则转发到Selectpage
-            if ($this->request->request('keyField')) {
-                return $this->selectpage();
-            }
-            list($where, $sort, $order, $offset, $limit) = $this->buildparams();
-
-            $list = $this->model
-                    ->with(['gifttype'])
-                    ->where($where)
-                    ->order($sort, $order)
-                    ->paginate($limit);
-
-            foreach ($list as $row) {
-                
-                $row->getRelation('gifttype')->visible(['name']);
-            }
-
-            $result = array("total" => $list->total(), "rows" => $list->items());
-
-            return json($result);
-        }
-        return $this->view->fetch();
-    }
-
 }

application/admin/lang/zh-cn/gift.php

@@ -1,23 +1,16 @@
 <?php
 
 return [
-    'Id'            => 'ID',
-    'No'            => '编号',
-    'Name'          => '名称',
-    'Type'          => '礼物分组',
-    'Value'         => '价值',
-    'Price'         => '价格',
-    'Image'         => '图片',
-    'Special'       => '特效',
-    'Sort'          => '排序',
-    'Md5_str'       => 'md5',
-    'Status'        => '状态',
-    'Status 0'      => '隐藏',
-    'Status 1'      => '显示',
-    'Updatetime'    => '更新时间',
-    'Createtime'    => '创建时间',
-    'Wallettype'    => '花费类型',
-    'Wallettype 1'  => '金币',
-    'Wallettype 2'  => '钻石',
-    'Gifttype.name' => '礼物分组'
+    'Id'        => 'ID',
+    'Is_vip'    => 'vip礼物',
+    'Is_vip 0'  => '否',
+    'Is_vip 1'  => '是',
+    'Name'      => '礼物名称',
+    'Price'     => '礼物价格',
+    'Image'     => '礼物图片',
+    'Special'   => '礼物特效',
+    'Weigh'     => '排序',
+    'Is_show'   => '是否上架',
+    'Is_show 1' => '是',
+    'Is_show 0' => '否'
 ];

application/admin/model/Gift.php

@@ -16,74 +16,56 @@ class Gift extends Model
     protected $name = 'gift';
     
     // 自动写入时间戳字段
-    protected $autoWriteTimestamp = 'int';
+    protected $autoWriteTimestamp = false;
 
     // 定义时间戳字段名
-    protected $createTime = 'createtime';
-    protected $updateTime = 'updatetime';
+    protected $createTime = false;
+    protected $updateTime = false;
     protected $deleteTime = false;
 
     // 追加属性
     protected $append = [
-        'status_text',
-        'wallettype_text'
+        'is_vip_text',
+        'is_show_text'
     ];
+    
 
     protected static function init()
     {
-        //两个毫无用处的字段，没有还不行
-        self::afterInsert(function ($row){
-            $data = [
-                'no' => $row['id'],
-                'price' => $row['value'],
-            ];
-
-            db('gift')->where('id',$row['id'])->update($data);
-        });
-
-        self::beforeUpdate(function ($row) {
-            $changed = $row->getChangedData();
-            //如果有修改密码
-            if (isset($changed['value'])) {
-                $row->price = $changed['value'];
-            }
-
+        self::afterInsert(function ($row) {
+            $pk = $row->getPk();
+            $row->getQuery()->where($pk, $row[$pk])->update(['weigh' => $row[$pk]]);
         });
     }
-    
 
     
-    public function getStatusList()
+    public function getIsVipList()
     {
-        return ['0' => __('Status 0'), '1' => __('Status 1')];
+        return ['0' => __('Is_vip 0'), '1' => __('Is_vip 1')];
     }
 
-    public function getWallettypeList()
+    public function getIsShowList()
     {
-        return ['1' => __('Wallettype 1'), '2' => __('Wallettype 2')];
+        return ['1' => __('Is_show 1'), '0' => __('Is_show 0')];
     }
 
 
-    public function getStatusTextAttr($value, $data)
+    public function getIsVipTextAttr($value, $data)
     {
-        $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
-        $list = $this->getStatusList();
+        $value = $value ? $value : (isset($data['is_vip']) ? $data['is_vip'] : '');
+        $list = $this->getIsVipList();
         return isset($list[$value]) ? $list[$value] : '';
     }
 
 
-    public function getWallettypeTextAttr($value, $data)
+    public function getIsShowTextAttr($value, $data)
     {
-        $value = $value ? $value : (isset($data['wallettype']) ? $data['wallettype'] : '');
-        $list = $this->getWallettypeList();
+        $value = $value ? $value : (isset($data['is_show']) ? $data['is_show'] : '');
+        $list = $this->getIsShowList();
         return isset($list[$value]) ? $list[$value] : '';
     }
 
 
 
 
-    public function gifttype()
-    {
-        return $this->belongsTo('Gifttype', 'type', 'id', [], 'LEFT')->setEagerlyType(0);
-    }
 }

application/admin/view/gift/add.html

@@ -1,40 +1,34 @@
 <form id="add-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('No')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-no" data-rule="required" class="form-control" name="row[no]" type="number" value="0">
-        </div>
-    </div>-->
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_vip')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text">
+                        
+            <select  id="c-is_vip" data-rule="required" class="form-control selectpicker" name="row[is_vip]">
+                {foreach name="isVipList" item="vo"}
+                    <option value="{$key}" {in name="key" value="0"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-type" data-rule="required" data-source="gifttype/index" data-field="name" class="form-control selectpage" name="row[type]" type="text" value="0">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Value')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-value" data-rule="required" class="form-control" name="row[value]" type="number" value="0">
-        </div>
-    </div>
-    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-price" class="form-control" name="row[price]" type="number">
+            <input id="c-price" class="form-control" name="row[price]" type="number" value="0">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text">
+                <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -47,47 +41,21 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Special')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-special" class="form-control" size="50" name="row[special]" type="text" value="">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-special" class="btn btn-danger faupload" data-input-id="c-special" data-mimetype="svga,mp4" data-multiple="false" data-preview-id="p-special"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-special" class="btn btn-primary fachoose" data-input-id="c-special" data-mimetype="" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-special"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-special"></ul>
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Sort')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-sort" class="form-control" name="row[sort]" type="number" value="0">
+            <input id="c-special" class="form-control" name="row[special]" type="text" value="">
         </div>
     </div>
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Md5_str')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-md5_str" data-rule="required" class="form-control" name="row[md5_str]" type="text" value="">
-        </div>
-    </div>-->
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</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>
-
+            <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Wallettype')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_show')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-wallettype" data-rule="required" class="form-control selectpicker" name="row[wallettype]">
-                {foreach name="wallettypeList" item="vo"}
+            <select  id="c-is_show" data-rule="required" class="form-control selectpicker" name="row[is_show]">
+                {foreach name="isShowList" item="vo"}
                     <option value="{$key}" {in name="key" value="1"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>

application/admin/view/gift/edit.html

@@ -1,40 +1,34 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
 
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('No')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-no" data-rule="required" class="form-control" name="row[no]" type="number" value="{$row.no|htmlentities}">
-        </div>
-    </div>-->
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_vip')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
+                        
+            <select  id="c-is_vip" data-rule="required" class="form-control selectpicker" name="row[is_vip]">
+                {foreach name="isVipList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_vip"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-type" data-rule="required" data-source="gifttype/index" class="form-control selectpage" name="row[type]" type="text" value="{$row.type|htmlentities}">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Value')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-value" data-rule="required" class="form-control" name="row[value]" type="number" value="{$row.value|htmlentities}">
-        </div>
-    </div>
-    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-price" class="form-control" name="row[price]" type="number" value="{$row.price|htmlentities}">
         </div>
-    </div>-->
+    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-image" data-rule="required" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
+                <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-image" class="btn btn-danger faupload" data-input-id="c-image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-image" class="btn btn-primary fachoose" data-input-id="c-image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -47,48 +41,22 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Special')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-special" class="form-control" size="50" name="row[special]" type="text" value="{$row.special|htmlentities}">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-special" class="btn btn-danger faupload" data-input-id="c-special" data-mimetype="svga,mp4" data-multiple="false" data-preview-id="p-special"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-special" class="btn btn-primary fachoose" data-input-id="c-special" data-mimetype="" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-special"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-special"></ul>
+            <input id="c-special" class="form-control" name="row[special]" type="text" value="{$row.special|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Sort')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Weigh')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-sort" class="form-control" name="row[sort]" type="number" value="{$row.sort|htmlentities}">
-        </div>
-    </div>
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Md5_str')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-md5_str" data-rule="required" class="form-control" name="row[md5_str]" type="text" value="{$row.md5_str|htmlentities}">
-        </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>
-
+            <input id="c-weigh" class="form-control" name="row[weigh]" type="number" value="{$row.weigh|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Wallettype')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_show')}:</label>
         <div class="col-xs-12 col-sm-8">
                         
-            <select  id="c-wallettype" data-rule="required" class="form-control selectpicker" name="row[wallettype]">
-                {foreach name="wallettypeList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.wallettype"}selected{/in}>{$vo}</option>
+            <select  id="c-is_show" data-rule="required" class="form-control selectpicker" name="row[is_show]">
+                {foreach name="isShowList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_show"}selected{/in}>{$vo}</option>
                 {/foreach}
             </select>
 

application/admin/view/gift/index.html

@@ -1,15 +1,5 @@
 <div class="panel panel-default panel-intro">
-    
-    <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>
-
+    {:build_heading()}
 
     <div class="panel-body">
         <div id="myTabContent" class="tab-content">
@@ -18,7 +8,7 @@
                     <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('gift/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('gift/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('gift/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('gift/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('gift/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>
 
@@ -28,7 +18,7 @@
                                 <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>

public/assets/js/backend/gift.js

@@ -21,25 +21,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             table.bootstrapTable({
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
-                sortName: 'id',
+                sortName: 'weigh',
                 columns: [
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-//                        {field: 'no', title: __('No')},
+                        {field: 'is_vip', title: __('Is_vip'), searchList: {"0":__('Is_vip 0'),"1":__('Is_vip 1')}, formatter: Table.api.formatter.normal},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
-//                        {field: 'type', title: __('Type')},
-                        {field: 'gifttype.name', title: __('Gifttype.name'), operate: 'LIKE'},
-                        {field: 'value', title: __('Value')},
-//                        {field: 'price', title: __('Price')},
+                        {field: 'price', title: __('Price')},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-//                        {field: 'special', title: __('Special'), operate: 'LIKE'},
-                        {field: 'sort', title: __('Sort')},
-//                        {field: 'md5_str', title: __('Md5_str'), operate: 'LIKE'},
-                        {field: 'status', title: __('Status'), searchList: {"0":__('Status 0'),"1":__('Status 1')}, formatter: Table.api.formatter.status},
-                        {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'wallettype', title: __('Wallettype'), searchList: {"1":__('Wallettype 1'),"2":__('Wallettype 2')}, formatter: Table.api.formatter.normal},
+                        {field: 'special', title: __('Special'), operate: 'LIKE'},
+                        {field: 'weigh', title: __('Weigh'), operate: false},
+                        {field: 'is_show', title: __('Is_show'), searchList: {"1":__('Is_show 1'),"0":__('Is_show 0')}, formatter: Table.api.formatter.normal},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]