Merge branch 'develop' of gitea.hmily.club:pdkj/jiqu-library-server into develop
commit
cac7d29241
|
|
@ -60,9 +60,7 @@ class StatisticsTotal extends RadialBar
|
|||
$order = Order::whereBetween('created_at', [$start_time, $end_time])->whereNotIn('status', [Order::STATUS_PENDING, Order::STATUS_CANCELLED])->sum('total_amount');
|
||||
// 卡片内容
|
||||
$this->withContent([
|
||||
'total_points'=> UserInfo::sum('points'),
|
||||
'total_wallet'=> bcdiv(Wallet::sum('balance'), 100, 2),
|
||||
'total_balance'=> bcdiv(Balance::sum('balance'), 100, 2),
|
||||
'total_points'=> bcdiv(UserInfo::sum('points'), 100, 2),
|
||||
'order_money' => bcdiv($order, 100, 2)
|
||||
]);
|
||||
}
|
||||
|
|
@ -83,16 +81,6 @@ class StatisticsTotal extends RadialBar
|
|||
<h1 class="font-lg-1 mt-2 mb-0">{$content['total_points']}</h1>
|
||||
总积分
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<h1 class="font-lg-1 mt-2 mb-0">{$content['total_wallet']}</h1>
|
||||
总可提
|
||||
</div>
|
||||
<div class="col-sm-4">
|
||||
<h1 class="font-lg-1 mt-2 mb-0">{$content['total_balance']}</h1>
|
||||
总余额
|
||||
</div>
|
||||
</div>
|
||||
<div class="d-flex row text-center">
|
||||
<div class="col-sm-4">
|
||||
<h1 class="font-lg-1 mt-2 mb-0">{$content['order_money']}</h1>
|
||||
销售额
|
||||
|
|
|
|||
Loading…
Reference in New Issue