فهرست منبع

后台,语音,视频

lizhen_gitee 9 ماه پیش
والد
کامیت
5e9df0f13a

+ 3 - 1
application/admin/lang/zh-cn/usermatchaudiolog.php

@@ -14,5 +14,7 @@ return [
     'Plantask_status 0' => '未执行',
     'Plantask_status 1' => '已执行',
     'aUser.username'     => '消费用户名',
-    'bUser.username'     => '收益用户名'
+    'bUser.username'     => '收益用户名',
+    'Free_times'        => '免费次数',
+    'Free_money'        => '免费补贴',
 ];

+ 3 - 1
application/admin/lang/zh-cn/usermatchvideolog.php

@@ -14,5 +14,7 @@ return [
     'Plantask_status 0' => '未执行',
     'Plantask_status 1' => '已执行',
     'aUser.username'     => '消费用户名',
-    'bUser.username'     => '收益用户名'
+    'bUser.username'     => '收益用户名',
+    'Free_times'        => '免费次数',
+    'Free_money'        => '免费补贴',
 ];

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

@@ -40,7 +40,7 @@ class Demo extends Api
      */
     public function test()
     {
-
+        exit;
 
         $user_id = 6064;
         $accountType = 'gold';

+ 2 - 0
public/assets/js/backend/usermatchaudiolog.js

@@ -38,6 +38,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'call_minutes', title: __('Call_minutes')},
                         {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: 'free_times', title: __('Free_times')},
+                        {field: 'free_money', title: __('Free_money'), 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}
                     ]

+ 2 - 0
public/assets/js/backend/usermatchvideolog.js

@@ -38,6 +38,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'call_minutes', title: __('Call_minutes')},
                         {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: 'free_times', title: __('Free_times')},
+                        {field: 'free_money', title: __('Free_money'), 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}
                     ]

+ 1 - 1
public/assets/js/backend/userwallet.js

@@ -25,7 +25,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                 columns: [
                     [
                         {checkbox: true},
-                        {field: 'id', title: __('Id')},
+//                        {field: 'id', title: __('Id')},
                         {field: 'user_id', title: __('User_id')},
                         {field: 'user.username', title: __('User.username'), operate: 'LIKE'},
                         {field: 'gold', title: __('Gold'), operate:'BETWEEN'},