后台创建

application/admin/controller/Gift.php

@@ -23,7 +23,6 @@ class Gift extends Backend
         parent::_initialize();
         $this->model = new \app\admin\model\Gift;
         $this->view->assign("isShowList", $this->model->getIsShowList());
-        $this->view->assign("isVipList", $this->model->getIsVipList());
     }
 
     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("plantaskStatusList", $this->model->getPlantaskStatusList());
     }
 
     public function import()
@@ -54,15 +54,15 @@ class Giftusertyping extends Backend
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
             $list = $this->model
-                    ->with(['user','touser'])
+                    ->with(['auser','buser'])
                     ->where($where)
                     ->order($sort, $order)
                     ->paginate($limit);
 
             foreach ($list as $row) {
                 
-                $row->getRelation('user')->visible(['username']);
-				$row->getRelation('touser')->visible(['username']);
+                $row->getRelation('auser')->visible(['username']);
+				$row->getRelation('buser')->visible(['username']);
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

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

@@ -1,16 +1,13 @@
 <?php
 
 return [
-    'Id'        => '主键ID',
-    'Name'      => '名称',
-    'Price'     => '价格',
-    'Image'     => '图片',
-    'Special'   => '特效',
+    'Id'        => 'ID',
+    'Name'      => '礼物名称',
+    'Price'     => '礼物价格',
+    'Image'     => '礼物图片',
+    'Special'   => '礼物特效',
     'Weigh'     => '排序',
     'Is_show'   => '是否上架',
     'Is_show 1' => '是',
-    'Is_show 0' => '否',
-    'Is_vip'    => 'vip专属',
-    'Is_vip 1'  => '是',
-    'Is_vip 0'  => '否'
+    'Is_show 0' => '否'
 ];

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

@@ -1,15 +1,20 @@
 <?php
 
 return [
-    'Id'            => 'ID',
-    'User_id'       => '赠送用户ID',
-    'User_to_id'    => '获赠用户ID',
-    'Gift_id'       => '礼物ID',
-    'Gift_name'     => '礼物名称',
-    'Number'        => '数量',
-    'Price'         => '单个价值',
-    'Total_Price'         => '总价值',
-    'Createtime'    => '创建时间',
-    'User.username' => '赠送用户名',
-    'Touser.username' => '获赠用户名'
+    'Id'                => 'ID',
+    'User_id'           => '赠送用户ID',
+    'User_to_id'        => '获赠用户ID',
+    'Gift_id'           => '礼物ID',
+    'Gift_name'         => '礼物名称',
+    'Number'            => '数量',
+    'Price'             => '单价',
+    'Total_price'       => '总价值',
+    'Createtime'        => '创建时间',
+    'Platvalue'         => '平台抽成',
+    'Getvalue'          => '获赠价值',
+    'Plantask_status'   => '任务状态',
+    'Plantask_status 0' => '未执行',
+    'Plantask_status 1' => '已执行',
+    'aUser.username'     => '送礼用户名',
+    'bUser.username'     => '获赠用户名'
 ];

application/admin/model/Gift.php

@@ -25,8 +25,7 @@ class Gift extends Model
 
     // 追加属性
     protected $append = [
-        'is_show_text',
-        'is_vip_text'
+        'is_show_text'
     ];
     
 
@@ -44,11 +43,6 @@ class Gift extends Model
         return ['1' => __('Is_show 1'), '0' => __('Is_show 0')];
     }
 
-    public function getIsVipList()
-    {
-        return ['1' => __('Is_vip 1'), '0' => __('Is_vip 0')];
-    }
-
 
     public function getIsShowTextAttr($value, $data)
     {
@@ -58,14 +52,6 @@ class Gift extends Model
     }
 
 
-    public function getIsVipTextAttr($value, $data)
-    {
-        $value = $value ? $value : (isset($data['is_vip']) ? $data['is_vip'] : '');
-        $list = $this->getIsVipList();
-        return isset($list[$value]) ? $list[$value] : '';
-    }
-
-
 
 
 }

application/admin/model/Giftusertyping.php

@@ -25,25 +25,34 @@ class Giftusertyping extends Model
 
     // 追加属性
     protected $append = [
-
+        'plantask_status_text'
     ];
     
 
     
+    public function getPlantaskStatusList()
+    {
+        return ['0' => __('Plantask_status 0'), '1' => __('Plantask_status 1')];
+    }
 
 
+    public function getPlantaskStatusTextAttr($value, $data)
+    {
+        $value = $value ? $value : (isset($data['plantask_status']) ? $data['plantask_status'] : '');
+        $list = $this->getPlantaskStatusList();
+        return isset($list[$value]) ? $list[$value] : '';
+    }
 
 
 
 
-
-    public function user()
+    public function auser()
     {
         return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }
 
 
-    public function touser()
+    public function buser()
     {
         return $this->belongsTo('User', 'user_to_id', 'id', [], 'LEFT')->setEagerlyType(0);
     }

application/admin/view/gift/add.html

@@ -3,20 +3,20 @@
     <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">
         <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" 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">{:__('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" 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>
@@ -29,15 +29,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Special')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-special" class="form-control" size="50" name="row[special]" type="text" value="">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-special" class="btn btn-danger faupload" data-input-id="c-special" data-mimetype="mp4" data-multiple="false" data-preview-id="p-special"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-special" class="btn btn-primary fachoose" data-input-id="c-special" data-mimetype="" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-special"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-special"></ul>
+            <input id="c-special" class="form-control" name="row[special]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
@@ -58,18 +50,6 @@
 
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Is_vip')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-is_vip" data-rule="required" class="form-control selectpicker" name="row[is_vip]">
-                {foreach name="isVipList" item="vo"}
-                    <option value="{$key}" {in name="key" value=""}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/gift/edit.html

@@ -16,7 +16,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" value="{$row.image|htmlentities}">
+                <input id="c-image" class="form-control" size="50" name="row[image]" type="text" value="{$row.image|htmlentities}">
                 <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>
@@ -29,15 +29,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Special')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <div class="input-group">
-                <input id="c-special" class="form-control" size="50" name="row[special]" type="text" value="{$row.special|htmlentities}">
-                <div class="input-group-addon no-border no-padding">
-                    <span><button type="button" id="faupload-special" class="btn btn-danger faupload" data-input-id="c-special" data-mimetype="mp4" data-multiple="false" data-preview-id="p-special"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
-                    <span><button type="button" id="fachoose-special" class="btn btn-primary fachoose" data-input-id="c-special" data-mimetype="" data-multiple="false"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
-                </div>
-                <span class="msg-box n-right" for="c-special"></span>
-            </div>
-            <ul class="row list-inline faupload-preview" id="p-special"></ul>
+            <input id="c-special" class="form-control" name="row[special]" type="text" value="{$row.special|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -58,18 +50,6 @@
 
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Is_vip')}:</label>
-        <div class="col-xs-12 col-sm-8">
-                        
-            <select  id="c-is_vip" data-rule="required" class="form-control selectpicker" name="row[is_vip]">
-                {foreach name="isVipList" item="vo"}
-                    <option value="{$key}" {in name="key" value="$row.is_vip"}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

@@ -21,7 +21,7 @@
     <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">
@@ -36,6 +36,36 @@
             <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">{:__('Total_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-total_price" data-rule="required" class="form-control" name="row[total_price]" 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.1" name="row[platvalue]" type="number" value="0.0">
+        </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.1" name="row[getvalue]" type="number" value="0.0">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Plantask_status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="plantaskStatusList" item="vo"}
+            <label for="row[plantask_status]-{$key}"><input id="row[plantask_status]-{$key}" name="row[plantask_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/giftusertyping/edit.html

@@ -36,6 +36,36 @@
             <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">{:__('Total_price')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-total_price" data-rule="required" class="form-control" name="row[total_price]" type="number" value="{$row.total_price|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.1" 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">{:__('Getvalue')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-getvalue" data-rule="required" class="form-control" step="0.1" 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">{:__('Plantask_status')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            
+            <div class="radio">
+            {foreach name="plantaskStatusList" item="vo"}
+            <label for="row[plantask_status]-{$key}"><input id="row[plantask_status]-{$key}" name="row[plantask_status]" type="radio" value="{$key}" {in name="key" value="$row.plantask_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">

public/assets/js/backend/gift.js

@@ -32,7 +32,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'special', title: __('Special'), operate: 'LIKE'},
                         {field: 'weigh', title: __('Weigh'), operate: false},
                         {field: 'is_show', title: __('Is_show'), searchList: {"1":__('Is_show 1'),"0":__('Is_show 0')}, formatter: Table.api.formatter.normal},
-                        {field: 'is_vip', title: __('Is_vip'), searchList: {"1":__('Is_vip 1'),"0":__('Is_vip 0')}, formatter: Table.api.formatter.normal},
                         {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]

public/assets/js/backend/giftusertyping.js

@@ -7,8 +7,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 extend: {
                     index_url: 'giftusertyping/index' + location.search,
                     add_url: 'giftusertyping/add',
-//                    edit_url: 'giftusertyping/edit',
-//                    del_url: 'giftusertyping/del',
+                    edit_url: 'giftusertyping/edit',
+                    del_url: 'giftusertyping/del',
                     multi_url: 'giftusertyping/multi',
                     import_url: 'giftusertyping/import',
                     table: 'gift_user_typing',
@@ -27,15 +27,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
 //                        {field: 'user_id', title: __('User_id')},
+                        {field: 'auser.username', title: __('aUser.username'), operate: 'LIKE'},
 //                        {field: 'user_to_id', title: __('User_to_id')},
-                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
-                        {field: 'touser.username', title: __('Touser.username'), operate: 'LIKE'},
+                        {field: 'buser.username', title: __('bUser.username'), operate: 'LIKE'},
                         {field: 'gift_id', title: __('Gift_id')},
                         {field: 'gift_name', title: __('Gift_name'), operate: 'LIKE'},
                         {field: 'number', title: __('Number')},
                         {field: 'price', title: __('Price')},
-                        {field: 'total_price', title: __('Total_Price')},
+                        {field: 'total_price', title: __('Total_price')},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'platvalue', title: __('Platvalue'), operate:'BETWEEN'},
+                        {field: 'getvalue', title: __('Getvalue'), operate:'BETWEEN'},
+//                        {field: 'plantask_status', title: __('Plantask_status'), searchList: {"0":__('Plantask_status 0'),"1":__('Plantask_status 1')}, formatter: Table.api.formatter.status},
 
 //                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]