重建礼物

application/admin/controller/Gift.php

@@ -22,11 +22,8 @@ class Gift extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\Gift;
-        $typeList = [
-            'statusList' => $this->model->getStatusList(),
-        ];
-        $this->view->assign($typeList);
-        $this->assignconfig($typeList);
+        $this->view->assign("statusList", $this->model->getStatusList());
+        $this->view->assign("wallettypeList", $this->model->getWallettypeList());
     }
 
     public function import()
@@ -58,15 +55,15 @@ class Gift extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    //->with(['gifttype'])
+                    ->with(['gifttype'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
 
-           /* foreach ($list as $row) {
+            foreach ($list as $row) {
                 
                 $row->getRelation('gifttype')->visible(['name']);
-            }*/
+            }
 
             $result = array("total" => $list->total(), "rows" => $list->items());
 
@@ -75,39 +72,4 @@ class Gift extends Backend
         return $this->view->fetch();
     }
 
-    /**
-     * 删除
-     */
-    public function del($ids = null)
-    {
-        if (false === $this->request->isPost()) {
-            $this->error(__("Invalid parameters"));
-        }
-        $ids = $ids ?: $this->request->post("ids");
-        if (empty($ids)) {
-            $this->error(__('Parameter %s can not be empty', 'ids'));
-        }
-        $pk = $this->model->getPk();
-        $adminIds = $this->getDataLimitAdminIds();
-        if (is_array($adminIds)) {
-            $this->model->where($this->dataLimitField, 'in', $adminIds);
-        }
-        $list = $this->model->where($pk, 'in', $ids)->select();
-
-        $count = 0;
-        Db::startTrans();
-        try {
-            foreach ($list as $item) {
-                $count += $item->delete();
-            }
-            Db::commit();
-        } catch (PDOException|Exception $e) {
-            Db::rollback();
-            $this->error($e->getMessage());
-        }
-        if ($count) {
-            $this->success();
-        }
-        $this->error(__('No rows were deleted'));
-    }
 }

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

@@ -10,11 +10,14 @@ return [
     'Image'         => '图片',
     'Special'       => '特效',
     'Sort'          => '排序',
+    'Md5_str'       => 'md5',
+    'Status'        => '状态',
+    'Status 0'      => '隐藏',
+    'Status 1'      => '显示',
     'Updatetime'    => '更新时间',
     'Createtime'    => '创建时间',
-    'Gifttype.name' => '礼物类型',
-    'Md5'           => 'md5',
-    'status'        => '状态',
-    'status 0'      => '隐藏',
-    'status 1'      => '显示',
+    'Wallettype'    => '花费类型',
+    'Wallettype 1'  => '金币',
+    'Wallettype 2'  => '钻石',
+    'Gifttype.name' => '礼物类型'
 ];

application/admin/model/Gift.php

@@ -25,7 +25,8 @@ class Gift extends Model
 
     // 追加属性
     protected $append = [
-
+        'status_text',
+        'wallettype_text'
     ];
 
     protected static function init()
@@ -52,12 +53,17 @@ class Gift extends Model
     
 
     
-
     public function getStatusList()
     {
-        return ['0' =>__('Status 0'), '1' =>__('Status 1')];
+        return ['0' => __('Status 0'), '1' => __('Status 1')];
+    }
+
+    public function getWallettypeList()
+    {
+        return ['1' => __('Wallettype 1'), '2' => __('Wallettype 2')];
     }
 
+
     public function getStatusTextAttr($value, $data)
     {
         $value = $value ? $value : (isset($data['status']) ? $data['status'] : '');
@@ -66,6 +72,13 @@ class Gift extends Model
     }
 
 
+    public function getWallettypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['wallettype']) ? $data['wallettype'] : '');
+        $list = $this->getWallettypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
 
 
 

application/admin/view/gift/add.html

@@ -1,27 +1,35 @@
 <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>
         <div class="col-xs-12 col-sm-8">
             <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text">
         </div>
     </div>
-
-
-    <!--<div class="form-group">
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</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">
         </div>
-    </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="">
+            <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">
+        </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">
@@ -51,25 +59,39 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Md5')}:</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">
-        </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">
         </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>
         <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}
+            {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">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Wallettype')}:</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="1"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
     <div class="form-group layer-footer">

application/admin/view/gift/edit.html

@@ -1,25 +1,35 @@
 <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>
         <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}">
         </div>
     </div>
-    <!--<div class="form-group">
+    <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Type')}:</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}">
         </div>
-    </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 class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Image')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -49,25 +59,39 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Md5')}:</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">{:__('Sort')}:</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}
+            {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">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Wallettype')}:</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>
+                {/foreach}
+            </select>
+
         </div>
     </div>
     <div class="form-group layer-footer">

application/admin/view/gift/index.html

@@ -1,5 +1,15 @@
 <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 id="myTabContent" class="tab-content">

public/assets/js/backend/gift.js

@@ -29,15 +29,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
 //                        {field: 'no', title: __('No')},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
 //                        {field: 'type', title: __('Type')},
-//                         {field: 'gifttype.name', title: __('Gifttype.name'), operate: 'LIKE'},
+                        {field: 'gifttype.name', title: __('Gifttype.name'), operate: 'LIKE'},
                         {field: 'value', title: __('Value')},
+//                        {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: 'md5_str', title: __('Md5'), operate: 'LIKE'},
                         {field: 'sort', title: __('Sort')},
-                        {field: 'status', title: __('Status'), searchList: Config.statusList, formatter: Table.api.formatter.status},
+//                        {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: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]