|
@@ -102,14 +102,14 @@ class WechatMinprogramUserService
|
|
}
|
|
}
|
|
|
|
|
|
$list = $list->orderBy('orders.id', 'desc')
|
|
$list = $list->orderBy('orders.id', 'desc')
|
|
- ->paginate(15);
|
|
|
|
|
|
+ ->paginate(getProp($param,'limit',15));
|
|
|
|
|
|
foreach ($list as $item) {
|
|
foreach ($list as $item) {
|
|
$item->pay_name = '微信支付';
|
|
$item->pay_name = '微信支付';
|
|
$item->status = '已完成';
|
|
$item->status = '已完成';
|
|
if ($item->type == 'COIN') {
|
|
if ($item->type == 'COIN') {
|
|
$item->rechare_coin = $item->product_price * 100;
|
|
$item->rechare_coin = $item->product_price * 100;
|
|
- $item->pay_result = $item->product_price * 100 + $item->given;
|
|
|
|
|
|
+ $item->pay_result =- $item->product_price * 100 + $item->given;
|
|
} elseif (isset($pool[$item->type])) {
|
|
} elseif (isset($pool[$item->type])) {
|
|
$item->rechare_coin = "-";
|
|
$item->rechare_coin = "-";
|
|
$item->pay_result = $pool[$item->type];
|
|
$item->pay_result = $pool[$item->type];
|