浏览代码

礼物设置是否大礼物

lizhen_gitee 1 年之前
父节点
当前提交
c29bbd60ab

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

@@ -22,6 +22,7 @@ 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());

+ 9 - 0
application/admin/lang/zh-cn/gift/gift.php

@@ -10,6 +10,15 @@ return [
     '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'   => '不可以',

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

@@ -25,13 +25,17 @@ class Gift extends Model
 
     // 追加属性
     protected $append = [
-        'type_text',
+        'is_big_text',
         'complex_text',
         'timelimit_text'
     ];
     
 
     
+    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')];
@@ -59,6 +63,12 @@ class Gift extends Model
         $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] : '';
+    }
 
 
     public function getComplexTextAttr($value, $data)

+ 16 - 4
application/admin/view/gift/gift/add.html

@@ -19,7 +19,7 @@
         </div>
     </div>
     <!--<div class="form-group">
-        <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">
                         
             <select  id="c-box_type" data-rule="required" class="form-control selectpicker" name="row[box_type]">
@@ -31,6 +31,18 @@
         </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">
                         
@@ -93,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>
 
@@ -122,7 +134,7 @@
 
 <script src="/assets/js/svga.min.js" ></script>
 <script>
-    // 鎾�斁
+    // 播放
     function play() {
         $("#p-special li a.thumbnail").html("<div id='demoCanvas'></div>");
 
@@ -130,7 +142,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();
 

+ 16 - 4
application/admin/view/gift/gift/edit.html

@@ -19,7 +19,7 @@
         </div>
     </div>
     <!--<div class="form-group">
-        <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">
                         
             <select  id="c-box_type" data-rule="required" class="form-control selectpicker" name="row[box_type]">
@@ -30,6 +30,18 @@
 
         </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">
@@ -93,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>
 
@@ -121,7 +133,7 @@
 </style>
 <script src="/assets/js/svga.min.js" ></script>
 <script>
-    // 鎾�斁
+    // 播放
     function play() {
         $("#p-special li a.thumbnail").html("<div id='demoCanvas'></div>");
 
@@ -129,7 +141,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();
 

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

@@ -29,6 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {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')},