소스 검색

后台金币流水

lizhen_gitee 1 년 전
부모
커밋
bc4bbb240e
3개의 변경된 파일10개의 추가작업 그리고 3개의 파일을 삭제
  1. 7 1
      application/admin/controller/Userjewellog.php
  2. 1 1
      application/api/controller/Eggnew.php
  3. 2 1
      public/assets/js/backend/userjewellog.js

+ 7 - 1
application/admin/controller/Userjewellog.php

@@ -64,7 +64,13 @@ class Userjewellog extends Backend
                 $row->getRelation('user')->visible(['username']);
             }
 
-            $result = array("total" => $list->total(), "rows" => $list->items());
+            $list2 = collection($list->items())->toArray();
+            $logtype = config('wallet.logtype');
+            foreach($list2 as $key => &$val){
+                $val['type_text'] = $logtype[$val['type']];
+            }
+
+            $result = array("total" => $list->total(), "rows" => $list2);
 
             return json($result);
         }

+ 1 - 1
application/api/controller/Eggnew.php

@@ -273,7 +273,7 @@ class Eggnew extends Api
 
 
             //扣金币
-            $rs_wallet = model('wallet')->lockChangeAccountRemain($user_id,$total_jewel,'-',0,'开箱子和大转盘',13,'jewel');
+            $rs_wallet = model('wallet')->lockChangeAccountRemain($user_id,$total_jewel,'-',0,'大转盘',13,'jewel');
             if($rs_wallet['status'] === false){
                 Db::rollback();
                 $this->error($rs_wallet['msg']);

+ 2 - 1
public/assets/js/backend/userjewellog.js

@@ -34,7 +34,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'balance', title: __('Balance')},
                         {field: 'detail', title: __('Detail'), operate: 'LIKE'},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'type', title: __('Type')},
+                        {field: 'type', title: __('Type')},
+                        {field: 'type_text', title: '类型描述',operate:false},
 //                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]