地图订单修改

miniprogram/services/apiService.ts

@@ -451,15 +451,14 @@ async ServerLogin(code: string) {
           if (res.statusCode >= 200 && res.statusCode < 300) {
             try {
               const data = JSON.parse(res.data);
+              // 使用服务器返回的实际路径，而不是构造的路径
+              const avatarUrl = data.avatarPath ? `${API_BASE_URL}${data.avatarPath}` : data.avatarUrl;
               resolve({
                 success: true,
-                avatarUrl: data.avatarUrl
+                avatarUrl: avatarUrl
               });
             } catch (error) {
-              resolve({
-                success: true,
-                avatarUrl: `${API_BASE_URL}/avatars/${employeeId}.jpg`
-              });
+              reject(new Error(`解析响应失败: ${error}`));
             }
           } else {
             reject(new Error(`上传失败: HTTP ${res.statusCode}`));
@@ -479,12 +478,13 @@ async ServerLogin(code: string) {
    */
   async getEmployeeAvatar(employeeId: number): Promise<string> {
     try {
-      // 尝试获取头像信息
-      const response = await this.request<{ avatarUrl: string }>(`/employees/${employeeId}/avatar`);
-      return response.avatarUrl || `${API_BASE_URL}/avatars/${employeeId}.jpg`;
+      // 使用RESTful API获取头像信息，确保路径一致性
+      const response = await this.request<{ avatarPath: string }>(`/employees/${employeeId}/avatar`);
+      // 使用服务器返回的实际路径
+      return response.avatarPath ? `${API_BASE_URL}${response.avatarPath}` : '/images/user-avatar.png';
     } catch (error) {
-      // 如果获取失败，返回默认头像URL
-      return `${API_BASE_URL}/avatars/${employeeId}.jpg`;
+      // 如果获取失败，返回默认头像
+      return '/images/user-avatar.png';
     }
   }