From 665d56a8bba3e4350d2547de3b3a4bf6be3f3cae Mon Sep 17 00:00:00 2001
From: liangyuyan <1103300295@qq.com>
Date: Fri, 20 Nov 2020 10:42:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E9=80=81=E7=BB=9F=E8=AE=A1--=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=B1=85=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php | 2 +-
 app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php  | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php b/app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php
index fb3a06a..487f37f 100644
--- a/app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php
+++ b/app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php
@@ -32,7 +32,7 @@ class OrderDeliveryDetailSheet implements FromArray, WithStrictNullComparison, S
                     '订单编号',
                     '下单市场',
                     '下单时间',
-                    '订单配送费',
+                    '订单配送费（元）',
                 ]];
         $data = $this->getData($this->params);
         $markets = MarketModel::getMarketArray();
diff --git a/app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php b/app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php
index 27b6367..e06352b 100644
--- a/app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php
+++ b/app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php
@@ -46,7 +46,7 @@ class OrderDeliveryTotalSheet implements FromArray, WithStrictNullComparison, Sh
     {
         $titles = [[
                     '配送人员',
-                    '总配送费',
+                    '总配送费（元）',
                 ]];
         $data = $this->getData($this->params);
         return array_merge($titles,$data);
@@ -54,7 +54,11 @@ class OrderDeliveryTotalSheet implements FromArray, WithStrictNullComparison, Sh
 
     public function styles(Worksheet $sheet)
     {
-        $sheet->mergeCells('A1:B1');
+        $sheet->mergeCells('A1:B1');// 合并
+        // $sheet->getColumnDimension('A')->setWidth(100); // 列宽 不生效
+        $sheet->getRowDimension(1)->setRowHeight(20); // 行高
+        $sheet->getStyle('A1:B1')->getAlignment()->setVertical('center');// 垂直居中
+        $sheet->getStyle('A1:B1')->getAlignment()->setHorizontal('center');// 水平居中
 
         return [
             1 => ['font' => ['bold' => true,'size' => 12]],