From 7e97caab01597e6c2b17a2d41f184464e38cd4ec Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Thu, 24 Aug 2023 11:01:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=9C=B0=E5=9D=80=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/merchant/store/shipping/City.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controller/merchant/store/shipping/City.php b/app/controller/merchant/store/shipping/City.php
index 1972f3c5..c93f6f38 100644
--- a/app/controller/merchant/store/shipping/City.php
+++ b/app/controller/merchant/store/shipping/City.php
@@ -70,7 +70,7 @@ class City extends BaseController
                 ];
                 if ($pinyin == 1) {
                     $temp = [
-                        'pinyin' => (new Pinyin)->abbr($v['village_name'])[0] ?? '-',
+                        'pinyin' => strtoupper((new Pinyin)->abbr($v['village_name'])[0] ?? '-'),
                         'data'   => [
                             'type' => 'village',
                             'id' => $v['village_id'],
@@ -92,7 +92,7 @@ class City extends BaseController
                 ];
                 if ($pinyin == 1) {
                     $temp = [
-                        'pinyin' => (new Pinyin)->abbr($v['street_name'])[0] ?? '-',
+                        'pinyin' => strtoupper((new Pinyin)->abbr($v['street_name'])[0] ?? '-'),
                         'data'   => [
                             'type' => 'street',
                             'id' => $v['street_id'],
@@ -114,7 +114,7 @@ class City extends BaseController
                 ];
                 if ($pinyin == 1) {
                     $temp = [
-                        'pinyin' => (new Pinyin)->abbr($v['area_name'])[0] ?? '-',
+                        'pinyin' => strtoupper((new Pinyin)->abbr($v['area_name'])[0] ?? '-'),
                         'data'   => [
                             'type' => 'area',
                             'id' => $v['area_id'],
@@ -136,7 +136,7 @@ class City extends BaseController
                 ];
                 if ($pinyin == 1) {
                     $temp = [
-                        'pinyin' => (new Pinyin)->abbr($v['city_name'])[0] ?? '-',
+                        'pinyin' => strtoupper((new Pinyin)->abbr($v['city_name'])[0] ?? '-'),
                         'data'   => [
                             'type' => 'city',
                             'id' => $v['city_id'],
@@ -158,7 +158,7 @@ class City extends BaseController
                 ];
                 if ($pinyin == 1) {
                     $temp = [
-                        'pinyin' => (new Pinyin)->abbr($v['province_name'])[0] ?? '-',
+                        'pinyin' => strtoupper((new Pinyin)->abbr($v['province_name'])[0] ?? '-'),
                         'data'   => [
                             'type' => 'province',
                             'id' => $v['province_id'],