Merge branch 'main' into dev

app/common/logic/AuthLogic.php

@@ -223,7 +223,7 @@ class AuthLogic
             'union_id'=>$userInfo['data']['union_id'],
             'name'=>$userInfo['data']['name'],
             'app_id'=>$data['app_id'],
-            'avatar'=>$userInfo['avatar_url']
+            'avatar'=>$userInfo['data']['avatar_url']??'',
         ]);
         return $userInfo['data'] + $data;
     }

app/common/service/UsedCarService.php

@@ -141,7 +141,11 @@ class UsedCarService
         $asc = ord($s[0]);
 
         if ($asc >= 65 && $asc <= 90) return $char;
-
+        
+    // 转码失败或长度不足
+    if ($s === false || strlen($s) < 2) {
+        return '';
+    }
         $code = ord($s[0]) * 256 + ord($s[1]) - 65536;
 
         $map = [

app/common/utils/pdf/template/usedCar.stub

@@ -87,7 +87,7 @@
     </tr>
     <tr>
         <td class="label">里程</td>
-        <td><?= $car['mileage'] ?></td>
+        <td><?= $car['mileage'].'km' ?></td>
     </tr>
     <tr>
         <td class="label">马力</td>