修改礼物获赠日志

application/admin/controller/gift/Log.php

@@ -22,7 +22,8 @@ class Log extends Backend
     {
         parent::_initialize();
         $this->model = new \app\admin\model\gift\Log;
-
+        $this->view->assign("giftGiveTypeList", $this->model->getGiftGiveTypeList());
+        $this->view->assign("taskStatusList", $this->model->getTaskStatusList());
     }
 
     public function import()

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

@@ -17,5 +17,13 @@ return [
     'Createtime'       => '创建时间',
     'User.nickname'    => '送礼用户昵称',
     'Touser.nickname'    => '收礼用户昵称',
-    'Party.party_name' => '派对名称'
+    'Party.party_name' => '派对名称',
+    'Platvalue'        => '平台抽成(钻石)',
+    'Guildervalue'     => '公会长抽成(钻石)',
+    'Guildermoney'     => '公会长抽成(余额)',
+    'Getvalue'         => '获赠价值(钻石)',
+    'Task_status'      => '任务状态',
+    'Task_status 0'    => '未执行',
+    'Task_status 1'    => '已执行',
+    'Createtime'       => '创建时间'
 ];

application/admin/model/gift/Log.php

@@ -25,11 +25,38 @@ class Log extends Model
 
     // 追加属性
     protected $append = [
-
+        'gift_give_type_text',
+        'task_status_text'
     ];
     
 
     
+    public function getGiftGiveTypeList()
+    {
+        return ['1' => __('Gift_give_type 1'), '2' => __('Gift_give_type 2')];
+    }
+
+    public function getTaskStatusList()
+    {
+        return ['0' => __('Task_status 0'), '1' => __('Task_status 1')];
+    }
+
+
+    public function getGiftGiveTypeTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['gift_give_type']) ? $data['gift_give_type'] : '');
+        $list = $this->getGiftGiveTypeList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
+
+    public function getTaskStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['task_status']) ? $data['task_status'] : '');
+        $list = $this->getTaskStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
+
 
 
 

application/admin/view/gift/log/add.html

@@ -27,20 +27,26 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gift_give_type')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-gift_give_type" data-rule="required" class="form-control" name="row[gift_give_type]" type="text">
+                        
+            <select  id="c-gift_give_type" data-rule="required" class="form-control selectpicker" name="row[gift_give_type]">
+                {foreach name="giftGiveTypeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="2"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gift_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-gift_name" data-rule="required" class="form-control" name="row[gift_name]" type="text">
+            <input id="c-gift_name" data-rule="required" class="form-control" name="row[gift_name]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gift_gif_image')}:</label>
         <div class="col-xs-12 col-sm-8">
             <div class="input-group">
-                <input id="c-gift_gif_image" data-rule="required" class="form-control" size="50" name="row[gift_gif_image]" type="text">
+                <input id="c-gift_gif_image" data-rule="required" class="form-control" size="50" name="row[gift_gif_image]" type="text" value="">
                 <div class="input-group-addon no-border no-padding">
                     <span><button type="button" id="faupload-gift_gif_image" class="btn btn-danger faupload" data-input-id="c-gift_gif_image" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="false" data-preview-id="p-gift_gif_image"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
                     <span><button type="button" id="fachoose-gift_gif_image" class="btn btn-primary fachoose" data-input-id="c-gift_gif_image" data-mimetype="image/*" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
@@ -59,7 +65,7 @@
     <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">
+            <input id="c-price" data-rule="required" class="form-control" name="row[price]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">
@@ -68,6 +74,42 @@
             <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">{:__('Platvalue')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-platvalue" data-rule="required" class="form-control" step="0.01" name="row[platvalue]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Guildervalue')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-guildervalue" data-rule="required" class="form-control" step="0.01" name="row[guildervalue]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Guildermoney')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-guildermoney" data-rule="required" class="form-control" step="0.01" name="row[guildermoney]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Getvalue')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-getvalue" data-rule="required" class="form-control" step="0.01" name="row[getvalue]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Task_status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="taskStatusList" item="vo"}
+            <label for="row[task_status]-{$key}"><input id="row[task_status]-{$key}" name="row[task_status]" type="radio" value="{$key}" {in name="key" value="0"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </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/gift/log/edit.html

@@ -27,7 +27,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Gift_give_type')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-gift_give_type" data-rule="required" class="form-control" name="row[gift_give_type]" type="text" value="{$row.gift_give_type|htmlentities}">
+                        
+            <select  id="c-gift_give_type" data-rule="required" class="form-control selectpicker" name="row[gift_give_type]">
+                {foreach name="giftGiveTypeList" item="vo"}
+                    <option value="{$key}" {in name="key" value="$row.gift_give_type"}selected{/in}>{$vo}</option>
+                {/foreach}
+            </select>
+
         </div>
     </div>
     <div class="form-group">
@@ -59,7 +65,7 @@
     <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}">
+            <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">
@@ -68,6 +74,42 @@
             <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">{:__('Platvalue')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-platvalue" data-rule="required" class="form-control" step="0.01" name="row[platvalue]" type="number" value="{$row.platvalue|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Guildervalue')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-guildervalue" data-rule="required" class="form-control" step="0.01" name="row[guildervalue]" type="number" value="{$row.guildervalue|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Guildermoney')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-guildermoney" data-rule="required" class="form-control" step="0.01" name="row[guildermoney]" type="number" value="{$row.guildermoney|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Getvalue')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-getvalue" data-rule="required" class="form-control" step="0.01" name="row[getvalue]" type="number" value="{$row.getvalue|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Task_status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="taskStatusList" item="vo"}
+            <label for="row[task_status]-{$key}"><input id="row[task_status]-{$key}" name="row[task_status]" type="radio" value="{$key}" {in name="key" value="$row.task_status"}checked{/in} /> {$vo}</label> 
+            {/foreach}
+            </div>
+
+        </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/gift/log/index.html

@@ -7,9 +7,24 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('gift/log/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('gift/log/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('gift/log/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        <a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('gift/log/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/log/multi')?'':'hide'}">
+                            <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
+                            <ul class="dropdown-menu text-left" role="menu">
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>
+                                <li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>
+                            </ul>
+                        </div>-->
+
                         
                     </div>
                     <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('gift/log/edit')}" 
+                           data-operate-del="{:$auth->check('gift/log/del')}" 
                            width="100%">
                     </table>
                 </div>

application/common/controller/Api.php

@@ -436,19 +436,6 @@ class Api
 
 
 
-    /**
-     * 判断当前url是否为全路径，并返回全路径
-     */
-    public function httpurlLocal($path) {
-        // 获取当前域名
-        if(strpos($path,'http://') === false && strpos($path,'https://') === false) {
-            $host = $_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"];
-            $url = $host.$path;
-        } else {
-            $url = $path;
-        }
-        return $url;
-    }
 
     /**
      * 接口请求限制

application/common/controller/Backend.php

@@ -781,18 +781,6 @@ class Backend extends Controller
         $this->request->token();
     }
 
-    /**
-     * 判断当前url是否为全路径，并返回全路径
-     */
-    public function httpurlLocal($path) {
-        // 获取当前域名
-        if(strpos($path,'http://') === false && strpos($path,'https://') === false) {
-            $host = $_SERVER["REQUEST_SCHEME"]."://".$_SERVER["HTTP_HOST"];
-            $url = $host.$path;
-        } else {
-            $url = $path;
-        }
-        return $url;
-    }
+
 
 }

public/assets/js/backend/gift/log.js

@@ -6,6 +6,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Table.api.init({
                 extend: {
                     index_url: 'gift/log/index' + location.search,
+                    add_url: 'gift/log/add',
+                    edit_url: 'gift/log/edit',
+                    del_url: 'gift/log/del',
+                    multi_url: 'gift/log/multi',
+                    import_url: 'gift/log/import',
                     table: 'gift_user_party',
                 }
             });
@@ -28,12 +33,17 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'party_id', title: __('Party_id')},
                         {field: 'party.party_name', title: __('Party.party_name'), operate: 'LIKE'},
                         {field: 'gift_id', title: __('Gift_id')},
-                        {field: 'gift_give_type', title: __('Gift_give_type'), operate: 'LIKE'},
+                        {field: 'gift_give_type', title: __('Gift_give_type'), searchList: {"1":__('Gift_give_type 1'),"2":__('Gift_give_type 2')}, formatter: Table.api.formatter.normal},
                         {field: 'gift_name', title: __('Gift_name'), operate: 'LIKE'},
                         // {field: 'gift_gif_image', title: __('Gift_gif_image'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         {field: 'number', title: __('Number')},
                         {field: 'price', title: __('Price')},
                         {field: 'value', title: __('Value')},
+                        {field: 'platvalue', title: __('Platvalue'), operate:'BETWEEN'},
+                        {field: 'guildervalue', title: __('Guildervalue'), operate:'BETWEEN'},
+                        {field: 'guildermoney', title: __('Guildermoney'), operate:'BETWEEN'},
+                        {field: 'getvalue', title: __('Getvalue'), operate:'BETWEEN'},
+//                        {field: 'task_status', title: __('Task_status'), searchList: {"0":__('Task_status 0'),"1":__('Task_status 1')}, formatter: Table.api.formatter.status},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         // {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]