lizhen_gitee il y a 1 an
Parent
commit
94c41cf556

+ 1 - 5
application/admin/controller/gift/Gift.php

@@ -22,12 +22,8 @@ class Gift extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\gift\Gift;
-        $this->view->assign("isBigList", $this->model->getIsBigList());
-        $this->view->assign("typeList", $this->model->getTypeList());
-        $this->view->assign("boxtypeList", $this->model->getBoxtypeList());
-        $this->view->assign("complexList", $this->model->getComplexList());
-        $this->view->assign("timelimitList", $this->model->getTimelimitList());
         $this->view->assign("isShowList", $this->model->getIsShowList());
+        $this->view->assign("isBaobiList", $this->model->getIsBaobiList());
     }
 
     public function import()

+ 18 - 34
application/admin/lang/zh-cn/gift/gift.php

@@ -1,38 +1,22 @@
 <?php
 
 return [
-    'Id'          => '主键ID',
-    'No'          => '编号',
-    'Name'        => '名称',
-    'Type'        => '类别',
-    'Type 0'      => '活动',
-    'Type 1'      => '常规',
-    'Type 2'      => '人气',
-    'Type 3'      => '浪漫',
-    'Type 4'      => '豪华',
-    'Is_big'      => '大礼物飘屏',
-    'Is_big 0'    => '否',
-    'Is_big 1'    => '是',
-    'Box_type'    => '宝箱类型',
-    'Box_type 0'  => '非宝箱礼物',
-    'Box_type 1'  => '青铜宝箱',
-    'Box_type 2'  => '黄金宝箱',
-    'Box_type 3'  => '荣耀黄金宝箱',
-    'Box_type 4'  => '荣耀紫金宝箱',
-    'Complex'     => '复数赠送',
-    'Complex 1'   => '可以',
-    'Complex 0'   => '不可以',
-    'Timelimit'   => '是否限时',
-    'Timelimit 1' => '是',
-    'Timelimit 0' => '否',
-    'Price'       => '价格',
-    'Value'       => '价值',
-    'Image'       => '图片',
-    'Special'     => '特效',
-    'Sort'        => '排序',
-    'Updatetime'  => '更新时间',
-    'Createtime'  => '创建时间',
-    'Is_show'     => '是否上架',
-    'Is_show 1'   => '是',
-    'Is_show 0'   => '否'
+    'Id'            => '主键ID',
+    'Name'          => '名称',
+    'Type'          => '类别ID',
+    'Price'         => '价格',
+    'Value'         => '价值',
+    'Image'         => '图片',
+    'Special'       => '特效',
+    'Sort'          => '排序',
+    'Updatetime'    => '更新时间',
+    'Createtime'    => '创建时间',
+    'Is_show'       => '是否上架',
+    'Is_show 1'     => '是',
+    'Is_show 0'     => '否',
+    'Is_baobi'      => '是否爆币',
+    'Is_baobi 1'    => '是',
+    'Is_baobi 0'    => '否',
+    'Back_json'     => '爆币数据',
+    'Gifttype.name' => '礼物类型'
 ];

+ 14 - 52
application/admin/model/gift/Gift.php

@@ -25,11 +25,10 @@ class Gift extends Model
 
     // 追加属性
     protected $append = [
-        'is_big_text',
-        'complex_text',
-        'timelimit_text',
-        'is_show_text'
+        'is_show_text',
+        'is_baobi_text'
     ];
+    
 
     protected static function init()
     {
@@ -43,74 +42,37 @@ class Gift extends Model
         });
     }
     
-    public function getIsBigList()
-    {
-        return ['0' => __('Is_big 0'), '1' => __('Is_big 1')];
-    }
-    public function getTypeList()
-    {
-        return ['0' => __('Type 0'), '1' => __('Type 1'), '2' => __('Type 2'), '3' => __('Type 3'), '4' => __('Type 4')];
-    }
-    
-    public function getComplexList()
-    {
-        return ['1' => __('Complex 1'), '0' => __('Complex 0')];
-    }
-
-    public function getBoxtypeList()
-    {
-        return ['0' => __('非宝箱礼物'), '1' => __('青铜宝箱'), '2' => __('黄金宝箱'), '3' => __('荣耀黄金宝箱'), '4' => __('荣耀紫金宝箱')];
-    }
-
-    public function getTimelimitList()
-    {
-        return ['1' => __('Timelimit 1'), '0' => __('Timelimit 0')];
-    }
     public function getIsShowList()
     {
         return ['1' => __('Is_show 1'), '0' => __('Is_show 0')];
     }
 
-
-    public function getTypeTextAttr($value, $data)
+    public function getIsBaobiList()
     {
-        $value = $value ? $value : (isset($data['type']) ? $data['type'] : '');
-        $list = $this->getTypeList();
-        return isset($list[$value]) ? $list[$value] : '';
-    }
-    public function getIsBigTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['is_big']) ? $data['is_big'] : '');
-        $list = $this->getIsBigList();
-        return isset($list[$value]) ? $list[$value] : '';
+        return ['1' => __('Is_baobi 1'), '0' => __('Is_baobi 0')];
     }
 
 
-    public function getComplexTextAttr($value, $data)
+    public function getIsShowTextAttr($value, $data)
     {
-        $value = $value ? $value : (isset($data['complex']) ? $data['complex'] : '');
-        $list = $this->getComplexList();
+        $value = $value ? $value : (isset($data['is_show']) ? $data['is_show'] : '');
+        $list = $this->getIsShowList();
         return isset($list[$value]) ? $list[$value] : '';
     }
 
 
-    public function getTimelimitTextAttr($value, $data)
+    public function getIsBaobiTextAttr($value, $data)
     {
-        $value = $value ? $value : (isset($data['timelimit']) ? $data['timelimit'] : '');
-        $list = $this->getTimelimitList();
+        $value = $value ? $value : (isset($data['is_baobi']) ? $data['is_baobi'] : '');
+        $list = $this->getIsBaobiList();
         return isset($list[$value]) ? $list[$value] : '';
     }
 
+
+
+
     public function gifttype()
     {
         return $this->belongsTo('app\admin\model\gift\Type', 'type', 'id', [], 'LEFT')->setEagerlyType(0);
     }
-
-    public function getIsShowTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['is_show']) ? $data['is_show'] : '');
-        $list = $this->getIsShowList();
-        return isset($list[$value]) ? $list[$value] : '';
-    }
-
 }

+ 20 - 90
application/admin/view/gift/gift/add.html

@@ -1,15 +1,9 @@
 <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">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -18,54 +12,6 @@
             <input id="c-type" data-rule="required" data-source="gift/type/index" class="form-control selectpage" name="row[type]" type="text" value="">
         </div>
     </div>
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Box_type')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-box_type" data-rule="required" class="form-control selectpicker" name="row[box_type]">
-                {foreach name="boxtypeList" 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">{:__('Is_big')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-is_big" data-rule="required" class="form-control selectpicker" name="row[is_big]">
-                {foreach name="isBigList" 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">{:__('Complex')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-complex" data-rule="required" class="form-control selectpicker" name="row[complex]">
-                {foreach name="complexList" 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">{:__('Timelimit')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-timelimit" data-rule="required" class="form-control selectpicker" name="row[timelimit]">
-                {foreach name="timelimitList" 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">{:__('Price')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -82,7 +28,7 @@
         <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" data-rule="required" 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>
@@ -92,7 +38,6 @@
             <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
     </div>
-
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Special')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -108,7 +53,6 @@
             <div style="padding:2px 33px;margin-top:10px;width:120px;color:#fff3f6;cursor:pointer;background-color: #00A000;border-radius: 2px;" onclick="play()">播放动画</div>
         </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">
@@ -127,6 +71,24 @@
 
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_baobi')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_baobi" data-rule="required" class="form-control selectpicker" name="row[is_baobi]">
+                {foreach name="isBaobiList" 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">{:__('Back_json')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-back_json" class="form-control " rows="5" name="row[back_json]" cols="50"></textarea>
+        </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">
@@ -135,35 +97,3 @@
         </div>
     </div>
 </form>
-
-<style>
-
-    #demoCanvas{
-        width: 100px;
-        height: 80px;
-    }
-</style>
-
-<script src="/assets/js/svga.min.js" ></script>
-<script>
-    // 播放
-    function play() {
-        $("#p-special li a.thumbnail").html("<div id='demoCanvas'></div>");
-
-        var player = new SVGA.Player('#demoCanvas');
-        player.loops=1;
-        player.clearsAfterStop=false;
-
-        var parser = new SVGA.Parser('#demoCanvas'); // 如果你需要支持 IE6+,那么必须把同样的选择器传给 Parser。
-
-        var svgaUrl = $("#c-special").val();
-
-        if(svgaUrl.indexOf("http://") == -1 && svgaUrl.indexOf("https://") == -1) {
-            svgaUrl = "{$Think.config.cos.url}"+svgaUrl;
-        }
-        parser.load(svgaUrl, function(videoItem) {
-            player.setVideoItem(videoItem);
-            player.startAnimation();
-        })
-    }
-</script>

+ 19 - 88
application/admin/view/gift/gift/edit.html

@@ -1,11 +1,5 @@
 <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">
@@ -18,54 +12,6 @@
             <input id="c-type" data-rule="required" data-source="gift/type/index" class="form-control selectpage" name="row[type]" type="text" value="{$row.type|htmlentities}">
         </div>
     </div>
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('��������')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-box_type" data-rule="required" class="form-control selectpicker" name="row[box_type]">
-                {foreach name="boxtypeList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.box_type"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
-        </div>
-    </div>-->
-	<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Is_big')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-is_big" data-rule="required" class="form-control selectpicker" name="row[is_big]">
-                {foreach name="isBigList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.is_big"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
-        </div>
-    </div>
-    <!--<div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Complex')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-complex" data-rule="required" class="form-control selectpicker" name="row[complex]">
-                {foreach name="complexList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.complex"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Timelimit')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-timelimit" data-rule="required" class="form-control selectpicker" name="row[timelimit]">
-                {foreach name="timelimitList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.timelimit"}selected{/in}>{$vo}</option>
-                {/foreach}
-            </select>
-
-        </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">
@@ -92,7 +38,6 @@
             <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
     </div>
-
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Special')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -105,10 +50,9 @@
                 <span class="msg-box n-right" for="c-special"></span>
             </div>
             <ul class="row list-inline faupload-preview" id="p-special"></ul>
-            <div style="padding:2px 33px;margin-top:10px;width:120px;color:#fff3f6;cursor:pointer;background-color: #00A000;border-radius: 2px;" onclick="play()">播放动画</div>
+            <div style="padding:2px 33px;margin-top:10px;width:120px;color:#fff3f6;cursor:pointer;background-color: #00A000;border-radius: 2px;" onclick="play()">²¥·Å¶¯»­</div>
         </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">
@@ -127,6 +71,24 @@
 
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Is_baobi')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <select  id="c-is_baobi" data-rule="required" class="form-control selectpicker" name="row[is_baobi]">
+                {foreach name="isBaobiList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.is_baobi"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Back_json')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <textarea id="c-back_json" class="form-control " rows="5" name="row[back_json]" cols="50">{$row.back_json|htmlentities}</textarea>
+        </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">
@@ -135,34 +97,3 @@
         </div>
     </div>
 </form>
-
-<style>
-
-    #demoCanvas{
-        width: 100px;
-        height: 80px;
-    }
-</style>
-<script src="/assets/js/svga.min.js" ></script>
-<script>
-    // 播放动画
-    function play() {
-        $("#p-special li a.thumbnail").html("<div id='demoCanvas'></div>");
-
-        var player = new SVGA.Player('#demoCanvas');
-        player.loops=1;
-        player.clearsAfterStop=false;
-
-        var parser = new SVGA.Parser('#demoCanvas'); // 如果你需�支� IE6+,那么必须把�样的选择器传给 Parser。
-
-        var svgaUrl = $("#c-special").val();
-
-        if(svgaUrl.indexOf("http://") == -1 && svgaUrl.indexOf("https://") == -1) {
-            svgaUrl = "{$Think.config.cos.url}"+svgaUrl;
-        }
-        parser.load(svgaUrl, function(videoItem) {
-            player.setVideoItem(videoItem);
-            player.startAnimation();
-        })
-    }
-</script>

+ 6 - 6
application/admin/view/gift/gift/index.html

@@ -13,18 +13,18 @@
                         <!--<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('gift/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>-->
 
                         <div class="dropdown btn-group {:$auth->check('gift/gift/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i>上下架</a>
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i>ÉÏϼÜ</a>
                             <ul class="dropdown-menu text-left" role="menu">
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_show=1"><i class="fa fa-eye"></i>上架</a></li>
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_show=0"><i class="fa fa-eye-slash"></i>下架</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_show=1"><i class="fa fa-eye"></i>ÉϼÜ</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_show=0"><i class="fa fa-eye-slash"></i>ϼÜ</a></li>
                             </ul>
                         </div>
 
                         <div class="dropdown btn-group {:$auth->check('gift/gift/multi')?'':'hide'}">
-                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i>大礼物飘�</a>
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i>´óÀñÎïÆ®ÆÁ</a>
                             <ul class="dropdown-menu text-left" role="menu">
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_big=1"><i class="fa fa-eye"></i>是</a></li>
-                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_big=0"><i class="fa fa-eye-slash"></i>�</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_big=1"><i class="fa fa-eye"></i>ÊÇ</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="is_big=0"><i class="fa fa-eye-slash"></i>·ñ</a></li>
                             </ul>
                         </div>
 

+ 8 - 9
public/assets/js/backend/gift/gift.js

@@ -26,20 +26,19 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-//                        {field: 'no', title: __('No')},
                         {field: 'name', title: __('Name'), operate: 'LIKE'},
-                        {field: 'gifttype.name', title: __('Type'), formatter: Table.api.formatter.normal},
-                        {field: 'is_big', title: __('Is_big'), searchList: {"0":__('Is_big 0'),"1":__('Is_big 1')}, formatter: Table.api.formatter.normal},
-//                        {field: 'complex', title: __('Complex'), searchList: {"1":__('Complex 1'),"0":__('Complex 0')}, formatter: Table.api.formatter.normal},
-//                        {field: 'timelimit', title: __('Timelimit'), searchList: {"1":__('Timelimit 1'),"0":__('Timelimit 0')}, formatter: Table.api.formatter.normal},
-                        {field: 'price', title: __('Price'),sortable:true},
-//                        {field: 'value', title: __('Value')},
+                        {field: 'type', title: __('Type')},
+                        {field: 'price', title: __('Price')},
+                        {field: 'value', title: __('Value')},
                         {field: 'image', title: __('Image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        // {field: 'special', title: __('Special'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'sort', title: __('Sort'),sortable:true},
+                        {field: 'special', title: __('Special'), operate: 'LIKE'},
+                        {field: 'sort', title: __('Sort')},
                         {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: 'is_show', title: __('Is_show'), searchList: {"1":__('Is_show 1'),"0":__('Is_show 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'is_baobi', title: __('Is_baobi'), searchList: {"1":__('Is_baobi 1'),"0":__('Is_baobi 0')}, formatter: Table.api.formatter.normal},
+                        {field: 'back_json', title: __('Back_json')},
+                        {field: 'gifttype.name', title: __('Gifttype.name'), operate: 'LIKE'},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]