bug fix

src/pages/project/album/index.js

@@ -56,13 +56,12 @@ export default class Index extends Component {
   }
 
   render () {
-    const { projectDetail: { buildingApartment } } = this.props
+    const { projectDetail: { buildingApartment = [] } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'photo')
     const { current } = this.state
-    const imgList = list[current].buildingImgList
+    const imgList = (list[current] || {}).buildingImgList || []
     let _photosImgs = imgList.map(img => img.url)
 
-
     return (
       <View className='photos'>
         <ScrollView scrollX>
@@ -71,7 +70,7 @@ export default class Index extends Component {
             <View className="around-tab">
               {list.map((item, index) => {
                 const { apartmentName } = item || {}
-                const buildingImgList = item.buildingImgList
+                const buildingImgList = item.buildingImgList || []
 
                 console.log(item, '22333333222')
                 return (<View>

src/pages/project/index.js

@@ -89,76 +89,27 @@ export default class Index extends Component {
     const { cityList, userInfo: { person: { org } } } = this.props
     let defaultCity = cityList.filter(item => {
       return item.id == org.defaultCityId
-    })
-
-
+    })[0]
     console.log('-----defaultCity-->', defaultCity)
+
     Taro.getLocation().then(location => {
       Taro.setStorageSync('lat', location.latitude)
       Taro.setStorageSync('lon', location.longitude)
+
       console.log(location, 'location')
 
       const payload = { location: `${location.longitude},${location.latitude}` }
-      console.log(payload, 'payload')
 
       getLocationCity(payload).then(res => {
-        let cityId = res.id
-        let curCity = cityList.filter(item => {
-          return item.id == cityId
-        })
-
+        const curCity = res
+        this.updateCity(curCity)
+      }).catch(err=>{
         Taro.showToast({
-          title: `当前定位城市:${res.name}`,
+          title: `定位错误: ${err.message}`,
           icon: 'none',
         })
-
-        this.updateCity(curCity[0] || defaultCity[0])
-        console.log(curCity, 'location')
-
-
-        // this.qqmapsdk.getLocationCity({
-
-
-        //   location,
-        //   success: (res) => {
-        //     // debugger
-        //     let city = res.result.address_component.city
-
-        //     console.log('-----city-->', city)
-        //     console.log('-----cityList-->', cityList)
-
-
-        //     let curCity = cityList.filter(item => {
-        //       return item.name == city
-        //     })
-
-
-
-
-        //     Taro.showToast({
-        //       title: `当前定位城市:${(curCity[0] || {}).name}`,
-        //       icon: 'none',
-        //     })
-
-        //     this.updateCity(curCity[0] || defaultCity[0])
-        //   },
-        //   fail: (error) => {
-
-
-        //     Taro.showToast({
-        //       title: `定位错误: ${error.message}`,
-        //       icon: 'none',
-        //     })
-        //     console.error(err)
-        //     this.updateCity(defaultCity[0])
-        //   },
-      }).catch(err=>{
-               Taro.showToast({
-              title: `定位错误: ${error.message}`,
-              icon: 'none',
-            })
-            console.error(err)
-            this.updateCity(defaultCity[0])
+        console.error(err)
+        this.updateCity(defaultCity)
       })
     }).catch(err => {
       if (err.errMsg === 'getLocation:fail auth deny') {
@@ -173,13 +124,11 @@ export default class Index extends Component {
         })
       }
       console.error(err)
-      this.updateCity(defaultCity[0])
+      this.updateCity(defaultCity)
     })
   }
 
   updateCity (payload) {
-
-
     this.props.dispatchCitySelected(payload).then(res => {
       this.loadData()
     })

src/pages/project/item/index.js

@@ -20,7 +20,7 @@ export default class Index extends Component {
     const { data, onClick } = this.props
     const { uvList = {}, buildingTag = [], buildingListImg, shareList = {} } = data
     const { records = [], total = 0 } = uvList
-    const imgSrc = (buildingListImg && buildingListImg[0]) ? buildingListImg[0].url : getThumbnail('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/default.jpg')
+    const imgSrc = (buildingListImg && buildingListImg[0]) ? buildingListImg[0].url : 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/default.jpg'
 
     return (
       <View className='item' onClick={onClick.bind(this, data)}>