静态页面

src/components/ProjectItemCard/index.jsx

@@ -17,8 +17,14 @@ export default (props) => {
     <view className='components ProjectItemCard'>
       <view className='Img' onClick={() => goto(Data)}>
         <Image mode='scaleToFill' src={getImgURL(Data?.buildingListImg?.length ? Data.buildingListImg[0].url : null)} className='centerLabel'></Image>
-        <Image mode='heightFix' className='Tips Vr' src={require('@/assets/index-icon18.png')} />
-        <Image mode='heightFix' className='Tips Video' src={require('@/assets/index-icon19.png')} />
+          {
+            Data.panoramaList.length > 0 &&
+            <Image mode='heightFix' className='Tips Vr' src={require('@/assets/index-icon18.png')} />
+          }
+          {
+            Data.videoUrl !== null &&
+            <Image mode='heightFix' className='Tips Video' src={require('@/assets/index-icon19.png')} />
+          }
       </view>
       <view className='Name flex-h' onClick={() => goto(Data)}>
         <view className='flex-item'>

src/components/ProjectItemCard/style.scss

@@ -22,7 +22,7 @@
       z-index: 2;
       bottom: 10px;
       left: 18px;
-      &.Vr {
+      &:nth-child(3) {
         left: 58px;
       }
     }

src/components/ProjectListItem/index.jsx

@@ -13,8 +13,14 @@ export default function ProjectListItem (props) {
       <view className='Img'>
         <view>
           <Image mode='aspectFill' className='centerLabel' src={getImgURL(Data.buildingListImg?.length ? Data.buildingListImg[0].url : null)} />
-          <Image mode='heightFix' className='Tips Vr' src={require('@/assets/index-icon18.png')} />
-          <Image mode='heightFix' className='Tips Video' src={require('@/assets/index-icon19.png')} />
+          {
+            Data.panoramaList.length > 0 &&
+            <Image mode='heightFix' className='Tips Vr' src={require('@/assets/index-icon18.png')} />
+          }
+          {
+            Data.videoUrl !== null &&
+            <Image mode='heightFix' className='Tips Video' src={require('@/assets/index-icon19.png')} />
+          }
         </view>
       </view>
       <view className='flex-item'>

src/components/ProjectListItem/index.scss

@@ -26,7 +26,7 @@
         z-index: 2;
         bottom: 10px;
         left: 10px;
-        &.Vr {
+        &:nth-child(3) {
           left: 50px;
         }
       }

src/pages/index/buildingAround/index.jsx

@@ -15,8 +15,8 @@ export default withLayout((props) => {
   const [loc, setLoc] = useState([])
   const [NavList, setNavList] = useState([])
   const [CurrentNavId, setCurrentNavId] = useState(1)
-  const [List, setList] = useState([{}, {}, {}, {}, {}, {}, {}, {}, {}])
-  const [OtherList, setOtherList] = useState([{}, {}, {}, {}, {}, {}, {}, {}, {}])
+  const [List, setList] = useState([])
+  const [OtherList, setOtherList] = useState([])
   const [markers, setMarkers] = useState([])
   const mapCtx = useRef()
 
@@ -61,8 +61,8 @@ export default withLayout((props) => {
     if (mapCtx.current) {
       // 缩放地图，显示所有 marker
       const points = [
-        {longitude: center.longitude, latitude: center.latitude},
-        {longitude: marker.longitude, latitude: marker.latitude}
+        { longitude: center.longitude, latitude: center.latitude },
+        { longitude: marker.longitude, latitude: marker.latitude }
       ]
       mapCtx.current.includePoints({ points, padding: [32] })
     }
@@ -98,12 +98,12 @@ export default withLayout((props) => {
         }])
         setDetailInfo(res || {})
         if (res.mapJson) {
-          const pois = JSON.parse(res.mapJson).map(poi => ({...poi, data: JSON.parse(poi.data)}))
+          const pois = JSON.parse(res.mapJson).map(poi => ({ ...poi, data: JSON.parse(poi.data) }))
           setNavList(pois)
           setCurrentNavId(pois[0].key)
           setList(pois[0].data)
         }
-        
+
       } else {
         Taro.showToast({
           title: '当前楼盘未设置位置信息',
@@ -116,6 +116,25 @@ export default withLayout((props) => {
 
   }, [id])
 
+  const TypeCalc = (key) => {
+    switch (key) {
+      case 'Transport':
+        return '交通'
+      case 'Mall':
+        return '商业'
+      case 'Edu':
+        return '学校'
+      case 'Hospital':
+        return '医院'
+      case 'Bank':
+        return '银行'
+      case 'Restaurant':
+        return '餐饮'
+      default:
+        return ''
+    }
+  }
+
   return (
     <view className='Page buildingAround'>
 
@@ -153,9 +172,9 @@ export default withLayout((props) => {
 
           <view className='Nav flex-h'>
             {
-              NavList.map((item, index) => (
+              NavList.map((item) => (
                 <view className={item.key === CurrentNavId ? 'flex-item active' : 'flex-item'} key={item.key}>
-                  <text onClick={CutNav(item.key)}>{`${item.label}(${item.data.length})`}</text>
+                  <text onClick={CutNav(item.key)}>{`${TypeCalc(item.key)}(${item.data.length})`}</text>
                 </view>
               ))
             }
@@ -175,12 +194,15 @@ export default withLayout((props) => {
                           <text>{item.name}</text>
                         </view>
                         <text className='iconfont icon-dingwei'></text>
-                        <text className='distance'>{`${item.distance}m`}</text>
+                        <text className='distance'>{`${item.distance || '-'}m`}</text>
                       </view>
                     ))
                   }
                 </view>
-                <text>其他</text>
+                {
+                  OtherList.length > 0 &&
+                  <text>其他</text>
+                }
                 <view className='List'>
                   {
                     OtherList.map((item, index) => (

src/pages/index/specialPriceHouse/index.jsx

@@ -97,8 +97,14 @@ export default withLayout((props) => {
                     <view className='InfoContent'>
                       <view className='Img' onClick={() => goto(item)}>
                         <Image mode='scaleToFill' src={mainImg} className='centerLabel'></Image>
-                        <Image mode='heightFix' className='Tips Vr' src={require('@/assets/index-icon18.png')} />
-                        <Image mode='heightFix' className='Tips Video' src={require('@/assets/index-icon19.png')} />
+                        {
+                          item.panoramaList.length > 0 &&
+                          <Image mode='heightFix' className='Tips Vr' src={require('@/assets/index-icon18.png')} />
+                        }
+                        {
+                          item.videoUrl !== null &&
+                          <Image mode='heightFix' className='Tips Video' src={require('@/assets/index-icon19.png')} />
+                        }
                       </view>
                       <view className='Name flex-h' onClick={() => goto(item)}>
                         <view className='flex-item'>

src/pages/index/specialPriceHouse/index.scss

@@ -90,7 +90,7 @@
                 z-index: 2;
                 bottom: 10px;
                 left: 18px;
-                &.Vr {
+                &:nth-child(3) {
                   left: 58px;
                 }
               }

src/pages/mine/components/ResidentListItem/index.jsx

@@ -26,7 +26,7 @@ export default function ResidentListItem (props) {
           <text className='Status'>已报备</text>
         } */}
         {
-          data.type === 'report' && (data.channelStatus - 0) === 1 &&
+          data.customerStatus - 0 === 1 &&
           <text className='Status' onClick={() => { Taro.navigateTo({ url: `/pages/mine/sureVisit/index?id=${data.id}` }) }}>到访确认</text>
         }
       </view>
@@ -75,7 +75,7 @@ export default function ResidentListItem (props) {
       <view className='flex-h'>
         <text>报备经纪：</text>
         <view className='flex-item'>
-          <text>{data.recommendPersonName}  {data.recommendPersonPhone}</text>
+          <text>{data.recommendPersonName}  {data.recommendPersonPhone}（{data.type === 'customer' ? '客户' : data.consultant ? '置业顾问' : data.channelName || '经纪人'}）</text>
         </view>
       </view>
       <view className='flex-h'>

src/pages/mine/residentManager/index.jsx

@@ -50,12 +50,10 @@ export default withLayout(() => {
   }, [PersonId])
 
   useEffect(() => {
-    if (FilterData.keywords) {
-      if (pageNumber === 1) {
-        GetPageList()
-      } else {
-        setPageNumber(1)
-      }
+    if (pageNumber === 1) {
+      GetPageList()
+    } else {
+      setPageNumber(1)
     }
   }, [FilterData])