From dc49b96b835326a64056da9da0b43eabd2d96e32 Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期五, 25 七月 2025 19:37:11 +0800
Subject: [PATCH] 常用取水口列表搜索接口兼容性

---
 pages/waterIntake/waterIntake.js |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pages/waterIntake/waterIntake.js b/pages/waterIntake/waterIntake.js
index 73369f1..0ef769c 100644
--- a/pages/waterIntake/waterIntake.js
+++ b/pages/waterIntake/waterIntake.js
@@ -231,14 +231,28 @@
           isRefreshing_all: false
         });
         if (data.success && data.code === "0001") {
-          if (!data.content || data.content.itemTotal === 0 || !data.content.obj || data.content.obj.length === 0) {
+          let waterPoints = [];
+          
+          // 鍏煎鏂版棫涓ょ鏁版嵁缁撴瀯
+          if (data.content) {
+            // 鏂版暟鎹粨鏋勶細content鐩存帴鍖呭惈鍙栨按鍙d俊鎭�
+            if (data.content.intakeId) {
+              waterPoints = [data.content];
+            }
+            // 鏃ф暟鎹粨鏋勶細content鍖呭惈obj鏁扮粍
+            else if (data.content.obj && Array.isArray(data.content.obj) && data.content.obj.length > 0) {
+              waterPoints = data.content.obj;
+            }
+          }
+          
+          if (waterPoints.length === 0) {
             wx.showToast({
               title: '娌℃湁鎼滅储鍒板彇姘村彛',
               icon: 'error',
             })
           } else {
             this.setData({
-              allWaterPoints: data.content.obj
+              allWaterPoints: waterPoints
             });
           }
 

--
Gitblit v1.8.0