Explorar o código

去掉会员卡单开关,充值管理后台增加图片

Jason hai 1 ano
pai
achega
2a82109447

+ 5 - 6
application/api/controller/Order.php

@@ -113,12 +113,11 @@ class Order extends Api
         }
 
         $freeze = false; //是否有冻结金额
-        if($user['is_limit_task'] == 1){
-            //卡单 limit_task 字段值为json {"which_start":"7","min_amount":"100","max_amount":"1000","income_multiple":"2"}
-            $limit_task = json_decode($user['limit_task'], true);
-            if(empty($limit_task)){
-                $this->error(__('参数错误'));
-            }
+
+        //卡单 limit_task 字段值为json {"which_start":"7","min_amount":"100","max_amount":"1000","income_multiple":"2"}
+        $limit_task = json_decode($user['limit_task'], true);
+
+        if(!empty($limit_task)){
             $val_arr = array_column($limit_task, 'which_start');
             $key =  array_search($user['task_num'] + 1, $val_arr);
             if($key !== false){

+ 8 - 8
application/extra/site.php

@@ -34,17 +34,17 @@ return array (
     'custom' => 'Custom',
   ),
   'recharge_usdt_switch' => '1',
-  'recharge_usdt_address' => 'ox5454534cccccccccc',
+  'recharge_usdt_address' => '-',
   'recharge_bank_switch' => '0',
-  'recharge_bank_name' => '花旗银行',
+  'recharge_bank_name' => '-',
   'withdraw_usdt_switch' => '1',
   'withdraw_bank_switch' => '1',
   'withdrawal_time' => '15:04:41',
-  'withdrawal_fee' => '0.2',
-  'recharge_bank_card' => '银行卡号号码',
-  'recharge_real_name' => '开户人姓名',
+  'withdrawal_fee' => '0',
+  'recharge_bank_card' => '-',
+  'recharge_real_name' => '-',
   'balance_mini' => '15',
-  'bonus_share_1' => '0.05',
-  'bonus_share_2' => '0.04',
-  'bonus_share_3' => '0.03',
+  'bonus_share_1' => '0.5',
+  'bonus_share_2' => '0.5',
+  'bonus_share_3' => '0.5',
 );

+ 1 - 1
public/assets/js/backend/trade/money_in.js

@@ -33,7 +33,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         // {field: 'bank_card', title: __('Bank_card'), operate: 'LIKE'},
                         // {field: 'account_name', title: __('Account_name'), operate: false},
                         {field: 'amount', title: __('Amount'), operate: false},
-                        {field: 'img_urls', title: __('Url'), formatter: Table.api.formatter.url, visible: false},
+                        {field: 'img_url', title: __('充值截图'), events: Table.api.events.image, formatter: Table.api.formatter.image, operate: false},
                         {field: 'status', title: __("Status"),
                             searchList: {0:__('待支付'), 100:__('待处理'), 200:__('成功'), 400:__('失败'), 500:__('取消')},
                             formatter: Table.api.formatter.status

+ 0 - 3
public/assets/js/backend/user/user.js

@@ -36,9 +36,6 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {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},