FLX

src/pages/index/tabs/Guide.jsx

@@ -45,18 +45,10 @@ export default (props) => {
   const [wifiButtonStyle, setWifiButtonStyle] = useState('')
   const [parkingButtonStyle, setParkingButtonStyle] = useState('')
   const [guideStyle, setGuideStyle] = useState('')
+  const parkingGps = taRoomContent?.parkingLocation
+  const roomGps = taRoomContent?.location
+
 
-  //当前指南总数
-  const [newextNum, setNewextNum] = useState(0)
-  //全部指南个数
-  const [AllextNum, setAllextNum] = useState(0)
-  //指南当前页数
-  const extendMore = () => {
-    getExtendContent('room', roomId, { pageNum: 99999 }).then((res) => {
-      setExtend([...extend, ...res.records])
-      setNewextNum(newextNum + res.records.length)
-    })
-  }
 
   const goContent = () => {
     if (roomOrderId) {
@@ -81,10 +73,10 @@ export default (props) => {
       // 点击’去这里‘跳转导航
       setLoading(true)
       getTaRoom(roomId).then((res) => {
-        Roomlog.current = (res.location).toString().split(',')[0]
-        Roomlat.current = (res.location).toString().split(',')[1]
-        Parklog.current = (res.parkingLocation).toString().split(',')[0]
-        Parklat.current = (res.parkingLocation).toString().split(',')[1]
+        Roomlog.current = (!res.location).toString().split(',')[0]
+        Roomlat.current = (!res.location).toString().split(',')[1]
+        Parklog.current = (!res.parkingLocation).toString().split(',')[0]
+        Parklat.current = (!res.parkingLocation).toString().split(',')[1]
         setTaRoomContent(res || [])
         setLoading(false)
 
@@ -92,11 +84,16 @@ export default (props) => {
       //更多指引
       setLoading(true)
 
-      getExtendContent('room', roomId).then((res) => {
-        setExtend(res.records || [])
+      getExtendContent('room', roomId, {
+        pageNum: 99,
+        pageSize: 999,
+
+      }).then((res) => {
+        // setExtend(res.records || [])
+        setExtend(res.records)
+
         setIfroomId('reality')
-        setAllextNum(res.total)
-        setNewextNum(res.records.length)
+
         setLoading(false)
 
       })
@@ -125,34 +122,34 @@ export default (props) => {
       setParkingButtonStyle('none')
     }
   })
+  const geiZy = () => {
+    setLoading(true)
+    getExtendContent('room', roomId, {
 
-  const parkingGps = taRoomContent?.parkingLocation
-  const roomGps = taRoomContent?.location
-  useEffect(() => {
+    }).then((res) => {
+      // setExtend(res.records || [])
+      setExtend(res.records)
+      setIfroomId('reality')
+      setLoading(false)
 
+    })
+    setLoading(true)
+  }
+
+  useEffect(() => {
     if (roomId) {
       setLoading(true)
       // 点击’去这里‘跳转导航
       getTaRoom(roomId).then((res) => {
-        Roomlog.current = (res.location).toString().split(',')[0]
-        Roomlat.current = (res.location).toString().split(',')[1]
-        Parklog.current = (res.parkingLocation).toString().split(',')[0]
-        Parklat.current = (res.parkingLocation).toString().split(',')[1]
+        Roomlog.current = (!res.location).toString().split(',')[0]
+        Roomlat.current = (!res.location).toString().split(',')[1]
+        Parklog.current = (!res.parkingLocation).toString().split(',')[0]
+        Parklat.current = (!res.parkingLocation).toString().split(',')[1]
         setTaRoomContent(res || [])
         setLoading(false)
       })
       //更多指引
-      setLoading(true)
-
-      getExtendContent('room', roomId).then((res) => {
-        setExtend(res.records || [])
-        setIfroomId('reality')
-        setAllextNum(res.total)
-        setNewextNum(res.records.length)
-        setLoading(false)
-
-      })
-      setLoading(true)
+      geiZy()
 
       getRecommendList({ location: location }).then((res) => {
         setPackage(res || [])
@@ -305,11 +302,6 @@ export default (props) => {
                     <text className='title-title-boss' >更多指引</text>
                   </view>
                   {(extend || []).map((item, index) => <MoreGuide key={(index)} item={item} />)}
-                  {/* 
-                <view className='showMore' style={{ display: newextNum == AllextNum ? 'none' : '' }} onClick={extendMore}>
-                  <view>点击查看更多</view>
-                  <image src={showMore} className='moreTip' />
-                </view> */}
                 </view>
               </view>
             )