Merge branch 'master' of https://git.hxiaoju.top/Teapay/RWACha-API

* 'master' of https://git.hxiaoju.top/Teapay/RWACha-API:
  提现说明
  手续费用
  赠送

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'] = [

application/config.php

@@ -328,7 +328,7 @@ return [
         2.提现后由平台管理员审核，如无异常将于48小时之内完成审核并转入提现地址，您可在右上角明细中查看订单进度。<br/>
         3.主网现阶段默认且仅支持币安链提现地址，请务必保证地址准确无误，否则将造成资产无法找回。<br/>
         4.请确保转出地址和数额无误，如因提现地址填写错误造成的损失由用户自行承担。<br/>
-        5.提现手续费:300 茶宝以内每笔 3 茶宝，300 茶宝以上 1%。",
+        5.提现手续费:300 茶宝以内每笔 3 茶宝，300 茶宝以上（含） 1%。",
     //市场配置 
     'market_transfer' => [
         'lock_time'         => 180, //锁定时间秒
@@ -339,8 +339,8 @@ return [
             3.求购期间成交，无法撤销。',
         'serve_fee'         => 0.045, //服务费
         'max_buying_count'  => 10, //最大求购套数
-        'zh_serve_agree'      => 227, //中文服务协议id
-        'en_serve_agree'      => 228, //英文协议id
+        'zh_serve_agree'    => 227, //中文服务协议id
+        'en_serve_agree'    => 228, //英文协议id
     ],
     //Teac配置
     'teac_trade' => [
@@ -382,10 +382,10 @@ return [
         'product_id'    => 17,//购买指定产品
         //空投产品与数量
         'airdrop' => [
-            0 => ['product_id'=>27, 'num'=>1], //1.茶世通宝1套（ID 27）
+            0 => ['product_id'=>27, 'num'=>1],  //1.茶世通宝1套（ID 27）
             1 => ['product_id'=>12, 'num'=>200],//2.茶世通宝·金 200套（ID 12）
-            2 => ['product_id'=>25, 'num'=>100],// 3.茶世通宝·橘 100套（ID 25）
-            3 => ['product_id'=>40, 'num'=>8] // 4.RWACHA·破茧化蝶 8套（id 40）
+            2 => ['product_id'=>25, 'num'=>100],//3.茶世通宝·橘 100套（ID 25）
+            3 => ['product_id'=>40, 'num'=>8]   //4.RWACHA·破茧化蝶 8套（id 40）
         ],
         'frozen' => '999', //发放标记茶宝 999个   
 

public/assets/js/backend/ledger/ledger_frozen_change.js

@@ -29,7 +29,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'create_time', title: __('Create_time'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {
                             field: 'action', title: __('Action'), searchList: {
-                                0: '赠送',
+                                0: '赠送手续费',
                                 1: '茶宝标记激活',
                                 2: '物流运费',
                                 3: '转账支付',

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}
                     ]
                 ]