阶段性更新

This commit is contained in:
2020-10-13 08:49:57 +08:00
parent 7cfd45bf99
commit d8cd8ae9a6
21 changed files with 420 additions and 423 deletions

View File

@@ -10,6 +10,7 @@ use RuLong\Identity\Models\Identity;
class IdentityController extends AdminController
{
protected $title = '用户身份配置';
protected function grid()
@@ -47,6 +48,7 @@ class IdentityController extends AdminController
$grid->column('remark', '说明');
$grid->column('updated_at', '修改时间');
return $grid;
}

View File

@@ -41,6 +41,10 @@ class IndexController extends AdminController
$filter->column(1 / 2, function ($filter) {
$filter->equal('msg_txn_code', '交易类型')->select(config('unionpay.type'));
});
$filter->column(1 / 2, function ($filter) {
$filter->equal('req_serial_no', '流水号');
$filter->equal('orig_req_serial_no', '原流水号');
});
});
$grid->column('id', '#ID#');
@@ -53,6 +57,9 @@ class IndexController extends AdminController
$grid->column('mkt_code', '券码');
$grid->column('msg_sys_sn', '平台流水号');
$grid->column('req_serial_no', '查询流水号');
$grid->column('status', '状态')
->using(UnionpayLog::STATUS)
->label();
// $grid->column('请求参数')->display(function ($title, $column) {
// return '点击展开';

View File

@@ -143,12 +143,15 @@ class IndexController extends AdminController
$grid->column('分润规则')->display(function ($title, $column) {
return '点击展开';
})->modal(function ($model) {
if ($model->code) {
$codes = $model->code->map(function ($code) {
return $code->only(['name', 'code', 'profit']);
});
return new Table(['名称', '规则项', '分润金额(元)'], $codes->toArray());
$table = new Table(['名称', '规则项', '分润金额(元)'], $codes->toArray());
return trim($table->render(), '"');
}
});