From 30b3d6c5c51ab6cda9b51f394a04eb8964b77d84 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Sun, 21 Jan 2024 16:03:20 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E4=BB=8E=E6=96=B0=E4=BE=9B=E9=94=80?=
 =?UTF-8?q?=E6=9F=A5=E9=85=8D=E9=80=81=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/logic/LogisticsLogic.php | 2 +-
 public/nginx.htaccess            | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/api/logic/LogisticsLogic.php b/app/api/logic/LogisticsLogic.php
index 96c513ed..e64e9e11 100644
--- a/app/api/logic/LogisticsLogic.php
+++ b/app/api/logic/LogisticsLogic.php
@@ -189,7 +189,7 @@ class LogisticsLogic extends BaseLogic
         $captain = Courier::field('id,company_id,nickname,mobile')->where("CONCAT_WS(',',province,city,area,street,village,brigade) = '". $order['user_address_code']."'")->whereIn('group_id',[2, 18])->find();
         if(!$captain) return ['code'=>0, 'msg'=>'无法确定所在小队'];
         //获取配送员信息
-        $courier = Courier::field('id as user_id,nickname as master_name,mobile as master_phone')->where('group_id',20)->find();
+        $courier = Courier::field('nickname as company_name,id as user_id,nickname as master_name,mobile as master_phone')->where('group_id',20)->find();
         //判断配送员是否存在
         if(!$courier) return ['code'=>0, 'msg'=>'配送员未匹配'];
         //获取下单用户信息
diff --git a/public/nginx.htaccess b/public/nginx.htaccess
index a24cf3bb..a1784fea 100755
--- a/public/nginx.htaccess
+++ b/public/nginx.htaccess
@@ -1,5 +1,5 @@
-location / {
-   if (!-f $request_filename) {
-   		rewrite  ^(.*)$  /index.php?s=/$1  last;
-    }
+if (!-e $request_filename)
+{
+       rewrite ^/(.*)$ /index.php?s=$1 last;
+       break;
 }
\ No newline at end of file