From 0f115f15c3417d0c04642d291042b5f7ebd73283 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Thu, 10 Feb 2022 11:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=90=8E=E5=8F=B0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Controllers/OrderController.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php
index 5829f118..35bb983a 100644
--- a/app/Admin/Controllers/OrderController.php
+++ b/app/Admin/Controllers/OrderController.php
@@ -59,7 +59,7 @@ class OrderController extends AdminController
             $grid->column('tags', '标签')->display(function ($tags) {
                 $array = [];
                 foreach ($this->tags as $key => $tag) {
-                    $array[] =  $tag->name;
+                    $array[] = $tag->name;
                 }
                 return $array;
             })->label();
@@ -254,12 +254,15 @@ class OrderController extends AdminController
                 $productGrid = Grid::make($builder, function (Grid $grid) {
                     $grid->column('name')->display(function ($value) {
                         if ($this->gift_for_sku_id) {
-                            $value.='-【赠品】';
+                            $value .= '-【赠品】';
                         }
                         return $value;
                     });
                     // $grid->column('cover')->image(50, 50);
-                    $grid->column('sell_price')->display(function ($value) {
+                    $grid->column('sell_price', '销售价格')->display(function ($value) {
+                        return bcdiv($value, 100, 2);
+                    })->prepend('￥');
+                    $grid->column('vip_price', '会员价格')->display(function ($value) {
                         return bcdiv($value, 100, 2);
                     })->prepend('￥');
                     $grid->column('quantity');
@@ -273,7 +276,7 @@ class OrderController extends AdminController
                     $grid->column('remain_quantity');
 
                     $grid->column('product_total_amount')->display(function () {
-                        return bcdiv($this->sell_price * $this->quantity, 100, 2);
+                        return bcdiv($this->total_amount, 100, 2);
                     })->prepend('￥');
                     $grid->column('afterSalesCount', '售后情况')->display(function ($value) {
                         return $value > 0 ? 1 : 0;