commit

app/admin/model/finance/FinanceModel.php

@@ -85,12 +85,13 @@ class FinanceModel extends BaseModel
                 $value['uid'],
                 $value['nickname'],
                 $value['pm'] == 0 ? '-' . $value['number'] : $value['number'],
+                $value['balance'],
                 $value['title'],
                 $value['mark'],
                 $value['add_time'],
             ];
         }
-        PHPExcelService::setExcelHeader(['会员ID', '昵称', '金额/积分', '类型', '备注', '创建时间'])
+        PHPExcelService::setExcelHeader(['会员ID', '昵称', '金额/积分','剩余', '类型', '备注', '创建时间'])
             ->setExcelTile('资金监控', '资金监控', date('Y-m-d H:i:s', time()))
             ->setExcelContent($export)
             ->ExcelSave();

app/admin/view/finance/finance/bill.php

@@ -77,6 +77,7 @@
             {field: 'uid', title: '会员ID', sort: true,event:'uid',align:"center",width:"10%"},
             {field: 'nickname', title: '昵称' ,align:"center",width:"16%"},
             {field: 'number', title: '金额',sort:true,templet:'#number',align:"center",width:"10%"},
+            {field: 'balance', title: '余额',sort:true,templet:'#balance',align:"center",width:"10%"},
             {field: 'title', title: '类型',align:"center",width:"10%"},
             {field: 'mark', title: '备注',align:"center"},
             {field: 'add_time', title: '创建时间',align:"center",width:"16%"},

app/api/controller/auction/AuctionOrderController.php

@@ -103,7 +103,7 @@ class AuctionOrderController
 
         $order = AuctionOrder::where('order_id', $data['order_id'])->find();
         $auction = Auction::where('id', $order['auction_id'])->find();
-        if (strtotime($auction['radd_time']) > time()) return app('json')->fail('未到开场时间不能支付');
+        if (strtotime($auction['radd_time']) > time()) return app('json')->fail('开场后传图');
         if (!$order) return app('json')->fail('订单不存在');
         if ($order['status'] == 3)  return app('json')->fail('当前订单已完成');
         $order['upload_image'] = $data['image'];

app/api/controller/auction/AuctionProductController.php

@@ -199,7 +199,7 @@ class AuctionProductController
 
         $order = AuctionOrder::where('id', $data['id'])->find();
         $auction = Auction::where('id', $order['auction_id'])->find();
-        if (strtotime($auction['radd_time']) > time()) return app('json')->fail('未到开场时间不能支付');
+        if (strtotime($auction['radd_time']) > time()) return app('json')->fail('开场后传图');
         if (!$order) return app('json')->fail('订单不存在');
         if ($order['status'] != 1)  return app('json')->fail('当前订单状态无法上传凭证');
         $order['upload_image'] = $data['image'];