会员余额流水

application/admin/controller/Usermoneylog.php

@@ -5,7 +5,7 @@ namespace app\admin\controller;
 use app\common\controller\Backend;
 
 /**
- * 会员余额流水
+ * 用户资金日志管理
  *
  * @icon fa fa-circle-o
  */
@@ -56,9 +56,12 @@ class Usermoneylog extends Backend
                     ->order($sort, $order)
                     ->paginate($limit);
 
+            $wallet_logtype = config('wallet.logtype');
+
             foreach ($list as $row) {
                 
-                $row->getRelation('user')->visible(['nickname','mobile','avatar']);
+                $row->getRelation('user')->visible(['username','nickname','mobile']);
+                $row['log_type_text'] = isset($wallet_logtype[$row['log_type']]) ? $wallet_logtype[$row['log_type']] : '';
             }
 
             $result = array("total" => $list->total(), "rows" => $list->items());

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

@@ -1,13 +1,18 @@
 <?php
 
 return [
-    'User_id'       => '会员ID',
-    'Money'         => '变更余额',
-    'Before'        => '变更前余额',
-    'After'         => '变更后余额',
-    'Memo'          => '备注',
+    'Id'            => 'ID',
+    'User_id'       => '用户ID',
+    'Log_type'      => '日志类型',
+    'Before'        => '之前余额',
+    'Change_value'  => '变动金额',
+    'Remain'        => '剩余金额',
+    'Table'         => '数据来源',
+    'Table_id'      => '数据来源ID',
+    'Remark'        => '备注',
     'Createtime'    => '创建时间',
+    'Updatetime'    => '更新时间',
+    'User.username' => '用户名',
     'User.nickname' => '昵称',
-    'User.mobile'   => '手机号',
-    'User.avatar'   => '头像'
+    'User.mobile'   => '手机号'
 ];

application/admin/model/Usermoneylog.php

@@ -20,7 +20,7 @@ class Usermoneylog extends Model
 
     // 定义时间戳字段名
     protected $createTime = 'createtime';
-    protected $updateTime = false;
+    protected $updateTime = 'updatetime';
     protected $deleteTime = false;
 
     // 追加属性

application/admin/view/usermoneylog/add.html

@@ -3,13 +3,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" min="0" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Log_type')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="0.00">
+            <input id="c-log_type" data-rule="required" class="form-control" name="row[log_type]" type="number" value="0">
         </div>
     </div>
     <div class="form-group">
@@ -19,15 +19,33 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('After')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Change_value')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-after" data-rule="required" class="form-control" step="0.01" name="row[after]" type="number" value="0.00">
+            <input id="c-change_value" data-rule="required" class="form-control" step="0.01" name="row[change_value]" type="number" value="0.00">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Memo')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remain')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-memo" class="form-control" name="row[memo]" type="text" value="">
+            <input id="c-remain" data-rule="required" class="form-control" step="0.01" name="row[remain]" type="number" value="0.00">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table" data-rule="required" class="form-control" name="row[table]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table_id" data-rule="required" data-source="table/index" class="form-control selectpage" name="row[table_id]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remark" data-rule="required" class="form-control" name="row[remark]" type="text" value="">
         </div>
     </div>
     <div class="form-group layer-footer">

application/admin/view/usermoneylog/edit.html

@@ -3,13 +3,13 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" data-rule="required" min="0" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
+            <input id="c-user_id" data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Log_type')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-money" data-rule="required" class="form-control" step="0.01" name="row[money]" type="number" value="{$row.money|htmlentities}">
+            <input id="c-log_type" data-rule="required" class="form-control" name="row[log_type]" type="number" value="{$row.log_type|htmlentities}">
         </div>
     </div>
     <div class="form-group">
@@ -19,15 +19,33 @@
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('After')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Change_value')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-after" data-rule="required" class="form-control" step="0.01" name="row[after]" type="number" value="{$row.after|htmlentities}">
+            <input id="c-change_value" data-rule="required" class="form-control" step="0.01" name="row[change_value]" type="number" value="{$row.change_value|htmlentities}">
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Memo')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remain')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-memo" class="form-control" name="row[memo]" type="text" value="{$row.memo|htmlentities}">
+            <input id="c-remain" data-rule="required" class="form-control" step="0.01" name="row[remain]" type="number" value="{$row.remain|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table" data-rule="required" class="form-control" name="row[table]" type="text" value="{$row.table|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Table_id')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-table_id" data-rule="required" data-source="table/index" class="form-control selectpage" name="row[table_id]" type="text" value="{$row.table_id|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Remark')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-remark" data-rule="required" class="form-control" name="row[remark]" type="text" value="{$row.remark|htmlentities}">
         </div>
     </div>
     <div class="form-group layer-footer">

application/admin/view/usermoneylog/index.html

@@ -7,10 +7,10 @@
                 <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('usermoneylog/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('usermoneylog/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('usermoneylog/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('usermoneylog/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-                        
+                        -->
 
                         
 

public/assets/js/backend/usermoneylog.js

@@ -22,20 +22,28 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 url: $.fn.bootstrapTable.defaults.extend.index_url,
                 pk: 'id',
                 sortName: 'id',
+                fixedColumns: true,
+                fixedRightNumber: 1,
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
+                        {field: 'id', title: '序号'},
                         {field: 'user_id', title: __('User_id')},
-                        {field: 'money', title: __('Money'), operate:'BETWEEN'},
-                        {field: 'before', title: __('Before'), operate:'BETWEEN'},
-                        {field: 'after', title: __('After'), operate:'BETWEEN'},
-                        {field: 'memo', title: __('Memo'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
-                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
                         {field: 'user.nickname', title: __('User.nickname'), operate: 'LIKE'},
                         {field: 'user.mobile', title: __('User.mobile'), operate: 'LIKE'},
-                        {field: 'user.avatar', title: __('User.avatar'), operate: 'LIKE', events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+//                        {field: 'log_type', title: __('Log_type')},
+                        {field: 'log_type_text', title: __('Log_type'),operate:false},
+                        {field: 'before', title: __('Before'), operate:'BETWEEN'},
+                        {field: 'change_value', title: __('Change_value'), operate:'BETWEEN'},
+                        {field: 'remain', title: __('Remain'), operate:'BETWEEN'},
+//                        {field: 'table', title: __('Table'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+//                        {field: 'table_id', title: __('Table_id')},
+                        {field: 'remark', title: __('Remark'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+//                        {field: 'updatetime', title: __('Updatetime'), 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}
                     ]
                 ]
             });