Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

project.config.json

@@ -27,7 +27,7 @@
 			"outputPath": ""
 		},
 		"useIsolateContext": true,
-		"useCompilerModule": false,
+		"useCompilerModule": true,
 		"userConfirmedUseCompilerModuleSwitch": false
 	},
 	"compileType": "miniprogram",

src/assets/css/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "11930508",
+      "name": "餐饮",
+      "font_class": "canyin",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    },
     {
       "icon_id": "1167166",
       "name": "交通",

src/assets/css/iconfont.svg

@@ -20,6 +20,9 @@ Created by iconfont
   />
     <missing-glyph />
     
+    <glyph glyph-name="canyin" unicode="&#58946;" d="M439.34082031 776.89746094c-13.09570313 0-21.84082031-8.72753906-21.84082031-21.82324219v-152.81542969h-0.08789062v-7.25976562c0.00878906-12.05859375-9.76464844-21.83203125-21.81445313-21.84082031-12.05859375-0.00878906-21.83203125 9.76464844-21.84082031 21.81445312V755.07421875c-0.00878906 12.05859375-9.78222656 21.82324219-21.84082031 21.81445313-12.04980469-0.00878906-21.81445313-9.7734375-21.81445313-21.81445313v-160.07519531c0.00878906-12.05859375-9.76464844-21.83203125-21.81445312-21.84082032-12.05859375-0.00878906-21.83203125 9.76464844-21.84082032 21.81445313V755.15332031c0 13.05175781-8.75390625 21.75292969-21.82324218 21.75292969s-21.84082031-8.72753906-21.84082032-21.82324219v-297.59765625c0-43.69921875 58.20996094-88.04003906 58.20996094-88.04003906V42.01757812000005c0-28.125 22.80761719-50.92382813 50.94140625-50.92382812 28.125 0 50.92382813 22.79882813 50.92382813 50.92382813V369.43652344s58.31542969 44.49902344 58.31542968 85.8515625V755.0390625c0.00878906 13.13085938-8.72753906 21.85839844-21.83203125 21.85839844z m341.87695313-356.51953125V737.6015625c0 21.50683594-17.31445313 38.99707031-38.8125 39.21679688-106.75195313 0-150.44238281-145.265625-150.44238282-196.45312501v-285.14355468l87.38964844-85.86035156v-167.34375c0-28.125 22.80761719-50.92382813 50.94140625-50.92382813 28.125 0 50.92382813 22.79882813 50.92382813 50.92382813V420.37792969z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="jiaotong" unicode="&#58932;" d="M869.76159781 95.83633499999996l-19.94871469 576.56141156c0 51.59190094-44.65868156 93.41186719-99.74453343 93.41186719L271.29248 765.80961281c-55.08681094 0-99.74357344-41.82092531-99.74357344-93.41186719L151.59923187 95.83633499999996l69.13840407 0c-0.50173969-2.63629219-0.81928406-5.34165844-0.81928407-8.12569125l0-18.960585c0-23.93385281 19.40188594-43.33669781 43.33669782-43.33669781l62.29824187 0c23.93673094 0 43.33861687 19.40380406 43.33861688 43.33669781L368.8919075 87.71064375000003c0 2.78307281-0.31754437 5.48843906-0.81928406 8.12569125l285.21750281 0c-0.50173969-2.63629219-0.81928406-5.34165844-0.81928406-8.12569125l0-18.960585c0-23.93385281 19.402845-43.33669781 43.33861687-43.33669781l62.29824188 0c23.93481188 0 43.33861687 19.40380406 43.33861687 43.33669781L801.446315 87.71064375000003c0 2.78307281-0.31754437 5.48843906-0.81928406 8.12569125L869.76159781 95.83633499999996zM274.68953656 186.18020156c-30.24829125 0-54.77118469 24.52289344-54.77118469 54.77310375 0 30.25021031 24.52289344 54.77310375 54.77118469 54.77310375 30.25212937 0 54.77310375-24.52289344 54.77310375-54.77310375C329.46264031 210.70309499999996 304.94166594 186.18020156 274.68953656 186.18020156zM235.89727719 385.01115469l7.4224875 236.69552062c0 52.20204656 19.01047125 72.85012781 67.06716843 72.85012781l400.3212225 0c48.05669719 0 67.06716844-20.64808031 67.06716844-72.85012781l7.68918656-236.69552062L235.89727719 385.01115469zM746.67129313 186.18020156c-30.25021031 0-54.77310375 24.52289344-54.77310376 54.77310375 0 30.25021031 24.52289344 54.77310375 54.77310375 54.77310375 30.25021031 0 54.77310375-24.52289344 54.77310376-54.77310375C801.44439687 210.70309499999996 776.92150344 186.18020156 746.67129313 186.18020156z"  horiz-adv-x="1024" />
 
     

src/constants/api.js

@@ -12,6 +12,12 @@ export const pathname = '/api/wx'
 
 const resolvePath = api => `${host + pathname}/${api}`
 
+// 特价房源
+export const API_SPECIAL_ROOM_LIST = resolvePath('specialRoomList') // 特价房源列表
+
+// 项目动态
+export const API_PROJECT_TREND_LIST = resolvePath('trendList') // 项目动态
+
 // 帮我找房
 export const API_HELP_FIND_HOUSE_QUESTION = resolvePath('houseProperty') // 问卷列表
 export const API_HELP_FIND_HOUSE_SUBMIT = resolvePath('searchHouse') // 问卷提交

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

@@ -1,19 +1,23 @@
-import React from 'react'
-import { Swiper, SwiperItem } from '@tarojs/components'
 
-import img1 from '@/assets/tmp/1.png'
-import img2 from '@/assets/tmp/2.png'
-import img3 from '@/assets/tmp/3.jpg'
-import img4 from '@/assets/tmp/4.jpg'
+import { Swiper, SwiperItem, Image } from '@tarojs/components'
+import { getImgURL } from '@/utils/image'
+import './index.scss'
 
-
-export default (props) => {
+export default function Banner (props) {
+  const { List = [] } = props
   return (
-    <Swiper interval={2000} duration={500} style={{ height: '100%' }}>
-      <SwiperItem><image src={img1} mode='aspectFill' style={{width: '100%', height: '100%'}} /></SwiperItem>
-      <SwiperItem><image src={img2} mode='aspectFill' style={{width: '100%', height: '100%'}} /></SwiperItem>
-      <SwiperItem><image src={img3} mode='aspectFill' style={{width: '100%', height: '100%'}} /></SwiperItem>
-      <SwiperItem><image src={img4} mode='aspectFill' style={{width: '100%', height: '100%'}} /></SwiperItem>
-    </Swiper>
+    <view className='components Banner'>
+      <Swiper autoplay interval={2000} indicator-dots>
+        {
+          List.map((item, index) => (
+            <SwiperItem key={`Banner-${index}`}>
+              <view className='swiper-item'>
+                <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.image || item.coverImg || item.url || item.img)} />
+              </view>
+            </SwiperItem>
+          ))
+        }
+      </Swiper>
+    </view>
   )
 }

src/pages/index/buildingDetail/components/Banner/index.scss

@@ -0,0 +1,21 @@
+.components.Banner {
+  width: 100%;
+  height: 100%;
+  background: #eee;
+  position: relative;
+  overflow: hidden;
+  > swiper {
+    width: 100%;
+    height: 100%;
+    .swiper-item {
+      width: 100%;
+      height: 100%;
+      position: relative;
+      overflow: hidden;
+      > image {
+        width: 100%;
+        height: 100%;
+      }
+    }
+  }
+}

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

@@ -1,17 +1,17 @@
-import React, { useState, useEffect } from 'react'
+
 import { ScrollView, Image } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default function HouseTypeIntro (props) {
-  const { Data = {} } = props
-  const [PageList, setPageList] = useState(['', '', '', '', ''])
+  const { Info = [] } = props
+  
   return (
     <view className='components HouseTypeIntro'>
 
       <view className='Title flex-h'>
         <view className='flex-item'>
-          <text>户型介绍（5）</text>
+          <text>户型介绍（{Info.length}）</text>
         </view>
         <text>更多</text>
         <text className='iconfont icon-jiantouright'></text>
@@ -20,17 +20,16 @@ export default function HouseTypeIntro (props) {
       <view className='ProjectList'>
         <ScrollView scroll-x>
           {
-            PageList.map((item, index) => (
+            Info.map((item, index) => (
               <view className='ListItem' key={`List-${index}`}>
                 <view className='Img'>
-                  <Image mode='aspectFill' src={null}></Image>
+                  <Image mode='aspectFill' src={item.buildingImgList.length ? item.buildingImgList[0].url : null}></Image>
                 </view>
                 <view className='Title'>
-                  <text>290平</text>
-                  <text>户型</text>
+                  <text>{item.apartmentName}</text>
                 </view>
-                <text>建面290m²</text>
-                <text>套内288m²</text>
+                <text>建面{item.buildingArea || `-`}m²</text>
+                <text>套内{item.insideArea || `-`}m²</text>
               </view>
             ))
           }

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

@@ -1,11 +1,11 @@
-import React, { useState, useEffect } from 'react'
+
 import { Image } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
+import { getImgURL } from '@/utils/image'
 import './index.scss'
 
 export default function LivingActivity (props) {
-  const { Data = {} } = props
-  const [PageList, setPageList] = useState(['', ''])
+  const { List = [] } = props
   return (
     <view className='components LivingActivity'>
 
@@ -19,10 +19,10 @@ export default function LivingActivity (props) {
 
       <view className='List flex-h'>
         {
-          PageList.map((item, index) => (
+          List.map((item, index) => (
             <view className='flex-item' key={`ListItem-${index}`}>
-              <view>
-                <Image mode='aspectFill' src={null} className='centerLabel'></Image>
+              <view style={{display: item.images ? 'block' : 'none'}}>
+                <Image mode='aspectFill' src={getImgURL(item.images)} className='centerLabel'></Image>
               </view>
             </view>
           ))

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

@@ -1,11 +1,11 @@
-import React, { useState, useEffect } from 'react'
+
 import { Swiper, SwiperItem, Image } from '@tarojs/components'
 import { getImgURL } from '@/utils/image'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default function MarketingActivity (props) {
-  const { List = ['', '', ''] } = props
+  const { List = [] } = props
   return (
     <view className='components MarketingActivity'>
 
@@ -24,7 +24,7 @@ export default function MarketingActivity (props) {
               List.map((item, index) => (
                 <SwiperItem key={`Banner-${index}`}>
                   <view className='swiper-item'>
-                    <Image mode='aspectFill' className='centerLabel' src={getImgURL(item?.image)} />
+                    <Image mode='aspectFill' className='centerLabel' src={getImgURL(item.bannerListImg || item.image || item.url || item.img || item.imgUrl || item.detailImg)} />
                   </view>
                 </SwiperItem>
               ))

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

@@ -1,11 +1,10 @@
-import React, { useState, useEffect } from 'react'
+
 import { Image } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default function News (props) {
-  const { Data = {} } = props
-  const [PageList, setPageList] = useState(['', ''])
+  const { List = [] } = props
   return (
     <view className='components News'>
 
@@ -19,12 +18,12 @@ export default function News (props) {
 
       <view className='List flex-h'>
         {
-          PageList.map((item, index) => (
+          List.map((item, index) => (
             <view className='flex-item' key={`ListItem-${index}`}>
-              <view className='Img'>
-                <Image mode='aspectFill' src={null} className='centerLabel'></Image>
+              <view className='Img' style={{display: item.newsImg || item.newsName ? 'block' : 'none'}}>
+                <Image mode='aspectFill' src={item.newsImg} className='centerLabel'></Image>
               </view>
-              <text className='Title'>一方山营销中心盛大样板间开盘活动</text>
+              <text className='Title'>{item.newsName}</text>
             </view>
           ))
         }

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

@@ -1,9 +1,36 @@
-import React, { useState, useEffect } from 'react'
+
+import { Map } from '@tarojs/components'
+import '@/assets/css/iconfont.css'
 import './index.scss'
-import '../../../../../assets/css/iconfont.css'
 
 export default function Periphery (props) {
-  const { Data = {} } = props
+  const { List = [] } = props
+
+  const CutTab = () => {
+    return () => {
+      
+    }
+  }
+
+  const ClassName = (label) => {
+    switch (label) {
+      case '交通':
+        return 'iconfont icon-jiaotong'
+      case '商业':
+        return 'iconfont icon-shangye'
+      case '学校':
+        return 'iconfont icon-xuexiao'
+      case '医院':
+        return 'iconfont icon-yiyuan'
+      case '银行':
+        return 'iconfont icon-yinhang'
+      case '餐饮':
+        return 'iconfont icon-canyin'
+      default:
+        return ''
+    }
+  }
+
   return (
     <view className='components Periphery'>
 
@@ -14,30 +41,27 @@ export default function Periphery (props) {
       </view>
 
       <view className='Map'>
-        <view></view>
+        <view>
+          <Map
+            id='poi-around'
+            show-location
+            scale={12}
+            markers={[]}
+            enable-enableScroll
+            enable-zoom
+          ></Map>
+        </view>
       </view>
 
       <view className='List flex-h'>
-        <view className='flex-item'>
-          <text className='iconfont icon-jiaotong'></text>
-          <text>交通(10)</text>
-        </view>
-        <view className='flex-item'>
-          <text className='iconfont icon-shangye'></text>
-          <text>商业(10)</text>
-        </view>
-        <view className='flex-item'>
-          <text className='iconfont icon-xuexiao'></text>
-          <text>学校(10)</text>
-        </view>
-        <view className='flex-item'>
-          <text className='iconfont icon-yiyuan'></text>
-          <text>医院(10)</text>
-        </view>
-        <view className='flex-item'>
-          <text className='iconfont icon-yinhang'></text>
-          <text>银行(10)</text>
-        </view>
+        {
+          List.map((item, index) => (
+            <view className='flex-item' key={`Item-${index}`} onClick={CutTab(index)}>
+              <text className={ClassName(item.label)}></text>
+              <text>{item.label}({item.data.length})</text>
+            </view>
+          ))
+        }
       </view>
 
     </view>

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

@@ -33,6 +33,10 @@
       top: 0;
       bottom: 0;
       overflow: hidden;
+      >map{
+        width: 100%;
+        height: 100%;
+      }
     }
   }
   >.List {

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

@@ -1,11 +1,10 @@
-import React, { useState, useEffect } from 'react'
+
 import '@/assets/css/iconfont.css'
 import { ScrollView, Image } from '@tarojs/components'
 import './index.scss'
 
 export default function Pictures (props) {
-  const { Data = {} } = props
-  const [PageList, setPageList] = useState(['', '', '', '', ''])
+  const { List = [] } = props
   return (
     <view className='components Pictures'>
 
@@ -18,12 +17,12 @@ export default function Pictures (props) {
       <view className='ProjectList'>
         <ScrollView scroll-x>
           {
-            PageList.map((item, index) => (
+            List.map((item, index) => (
               <view className='ListItem' key={`List-${index}`}>
                 <view className='Img'>
-                  <Image mode='aspectFill' className='centerLabel' src={null}></Image>
+                  <Image mode='aspectFill' className='centerLabel' src={item.buildingImgList.length ? item.buildingImgList[0].url : null}></Image>
                 </view>
-                <text className='Title'>效果图(6)</text>
+                <text className='Title'>{item.apartmentName}({item.buildingImgList.length})</text>
               </view>
             ))
           }

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

@@ -1,18 +1,22 @@
-import React, { useState, useEffect } from 'react'
+import { useState } from 'react'
 import { Image } from '@tarojs/components'
+import Taro from '@tarojs/taro'
 import '@/assets/css/iconfont.css'
 import './index.scss'
 
 export default function PropertyConsultant (props) {
 
-  const { Data = {} } = props
+  const { List = [] } = props
   const [TipsList] = useState([
     {name: '官方保障', icon: 'icon-baozhang'},
     {name: '免费咨询', icon: 'icon-zixun'},
     {name: '户型解读', icon: 'icon-jiedu'},
     {name: '贴心服务', icon: 'icon-tiexin'}
   ])
-  const [PageList, setPageList] = useState(['', '', ''])
+
+  const CallPhone = (phone) => { // 拨打电话
+    Taro.makePhoneCall({ phoneNumber: phone })
+  }
 
   return (
     <view className='components PropertyConsultant'>
@@ -38,17 +42,17 @@ export default function PropertyConsultant (props) {
 
       <view className='PersonList'>
         {
-          PageList.map((item, index) => (
+          List.map((item, index) => (
             <view key={`PersonItem-${index}`} className='flex-h'>
               <view className='Icon'>
-                <Image mode='aspectFill' src={null}></Image>
+                <Image mode='aspectFill' src={item.photo || item.avatar}></Image>
               </view>
               <view className='flex-item'>
-                <text>陶虹</text>
-                <text>好评经纪人，熟悉楼盘特色</text>
+                <text>{item.userName}</text>
+                <text>{item.description || ''}</text>
               </view>
               <text className='iconfont icon-liaotian Chat'></text>
-              <text className='iconfont icon-dianhua Phone'></text>
+              <text className='iconfont icon-dianhua Phone' onClick={CallPhone(item.phone || item.tel)}></text>
             </view>
           ))
         }

src/pages/index/buildingDetail/index.jsx

@@ -4,9 +4,10 @@ import { ScrollView } from '@tarojs/components'
 import '@/assets/css/iconfont.css'
 import { useSelector } from 'react-redux'
 import { fetch } from '@/utils/request'
-import { API_ITEMS_DETAIL } from '@/constants/api'
+import { API_ITEMS_DETAIL, API_SPECIAL_ROOM_LIST, API_PROJECT_TREND_LIST, API_ACTIVITY_GROUP, API_LIVE_LIST, API_NEWS_LIST } from '@/constants/api'
 import './index.scss'
 import DetailBottom from './components/DetailBottom/index'
+import Banner from './components/Banner/index'
 import BasicInfo from './components/BasicInfo/index'
 import SpecialPriceHouse from './components/SpecialPriceHouse/index'
 import ProjectDynamic from './components/ProjectDynamic/index'
@@ -17,34 +18,92 @@ import MarketingActivity from './components/MarketingActivity/index'
 import LivingActivity from './components/LivingActivity/index'
 import News from './components/News/index'
 import Pictures from './components/Pictures/index'
-import Banner from './components/Banner'
 
 export default withLayout((props) => {
-  
+
   const user = useSelector(state => state.user)
   const [PersonId, setPersonId] = useState(null)
   const [DetailInfo, setDetailInfo] = useState({})
+  const [ActivityList, setActivityList] = useState([])
+  const [PictureList, setPictureList] = useState([])
+  const [NewsList, setNewsList] = useState([])
+  const [LiveList, setLiveList] = useState([])
+  const [MapList, setMapList] = useState([])
   const [IsPull, setPull] = useState(false)
   const [PullTimer, setPullTimer] = useState(null)
 
   useEffect(() => {
-    if(user?.userInfo?.person?.personId) {
+    if (user?.userInfo?.person?.personId) {
       setPersonId(user.userInfo.person.personId)
     }
   }, [user])
 
   useEffect(() => {
-    if(PersonId) {
+    if (PersonId) {
       GetBuildingDetail()
+      GetSpecialRoomList()
+      GetProjectTrendList()
+      GetActivityList()
+      GetLiveList()
+      GetNewsList()
     }
   }, [PersonId])
 
+  useEffect(() => {
+    if (DetailInfo.buildingApartment) {
+      const List = DetailInfo.buildingApartment.filter(item => item.apartmentType === 'photo')
+      setPictureList(List.filter(item => item.buildingImgList.length > 0))
+    }
+    if(DetailInfo.mapJson) {
+      setMapList(JSON.parse(DetailInfo.mapJson))
+    }
+  }, [DetailInfo])
+
   const GetBuildingDetail = () => { // 获取楼盘信息
-    fetch({ url: `${API_ITEMS_DETAIL}/${props.router.params.id}`, method: 'get'}).then((res) => {
+    fetch({ url: `${API_ITEMS_DETAIL}/${props.router.params.id}`, method: 'get' }).then((res) => {
       setDetailInfo(res || {})
     })
   }
 
+  const GetSpecialRoomList = () => { // 获取特价房源列表
+    fetch({ url: API_SPECIAL_ROOM_LIST, method: 'get' }).then((res) => {
+      console.log(res)
+    })
+  }
+
+  const GetProjectTrendList = () => { // 获取项目动态
+    fetch({ url: API_PROJECT_TREND_LIST, method: 'get' }).then((res) => {
+      console.log(res)
+    })
+  }
+
+  const GetActivityList = () => { // 获取活动列表
+    fetch({ url: `${API_ACTIVITY_GROUP}?buildingId=${props.router.params.id}`, method: 'get' }).then((res) => {
+      const ResArr = res || []
+      setActivityList(ResArr.filter((item) => { return item.type !== 'help' && item.type !== 'group' }))
+    })
+  }
+
+  const GetLiveList = () => { // 获取直播列表
+    fetch({ url: `${API_LIVE_LIST}?buildingId=${props.router.params.id}`, method: 'get' }).then((res) => {
+      let ResArr = res.records.slice(0, 2)
+      if (ResArr.length === 1) {
+        ResArr.push({})
+      }
+      setLiveList(ResArr || [])
+    })
+  }
+
+  const GetNewsList = () => { // 获取资讯列表
+    fetch({ url: `${API_NEWS_LIST}?buildingId=${props.router.params.id}&pageSize=2&pageNum=1`, method: 'get' }).then((res) => {
+      let ResArr = res.records.slice(0, 2)
+      if (ResArr.length === 1) {
+        ResArr.push({})
+      }
+      setNewsList(ResArr || [])
+    })
+  }
+
   const PageRefresh = () => { // 页面下拉刷新回调
     setPull(true)
   }
@@ -70,7 +129,7 @@ export default withLayout((props) => {
               <view className='BannerContainer'>
                 <view>
                   <view>
-                    <Banner />
+                    <Banner List={DetailInfo?.panoramaList}></Banner>
                   </view>
                 </view>
               </view>
@@ -94,38 +153,38 @@ export default withLayout((props) => {
                 </view>
 
                 {/* 置业顾问 */}
-                <view className='PropertyConsultant'>
-                  <PropertyConsultant></PropertyConsultant>
+                <view className='PropertyConsultant' style={{ display: DetailInfo?.consultants?.length ? 'block' : 'none' }}>
+                  <PropertyConsultant List={DetailInfo?.consultants}></PropertyConsultant>
                 </view>
 
                 {/* 位置及周边 */}
                 <view className='Periphery'>
-                  <Periphery></Periphery>
+                  <Periphery List={MapList} Info={DetailInfo}></Periphery>
                 </view>
 
                 {/* 户型介绍 */}
                 <view className='HouseTypeIntro'>
-                  <HouseTypeIntro></HouseTypeIntro>
+                  <HouseTypeIntro Info={DetailInfo?.buildingApartment}></HouseTypeIntro>
                 </view>
 
                 {/* 营销活动 */}
-                <view className='MarketingActivity'>
-                  <MarketingActivity></MarketingActivity>
+                <view className='MarketingActivity' style={{ display: ActivityList.length ? 'block' : 'none' }}>
+                  <MarketingActivity List={ActivityList}></MarketingActivity>
                 </view>
 
                 {/* 直播活动 */}
-                <view className='LivingActivity'>
-                  <LivingActivity></LivingActivity>
+                <view className='LivingActivity' style={{ display: LiveList.length ? 'block' : 'none' }}>
+                  <LivingActivity List={LiveList}></LivingActivity>
                 </view>
 
                 {/* 新鲜资讯 */}
-                <view className='News'>
-                  <News></News>
+                <view className='News' style={{ display: NewsList.length ? 'block' : 'none' }}>
+                  <News List={NewsList}></News>
                 </view>
 
                 {/* 相册 */}
-                <view className='Pictures'>
-                  <Pictures></Pictures>
+                <view className='Pictures' style={{ display: PictureList.length ? 'block' : 'none' }}>
+                  <Pictures List={PictureList}></Pictures>
                 </view>
 
               </view>

src/utils/amap.js

@@ -0,0 +1,40 @@
+const POI_TYPES = [
+  {
+    key: 'Transport',
+    label: '交通',
+    types: ['150100', '150200', '150300', '150400', '150500', '150600'],
+  },
+  {
+    key: 'Mall',
+    label: '商业',
+    types: ['060100', '060200', '060300', '060400', '060500', '060600',
+            '060700', '060800', '060900', '061000', '061100', '061200',
+            '061300', '061400', '080100', '080200', '080300', '080400',
+            '080500', '080600'],
+  },
+  {
+    key: 'Edu',
+    label: '学校',
+    types: ['141200'],
+  },
+  {
+    key: 'Hospital',
+    label: '医院',
+    types: ['090100', '090200', '090300', '090400', '090500', '090600', '090700'],
+  },
+  {
+    key: 'Bank',
+    label: '银行',
+    types: ['160100'],
+  },
+  {
+    key: 'Restaurant',
+    label: '餐饮',
+    types: ['050100', '050200', '050300', '050400', '050500', '050600',
+            '050700', '050800', '050900'],
+  },
+]
+
+export {
+  POI_TYPES,
+}