shebi xiufu

src/components/pages/EquipmentPage.tsx

@@ -56,6 +56,8 @@ interface Equipment {
   equipmentType: string
   equipmentModel: string
   merchantId: string
+  merchantName: string
+  mallName: string
   installationLocation: string
   installationDate: string
   status: string
@@ -347,11 +349,10 @@ export default function EquipmentPage() {
   }
 
   const filteredEquipment = equipmentList.filter((item) => {
-    const merchantInfo = getMerchantInfo(item.merchantId)
     const matchesSearch =
       item.equipmentName.toLowerCase().includes(searchTerm.toLowerCase()) ||
-      merchantInfo.name.toLowerCase().includes(searchTerm.toLowerCase()) ||
-      merchantInfo.mall.toLowerCase().includes(searchTerm.toLowerCase())
+      item.merchantName.toLowerCase().includes(searchTerm.toLowerCase()) ||
+      item.mallName.toLowerCase().includes(searchTerm.toLowerCase())
     
     // 修正状态筛选逻辑
     let matchesStatus = true
@@ -737,7 +738,6 @@ export default function EquipmentPage() {
                   </TableRow>
                 ) : (
                   filteredEquipment.map((item) => {
-                    const merchantInfo = getMerchantInfo(item.merchantId)
                     const equipmentTypeDisplay = equipmentTypes[item.equipmentType] || item.equipmentType
                     return (
                       <TableRow key={item.equipmentId} className="hover:bg-gray-50">
@@ -755,11 +755,11 @@ export default function EquipmentPage() {
                         </TableCell>
                         <TableCell>
                           <div className="space-y-1">
-                            <div className="font-medium">{merchantInfo.name}</div>
-                            <div className="text-sm text-gray-600">{merchantInfo.mall}</div>
+                            <div className="font-medium">{item.merchantName}</div>
+                            <div className="text-sm text-gray-600">{item.mallName}</div>
                             <div className="flex items-center text-xs text-gray-500">
                               <MapPin className="h-3 w-3 mr-1" />
-                              {item.installationLocation || merchantInfo.address}
+                              {item.installationLocation}
                             </div>
                           </div>
                         </TableCell>