diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index 67eaa8a7..99fd5577 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -184,7 +184,7 @@ class OrderController extends AdminController
return bcdiv($v, 100, 2);
})->prepend('- ¥');
if ($show->model()->user_coupon_id) {
- $show->field('userCoupon.coupon_name')->label();
+ $show->field('user_coupon.coupon_name', '优惠券')->label();
$show->field('coupon_discount_amount')->as(function ($v) {
return bcdiv($v, 100, 2);
})->prepend('- ¥');
diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php
index f9539b9e..6d34963d 100644
--- a/app/Admin/Controllers/UserController.php
+++ b/app/Admin/Controllers/UserController.php
@@ -12,6 +12,8 @@ use Dcat\Admin\Grid;
use Dcat\Admin\Http\Controllers\AdminController;
use Dcat\Admin\Layout\Row;
use Dcat\Admin\Show;
+use Dcat\Admin\Widgets\Box;
+use Dcat\Admin\Widgets\Tab;
use Illuminate\Support\Facades\Request;
class UserController extends AdminController
@@ -23,7 +25,7 @@ class UserController extends AdminController
*/
protected function grid()
{
- $builder = User::with(['userVip', 'userInfo', 'wallet', 'balance', 'userInfo.inviterInfo.user']);
+ $builder = User::with(['userInfo', 'wallet', 'balance', 'userInfo.inviterInfo.user']);
return Grid::make($builder, function (Grid $grid) {
// $grid->column('id')->sortable();
$grid->column('phone');
@@ -31,18 +33,18 @@ class UserController extends AdminController
return $this->userInfo?->agent_level_name??'未知';
})->label();
- $grid->column('userInfo.inviterInfo.user.phone', '推荐人手机');
- $grid->column('userInfo.growth_value', '消费值');
- $grid->column('userInfo.group_sales_value', '业绩');
+ $grid->column('userInfo.inviterInfo.user.phone');
+ $grid->column('userInfo.growth_value');
+ $grid->column('userInfo.group_sales_value');
- $grid->column('wallet.balance', '可提')->display(function ($value) {
+ $grid->column('wallet.balance')->display(function ($value) {
$value = bcdiv($value, 100, 2);
if ($this->wallet?->is_frozen) {
$value.= " 冻结";
}
return $value;
})->prepend('¥');
- $grid->column('balance.balance', '余额')->display(function ($value) {
+ $grid->column('balance.balance')->display(function ($value) {
$value = bcdiv($value, 100, 2);
if ($this->balance?->is_frozen) {
$value.= " 冻结";
@@ -105,27 +107,53 @@ class UserController extends AdminController
protected function detail($id)
{
return function (Row $row) use ($id) {
- $row->column(4, function ($column) use ($id) {
- $column->row(Show::make($id, new User(), function (Show $show) {
+ $row->column(5, function ($column) use ($id) {
+ $builder = User::with(['userInfo', 'wallet', 'balance', 'userInfo.inviterInfo.user']);
+ $column->row(Show::make($id, $builder, function (Show $show) {
$show->field('id');
$show->field('phone');
+ $show->field('user_info.agent_level')->as(function ($value) {
+ return $this->userInfo?->agent_level_name??'未知';
+ })->label();
+ $show->field('user_info.inviter_info.user.phone');
+ $show->field('user_info.growth_value');
+ $show->field('user_info.group_sales_value');
+
+ $show->field('wallet.balance')->as(function ($value) {
+ $value = bcdiv($value, 100, 2);
+ return $value;
+ })->prepend('¥');
+ $show->field('balance.balance')->as(function ($value) {
+ $value = bcdiv($value, 100, 2);
+ return $value;
+ })->prepend('¥');
+
$show->field('last_login_ip');
$show->field('last_login_at');
$show->field('register_ip');
$show->field('created_at');
- $show->field('updated_at');
$show->panel()
->tools(function ($tools) {
$tools->disableEdit();
$tools->disableDelete();
// todo-修改手机号
// todo-修改银行卡
+ // todo-开启奖金分红
+ // todo-关闭奖金分红
});
}));
});
- $row->column(5, function () {
-
+ $row->column(7, function ($column) use ($id) {
+ $tab = Tab::make();
// todo_粉丝列表
+ $tab->add('粉丝列表', 'html1');
+ // todo-预收益明细
+ $tab->add('预收益明细', 'html2');
+ // todo-可提明细
+ $tab->add('可提明细', 'html3');
+ // todo-余额明细
+ $tab->add('余额明细', 'html4');
+ $column->row(Box::make('用户记录', $tab));
});
};
}
diff --git a/resources/lang/zh_CN/user.php b/resources/lang/zh_CN/user.php
index c1f93f35..d9fd78ad 100644
--- a/resources/lang/zh_CN/user.php
+++ b/resources/lang/zh_CN/user.php
@@ -24,6 +24,30 @@ return [
'userInfo'=>[
'avatar' => '头像',
'agent_level'=>'管理级别',
+ 'growth_value'=>'消费值',
+ 'group_sales_value'=>'业绩',
+ 'inviterInfo'=>[
+ 'user'=>[
+ 'phone' =>'推荐人手机',
+ ],
+ ],
+ ],
+ 'user_info'=>[
+ 'avatar' => '头像',
+ 'agent_level'=>'管理级别',
+ 'growth_value'=>'消费值',
+ 'group_sales_value'=>'业绩',
+ 'inviter_info'=>[
+ 'user'=>[
+ 'phone' =>'推荐人手机',
+ ],
+ ],
+ ],
+ 'wallet'=>[
+ 'balance'=>'可提',
+ ],
+ 'balance' =>[
+ 'balance'=>'余额',
],
'status_remark'=>'备注',
],