elf
/
qy-platform
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
master
liuweiwen 5 years ago
parent aa81eda2fc a782121581
commit d9782182ca
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File

4
Application/Home/Controller/DownloadController.class.php
Unescape Escape View File

@ -2593,7 +2593,7 @@ class DownloadController extends BaseController {
$csvData["pay_amount_zhi"] = $list["pay_amount_zhi"]; $csvData["pay_amount_zhi"] = $list["pay_amount_zhi"];
$csvData["pay_amount_nei"] = $list["pay_amount_nei"]; $csvData["pay_amount_nei"] = $list["pay_amount_nei"];
$csvData["selle_ratio"] = $list["selle_ratio"]; $csvData["selle_ratio"] = $list["selle_ratio"];
$csvData["selle_ratio"] = $list["selle_ratio"]; $csvData["selle_ratio1"] = $list["selle_ratio"];
$csvData["income"] = $list["income"]; $csvData["income"] = $list["income"];
$csvData["pay_time"] = $list["pay_time"]; $csvData["pay_time"] = $list["pay_time"];
$csvData["selle_status"] = $list["selle_status"]; $csvData["selle_status"] = $list["selle_status"];
@ -2613,7 +2613,7 @@ class DownloadController extends BaseController {
$allData['pay_amount_zhi'] = $total['direct_pay_amount']; $allData['pay_amount_zhi'] = $total['direct_pay_amount'];
$allData['pay_amount_nei'] = $total['inner_pay_amount']; $allData['pay_amount_nei'] = $total['inner_pay_amount'];
$allData['selle_ratio'] = '--'; $allData['selle_ratio'] = '--';
$allData['selle_ratio'] = '--'; $allData['selle_ratio1'] = '--';
$allData['income'] = $total['income']; $allData['income'] = $total['income'];
$allData['pay_time'] = '--'; $allData['pay_time'] = '--';
$allData['selle_status'] = '--'; $allData['selle_status'] = '--';

Write Preview
Loading…
Cancel
Save