afa 6 months ago
parent
commit
7626aebfbf
2 changed files with 5 additions and 4 deletions
  1. 1 0
      application/api/controller/Ledger.php
  2. 4 4
      public/assets/js/backend/user/airdrop.js

+ 1 - 0
application/api/controller/Ledger.php

@@ -38,6 +38,7 @@ class Ledger extends Api
         $res['transfes_fee']  = $config['transfer_fee'];  //转让手续费比例
         $res['transfes_txt']  = $config['transfes_txt'];   //转让文字表述
         $res['chabao_rate']   = $config['chabao_rate'];    //茶宝汇率
+        $res['giveaway_txt']  = $config['giveaway_txt'];   //赠送说明
         $res['withdrawal_next_fee']  = $config['withdrawal_next_fee'];  //600以下提现收费
         $res['withdrawal_up_fee']    = $config['withdrawal_up_fee'];    //600以上提现收费
         $res['coin_list'] = [

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

@@ -23,20 +23,20 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        { field: 'type_id', title: __('投放类型'), searchList: { "0": __('指定账号'), "1": __('超过Rwa数用户'),"2": __('指定区域消费金')}, formatter: Table.api.formatter.label },
+                        { field: 'type_id', title: __('投放类型'), searchList: { "0": __('指定账号'), "1": __('超过Rwa数用户'),
+                            "2": __('指定区域消费金'),'3':__('超级福利'),'4':__('超级福利上级')}, formatter: Table.api.formatter.label },
                         {field: 'product.zh_name', title: __('Product_id'), operate: 'LIKE'},
                         {field: 'num', title: __('Num'), operate: false},
                         {field: 'address', title: __('Address'), operate: 'LIKE'},
                         {field: 'rwa_num', title: __('Rwa_num'), operate: false},
                         {field: 'rwa_product.zh_name', title: __('持有产品'), operate: 'LIKE'},
-                        
                         {field: 'amount', title: __('指定区域消费金'), operate: false, formatter: function (value, row, index, field) {
                             return (row.amount > 0)? row.area_txt+ "-"+ row.amount: "";
                         }},
-                        {field: 'remark', title: __('Remark'), operate: 'LIKE'},
+                        {field: 'remark', title: __('Remark'), operate: false},
                         { field: 'status', title: __('Status'), searchList: { "1": __('已发放'), "0": __('待发放') }, formatter: Table.api.formatter.status },
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-                        {field: 'update_time', title: __('Update_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
+                        {field: 'update_time', title: __('Update_time'), operate:false, 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}
                     ]
                 ]