Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into v3.5.1

config/dev.js

@@ -5,12 +5,12 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST:  '"https://dev.jinchengjiaye.com"',//测试
-    WSS_HOST: '"wss://dev.jinchengjiaye.com"',
+    // HOST:  '"https://dev.jinchengjiaye.com"',//测试
+    // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://192.168.0.84:8080"',
-    // WSS_HOST: '"ws://192.168.0.84:8080"',
+    HOST: '"http://192.168.0.218:8080"',
+    WSS_HOST: '"ws://192.168.0.218:8080"',
   },
   weapp: {},
   h5: {}

project.config.json

@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
 	"description": "知与行联调",
-	"appid": "wxd9ee3a9480a4e544",
+	"appid": "wxda1f84b79b3edeb3",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,

src/constants/api.js

@@ -47,6 +47,8 @@ export const API_ITEMS_LIST = resolvePath('building/list')
 export const API_ITEMS_DETAIL = resolvePath('buildingSelectId')
 export const API_ITEMS_TYPE = resolvePath('tdBuildingType')
 export const API_ACTIVITY_GROUP = resolvePath('helpActivityAndGroup')
+export const API_LOCATION_CITYP = resolvePath('location/city')
+// /wx/location/city?location=lon,lat
 
 
 // shop

src/constants/project.js

@@ -1,2 +1,4 @@
 export const PROJECT_LIST = 'PROJECT_LIST'
-export const PROJECT_DETAIL = 'PROJECT_DETAIL'
+export const PROJECT_DETAIL = 'PROJECT_DETAIL'
+
+export const LOCATION_CITY = 'LOCATION_CITY'

src/pages/agent/become/index.js

@@ -43,7 +43,8 @@ export default class Index extends Component {
     else {
       console.log('11111')
       Taro.showToast({
-        title: '请输入渠道码'
+        title: '请输入渠道码',
+        icon: 'none'
       })
     }
   }

src/pages/card/index.js

@@ -432,10 +432,10 @@ export default class Index extends Component {
             <ScrollView scrollY>
               <View className='mycard__user__info'>
                 <View className='mycard__user__imgox'>
-                  <Image className='mycard__user__img' src={picture} mode="aspectFill"></Image>
+                  <Image className='mycard__user__img' src={picture} mode="widthFix"></Image>
                   <Image src={picture} mode="aspectFill" className='head__img'></Image>
                 </View>
-                <Image src={require('@assets/person/top.png')} className='top-img' mode="aspectFill"></Image>
+                <Image src={require('@assets/person/top.png')} className='top-img' mode="widthFix"></Image>
               </View>
 
               <View className='mycard__user__information'>
@@ -464,7 +464,7 @@ export default class Index extends Component {
 
                 </View>
                 <View className='row medal'>
-                  <Image mode="aspectFill" className="img" src={require('@assets/person/jinpai.png')}></Image>
+                  <Image mode="widthFix" className="img" src={require('@assets/person/jinpai.png')}></Image>
                   <Text>金牌置业顾问</Text>
                 </View>
 

src/pages/card/index.scss

@@ -49,11 +49,16 @@
 
   &__imgox {
     width: 100%;
-    height: 550px;
+    height: 750px;
     overflow: hidden;
     position: relative;
-  }
 
+    
+  }
+&__img {
+     width: 750px;
+     height: 750px;
+    }
   &__info {
     width: 100%;
     position: relative;

src/pages/person/customerAnalysis/analysis.js

@@ -10,6 +10,7 @@ import { savePoint, updatePoint } from '@services/common'
 import { querySexInfo, getEchartDailyInfo, getEchartMonthInfo } from '@services/person'
 import { connect } from '@tarojs/redux'
 import LineChart from "../../../components/charts/Line";
+const nothing = require('@assets/person/nothing.png')
 
 
 @connect(({ user, city }) => ({ user, city }))
@@ -136,7 +137,7 @@ export default class analysis extends Taro.Component {
       } else if (params == 'follow') {
         getEchartMonthInfo(params).then(res => {
           this.setState({
-            chartInfo2:  res.map(x => ({ name: `${x.month.substr(4)}月`, value: x.customerNum })) || []
+            chartInfo2: res.map(x => ({ name: `${x.month.substr(4)}月`, value: x.customerNum })) || []
           })
         })
       } else {
@@ -165,77 +166,136 @@ export default class analysis extends Taro.Component {
         <AtTabs className="tab-bar" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable="false">
           <AtTabsPane current={current} index={0} >
             <View>
-              <View style="height:40rpx;position: relative;margin-top:20rpx">
-                <View className="daily-month" >
-                  {
-                    dailyMonth.map((item, index) => (
-                      <View key={index + 'daily'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
-                        {item}
-                      </View>))
-                  }
+              {
+                chartInfo.length &&
+                <View>
+                  <View style="height:40rpx;position: relative;margin-top:20rpx">
+                    <View className="daily-month" >
+                      {
+                        dailyMonth.map((item, index) => (
+                          <View key={index + 'daily'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
+                            {item}
+                          </View>))
+                      }
+                    </View>
+                  </View>
+                  <View style="width:100vw;height:530rpx;position: relative;">
+                    <LineChart source={chartInfo} />
+                  </View>
                 </View>
-              </View>
-              <View style="width:100vw;height:530rpx;position: relative;">
-                <LineChart source={chartInfo} />
-              </View>
-              <View style="height:20rpx;background:#f5f5f5;"> </View>
-              <View style="padding: 40rpx;">
-                <View style="font-size: 36rpx;color: #666;margin-bottom:20rpx;">性别</View>
-                {sexInfo.map((item, index) => (
-                  <View key={index + 'sex1'} style="display: flex;align-items: center;"><View style="font-size: 32rpx;color: #666;min-width:80rpx">{item.genderType == 1 ? '男' : item.genderType == 2 ? '女' : '未知'}</View><AtProgress percent={(item.percentage * 100).toFixed(2)} strokeWidth={6} color={item.genderType == 1 ? '#BB9C79' : item.genderType == 2 ? '#F6B61D' : '#A2A2A2'} /></View>
-                ))
-                }
-              </View>
+              }
+              {
+                !chartInfo.length &&
+                <View >
+                  <Image style="width: 320rpx;height: 260rpx;margin: 60rpx auto 20rpx auto;display:block" src={nothing} />
+                  <View style="text-align:center;color:#999;font-size:30rpx;margin-bottom:100rpx;">
+                    暂无数据展示
+                </View>
+                </View>
+              }
+
+              {
+                sexInfo.length &&
+                <View>
+                  <View style="height:20rpx;background:#f5f5f5;"> </View>
+                  <View style="padding: 40rpx;">
+                    <View style="font-size: 36rpx;color: #666;margin-bottom:20rpx;">性别</View>
+                    {sexInfo.map((item, index) => (
+                      <View key={index + 'sex1'} style="display: flex;align-items: center;"><View style="font-size: 32rpx;color: #666;min-width:80rpx">{item.genderType == 1 ? '男' : item.genderType == 2 ? '女' : '未知'}</View><AtProgress percent={(item.percentage * 100).toFixed(2)} strokeWidth={6} color={item.genderType == 1 ? '#BB9C79' : item.genderType == 2 ? '#F6B61D' : '#A2A2A2'} /></View>
+                    ))
+                    }
+                  </View>
+                </View>
+              }
+
             </View>
           </AtTabsPane>
           <AtTabsPane current={current} index={1}>
             <View>
-              <View style="height:40rpx;position: relative;margin-top:20rpx">
-                <View className="daily-month" >
-                  {
-                    dailyMonth.map((item, index) => (
-                      <View key={index + 'month'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
-                        {item}
-                      </View>))
-                  }
+              {chartInfo2.length &&
+                <View>
+                  <View style="height:40rpx;position: relative;margin-top:20rpx">
+                    <View className="daily-month" >
+                      {
+                        dailyMonth.map((item, index) => (
+                          <View key={index + 'month'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
+                            {item}
+                          </View>))
+                      }
+                    </View>
+                  </View>
+                  <View style="width:100vw;height:530rpx;position: relative;">
+                    <LineChart source={chartInfo2} />
+                  </View>
+                </View>
+              }
+              {
+                !chartInfo2.length &&
+                <View >
+                  <Image style="width: 320rpx;height: 260rpx;margin: 60rpx auto 20rpx auto;display:block" src={nothing} />
+                  <View style="text-align:center;color:#999;font-size:30rpx;margin-bottom:100rpx;">
+                    暂无数据展示
                 </View>
-              </View>
-              <View style="width:100vw;height:530rpx;position: relative;">
-                <LineChart source={chartInfo2} />
-              </View>
-              <View style="height:20rpx;background:#f5f5f5;"> </View>
-              <View style="padding: 40rpx;">
-                <View style="font-size: 36rpx;color: #666;margin-bottom:20rpx;">性别</View>
-                {sexInfo.map((item, index) => (
-                  <View key={index + 'sex2'} style="display: flex;align-items: center;"><View style="font-size: 32rpx;color: #666;min-width:80rpx">{item.genderType == 1 ? '男' : item.genderType == 2 ? '女' : '未知'}</View><AtProgress percent={(item.percentage * 100).toFixed(2)} strokeWidth={6} color={item.genderType == 1 ? '#BB9C79' : item.genderType == 2 ? '#F6B61D' : '#A2A2A2'} /></View>
-                ))
-                }
-              </View>
+                </View>
+              }
+
+              {
+                sexInfo.length &&
+                <View>
+                  <View style="height:20rpx;background:#f5f5f5;"> </View>
+                  <View style="padding: 40rpx;">
+                    <View style="font-size: 36rpx;color: #666;margin-bottom:20rpx;">性别</View>
+                    {sexInfo.map((item, index) => (
+                      <View key={index + 'sex2'} style="display: flex;align-items: center;"><View style="font-size: 32rpx;color: #666;min-width:80rpx">{item.genderType == 1 ? '男' : item.genderType == 2 ? '女' : '未知'}</View><AtProgress percent={(item.percentage * 100).toFixed(2)} strokeWidth={6} color={item.genderType == 1 ? '#BB9C79' : item.genderType == 2 ? '#F6B61D' : '#A2A2A2'} /></View>
+                    ))
+                    }
+                  </View>
+                </View>
+              }
             </View>
           </AtTabsPane>
           <AtTabsPane current={current} index={2}>
             <View>
-              <View style="height:40rpx;position: relative;margin-top:20rpx">
-                <View className="daily-month" >
-                  {
-                    dailyMonth.map((item, index) => (
-                      <View key={index + 'day'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
-                        {item}
-                      </View>))
-                  }
+              {
+                chartInfo3.length &&
+                <View>
+                  <View style="height:40rpx;position: relative;margin-top:20rpx">
+                    <View className="daily-month" >
+                      {
+                        dailyMonth.map((item, index) => (
+                          <View key={index + 'day'} className={checkedWhich == index ? 'checked' : 'item'} onClick={this.changeDailyMonth.bind(this, index)}>
+                            {item}
+                          </View>))
+                      }
+                    </View>
+                  </View>
+                  <View style="width:100vw;height:530rpx;position: relative;">
+                    <LineChart source={chartInfo3} />
+                  </View>
+                </View>
+              }
+              {
+                !chartInfo3.length &&
+                <View >
+                  <Image style="width: 320rpx;height: 260rpx;margin: 60rpx auto 20rpx auto;display:block" src={nothing} />
+                  <View style="text-align:center;color:#999;font-size:30rpx;margin-bottom:100rpx;">
+                    暂无数据展示
+                </View>
+                </View>
+              }
+              {
+                sexInfo.length &&
+                <View>
+                  <View style="height:20rpx;background:#f5f5f5;"> </View>
+                  <View style="padding: 40rpx;">
+                    <View style="font-size: 36rpx;color: #666;margin-bottom:20rpx;">性别</View>
+                    {sexInfo.map((item, index) => (
+                      <View key={index + 'sex3'} style="display: flex;align-items: center;"><View style="font-size: 32rpx;color: #666;min-width:80rpx">{item.genderType == 1 ? '男' : item.genderType == 2 ? '女' : '未知'}</View><AtProgress percent={(item.percentage * 100).toFixed(2)} strokeWidth={6} color={item.genderType == 1 ? '#BB9C79' : item.genderType == 2 ? '#F6B61D' : '#A2A2A2'} /></View>
+                    ))
+                    }
+                  </View>
                 </View>
-              </View>
-              <View style="width:100vw;height:530rpx;position: relative;">
-                <LineChart source={chartInfo3} />
-              </View>
-              <View style="height:20rpx;background:#f5f5f5;"> </View>
-              <View style="padding: 40rpx;">
-                <View style="font-size: 36rpx;color: #666;margin-bottom:20rpx;">性别</View>
-                {sexInfo.map((item, index) => (
-                  <View key={index + 'sex3'} style="display: flex;align-items: center;"><View style="font-size: 32rpx;color: #666;min-width:80rpx">{item.genderType == 1 ? '男' : item.genderType == 2 ? '女' : '未知'}</View><AtProgress percent={(item.percentage * 100).toFixed(2)} strokeWidth={6} color={item.genderType == 1 ? '#BB9C79' : item.genderType == 2 ? '#F6B61D' : '#A2A2A2'} /></View>
-                ))
-                }
-              </View>
+              }
             </View>
           </AtTabsPane>
         </AtTabs>

src/pages/person/menus.js

@@ -146,14 +146,14 @@ const menus = [
     },
   ],
   [
-    {
-      name: '成为专业经纪人',
-      url: '/pages/agent/become/index',
-      icon: icons.development,
-      extends: undefined,
-      userTypes: [CUSTOMER, ESTATE_AGENT],
-      style: { color: '#888888' },
-    },
+    // {
+    //   name: '成为专业经纪人',
+    //   url: '/pages/agent/become/index',
+    //   icon: icons.development,
+    //   extends: undefined,
+    //   userTypes: [CUSTOMER, ESTATE_AGENT],
+    //   style: { color: '#888888' },
+    // },
     {
       name: '成为置业顾问',
       url: '',

src/pages/project/album/index.js

@@ -73,18 +73,20 @@ export default class Index extends Component {
                 const { apartmentName } = item || {}
                 const buildingImgList = item.buildingImgList
 
-                console.log(imgList, '22333333222')
-                return (
+                console.log(item, '22333333222')
+                return (<View>
+                  {buildingImgList.length>0&&
                   <View
-                    style={{ width: '100px' }}
+                    style={{ padding: '0 20px ' }}
                     key={current}
                     className={`around-tab__item ${current === index ? 'active' : ''}`}
                     onClick={() => this.setState({ current: index })}
                   >
 
                     <View>
-                      <View style={{ width: '100px', textAlign: 'center' }}>  {`${apartmentName}(${buildingImgList.length})`} </View>
+                      <View style={{  textAlign: 'center' }}>  {`${apartmentName}(${buildingImgList.length})`} </View>
                     </View>
+                  </View>}
                   </View>
                 )
               })}

src/pages/project/detail/index.js

@@ -58,7 +58,7 @@ export default class Index extends Component {
     videoPlayShow: 'flex',
   }
 
-  componentWillMount() {
+  componentWillMount () {
     // const { id = '78c3dd489791dc1d29472fa344b08c45' } = this.$router.params
 
     ready.queue(() => {
@@ -92,12 +92,12 @@ export default class Index extends Component {
     })
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
 
-  loadHelpGroupList() {
+  loadHelpGroupList () {
     const { buildingId } = this.state
 
     queryHelpGroup({ buildingId: buildingId }).then(res => {
@@ -119,7 +119,7 @@ export default class Index extends Component {
     )
   }
 
-  loadDetail() {
+  loadDetail () {
     const { buildingId } = this.state
     const { dispatchProjectDetail } = this.props
     this.setState({
@@ -147,7 +147,7 @@ export default class Index extends Component {
     })
   }
 
-  loadActivityData() {
+  loadActivityData () {
     const { buildingId } = this.state
     const payload = { pageSize: 999, pageNumber: 1, buildingId }
     queryActivityList(payload).then(res => {
@@ -157,7 +157,7 @@ export default class Index extends Component {
     })
   }
 
-  loadNewsData() {
+  loadNewsData () {
     const { buildingId } = this.state
     const payload = { pageSize: 2, pageNumber: 1, buildingId }
     queryNewsList(payload).then(res => {
@@ -167,11 +167,11 @@ export default class Index extends Component {
     })
   }
 
-  navigateTo(url) {
+  navigateTo (url) {
     Taro.navigateTo({ url: url })
   }
   // 海报预览图
-  previewImage(arr) {
+  previewImage (arr) {
     // console.log('arr:' + arr)
     if (arr[0].length > 1) {
       Taro.previewImage({
@@ -198,7 +198,7 @@ export default class Index extends Component {
     })
   }
 
-  openMap() {
+  openMap () {
     const {
       buildingName,
       address,
@@ -225,12 +225,12 @@ export default class Index extends Component {
     })
   }
 
-  toViewAlbum() {
+  toViewAlbum () {
     const { buildingId } = this.state
     this.navigateTo(`/pages/project/album/index?id=${buildingId}`)
   }
 
-  onViewFans() {
+  onViewFans () {
     const { buildingId } = this.state
     this.navigateTo('/pages/card/fans/index?type=item&id=' + buildingId)
   }
@@ -259,7 +259,7 @@ export default class Index extends Component {
     }
   }
 
-  getPhoneNumber(e, item) {
+  getPhoneNumber (e, item) {
     getUserPhone(e, (phoneNumber) => {
       const { userInfo: { person: { personId, nickname, name } } } = this.props
       Taro.navigateTo({
@@ -268,7 +268,7 @@ export default class Index extends Component {
     })
   }
 
-  getPosterData() {
+  getPosterData () {
     return new Promise(resolve => {
       const { posterData } = this.state
       if (posterData.qrcode) {
@@ -339,14 +339,14 @@ export default class Index extends Component {
     })
   }
 
-  handleTelClick(item, e) {
+  handleTelClick (item, e) {
     e.stopPropagation()
     Taro.makePhoneCall({
       phoneNumber: item.phone
     })
   }
 
-  handleChatClick(item, e) {
+  handleChatClick (item, e) {
     e.stopPropagation()
     const { userInfo: { person: { personId, nickname, name } } } = this.props
     Taro.navigateTo({
@@ -354,24 +354,24 @@ export default class Index extends Component {
     })
   }
 
-  handleConsuItemClick(item) {
+  handleConsuItemClick (item) {
     Taro.navigateTo({
       url: `/pages/card/index?id=${item.id}`
     })
   }
 
-  handleMoreClick() {
+  handleMoreClick () {
     // App.zhuge.track('查看置业顾问列表')
     Taro.navigateTo({
       url: `/pages/card/list/index?buildingId=${this.state.buildingId}`
     })
   }
 
-  handleStopPropagation(e) {
+  handleStopPropagation (e) {
     e.stopPropagation()
   }
 
-  toRecomonedPage() {
+  toRecomonedPage () {
     const {
       userInfo: { person: { personType } }
     } = this.props
@@ -387,50 +387,50 @@ export default class Index extends Component {
     }
   }
 
-  toHome() {
+  toHome () {
     Taro.switchTab({
       url: `/pages/project/index`
     })
   }
 
-  HandleCircumTabClick(id) {
+  HandleCircumTabClick (id) {
     this.setState({
       curTab: id
     })
   }
 
-  handleNewsMoreClick() {
+  handleNewsMoreClick () {
     Taro.navigateTo({
       url: `/pages/news/index?buildingId=` + this.state.buildingId
     })
   }
 
-  handNewsItemClick(id) {
+  handNewsItemClick (id) {
     Taro.navigateTo({
       url: '/pages/news/detail/index?id=' + id
     })
   }
 
-  handleActivityMoreClick() {
+  handleActivityMoreClick () {
     Taro.navigateTo({
       url: `/pages/activity/index?buildingId=` + this.state.buildingId
     })
   }
 
-  handActivityItemClick(id) {
+  handActivityItemClick (id) {
     Taro.navigateTo({
       url: '/pages/activity/detail/index?id=' + id
     })
   }
 
-  handlePreviewHxImage(current, urls) {
+  handlePreviewHxImage (current, urls) {
     Taro.previewImage({
       current,
       urls
     })
   }
 
-  handleFavor() {
+  handleFavor () {
     const { buildingId, isSaved } = this.state
     if (isSaved) {
       cancelFavorProject(buildingId).then(res => {
@@ -460,18 +460,18 @@ export default class Index extends Component {
       console.log('活动项目收藏')
     })
   }
-  handleToolsClick() {
+  handleToolsClick () {
     Taro.navigateTo({
       url: `/pages/toolKit/index`
     })
   }
-  moreFloor() {
+  moreFloor () {
     Taro.navigateTo({
       url: `/pages/project/floor/index`
     })
   }
 
-  renderBottomMenu() {
+  renderBottomMenu () {
     const { userInfo: { person: { personType } } } = this.props
     const { posterShow } = this.state
     return (
@@ -506,14 +506,14 @@ export default class Index extends Component {
     )
   }
 
-  previewHouseImage(current, urls) {
+  previewHouseImage (current, urls) {
     Taro.previewImage({
       current,
       urls
     })
   }
 
-  renderBuildingProjectTypeList() {
+  renderBuildingProjectTypeList () {
     const { statusOpts } = this.state
     const { projectDetail: { buildingProjectType = [], status, marketStatus } } = this.props
     return (
@@ -573,22 +573,22 @@ export default class Index extends Component {
   }
 
 
-  renderPhotoAlbum() {
+  renderPhotoAlbum () {
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'photo')
-    const imgList = list.reduce((prev, cur) => {
-      prev = prev.concat(cur.buildingImgList)
-      return prev
-    }, [])
+    // const imgList = list.reduce((prev, cur) => {
+    //   prev = prev.concat(cur.buildingImgList)
+    //   return prev
+    // }, [])
+
 
-    const { albumCurrent } = this.state
 
 
 
     return (
 
 
-      <Block>
+      <Block> {console.log(list, 'list')}
         {list.length > 0 &&
           (
             <View className='photos__type'>
@@ -598,22 +598,32 @@ export default class Index extends Component {
 
                   <View className="around-tab">
                     {list.map((item, index) => {
-                      const { apartmentName } = item || {}
-                      const buildingImgList = item.buildingImgList
-
-
-                      return (
-                        <View
-                          style={{ marginRight: '8px' }}
-                        >
-                          {/* {`${label}(${num})`} */}
-                          <View>
-                            <Image className='albumimg' src={getThumbnail(buildingImgList[0].url)} ></Image>
-                            <View style={{ textAlign: 'center' }}>  {`${apartmentName}(${buildingImgList.length})`} </View>
-                          </View>
-                        </View>
-                      )
-                    })}
+                      const { apartmentName } = item
+                      const buildingImgList = item.buildingImgList 
+                      const buildingImgUrl = buildingImgList.length > 0 ? buildingImgList[0].url : null
+
+                      console.log(buildingImgUrl, 'buildingImgUrl')
+
+                      // if (buildingImgUrl != null) {
+                        return (<View>
+                         {buildingImgUrl != null&& (<View
+                            style={{ marginRight: '8px' }}
+                          >
+
+                            <View>
+                              <Image className='albumimg' src={getThumbnail(buildingImgList[0].url)} ></Image>
+                              <View style={{ textAlign: 'center', width: '218rpx', display: 'flex' }}>
+                                <View style={{ textAlign: 'center', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}> {apartmentName}  </View>
+
+                                <View>({buildingImgList.length})</View>
+                              </View>
+                            </View>
+                          </View>)}</View>
+                        )
+                      // }
+
+                    })
+                    }
                   </View>
                 </View>
               </ScrollView>
@@ -623,7 +633,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  rendercircum() {
+  rendercircum () {
     const building = {
       ...this.props.projectDetail
     }
@@ -640,7 +650,7 @@ export default class Index extends Component {
     )
   }
 
-  renderConsuler() {
+  renderConsuler () {
     const { userInfo: { person: { phone } } } = this.props
     const { projectDetail: { consultants = [] } } = this.props
     return (
@@ -694,7 +704,7 @@ export default class Index extends Component {
     )
   }
 
-  renderStatement() {
+  renderStatement () {
     return (
       <View className='statement'>
         免责条款：以上价格仅供参考，具体一房一价的信息以售楼处展示为准。本网显示房屋位置、交通、医疗、教育、商业等配套信息，来源于第三方网络数据，不作为要约，仅供参考，双方具体权利义务应以法律规定及买卖合同约定为准。<br></br>本平台对项目周边文化教育的介绍旨在提供相关信息，并不意味着信息发布方对就学安排作出承诺。相关教育资源就学信息存在调整的可能，应以政府教育主管部门及办学颁布的政策规定为准。
@@ -703,7 +713,7 @@ export default class Index extends Component {
   }
 
 
-  renderHelp() {
+  renderHelp () {
     const { helpList } = this.state
     return (
       <Block>
@@ -724,17 +734,17 @@ export default class Index extends Component {
     )
   }
 
-  handleHelpClick(item) {
+  handleHelpClick (item) {
     Taro.navigateTo({
       url: '/pages/activity/detail/assistance?id=' + item.activityId
     })
   }
-  handleGroupClick(item) {
+  handleGroupClick (item) {
     Taro.navigateTo({
       url: '/pages/activity/detail/assemble?id=' + item.activityId
     })
   }
-  renderGroup() {
+  renderGroup () {
     const { groupList } = this.state
     return (
       <Block>
@@ -757,7 +767,7 @@ export default class Index extends Component {
     )
   }
 
-  renderHouseTypeList() {
+  renderHouseTypeList () {
     const { statusOpts } = this.state
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'apart')
@@ -874,7 +884,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  renderNews() {
+  renderNews () {
     const { newsList } = this.state
     return (
       <Block>
@@ -915,21 +925,21 @@ export default class Index extends Component {
     videoContext.play()
   }
 
-  onPlay() {
-    console.log()
-    this.setState({
-      videoPlayShow: 'none'
-    })
-  }
+  // onPlay () {
+  //   console.log()
+  //   this.setState({
+  //     videoPlayShow: 'none'
+  //   })
+  // }
 
-  onPause() {
-    this.setState({
-      videoPlayShow: 'flex'
-    })
-  }
+  // onPause() {
+  //   this.setState({
+  //     videoPlayShow: 'flex'
+  //   })
+  // }
 
 
-  renderVideo() {
+  renderVideo () {
     const { videoPlayShow } = this.state
     const { projectDetail } = this.props
     const { videoImage } = projectDetail
@@ -978,13 +988,13 @@ export default class Index extends Component {
     )
   }
 
-  changeCurrent(current) {
+  changeCurrent (current) {
     this.setState({
       current: current + 1
     })
   }
 
-  render() {
+  render () {
     const { posterStatus, posterData, loaded, btnstate } = this.state
     const { projectDetail } = this.props
     const { uvList = {} } = projectDetail

src/pages/project/index.js

@@ -8,6 +8,7 @@ import ActivityItem from '../activity/item'
 
 
 import ready from '@utils/ready'
+import { getLocationCity } from '@services/map'
 
 import { queryBanners, savePoint, updatePoint } from '@services/common'
 import { queryNewsList, queryHelpGroup } from '@services/news'
@@ -95,42 +96,69 @@ export default class Index extends Component {
     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')
 
-      this.qqmapsdk.reverseGeocoder({
-        location,
-        success: (res) => {
-          // debugger
-          let city = res.result.address_component.city
+      getLocationCity(payload).then(res => {
+        let cityId = res.id
+        let curCity = cityList.filter(item => {
+          return item.id == cityId
+        })
+
+        Taro.showToast({
+          title: `当前定位城市:${res.name}`,
+          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)
+        //     console.log('-----city-->', city)
+        //     console.log('-----cityList-->', cityList)
 
 
-          let curCity = cityList.filter(item => {
-            return item.name == city
-          })
+        //     let curCity = cityList.filter(item => {
+        //       return item.name == city
+        //     })
 
 
 
 
-          Taro.showToast({
-            title: `当前定位城市:${(curCity[0] || {}).name}`,
-            icon: 'none',
-          })
+        //     Taro.showToast({
+        //       title: `当前定位城市:${(curCity[0] || {}).name}`,
+        //       icon: 'none',
+        //     })
 
-          this.updateCity(curCity[0] || defaultCity[0])
-        },
-        fail: (error) => {
+        //     this.updateCity(curCity[0] || defaultCity[0])
+        //   },
+        //   fail: (error) => {
 
 
-          Taro.showToast({
-            title: `定位错误: ${error.message}`,
-            icon: 'none',
-          })
-          console.error(err)
-          this.updateCity(defaultCity[0])
-        },
+        //     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])
       })
     }).catch(err => {
       if (err.errMsg === 'getLocation:fail auth deny') {
@@ -185,6 +213,7 @@ export default class Index extends Component {
   }
   loadBannerList () {
     const { curCity } = this.props
+    console.log(this.props,'this.props')
     // 获取首页banner
     const payload = {
       showPosition: 'index'

src/services/map.js

@@ -0,0 +1,14 @@
+
+
+import { fetch } from '@utils/request'
+import {
+  API_LOCATION_CITYP
+
+} from '@constants/api'
+
+
+/**
+ * 获取名片列表
+ * @param {*} payload 
+ */
+export const getLocationCity = payload => fetch({ url: API_LOCATION_CITYP, payload })

src/utils/request.js

@@ -28,7 +28,7 @@ export const setStorage = function (key, data) {
  */
 export const fetch = async (options) => {
   const { url, payload, method = 'GET', showToast = true, autoLogin = true } = options
-
+  console.log(Taro.getStorageSync('token'),'----token---')
   return Taro.request({
     url,
     method,