礼物统一表

application/admin/controller/Giftuserdongtai.php

@@ -22,7 +22,7 @@ class Giftuserdongtai extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\Giftuserdongtai;
-
+        $this->view->assign("wallettypeList", $this->model->getWallettypeList());
     }
 
     public function import()

application/admin/controller/Giftusertyping.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 use app\common\controller\Backend;
 
 /**
- * 礼物赠送记录管理
+ * 聊天礼物赠送记录管理
  *
  * @icon fa fa-circle-o
  */
@@ -22,7 +22,7 @@ class Giftusertyping extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\Giftusertyping;
-
+        $this->view->assign("wallettypeList", $this->model->getWallettypeList());
     }
 
     public function import()

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

@@ -8,12 +8,16 @@ return [
     'Gift_id'              => '礼物ID',
     'Gift_name'            => '礼物名称',
     'Number'               => '数量',
-    'Price'                => '总价值',
+    'Price'                => '金币总价值',
     'Createtime'           => '创建时间',
     'User.nickname'        => '赠送用户昵称',
     'User.mobile'          => '赠送用户手机号',
     'Userto.nickname'        => '获赠用户昵称',
     'Userto.mobile'          => '获赠用户手机号',
     'Gift.name'            => '名称',
-    'Topicdongtai.content' => '描述'
+    'Topicdongtai.content' => '描述',
+    'Jewel'        => '钻石总价值',
+    'Wallettype'   => '礼物花费类型',
+    'Wallettype 1' => '金币',
+    'Wallettype 2' => '钻石'
 ];

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

@@ -7,8 +7,12 @@ return [
     'Gift_id'       => '礼物ID',
     'Gift_name'     => '礼物名称',
     'Number'        => '数量',
-    'Price'         => '总价值',
+    'Price'         => '金币总价值',
     'Createtime'    => '创建时间',
     'User.username' => '赠送用户名',
-    'Touser.username' => '获赠用户名'
+    'Touser.username' => '获赠用户名',
+    'Jewel'        => '钻石总价值',
+    'Wallettype'   => '花费类型',
+    'Wallettype 1' => '金币',
+    'Wallettype 2' => '钻石'
 ];

application/admin/model/Giftuserdongtai.php

@@ -25,13 +25,23 @@ class Giftuserdongtai extends Model
 
     // 追加属性
     protected $append = [
-
+        'wallettype_text'
     ];
     
 
     
+    public function getWallettypeList()
+    {
+        return ['1' => __('Wallettype 1'), '2' => __('Wallettype 2')];
+    }
 
 
+    public function getWallettypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['wallettype']) ? $data['wallettype'] : '');
+        $list = $this->getWallettypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
 
 
 

application/admin/model/Giftusertyping.php

@@ -25,13 +25,23 @@ class Giftusertyping extends Model
 
     // 追加属性
     protected $append = [
-
+        'wallettype_text'
     ];
     
 
     
+    public function getWallettypeList()
+    {
+        return ['1' => __('Wallettype 1'), '2' => __('Wallettype 2')];
+    }
 
 
+    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/giftuserdongtai/add.html

@@ -42,6 +42,24 @@
             <input id="c-price" data-rule="required" class="form-control" name="row[price]" type="number" value="0">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="0">
+        </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">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/giftuserdongtai/edit.html

@@ -42,6 +42,24 @@
             <input id="c-price" data-rule="required" 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">{:__('Jewel')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="{$row.jewel|htmlentities}">
+        </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">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/giftusertyping/add.html

@@ -36,6 +36,24 @@
             <input id="c-price" data-rule="required" class="form-control" name="row[price]" type="number" value="0">
         </div>
     </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Jewel')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="0">
+        </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">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/giftusertyping/edit.html

@@ -36,6 +36,24 @@
             <input id="c-price" data-rule="required" 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">{:__('Jewel')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-jewel" data-rule="required" class="form-control" name="row[jewel]" type="number" value="{$row.jewel|htmlentities}">
+        </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">
         <label class="control-label col-xs-12 col-sm-2"></label>
         <div class="col-xs-12 col-sm-8">

public/assets/js/backend/giftuserdongtai.js

@@ -38,8 +38,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'number', title: __('Number')},
                         {field: 'price', title: __('Price')},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-
-
+                        {field: 'jewel', title: __('Jewel')},
+                        {field: 'wallettype', title: __('Wallettype'), searchList: {"1":__('Wallettype 1'),"2":__('Wallettype 2')}, formatter: Table.api.formatter.normal},
                         // {field: 'gift.name', title: __('Gift.name'), operate: 'LIKE'},
                         // {field: 'topicdongtai.content', title: __('Topicdongtai.content'), operate: 'LIKE'},
                         // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}

public/assets/js/backend/giftusertyping.js

@@ -35,7 +35,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'number', title: __('Number')},
                         {field: 'price', title: __('Price')},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-
+                        {field: 'jewel', title: __('Jewel')},
+                        {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}
                     ]
                 ]