pdkj
/
jiqu-library-server
6
0
Fork 0
Code Releases Activity

后台优化调整

release
vine_liutk 2022-02-23 14:52:27 +08:00
parent 65e3448407
commit 55400515e5
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Admin/Controllers/DealerController.php
View File

@ -88,8 +88,9 @@ class DealerController extends AdminController
$grid->filter(function (Grid\Filter $filter) {
$filter->panel();
$filter->equal('user.phone')->width(3);
$filter->equal('userInfo.nickname')->width(3);
$filter->equal('userInfo.inviterInfo.user.phone')->width(3);
$filter->equal('userInfo.realInviterInfo.user.phone')->width(3);
$filter->equal('userInfo.nickname')->width(4);
});
});
}

6
app/Admin/Controllers/DealerOrderController.php
View File

@ -107,7 +107,11 @@ class DealerOrderController extends AdminController
$actions->append(new DealerOrderShipping());
}
}
if ($actions->row->isPending() && Admin::user()->can('dcat.admin.dealer_orders.cancel')) {
if ((
$actions->row->isPending() //待确认
|| $actions->row->isPay() //待付款
|| $actions->row->isPaid() //待收款
) && Admin::user()->can('dcat.admin.dealer_orders.cancel')) {
$actions->append(new DealerOrderCancel());
}
});

6
app/Admin/Metrics/StatisticsTotal.php
View File

@ -3,6 +3,7 @@
namespace App\Admin\Metrics;
use App\Models\Balance;
use App\Models\DealerWallet;
use App\Models\DistributionPreIncome;
use App\Models\UserInfo;
use App\Models\Wallet;
@ -40,6 +41,7 @@ class StatisticsTotal extends RadialBar
'total_distribution'=> DistributionPreIncome::unsettlement()->sum('total_revenue'),
'total_quota_v2' => UserInfo::sum('quota_v2'),
'total_quota_v1' => UserInfo::sum('quota_v1'),
'total_dealer_wallet' => bcdiv(DealerWallet::sum('balance'), 100, 2),
]);
}
@ -82,6 +84,10 @@ class StatisticsTotal extends RadialBar
<h1 class="font-lg-1 mt-2 mb-0">{$content['total_quota_v1']}</h1>
老配额
</div>
<div class="col-sm-4">
<h1 class="font-lg-1 mt-2 mb-0">{$content['total_dealer_wallet']}</h1>
批零余额
</div>
</div>
HTML
);