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

src/components/BackHomeBtn/index.js

@@ -8,73 +8,14 @@ export default class Index extends Component {
   static defaultProps = {
     style: {}
   }
-  state ={
-    buttonTop: 0,
-    buttonLeft: 0,
-    windowHeight: '',
-    windowWidth: ''
-  }
-  componentDidShow(){
-    Taro.getSystemInfo({
-      success: function (res) {
-        console.log(res,"9999999999999")
-        realWindowWidth = res.windowWidth
-        realWindowHeight = res.windowHeight
-      }
-    })
-  
-  }
-
   handleClick() {
     Taro.switchTab({
       url: `/pages/project/index`
     })
   }
-  buttonStart=(e)=> {
-    console.log(e,"eeeeeeeeeeeee")
-    startPoint = e.touches[0]
-  }
-  buttonMove=(e)=> {
-    console.log(e,"888888888888888")
-    var endPoint = e.touches[e.touches.length - 1]
-    var translateX = endPoint.clientX - startPoint.clientX
-    var translateY = endPoint.clientY - startPoint.clientY
-    startPoint = endPoint
-    var buttonTop = this.state.buttonTop + translateY
-    var buttonLeft = this.state.buttonLeft + translateX
-    //判断是移动否超出屏幕
-    if (buttonLeft+50 >= this.state.windowWidth){
-      buttonLeft = this.state.windowWidth-50;
-    }
-    if (buttonLeft<=0){
-      buttonLeft=0;
-    }
-    if (buttonTop<=0){
-      buttonTop=0
-    }
-    if (buttonTop + 50 >= this.state.windowHeight){
-      buttonTop = this.state.windowHeight-50;
-    }
-    this.setState({
-      buttonTop: buttonTop,
-      buttonLeft: buttonLeft
-    })
-  }
-  buttonEnd=(e)=> {
-
-  }
-
   render() {
     return (
-      // <View className="back-home" style={this.props.style} onClick={this.handleClick}  >
-      //   <Image src={require('@assets/homeicon.png')} className='home-img'></Image>
-      //   <Text className="text">首页</Text>
-      // </View>
-      <View className="back-home"
-       style={this.props.style} 
-       style='top:{this.state.buttonTop}px;left:{this.state.buttonLeft}px'
-       onClick={this.handleClick} ontouchmove={this.buttonMove} ontouchstart={this.buttonStart} ontouchend={this.buttonEnd} >
-        {/* <Text className="iconfont icon-shouyeshouye"></Text> */}
+      <View className="back-home" style={this.props.style} onClick={this.handleClick}  >
         <Image src={require('@assets/homeicon.png')} className='home-img'></Image>
         <Text className="text">首页</Text>
       </View>

src/pages/person/customerAnalysis/followUpCustomer/index.js

@@ -42,19 +42,21 @@ export default class transactionCustomer extends Taro.Component {
 
   }
 
-  loadList = (page) => {
+  loadList(pageNumber) {
     const payload = {
       type: 'follow',
-      pageNumber: page,
+      pageNumber,
       pageSize: 10
     }
     queryCustomerList(payload.type, payload).then(res => {
-
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.customerList.concat(_list)
       this.setState({
-        customerList: res.records || [],
-        isEmpty: res.total == 0,
-        hasMore: res.current < res.page,
-        pageIndex: res.current >= res.pages ? res.pages : res.current
+        customerList: newList,
+        isEmpty: total == 0,
+        hasMore: current < pages,
+        pageIndex: current >= pages ? pages : current
       })
       Taro.hideLoading()
     })

src/pages/person/customerAnalysis/index.scss

@@ -6,8 +6,6 @@
   height:100vh;
 }
 
-
-
 .tab-box{
   .at-tabs__header{
     width: 86%;

src/pages/person/customerAnalysis/myCustomer.js

@@ -1,5 +1,6 @@
 import Taro, { Component } from '@tarojs/taro';
 import { AtTabs, AtTabsPane } from 'taro-ui'
+import ListView from '@components/ListView'
 import "taro-ui/dist/style/components/tabs.scss"
 import { savePoint, updatePoint } from '@services/common'
 import { getCustomerDetail, getVisitRecord, getActivityList, getFollowRecord, addFollowRecord, commitCustomerInfo } from '@services/person'
@@ -31,7 +32,15 @@ export default class myCustomer extends Taro.Component {
     followRecord: [],
     visitRecord: [],
     baseInfo: {}, // 完善信息弹框数据
-
+    hasMore: true,
+    isEmpty: false,
+    pageIndex: 1,
+    hasMore2: true,
+    isEmpty2: false,
+    pageIndex2: 1,
+    hasMore3: true,
+    isEmpty3: false,
+    pageIndex3: 1,
   }
 
   componentWillUnmount() {
@@ -45,57 +54,126 @@ export default class myCustomer extends Taro.Component {
       current: value
     })
     if (value == 1) {
-      this.queryVisitRecord();
+      this.queryVisitRecord(1);
     } else if (value == 2) {
-      this.queryActivityList();
+      this.queryActivityList(1);
     } else if (value == 3) {
-      this.queryFollowRecord();
+      this.queryFollowRecord(1);
     }
   }
+  // 访问记录上拉加载下拉刷新
+  onScrollToLower = async (fn) => {
+    const { pageIndex } = this.state;
+    this.queryVisitRecord(pageIndex + 1)
+    fn && fn();
+  }
+  onPullDownRefresh = (rest) => {
+    // debugger
+    if (this.refreshing) return
+    this.refreshing = true
+    this.queryVisitRecord(1)
+    rest && rest()
+    this.refreshing = false
+  }
+  // 活动信息上拉加载下拉刷新
+  onScrollToLower2 = async (fn) => {
+    const { pageIndex2 } = this.state;
+    this.queryActivityList(pageIndex2 + 1)
+    fn && fn();
+  }
+  onPullDownRefresh2 = (rest) => {
+    // debugger
+    if (this.refreshing) return
+    this.refreshing = true
+    this.queryActivityList(1)
+    rest && rest()
+    this.refreshing = false
+  }
+  // 跟进记录上拉加载下拉刷新
+  onScrollToLower3 = async (fn) => {
+    const { pageIndex3 } = this.state;
+    this.queryFollowRecord(pageIndex3 + 1)
+    fn && fn();
+  }
+  onPullDownRefresh3 = (rest) => {
+    // debugger
+    if (this.refreshing) return
+    this.refreshing = true
+    this.queryFollowRecord(1)
+    rest && rest()
+    this.refreshing = false
+  }
   // 获取访问记录
-  queryVisitRecord() {
+  queryVisitRecord(pageNumber) {
     const { customerId } = this.$router.params
     const payload = {
-      pageNumber: '0',
+      pageNumber,
       pageSize: '10',
       customerId,
     }
     getVisitRecord(payload).then(res => {
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.visitRecord.concat(_list)
       this.setState({
-        visitRecord: res.records || []
+        visitRecord: newList,
+        isEmpty: total == 0,
+        hasMore: current < pages,
+        pageIndex: current >= pages ? pages : current
       })
     })
   }
   // 获取活动信息
-  queryActivityList() {
+  queryActivityList(pageNumber) {
     const { customerId } = this.$router.params
     const payload = {
-      pageNumber: '0',
+      pageNumber,
       pageSize: '10',
       customerId,
     }
     getActivityList(payload).then(res => {
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.activityList.concat(_list)
       this.setState({
-        activityList: res.records || []
+        activityList: newList,
+        isEmpty2: total == 0,
+        hasMore2: current < pages,
+        pageIndex2: current >= pages ? pages : current
       })
     })
   }
   // 获取跟进记录
-  queryFollowRecord() {
+  queryFollowRecord(pageNumber) {
     const { customerId } = this.$router.params
     const payload = {
-      pageNumber: '0',
-      pageSize: '30',
+      pageNumber,
+      pageSize: '10',
       customerId,
     }
     getFollowRecord(payload).then(res => {
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.followRecord.concat(_list)
       this.setState({
-        followRecord: res.records
+        followRecord: newList,
+        isEmpty3: total == 0,
+        hasMore3: current < pages,
+        pageIndex3: current >= pages ? pages : current
       })
     })
   }
   componentDidShow() {
     this.loadList()
+    // Taro.getSystemInfo({
+    //   success: function (res) {
+    //     console.log(res, "9999999999999")
+    //     this.setState({
+    //       tabHeight: res.screenHeight - 380 + 'px'
+    //     })
+    //   },
+    // })
+
   }
   loadList() {
     const { customerId } = this.$router.params
@@ -145,7 +223,7 @@ export default class myCustomer extends Taro.Component {
       customerId,
     }
     addFollowRecord(params).then(res => {
-      this.queryFollowRecord()
+      this.queryFollowRecord(1)
     })
     this.setState({
       followVisible: false,
@@ -251,9 +329,6 @@ export default class myCustomer extends Taro.Component {
       }
     })
   }
-
-
-
   onChange = e => {
     this.setState({
       baseInfo: {
@@ -262,7 +337,6 @@ export default class myCustomer extends Taro.Component {
       }
     })
   }
-
   onBaseTextareaChange(e) {
     this.setState({
       baseInfo: {
@@ -283,7 +357,7 @@ export default class myCustomer extends Taro.Component {
       customerId: customer.customerId,
     }
     addFollowRecord(params).then(res => {
-      this.queryFollowRecord()
+      this.queryFollowRecord(1)
     })
     this.setState({
       followVisible: false,
@@ -371,7 +445,7 @@ export default class myCustomer extends Taro.Component {
   render() {
 
     const tabList = [{ title: '基本信息' }, { title: '访问记录' }, { title: '活动信息' }, { title: '跟进记录' }]
-    const { customerDetail, visitRecord, activityList, followRecord, followVisible, baseVisible, } = this.state
+    const { customerDetail, visitRecord, activityList, followRecord, followVisible, baseVisible, isEmpty, hasMore, isEmpty2, hasMore2, isEmpty3, hasMore3 } = this.state
     return (
       <View>
         {followVisible && this.renderFollowBox()}
@@ -390,7 +464,7 @@ export default class myCustomer extends Taro.Component {
           </View>
           <View onClick={this.handleTelClick.bind(this, customerDetail)} className='user__left__phone'>{customerDetail.phone}<View style={`background-image: url(${iconImg});background-size: 100%;background-position: 0rpx -88rpx;width: 44rpx;height: 44rpx;margin-left:10rpx`}></View></View>
         </View>
-        <AtTabs className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
+        <AtTabs height="calc(100vh - 400rpx)" className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >
             <View className="tab-pane1 pane">
               <View className="status">{customerDetail.status == 1 ? '报备' : customerDetail.status == 2 ? '到访' : customerDetail.status == 3 ? '认筹' : '签约'}</View>
@@ -404,69 +478,104 @@ export default class myCustomer extends Taro.Component {
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={1}>
             <View className="tab-pane2 pane">
-              {visitRecord.length && visitRecord.map(item => (
-                <View className="record-item">
-                  <View className="title" >{item.activity}</View>
-                  <View className="time">{dayjs(item.visitTime).format('YYYY年MM月DD日 HH:mm:ss') || '　'}</View>
-                </View>
-              ))
-              }
-              {!visitRecord.length &&
-                <View className="empty">
-                  <Image className="empty__img" mode="widthFix" src={emptyImg}></Image>
-                  <View className="empty__text">暂无访问记录~</View>
+              <ListView
+                className="wrap"
+                style="height:calc(100vh - 400rpx)"
+                needInit
+                isEmpty={isEmpty}
+                emptyText="暂无访问记录~"
+                hasMore={hasMore}
+                onPullDownRefresh={fn => this.onPullDownRefresh(fn)}
+                onScrollToLower={fn => this.onScrollToLower(fn)}
+              >
+                <View className="list">
+                  {visitRecord.length && visitRecord.map((item, index) => (
+                    <View className="record-item" key={index + 'follow'}>
+                      <View className="title" >{item.activity}</View>
+                      <View className="time">{dayjs(item.visitTime).format('YYYY年MM月DD日 HH:mm:ss') || '　'}</View>
+                    </View>
+                  ))
+                  }
+                  {!visitRecord.length &&
+                    <View className="empty">
+                      {/* <Image className="empty__img" mode="widthFix" src={emptyImg}></Image>
+                  <View className="empty__text">暂无访问记录~</View> */}
+                    </View>
+                  }
                 </View>
-              }
-
+              </ListView>
             </View>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={2}>
             <View className="tab-pane3 pane">
-              {!activityList.length &&
-                <View className="empty">
-                  <Image className="empty__img" mode="widthFix" src={emptyImg}></Image>
-                  <View className="empty__text">暂无活动信息~</View>
+              <ListView
+                className="wrap"
+                style="height:calc(100vh - 400rpx)"
+                needInit
+                isEmpty={isEmpty2}
+                emptyText="暂无活动信息~"
+                hasMore={hasMore2}
+                onPullDownRefresh={fn => this.onPullDownRefresh2(fn)}
+                onScrollToLower={fn => this.onScrollToLower2(fn)}
+              >
+                <View className="list">
+                  {!activityList.length &&
+                    <View className="empty">
+                      {/* <Image className="empty__img" mode="widthFix" src={emptyImg}></Image>
+                  <View className="empty__text">暂无活动信息~</View> */}
+                    </View>
+                  }
+                  {activityList.length &&
+                    activityList.map(item => (
+                      <ActivityItem
+                        data={item}
+                        key={item.id + 'activity'}
+                        onClick={this.handleItemClick}>
+                      </ActivityItem>
+                    ))
+                  }
                 </View>
-              }
-              {activityList.length &&
-                activityList.map(item => (
-                  <ActivityItem
-                    data={item}
-                    key={item.id}
-                    onClick={this.handleItemClick}>
-                  </ActivityItem>
-                ))
-              }
+              </ListView>
             </View>
           </AtTabsPane>
           <AtTabsPane current={this.state.current} index={3}>
-            <View style="padding:10px 20px 120px 20px">
-              {followRecord.length && followRecord.map(item => (
-                <View>
-                  <View style=" display:flex;justify-content: space-between;align-items: center;color: #333;font-size: 16px; margin-bottom:20rpx;">
-                    <View style=" display: flex;align-items: center;"><View style="width:8px;height:8px;margin-right:20rpx;display:inline-block;background:rgba(246,182,29,1);border-radius: 50%;"></View>{item.recordType}</View>
-                    <View classNam="time" style=" font-size: 26rpx;color: #999;">{dayjs(item.createDate).format('YYYY年MM月DD日 HH:mm:ss') || '　'}</View>
-                  </View>
-                  {
-                    item.recordContent &&
-                    <View style="font-size:28rpx;color:#666;padding-left:32rpx;margin-bottom:20rpx;">
-                      {item.recordContent}
+            <View style="padding:10px 20px 20px 20px">
+              <ListView
+                className="wrap"
+                needInit
+                style="height:calc(100vh - 600rpx)"
+                isEmpty={isEmpty3}
+                emptyText="暂无跟进记录~"
+                hasMore={hasMore3}
+                onPullDownRefresh={fn => this.onPullDownRefresh3(fn)}
+                onScrollToLower={fn => this.onScrollToLower3(fn)} >
+                <View className="list">
+                  {followRecord.length && followRecord.map(item => (
+                    <View key={item.followUpRecordId + 'follow'}>
+                      <View style=" display:flex;justify-content: space-between;align-items: center;color: #333;font-size: 16px; margin-bottom:20rpx;">
+                        <View style=" display: flex;align-items: center;"><View style="width:8px;height:8px;margin-right:20rpx;display:inline-block;background:rgba(246,182,29,1);border-radius: 50%;"></View>{item.recordType}</View>
+                        <View classNam="time" style=" font-size: 26rpx;color: #999;">{dayjs(item.createDate).format('YYYY年MM月DD日 HH:mm:ss') || '　'}</View>
+                      </View>
+                      {
+                        item.recordContent &&
+                        <View style="font-size:28rpx;color:#666;padding-left:32rpx;margin-bottom:20rpx;">
+                          {item.recordContent}
+                        </View>
+                      }
+
+                    </View>
+                  ))
+                  }
+                  {!followRecord.length &&
+                    <View className="empty">
+                      {/* <Image className="empty__img" mode="widthFix" src={emptyImg}></Image>
+                  <View className="empty__text">暂无跟进记录~</View> */}
                     </View>
                   }
-
-                </View>
-              ))
-              }
-              {!followRecord.length &&
-                <View className="empty">
-                  <Image className="empty__img" mode="widthFix" src={emptyImg}></Image>
-                  <View className="empty__text">暂无跟进记录~</View>
                 </View>
-              }
-
-              <View className="btn" onClick={this.addFollow}>添加跟进</View>
+              </ListView>
+              <View className="btn" style="margin:40rpx auto;" onClick={this.addFollow}>添加跟进</View>
             </View>
-
           </AtTabsPane>
         </AtTabs>
       </View>

src/pages/person/customerAnalysis/transactionCustomer/index.js

@@ -29,21 +29,24 @@ export default class transactionCustomer extends Taro.Component {
   }
   componentDidShow() {
     Taro.showLoading()
-    this.loadList()
+    this.loadList(1)
 
   }
-  loadList() {
+  loadList(pageNumber) {
     const payload = {
       type: 'clinch',
-      pageNumber: 0,
+      pageNumber,
       pageSize: 9999
     }
     queryCustomerList(payload.type, payload).then(res => {
+      const { records, list, total, current, pages } = res || {}
+      const _list = records || list || []
+      const newList = current <= 1 ? _list : this.state.customerList.concat(_list)
       this.setState({
-        customerList: res.records || [],
-        isEmpty: res.total == 0,
-        hasMore: res.current < res.page,
-        pageIndex: res.current >= res.pages ? res.pages : res.current
+        customerList: newList,
+        isEmpty: total == 0,
+        hasMore: current < pages,
+        pageIndex: current >= pages ? pages : current
       })
       Taro.hideLoading()
     })
@@ -84,8 +87,8 @@ export default class transactionCustomer extends Taro.Component {
             }
             {
               customerList.length &&
-              customerList.map(item => (
-                <View class="item">
+              customerList.map((item, index) => (
+                <View class="item" key={index + 'transaction'}>
                   <Image src={item.picture || require('@assets/default-avatar.png')} className='img'></Image>
                   <View className="name">
                     {item.name}

src/pages/project/detail/index.js

@@ -57,7 +57,7 @@ export default class Index extends Component {
     albumCurrent: 0,
   }
 
-  componentWillMount () {
+  componentWillMount() {
     // const { id = '78c3dd489791dc1d29472fa344b08c45' } = this.$router.params
     ready.queue(() => {
       const router = Taro.getStorageSync('router')
@@ -90,12 +90,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 => {
       console.log(res, "buildingId")
@@ -116,7 +116,7 @@ export default class Index extends Component {
     )
   }
 
-  loadDetail () {
+  loadDetail() {
     const { buildingId } = this.state
     const { dispatchProjectDetail } = this.props
     this.setState({
@@ -144,7 +144,7 @@ export default class Index extends Component {
     })
   }
 
-  loadActivityData () {
+  loadActivityData() {
     const { buildingId } = this.state
     const payload = { pageSize: 999, pageNumber: 1, buildingId }
     queryActivityList(payload).then(res => {
@@ -154,7 +154,7 @@ export default class Index extends Component {
     })
   }
 
-  loadNewsData () {
+  loadNewsData() {
     const { buildingId } = this.state
     const payload = { pageSize: 2, pageNumber: 1, buildingId }
     queryNewsList(payload).then(res => {
@@ -164,11 +164,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({
@@ -195,7 +195,7 @@ export default class Index extends Component {
     })
   }
 
-  openMap () {
+  openMap() {
     const {
       buildingName,
       address,
@@ -222,12 +222,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)
   }
@@ -256,7 +256,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({
@@ -265,7 +265,7 @@ export default class Index extends Component {
     })
   }
 
-  getPosterData () {
+  getPosterData() {
     return new Promise(resolve => {
       const { posterData } = this.state
       if (posterData.qrcode) {
@@ -336,14 +336,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({
@@ -351,24 +351,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
@@ -384,50 +384,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 => {
@@ -457,18 +457,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 (
@@ -503,14 +503,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 (
@@ -535,7 +535,7 @@ export default class Index extends Component {
                         {/* <Icon className="iconfont icon-jinrongxianxingge-" onClick={this.handleToolsClick}></Icon> */}
                         <View className='row' style="margin-top:0">
                           <Text className='row-label'>项目类型：</Text>
-                          <Text className='row-txt black'>{item.buildingTypeName}</Text>
+                          <Text className='row-txt black'>{item.buildingTypeName || '　'}</Text>
                         </View>
                         <View className='row'>
                           <Text className='row-label'>项目参考价格：</Text>
@@ -545,10 +545,15 @@ export default class Index extends Component {
                         </View>
                         <View className='row'>
                           <Text className='row-label'>产权：</Text>
-                          <Text className='row-txt'>{item.rightsYear}年</Text>
+                          {item.rightsYear ?
+                            <Text className='row-txt'>{item.rightsYear}年</Text>
+                            :
+                            <Text className='row-txt'>暂无</Text>
+                          }
+
                           <View className='row-right'>
                             <Text className='row-label'>装修：</Text>
-                            <Text className='row-txt'>{item.decoration}</Text>
+                            <Text className='row-txt'>{item.decoration || '暂无'}</Text>
                           </View>
                         </View>
                       </View>
@@ -564,7 +569,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) => {
@@ -574,28 +579,28 @@ export default class Index extends Component {
 
     const { albumCurrent } = this.state
 
-  
-  
+
+
     return (
 
-   
+
       <Block>
-        { list.length > 0 &&
+        {list.length > 0 &&
           (
             <View className='photos__type'>
               <View className='photos__type__title'>相册</View>
               <ScrollView scrollX>
                 <View className='photos__type__content' onClick={this.toViewAlbum}>
-          
+
                   <View className="around-tab">
                     {list.map((item, index) => {
-                      const { apartmentName} = item || {}
-                      const  buildingImgList = item.buildingImgList
-                     
-                    
+                      const { apartmentName } = item || {}
+                      const buildingImgList = item.buildingImgList
+
+
                       return (
                         <View
-                          style={{ marginRight: '8px' }}                  
+                          style={{ marginRight: '8px' }}
                         >
                           {/* {`${label}(${num})`} */}
                           <View>
@@ -614,7 +619,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  rendercircum () {
+  rendercircum() {
     const building = {
       ...this.props.projectDetail
     }
@@ -631,7 +636,7 @@ export default class Index extends Component {
     )
   }
 
-  renderConsuler () {
+  renderConsuler() {
     const { userInfo: { person: { phone } } } = this.props
     const { projectDetail: { consultants = [] } } = this.props
     return (
@@ -685,7 +690,7 @@ export default class Index extends Component {
     )
   }
 
-  renderStatement () {
+  renderStatement() {
     return (
       <View className='statement'>
         免责条款：以上价格仅供参考，具体一房一价的信息以售楼处展示为准。本网显示房屋位置、交通、医疗、教育、商业等配套信息，来源于第三方网络数据，不作为要约，仅供参考，双方具体权利义务应以法律规定及买卖合同约定为准。<br></br>本平台对项目周边文化教育的介绍旨在提供相关信息，并不意味着信息发布方对就学安排作出承诺。相关教育资源就学信息存在调整的可能，应以政府教育主管部门及办学颁布的政策规定为准。
@@ -694,7 +699,7 @@ export default class Index extends Component {
   }
 
 
-  renderHelp () {
+  renderHelp() {
     const { helpList } = this.state
     return (
       <Block>
@@ -715,17 +720,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>
@@ -747,7 +752,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')
@@ -795,7 +800,7 @@ export default class Index extends Component {
 
     )
   }
-  renderActivities () {
+  renderActivities() {
     const { activityList } = this.state
     return (
       <Block>
@@ -826,7 +831,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  renderNews () {
+  renderNews() {
     const { newsList } = this.state
     return (
       <Block>
@@ -858,7 +863,7 @@ export default class Index extends Component {
     )
   }
 
-  renderVideo () {
+  renderVideo() {
     const { projectDetail } = this.props
     return (
       <View
@@ -876,7 +881,7 @@ export default class Index extends Component {
           }}
           controls={true}
           autoplay={false}
-        
+
           initialTime='0'
           id='video'
           loop={false}
@@ -887,7 +892,7 @@ export default class Index extends Component {
     )
   }
 
-  changeCurrent (current) {
+  changeCurrent(current) {
     this.setState({
       current: current + 1
     })
@@ -895,7 +900,7 @@ export default class Index extends Component {
 
 
 
-  render () {
+  render() {
     const { posterStatus, posterData, loaded, btnstate } = this.state
     const { projectDetail } = this.props
     const { uvList = {} } = projectDetail
@@ -928,7 +933,7 @@ export default class Index extends Component {
 
               {btnstate === 1 && projectDetail.videoUrl != null && this.renderVideo()}
 
-        
+
               {btnstate === 1 && projectDetail.videoUrl != null && (<View className='media-btn'>
                 <View className='video-btn' style={{ background: ' rgba(187, 156, 121, 1)', color: 'rgba(255, 255, 255, 1)' }} >视频</View>
                 <View className='img-btn' onClick={() => this.setState({ btnstate: 0 })}>图片</View>
@@ -967,7 +972,7 @@ export default class Index extends Component {
                       <View className='row project__addr'>
                         <Text className="label">楼盘地址：</Text>
                         <View className='address'>
-                          <Text className="address__text">{projectDetail.address}</Text>
+                          <Text className="address__text">{projectDetail.address || '暂无'}</Text>
                           {/* <Text className='iconfont icon-jingzhundaohang-copy' onClick={this.openMap.bind(this)}></Text> */}
                         </View>
                       </View>