ソースを参照

礼物上下架

lizhen_gitee 1 年間 前
コミット
17e71f9780

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

@@ -27,6 +27,7 @@ class Gift extends Backend
         $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());
     }
 
     public function import()

+ 4 - 1
application/admin/lang/zh-cn/gift/gift.php

@@ -31,5 +31,8 @@ return [
     'Special'     => '特效',
     'Sort'        => '排序',
     'Updatetime'  => '更新时间',
-    'Createtime'  => '创建时间'
+    'Createtime'  => '创建时间',
+    'Is_show'     => '是否上架',
+    'Is_show 1'   => '是',
+    'Is_show 0'   => '否'
 ];

+ 13 - 1
application/admin/model/gift/Gift.php

@@ -27,7 +27,8 @@ class Gift extends Model
     protected $append = [
         'is_big_text',
         'complex_text',
-        'timelimit_text'
+        'timelimit_text',
+        'is_show_text'
     ];
 
     protected static function init()
@@ -65,6 +66,10 @@ class Gift extends Model
     {
         return ['1' => __('Timelimit 1'), '0' => __('Timelimit 0')];
     }
+    public function getIsShowList()
+    {
+        return ['1' => __('Is_show 1'), '0' => __('Is_show 0')];
+    }
 
 
     public function getTypeTextAttr($value, $data)
@@ -101,4 +106,11 @@ class Gift extends Model
         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] : '';
+    }
+
 }

+ 15 - 3
application/admin/view/gift/gift/add.html

@@ -105,7 +105,7 @@
                 <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>
 
@@ -115,6 +115,18 @@
             <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">{:__('Is_show')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <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>
+
+        </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">
@@ -134,7 +146,7 @@
 
 <script src="/assets/js/svga.min.js" ></script>
 <script>
-    // 鎾�斁
+    // 播放
     function play() {
         $("#p-special li a.thumbnail").html("<div id='demoCanvas'></div>");
 
@@ -142,7 +154,7 @@
         player.loops=1;
         player.clearsAfterStop=false;
 
-        var parser = new SVGA.Parser('#demoCanvas'); // 濡傛灉浣犻渶瑕佹敮鎸� IE6+锛岄偅涔堝繀椤绘妸鍚屾牱鐨勯€夋嫨鍣ㄤ紶缁� Parser銆�
+        var parser = new SVGA.Parser('#demoCanvas'); // 如果你需要支持 IE6+,那么必须把同样的选择器传给 Parser。
 
         var svgaUrl = $("#c-special").val();
 

+ 12 - 0
application/admin/view/gift/gift/edit.html

@@ -115,6 +115,18 @@
             <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">{:__('Is_show')}:</label>
+        <div class="col-xs-12 col-sm-8">
+                        
+            <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>
+
+        </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">

+ 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>
 

+ 1 - 0
public/assets/js/backend/gift/gift.js

@@ -39,6 +39,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {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: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]