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

src/pages/checkin/index.js

@@ -16,7 +16,10 @@ export default class checkin extends Component {
 
   componentWillMount () {
     const router = Taro.getStorageSync('router')
+    console.log('router---',router)
+    console.log('props---',this.props)
     const { id, type } = parseQueryString(router.query.params)
+    console.log('props---',id)
     this.setState({ id, type })
     this.getcheckinDetails(id, type)
   }

src/pages/person/index.js

@@ -191,8 +191,12 @@ export default class Person extends Component {
           </View>
           <View className='qiandao-con'>
             <Text className='qiandao-text'>签到得积分，积分兑好礼，马上去签到吧！</Text>
-            <View className={user.havaSigned ? 'reday-qiandao-btn' : 'qiandao-btn'} onClick={this.doSign}>{user.havaSigned ? '已签到' : '签到'}</View>
-
+            {/* <View className={user.havaSigned ? 'reday-qiandao-btn' : 'qiandao-btn'} onClick={this.doSign}>{user.havaSigned ? '已签到' : '签到'}</View> */}
+            {
+                user.havaSigned ?
+                  ( <View className='reday-qiandao-btn' onClick={this.doSign}> 已签到</View> ):
+                  (<View className="qiandao__btn" onClick={this.doSign}>签到</View>)
+              }
             {/* <Text className='integral-cont_btn' onClick={this.goShop}>去兑换</Text> */}
 
           </View>

src/pages/project/album/index.js

@@ -91,7 +91,7 @@ export default class Index extends Component {
           {imgList.map((item, index) => {
             console.log(item, '299999933333222')
             return (
-              <Image className='photos__item-img' src={getThumbnail(item.url)} mode='widthFix' onClick={this.previewImage.bind(this, item.url, _photosImgs)}></Image>
+              <Image className='photos__item-img' src={getThumbnail(item.url)} mode='aspectFill' onClick={this.previewImage.bind(this, item.url, _photosImgs)}></Image>
             )
           })}
         </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,31 +387,31 @@ 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
     })
@@ -419,18 +419,18 @@ export default class Index extends Component {
 
   handActivityItemClick (item) {
     Taro.navigateTo({
-      url: '/pages/activity/detail/index?id=' +item.dynamicId
+      url: '/pages/activity/detail/index?id=' + item.dynamicId
     })
   }
 
-  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,7 +573,7 @@ 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) => {
@@ -582,14 +582,14 @@ export default class Index extends Component {
     // }, [])
 
 
-
+    const listimg = list.filter(item => item.buildingImgList.length > 0)
 
 
     return (
 
 
       <Block> {console.log(list, 'list')}
-        {list.length > 0 &&
+        {listimg.length > 0 &&
           (
             <View className='photos__type'>
               <View className='photos__type__title'>相册</View>
@@ -597,7 +597,7 @@ export default class Index extends Component {
                 <View className='photos__type__content' onClick={this.toViewAlbum}>
 
                   <View className="around-tab">
-                    {list.map((item, index) => {
+                    {listimg.map((item, index) => {
                       const { apartmentName } = item
                       const buildingImgList = item.buildingImgList
                       const buildingImgUrl = buildingImgList.length > 0 ? buildingImgList[0].url : null
@@ -612,10 +612,9 @@ export default class Index extends Component {
 
                           <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 style={{ textAlign: 'center' }}>({buildingImgList.length})</View>
+                            <View style={{ width: '218rpx', display: 'flex',justifyContent:'center'  }} >
+                              <View style={{  overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}> {apartmentName}  </View>
+                              <View> ({buildingImgList.length})</View>
                             </View>
                           </View>
                         </View>)}</View>
@@ -633,7 +632,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  rendercircum() {
+  rendercircum () {
     const building = {
       ...this.props.projectDetail
     }
@@ -650,7 +649,7 @@ export default class Index extends Component {
     )
   }
 
-  renderConsuler() {
+  renderConsuler () {
     const { userInfo: { person: { phone } } } = this.props
     const { projectDetail: { consultants = [] } } = this.props
     return (
@@ -723,7 +722,7 @@ export default class Index extends Component {
     )
   }
 
-  renderStatement() {
+  renderStatement () {
     return (
       <View className='statement'>
         免责条款：以上价格仅供参考，具体一房一价的信息以售楼处展示为准。本网显示房屋位置、交通、医疗、教育、商业等配套信息，来源于第三方网络数据，不作为要约，仅供参考，双方具体权利义务应以法律规定及买卖合同约定为准。<br></br>本平台对项目周边文化教育的介绍旨在提供相关信息，并不意味着信息发布方对就学安排作出承诺。相关教育资源就学信息存在调整的可能，应以政府教育主管部门及办学颁布的政策规定为准。
@@ -732,7 +731,7 @@ export default class Index extends Component {
   }
 
 
-  renderHelp() {
+  renderHelp () {
     const { helpList } = this.state
     return (
       <Block>
@@ -753,17 +752,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>
@@ -786,7 +785,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')
@@ -904,7 +903,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  renderNews() {
+  renderNews () {
     const { newsList } = this.state
     return (
       <Block>
@@ -959,7 +958,7 @@ export default class Index extends Component {
   // }
 
 
-  renderVideo() {
+  renderVideo () {
     const { videoPlayShow } = this.state
     const { projectDetail } = this.props
     const { videoImage } = projectDetail
@@ -981,12 +980,12 @@ export default class Index extends Component {
           }}
           id='myVideo'
           controls={true}
-          // autoplay={false}
-          // initialTime='0'
-          // loop={true}
-          // muted={false}
+        // autoplay={false}
+        // initialTime='0'
+        // loop={true}
+        // muted={false}
 
-          show-mute-btn='true'
+        // show-mute-btn='true'
         // onPlay={this.onPlay}
         // show-center-play-btn='false'
         // onPause= {this.onPause}
@@ -1008,13 +1007,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

@@ -101,9 +101,14 @@ export default class Index extends Component {
       const payload = { location: `${location.longitude},${location.latitude}` }
 
       getLocationCity(payload).then(res => {
-        const curCity = res
-        this.updateCity(curCity)
-      }).catch(err=>{
+
+        let curCity = cityList.filter(item => {
+          return item.name == res.name
+        })
+
+        console.log('-----curCity-->', curCity)
+        this.updateCity(curCity[0] || defaultCity)
+      }).catch(err => {
         Taro.showToast({
           title: `定位错误: ${err.message}`,
           icon: 'none',
@@ -162,7 +167,7 @@ export default class Index extends Component {
   }
   loadBannerList () {
     const { curCity } = this.props
-    console.log(this.props,'this.props')
+    console.log(this.props, 'this.props')
     // 获取首页banner
     const payload = {
       showPosition: 'index'