afa 8 сар өмнө
parent
commit
be43f8a4d0

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

@@ -83,7 +83,8 @@ return [
     'Recharge txt'                         => '充值描述',
     'Transfer fee'                         => '转让手续费',
     'Chabao rate'                          => '茶宝汇率',
-    'Withdrawal fee'                       => '提现手续费',
+    'Withdrawal next fee'                  => '提现600以下手续费(茶宝)',
+    'Withdrawal up fee'                    => '提现600以上手续费(比例)',
     'Direct income'                        => '直推收益',
     'Withdraw min amount'                  => '最小提现额',
     'Convert rate'                         => '折合Cny率',

+ 1 - 1
application/api/controller/User.php

@@ -79,7 +79,7 @@ class User extends Api
               ->join("products c", "c.id = b.type_id", "left")
               ->join("product_transfer z", "a.id = z.order_id AND a.status=2", "left") //转让
               ->join("product_area d", "d.id = a.area_id", "left") //地区
-              ->field('a.id as order_id,a.product_id,'.'b.'.$this->lan.'_name as name,b.thum as img_url,a.price,a.status,a.type_id,c.'.$this->lan.'_title as title,z.price as transfer_price,d.address')
+              ->field('a.id as order_id,a.product_id,'.'b.'.$this->lan.'_name as name,b.thum as img_url,a.price,a.status,a.type_id,c.'.$this->lan.'_title as title,z.price as transfer_price,d.address,b.min_transfer_fee,b.max_transfer_fee,b.give_fee,b.freight')
               ->where('a.user_id', $this->auth->id)
               ->where($where)
               ->order('a.id DESC')