zls

config/dev.js

     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://192.168.0.170:8080"',
-    WSS_HOST: '"ws://192.168.0.170:8080"',
+    HOST: '"http://192.168.0.218:8080"',
+    WSS_HOST: '"ws://192.168.0.218:8080"',
   },
   weapp: {},
   h5: {}

src/constants/api.js

 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

 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/client/index.js

                         </View>
                         <View className='client__top'>
                           <View className='client__infor'>
-                            <Text className='client__name'>{item.name}  &emsp;</Text>
+                            <Text className='client__name'>{item.name} </Text>
                             <Image className='sex' src={item.sex == 1 ? require('@assets/person/guest/man.png') : require('@assets/person/guest/women.png')} mode='widthFix'></Image>
                           </View>
 
 
                         </View>
 
-                        <View className='phone'>手机:&emsp;{item.phone}</View>
-                        <View className='phone'>意向楼盘:&emsp;{item.intention ? item.intention : '暂无'}</View>
+                        <View className='phone'>手机: {item.phone}</View>
+                        <View className='phone'>意向楼盘: {item.intention ? item.intention : '暂无'}</View>
 
                       </View>
                       <View className='time'>{dayjs(item.createDate).format('YYYY-MM-DD HH:mm:ss')}</View>

src/pages/card/index.js

 
 export default class Index extends Component {
   config = {
-    navigationBarTitleText: '个人主页' 
+    navigationBarTitleText: '个人主页'
   }
   state = {
     cardId: null,
       const router = Taro.getStorageSync('router')
       const id = this.$router.params.id || router.query.id || '4604a792d575eb8187711625bd88832c'
 
-      if(router.query.id){
+      if (router.query.id) {
         this.setState({
           cardId: id,
           modalStatus: true
         }, this.loadCardDetail)
-      }else{
+      } else {
         this.setState({
           cardId: id,
           modalStatus: false
 
                 </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>
 
                 <View className='detailed__main'>
                   <View className='detailed__tel' onClick={this.makePhoneCall}>
                     <View className='detailed__tel__txt'>
-                      <Text className='tel__txt' space='ensp'>手机&emsp;</Text> {cardInfo.phone}
+                      <Text className='tel__txt' space='ensp'>手机 </Text> {cardInfo.phone}
                     </View>
                     <Text className='iconfont icon-dianhua tel__img'></Text>
                   </View>
                   <View className='detailed__add' onClick={this.getLocation}>
                     <View className='detailed__add__txt'>
-                      <Text className='add__txt' space='ensp'>地址&emsp;</Text> {cardInfo.address}
+                      <Text className='add__txt' space='ensp'>地址 </Text> {cardInfo.address}
                     </View>
                     <Text className='iconfont icon-daohangdizhi add__img'></Text>
                   </View>

src/pages/card/index.scss

 
   &__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/index.js

 
   render() {
     const tabList = [{ title: '客户分析' }, { title: '我的客户' }]
-    const { customerNum } = this.state
+    const { customerNum, current } = this.state
     return (
-      <AtTabs className="tab-box" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
-        <AtTabsPane current={this.state.current} index={0} >
+      <AtTabs className="tab-box" current={current} tabList={tabList} onClick={this.handleClick.bind(this)}>
+        <AtTabsPane current={current} index={0} >
           <View >
-            <Analysis></Analysis>
+            {
+              current != 1 && <Analysis></Analysis>
+            }
           </View>
         </AtTabsPane>
-        <AtTabsPane current={this.state.current} index={1}>
+        <AtTabsPane current={current} index={1}>
           <View style="padding:10px 20px; display: flex;flex-wrap: wrap;align-content: flex-start;justify-content: space-between;">
             <View className="my-customer" onClick={this.toFollowUpCustomer} style="border-right:1px solid rgba(0,0,0,0.12)">
               <Image mode="widthFix" src={require('@assets/person/genjin.png')} className='img'></Image>

src/pages/project/album/index.js

                 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

     videoPlayShow: 'flex',
   }
 
-  componentWillMount() {
+  componentWillMount () {
     // const { id = '78c3dd489791dc1d29472fa344b08c45' } = this.$router.params
 
     ready.queue(() => {
     })
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
   }
 
-  loadHelpGroupList() {
+  loadHelpGroupList () {
     const { buildingId } = this.state
 
     queryHelpGroup({ buildingId: buildingId }).then(res => {
     )
   }
 
-  loadDetail() {
+  loadDetail () {
     const { buildingId } = this.state
     const { dispatchProjectDetail } = this.props
     this.setState({
     })
   }
 
-  loadActivityData() {
+  loadActivityData () {
     const { buildingId } = this.state
     const payload = { pageSize: 999, pageNumber: 1, buildingId }
     queryActivityList(payload).then(res => {
     })
   }
 
-  loadNewsData() {
+  loadNewsData () {
     const { buildingId } = this.state
     const payload = { pageSize: 2, pageNumber: 1, buildingId }
     queryNewsList(payload).then(res => {
     })
   }
 
-  navigateTo(url) {
+  navigateTo (url) {
     Taro.navigateTo({ url: url })
   }
   // 海报预览图
-  previewImage(arr) {
+  previewImage (arr) {
     // console.log('arr:' + arr)
     if (arr[0].length > 1) {
       Taro.previewImage({
     })
   }
 
-  openMap() {
+  openMap () {
     const {
       buildingName,
       address,
     })
   }
 
-  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)
   }
     }
   }
 
-  getPhoneNumber(e, item) {
+  getPhoneNumber (e, item) {
     getUserPhone(e, (phoneNumber) => {
       const { userInfo: { person: { personId, nickname, name } } } = this.props
       Taro.navigateTo({
     })
   }
 
-  getPosterData() {
+  getPosterData () {
     return new Promise(resolve => {
       const { posterData } = this.state
       if (posterData.qrcode) {
     })
   }
 
-  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({
     })
   }
 
-  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
     }
   }
 
-  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 => {
       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 (
     )
   }
 
-  previewHouseImage(current, urls) {
+  previewHouseImage (current, urls) {
     Taro.previewImage({
       current,
       urls
     })
   }
 
-  renderBuildingProjectTypeList() {
+  renderBuildingProjectTypeList () {
     const { statusOpts } = this.state
     const { projectDetail: { buildingProjectType = [], status, marketStatus } } = this.props
     return (
   }
 
 
-  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'>
 
                   <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>
       </Block>
     )
   }
-  rendercircum() {
+  rendercircum () {
     const building = {
       ...this.props.projectDetail
     }
     )
   }
 
-  renderConsuler() {
+  renderConsuler () {
     const { userInfo: { person: { phone } } } = this.props
     const { projectDetail: { consultants = [] } } = this.props
     return (
     )
   }
 
-  renderStatement() {
+  renderStatement () {
     return (
       <View className='statement'>
         免责条款：以上价格仅供参考，具体一房一价的信息以售楼处展示为准。本网显示房屋位置、交通、医疗、教育、商业等配套信息，来源于第三方网络数据，不作为要约，仅供参考，双方具体权利义务应以法律规定及买卖合同约定为准。<br></br>本平台对项目周边文化教育的介绍旨在提供相关信息，并不意味着信息发布方对就学安排作出承诺。相关教育资源就学信息存在调整的可能，应以政府教育主管部门及办学颁布的政策规定为准。
   }
 
 
-  renderHelp() {
+  renderHelp () {
     const { helpList } = this.state
     return (
       <Block>
     )
   }
 
-  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>
     )
   }
 
-  renderHouseTypeList() {
+  renderHouseTypeList () {
     const { statusOpts } = this.state
     const { projectDetail: { buildingApartment } } = this.props
     const list = buildingApartment.filter(item => item.apartmentType === 'apart')
       </Block>
     )
   }
-  renderNews() {
+  renderNews () {
     const { newsList } = this.state
     return (
       <Block>
   }
 
   onPlay () {
-        console.log()
+    console.log()
     this.setState({
       videoPlayShow: 'none'
     })
 
 
   renderVideo () {
-    const {videoPlayShow}  = this.state
+    const { videoPlayShow } = this.state
     const { projectDetail } = this.props
     const { videoImage } = projectDetail
     const imgSrc = videoImage[0].url
           // initialTime='0'
           // loop={false}
           // muted={false}
-          
+
           show-mute-btn='true'
-          // onPlay={this.onPlay}
-          // show-center-play-btn='false'
-          // onPause= {this.onPause}
-       
+        // onPlay={this.onPlay}
+        // show-center-play-btn='false'
+        // onPause= {this.onPause}
+
         ></Video>
         {/* <Button className='pro__banner-btn' onClick={this.plagVideo} style={{ display: videoPlayShow  }}>
           <Image src={require('@assets/play.png')} mode='scaleToFill' className='pro__banner-btn-img'></Image>
         {/* <View className='pro__banner-voice' onClick={this.plagVideo} >
           <Image src={require('@assets/voice.png')} mode='scaleToFill	' className='pro__banner-voice-img'></Image>
         </View> */}
-{/* 
+        {/* 
         <View className='pro__banner-extend' onClick={this.fullScreen} >
           <Image src={require('@assets/extend.png')} mode='scaleToFill	' className='pro__banner-extend-img'></Image>
         </View> */}
-      
+
       </View>
     )
   }
 
-  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

 
 
 import ready from '@utils/ready'
+import { getLocationCity } from '@services/map'
 
 import { queryBanners, savePoint, updatePoint } from '@services/common'
 import { queryNewsList, queryHelpGroup } from '@services/news'
     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') {
   }
   loadBannerList () {
     const { curCity } = this.props
+    console.log(this.props,'this.props')
     // 获取首页banner
     const payload = {
       showPosition: 'index'

src/pages/shop/index.js

     goodsBuilding: [],
     goodsList: [],
     user: {},
+    current: 0,
+    points:0
   }
 
   componentDidShow() {
         return;
     }
   }
-  state = {
-    current: 0,
-  }
-
-
 
   renderGoods() {
     const { goods: { records = [] } } = this.props
             <Banner list={bannerList} onClick={this.handleBannerClick} indicatorDots={false}></Banner>
           }
 
-
           {this.renderGoods()}
         </ScrollView>
       </View >

src/services/map.js

+
+
+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

  */
 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,