价格表

biz-ghs/product/services/ProductService.php

@@ -419,6 +419,7 @@ class ProductService extends BaseService
             if (isset($class['child']) && !empty($class['child'])) {
                 foreach ($class['child'] as $cKey => $child) {
                     $cName = $child['name'] ?? '';
+                    $cName = trim($cName);
                     $price = $child['price'] ?? '';
                     $formatData[] = [
                         'name' => $cName,
@@ -492,7 +493,7 @@ class ProductService extends BaseService
 
             if (isset($product['price']) == false || empty($product['price'])) {
                 //没有价格的合并单元格
-                $objPHPExcel->getActiveSheet()->mergeCells("{$before}{$x}:{$after}{$x}")->setCellValue($before . $x, $product['name']);
+                $objPHPExcel->getActiveSheet()->mergeCells("{$before}{$x}:{$after}{$x}")->setCellValue($before . $x, trim($product['name']));
                 //加粗
                 $objPHPExcel->getActiveSheet()->getStyle($before . $x)->getFont()->setSize(9)->setBold(true);
                 $objPHPExcel->getActiveSheet()->getStyle($before . $x)->getFont()->setName('微软雅黑');
@@ -501,7 +502,7 @@ class ProductService extends BaseService
                 //垂直居中
                 $objPHPExcel->getActiveSheet()->getStyle($before . $x)->getAlignment()->setVertical(\PHPExcel_Style_Alignment::VERTICAL_CENTER);
             } else if (isset($product['type']) && $product['type'] == 'reach') {
-                $objPHPExcel->getActiveSheet()->setCellValue($before . $x, $product['name'])->setCellValue($after . $x, $product['price']);
+                $objPHPExcel->getActiveSheet()->setCellValue($before . $x, trim($product['name']))->setCellValue($after . $x, $product['price']);
                 //字体大小 加粗
                 $objPHPExcel->getActiveSheet()->getStyle($before . $x)->getFont()->setSize(9)->setBold(true);
                 //红色
@@ -513,7 +514,7 @@ class ProductService extends BaseService
                 //红色
                 $objPHPExcel->getActiveSheet()->getStyle($after . $x)->getFont()->getColor()->setARGB(\PHPExcel_Style_Color::COLOR_RED);
             } else {
-                $objPHPExcel->getActiveSheet()->setCellValue($before . $x, $product['name'])->setCellValue($after . $x, $product['price']);
+                $objPHPExcel->getActiveSheet()->setCellValue($before . $x, trim($product['name']))->setCellValue($after . $x, $product['price']);
                 //字体大小
                 $objPHPExcel->getActiveSheet()->getStyle($before . $x)->getFont()->setSize(9);
                 //垂直居中