diff --git a/app/Admin/Actions/Show/OrderConsigneeInfo.php b/app/Admin/Actions/Show/OrderConsigneeInfo.php index c999c320..01754531 100644 --- a/app/Admin/Actions/Show/OrderConsigneeInfo.php +++ b/app/Admin/Actions/Show/OrderConsigneeInfo.php @@ -18,7 +18,7 @@ class OrderConsigneeInfo extends AbstractTool * * @var string */ - protected $style = 'btn-success'; + protected $style = 'btn-warning'; public function render() { diff --git a/app/Admin/Actions/Show/OrderReduce.php b/app/Admin/Actions/Show/OrderReduce.php index 453ee4e0..239c85e7 100644 --- a/app/Admin/Actions/Show/OrderReduce.php +++ b/app/Admin/Actions/Show/OrderReduce.php @@ -18,7 +18,7 @@ class OrderReduce extends AbstractTool * * @var string */ - protected $style = 'btn-success'; + protected $style = 'btn-warning'; public function render() { diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php index 773406f6..061a0da3 100644 --- a/app/Admin/Controllers/OrderController.php +++ b/app/Admin/Controllers/OrderController.php @@ -158,17 +158,20 @@ class OrderController extends AdminController })->prepend('¥'); $show->field('vip_discount_amount')->as(function ($v) { return bcdiv($v, 100, 2); - })->prepend('¥'); - $show->field('userCoupon.coupon_name')->label(); - $show->field('coupon_discount_amount')->as(function ($v) { - return bcdiv($v, 100, 2); - })->prepend('¥'); + })->prepend('- ¥'); + if ($show->model()->user_coupon_id) { + $show->field('userCoupon.coupon_name')->label(); + $show->field('coupon_discount_amount')->as(function ($v) { + return bcdiv($v, 100, 2); + })->prepend('- ¥'); + } + $show->field('reduced_amount')->as(function ($v) { return bcdiv($v, 100, 2); - })->prepend('¥'); + })->prepend('- ¥'); $show->field('shipping_fee')->as(function ($v) { return bcdiv($v, 100, 2); - })->prepend('¥'); + })->prepend('+ ¥'); $show->divider(); $show->field('note'); $show->field('remark');