feats

src/components/Loading/index.jsx

 import './style.scss'
 
 export default (props) => {
-  const { width = '80px', logoVisible } = props
+  const { width = '64px', logoVisible } = props
   const height = width
 
   return (

src/components/Loading/style.scss

   position: relative;
 
   &-logo {
+    box-sizing: border-box;
+    padding: 12px;
     position: absolute;
     left: 0;
     transform: scale(.75, .75);

src/components/ProjectListItem/index.jsx

 import '@/assets/css/iconfont.css'
 import Taro from '@tarojs/taro'
 import { Image } from '@tarojs/components'
+import { getImgURL } from '@/utils/image'
 
 export default function ProjectListItem (props) {
   const { Data = {} } = props
     <view className='components ProjectListItem flex-h' onClick={() => {Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${Data.buildingId}` })}}>
       <view className='Img'>
         <view>
-          <Image mode='aspectFill' className='centerLabel' src={Data.buildingListImg?.length ? Data.buildingListImg[0].url : null} />
+          <Image mode='aspectFill' className='centerLabel' src={getImgURL(Data.buildingListImg?.length ? Data.buildingListImg[0].url : null)} />
         </view>
       </view>
       <view className='flex-item'>

src/pages/index/activityDetail/index.jsx

                   </view>
 
                   {detail.type == "dymic" && dymic()}
-                  {detail.type == "house" && house()}
+                  {detail.type !== "dymic" && house()}
                   <view className='ActivityIntro'>
                     <view className='Title'>
                       <text>活动介绍</text>

src/pages/index/activityDetail/index.scss

               overflow: hidden;
               text-align: center;
               font-size: 0;
+              margin-bottom: 30rpx;
+
               &::after {
                 content: '';
                 display: block;

src/pages/index/buildingDetail/components/DetailBottom/index.jsx

     if (Info.buildingId) {
       // 请求看房活动
       queryActivityList({ buildingId: Info.buildingId, pageSize: 1, type: 'look' }).then((res) => {
-        const { list } = res || {}
+        const { records } = res || {}
 
         // 只保留已发布的活动
-        setActList((list || []))
+        setActList((records || []))
       })
     }
   }, [Info.buildingId])

src/pages/index/buildingDetail/components/MarketingActivity/index.jsx

   useEffect(() => {
     if (buildingId) {
       queryActivityList({ buildingId, pageSize: 500, type: 'house' }).then((res) => {
-        const { list } = res || {}
+        const { records } = res || {}
         
         // 只保留3场在进行中的活动
-        setDataList((list || []).filter((x) => (x.activityStatus === 0)).slice(0, 3))
+        setDataList((records || []).filter((x) => (x.activityStatus < 2)).slice(0, 3))
       })
     }
   }, [buildingId])
               dataList.map((item, index) => (
                 <SwiperItem key={`Banner-${index}`}>
                   <view className='swiper-item' onClick={() => goDetail(item.dynamicId)}>
-                    <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.bannerListImg || item.image || item.url || item.img || item.imgUrl || item.detailImg)} />
+                    <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.imgUrl || item.image || item.url || item.img || item.imgUrl || item.detailImg)} />
                   </view>
                 </SwiperItem>
               ))

src/pages/index/buildingDetail/components/Periphery/index.jsx

         longitude: loc[0],
         latitude: loc[1],
         iconPath: '',
-        width: 24,
-        height: 36,
-        customCallout: {
-          anchorY: 0,
-          anchorX: 0,
+        width: 18,
+        height: 27,
+        callout: {
+          content: Info.buildingName,
+          color: '#333333',
+          padding: 6,
           display: 'ALWAYS',
         }
       })
         <view>
           <Map
             id='poi-around'
-            show-location
+            // show-location
             scale={12}
             markers={markers}
             longitude={loc[0]}
             latitude={loc[1]}
             // enable-enableScroll
             // enable-zoom
-          >
-            <CoverView slot='callout' className='marker-callout'>
-              <CoverView markerId={-1} className='marker-project'>{Info.buildingName}</CoverView>
-            </CoverView>
-          </Map>
+          />
         </view>
       </view>
 

src/pages/index/findHouseFromMap/index.jsx

-import { useState } from 'react'
+import { useEffect, useRef, useState } from 'react'
+import Taro from '@tarojs/taro'
 import withLayout from '@/layout'
-import { Image } from '@tarojs/components'
+import { Image, Map } from '@tarojs/components'
+import { getItemList } from '@/services/item'
+import { getImgURL } from '@/utils/image'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
-export default withLayout(() => {
+export default withLayout((props) => {
+  const { city } = props
 
   const [ShowInfo, setShowInfo] = useState(false)
+  const [list, setList] = useState([])
+  const [markers, setMarkers] = useState([])
+  const mapCtx = useRef()
+  const [current, setCurrent] = useState({})
 
-  const CutInfo = (status) => {
-    return () => {
-      setShowInfo(!!status)
+  const changeCity = () => {
+    Taro.navigateTo({ url: '/pages/index/location/index' })
+  }
+
+  const handleMarker = (e) => {
+    const { markerId } = e
+    const building = list[markerId - 1];
+    setCurrent(building||{});
+    setShowInfo(true)
+  }
+
+  const gotoDetail = () => {
+    if (current.buildingId) {
+      Taro.navigateTo({ url: `/pages/index/buildingDetail/index?id=${current.buildingId}` })
+    }
+  }
+
+  const locationTo = () => {
+    if (current.buildingId) {
+      const loc = current.coordinate.split(',')
+      Taro.openLocation({
+        longitude: loc[0] - 0,
+        latitude: loc[1] - 0,
+        name: current.buildingName,
+        address: current.address,
+        scale: 12,
+      })
     }
   }
 
+  useEffect(() => {
+    Taro.nextTick(() => {
+      mapCtx.current = Taro.createMapContext('map-buildings')
+    })
+  }, [])
+
+  useEffect(() => {
+    if (city?.id) {
+      // 先移除页面的 markers
+      if (mapCtx.current && markers.length) {
+        mapCtx.current.removeMarkers({ markerIds: markers.map(x => x.id) })
+        setMarkers([])
+      }
+
+      getItemList({
+        cityId: city.id,
+        pageSize: 100,
+      }).then((res) => {
+        const { records } = res
+        setList((records || []).filter(x => x.coordinate))
+      })
+    }
+  }, [city?.id])
+
+  useEffect(() => {
+    if (!list.length) return;
+
+    const mks = list.map((item, index) => {
+      const loc = item.coordinate.split(',')
+
+      return {
+        id: index + 1,
+        longitude: loc[0] - 0,
+        latitude: loc[1] - 0,
+        iconPath: '',
+        width: 18,
+        height: 27,
+        callout: {
+          content: item.buildingName,
+          color: '#333333',
+          fontSize: 14,
+          display: 'ALWAYS',
+          padding: 6,
+          borderRadius: 2,
+          borderColor: 'rgba(0,0,0, .1)',
+        }
+        // customCallout: {
+        //   anchorY: 0,
+        //   anchorX: 0,
+        //   display: 'ALWAYS',
+        // }
+      }
+    })
+
+    const points = mks.map(it => ({ longitude: it.longitude, latitude: it.latitude }))
+    setMarkers(mks)
+
+    const t = setInterval(() => {
+      if (mapCtx.current) {
+        mapCtx.current.includePoints({ points, padding: [32] })
+        clearInterval(t)
+      }
+    }, 300)
+
+    return () => clearInterval(t)
+  }, [list])
+
   return (
     <view className='Page findHouseFromMap'>
 
       {/* 地图 */}
       <view className='MapContainer'>
-
+        <Map
+          id='map-buildings'
+          show-location
+          scale={12}
+          longitude={city?.lng}
+          latitude={city?.lat}
+          markers={markers}
+          onMarkertap={handleMarker}
+          onTap={() => setShowInfo(false)}
+        />
       </view>
 
       {/* 定位 */}
-      <view className='Location'>
+      <view className='Location' onClick={changeCity}>
         <text className='iconfont icon-dingwei'></text>
-        <text>南京市</text>
+        <text>{city.name}</text>
       </view>
 
       {/* 分享 */}
-      <view className='Share'>
+      <button className='Share' openType='share'>
         <text className='iconfont icon-fenxiang'></text>
-        <text>分享</text>
-      </view>
+        <text>分 享</text>
+      </button>
 
       {/* 附近楼盘 */}
       <view className={ShowInfo ? 'AroundBuilding active' : 'AroundBuilding'}>
-        <view className='Go'>
+        <view className='Go' onClick={locationTo}>
           <text>立即</text>
           <text>前往</text>
         </view>
         <view className='InfoContainer'>
-          <text className='Title' onClick={CutInfo(true)}>附近楼盘</text>
+          {/* <text className='Title' onClick={CutInfo(true)}>附近楼盘</text> */}
           <view className='InfoContent'>
-            <view className='Img'>
-              <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
+            <view className='Img' onClick={gotoDetail}>
+              <Image mode='scaleToFill' src={getImgURL(current.buildingListImg?.length ? current.buildingListImg[0].url : null)} className='centerLabel'></Image>
             </view>
             <view className='Name flex-h'>
               <view className='flex-item'>
-                <text>奥园金基天著尚居</text>
+                <text>{current.buildingName}</text>
               </view>
-              <text>约</text>
-              <text>20000/㎡</text>
+              <text></text>
+              <text>{current.price}</text>
             </view>
-            <text className='Address'>江宁禄口云熙99路号（诚信大道）</text>
+            <text className='Address'>{current.address}</text>
             <view className='Tag'>
-              <text>纯新盘</text>
-              <text>纯新盘</text>
-              <text>纯新盘</text>
+            {
+              (current.buildingTag || []).map((item, index) => (
+                <text key={`Tags-${index}`}>{item.tagName}</text>
+              ))
+            }
             </view>
             <view className='Views flex-h'>
               <view className='flex-item'>
                 <text className='iconfont icon-fenxiang'></text>
-                <text>3次分享</text>
+                <text>{`${current.shareNum||0}次分享`}</text>
               </view>
               <view className='Icons'>
-                <view>
-                  <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
-                </view>
-                <view>
-                  <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
-                </view>
-                <view>
-                  <Image mode='scaleToFill' src={null} className='centerLabel'></Image>
-                </view>
+                {
+                  (current.uvList?.records || []).slice(0, 3).map((item, index) => (
+                    <view key={`uv-${index}`}>
+                      <Image mode='scaleToFill' className='centerLabel' src={item.photoOravatar} />
+                    </view>
+                  ))
+                }
               </view>
-              <text>...9人围观</text>
+              <text>{`...${current.pvNum}人围观`}</text>
             </view>
           </view>
         </view>

src/pages/index/findHouseFromMap/index.scss

     overflow: hidden;
     z-index: 1;
     background: #eee;
+
+    map {
+      width: 100%;
+      height: 100%;
+    }
   }
   > .Location,
   > .Share {
     top: 30px;
     right: 30px;
     border-radius: 12px;
+    padding: 0;
+
     > text {
       display: block;
       text-align: center;

src/pages/index/specialPriceHouse/index.jsx

 
 const defaultRuleImage = 'https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/index-icon19.jpg'
 
-export default withLayout(() => {
+export default withLayout((props) => {
+  const { city } = props
   
-  const user = useSelector(state => state.user)
   const [PageList, setPageList] = useState([])
   const [IsPull, setPull] = useState(false)
-  const [PersonId, setPersonId] = useState(null)
   const [pageNumber, setPageNumber] = useState(1)
   const [HasNextPage, setHasNextPage] = useState(true)
 
   useEffect(() => {
-    if(user?.userInfo?.person?.personId) {
-      setPersonId(user.userInfo.person.personId)
-    }
-  }, [user])
-
-  useEffect(() => {
-    if(PersonId) {
-      GetPageList()
-    }
-  }, [pageNumber, PersonId])
+    GetPageList()
+  }, [pageNumber])
 
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
 
   const GetPageList = () => {
     setHasNextPage(false)
-    fetch({ url: API_SPECIAL_ROOM_LIST, method: 'get', payload: { pageNumber, pageSize: 10 } }).then((res) => {
+    fetch({ url: API_SPECIAL_ROOM_LIST, method: 'get', payload: { pageNumber, pageSize: 10, cityId: city?.id } }).then((res) => {
       setPageList(pageNumber === 1 ? res.records || [] : PageList.concat(res.records || []))
       setHasNextPage(res.current < res.pages)
       setPull(false)