Explorar el Código

会员管理增加 卡单 任务锁定开关

Jason hace 1 año
padre
commit
0b7c6c2e46

+ 2 - 1
application/admin/lang/zh-cn/user/user.php

@@ -18,7 +18,8 @@ return [
     '关'                     => '关',
     'Recharge'              => '充值',
     'Withdrawal'            => '提现',
-    'Income'                => '收益',
+    'Income'                => '存取差',
+    '累计收益'                => '累计收益',
     'Account change'        => '帐变',
     'Clear'                 => '清零',
     'Team'                  => '团队',

+ 1 - 1
application/common/model/Users.php

@@ -70,7 +70,7 @@ class Users extends Model
             if((new Config())->getValue('recharge_bank_switch')){
                 $data['bank']['bank_name']    = (new Config())->getValue('recharge_bank_name');
                 $data['bank']['bank_card']    = (new Config())->getValue('recharge_bank_card');
-                $data['bank']['account_name'] = (new Config())->getValue('recharge_account_name');
+                $data['bank']['account_name'] = (new Config())->getValue('recharge_real_name');
             }
             $data['agent_id'] = 0;
             return $data;

+ 1 - 1
application/extra/site.php

@@ -4,7 +4,7 @@ return array (
   'name' => '投标系统',
   'logo' => 'http://dapp-static.oss-cn-shenzhen.aliyuncs.com/tou-biao/202403/logo.png',
   'maintain_switch' => '1',
-  'day_tasks_num' => '1',
+  'day_tasks_num' => '60',
   'task_income' => '0.1',
   'categorytype' => 
   array (

+ 9 - 4
public/assets/js/backend/user/user.js

@@ -34,16 +34,21 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'balance', title: __('Balance'), operate: false},
                         {field: 'freeze', title: __('Freeze'), operate: false},
                         {field: 'task_num', title: __('Task'), operate: false},
+                        {field: 'open_task', title: __('抢单开关'), formatter: Table.api.formatter.toggle,
+                            searchList: {0: __('关'), 1: __('开')}
+                        },
+                        {field: 'is_limit_task', title: __('卡单开关'), formatter: Table.api.formatter.toggle,
+                            searchList: {0: __('关'), 1: __('开')}
+                        },
                         {field: 'recharge', title: __('Recharge'), operate: false},
                         {field: 'withdraw', title: __('Withdrawal'), operate: false},
+                        {field: 'bonus_sum', title: __('累计收益'), operate: false},
                         {field: 'id', title: __('Income'), operate: false, formatter: function(value, row, index) {
-                            var income = row.withdraw - row.recharge;
-                            return income < 0?0:income;
+                            return row.recharge - row.withdraw;
                         }},
                         {field: 'invitation_code', title: __('Invitation_code'), operate: false},
                         {field: 'is_agent', title: __('Is_agent'), searchList: {1: __('Yes'), 0: __('No')}, formatter: Table.api.formatter.status},
-                        
-                        {field: 'user_type', title: __('User_type'), formatter: Table.api.formatter.toggle, 
+                        {field: 'user_type', title: __('User_type'), formatter: Table.api.formatter.toggle,
                             searchList: {0: __('Dummy'), 1: __('Real person')}
                         },
                         {field: 'is_lock', title: __('Status'), formatter: Table.api.formatter.toggle,