资产信息

application/api/controller/Ledger.php

@@ -35,7 +35,7 @@ class Ledger extends Api
         $res['transfes_fee']  = getConfig('transfer_fee');  //转让手续费比例
         $res['transfes_txt']  = config('transfes_txt');     //转让文字表述
         $res['giveaway']      = getConfig('giveaway');      //赠送手续费比例
-        $res['giveaway_txt']  = config('giveaway_txt');     //赠送文字表述
+        $res['giveaway_txt']  = getConfig('giveaway_txt');  //赠送文字表述
         $res['coin_list'] = [
             [
                 'coin_name' => '茶宝',

public/assets/js/backend/offline/order.js

@@ -30,10 +30,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'order_id', title: __('Order_id'), operate: false},
                         {field: 'products.zh_name', title: __('Product_id'),operate:'LIKE'},
                         {field: 'areas.address', title: __('Area_id')},
-                        {field: 'type_id', title: __('Type_id'), searchList: {0:__('热销'), 1:__('转让')}, formatter: Table.api.formatter.status},
+                        {field: 'type_id', title: __('Type_id'), searchList: {0:__('热销'), 1:__('转让'), 2:__('赠送')}, formatter: Table.api.formatter.status},
+                        {field: 'from_user', title: __('来源用户Id'), operate:false},
                         {field: 'price', title: __('Price'), operate:false},
-                        {field: 'status', title: __('Status'), searchList: {0:__('已下单'), 1:__('支付'), 2:__('转让'), 3:__('提货'), 4:__('取消'),
-                             5:__('关闭')}}, formatter: Table.api.formatter.status},
+                        {field: 'fees', title: __('手续费'), operate:false},
+                        {field: 'status', title: __('Status'), searchList: {0:__('已下单'), 1:__('支付'), 2:__('转让'), 3:__('提货'), 4:__('取消'), 5:__('关闭')},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: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}