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

src/constants/api.js

@@ -179,3 +179,4 @@ export const API_FOLLOW_LIST = resolvePath('taCustomerFollowUpRecord')
 export const API_SEX_INFO = resolvePath('genderStatistic')
 export const API_ECHERTS_DAILY = resolvePath('customerStatisticDaily')
 export const API_ECHERTS_MONTH = resolvePath('customerStatisticMonthly')
+export const API_BUILDING_TYPE = resolvePath('getByBuildingIdSelectBuildingProjectType')

src/pages/activity/detail/assemble.js

@@ -402,15 +402,18 @@ export default class Detail extends Component {
               phone: person.tel || person.phone,
               avatarurl: person.avatarurl,
             }).then(res => {
-              this.setState({
-                recordDetail: res.taShareRecord,
-                recordId: res.taShareRecord.recordId,
-                memberList: res.shareChildRecordList || [],
-                isStarter: true,
-                groupState: res.taShareRecord.status,
-              }, () => cb && cb())
+              console.log(res,'888888')
+              if(res){
+                this.setState({
+                  recordDetail: res.taShareRecord,
+                  recordId: res.taShareRecord.recordId,
+                  memberList: res.shareChildRecordList || [],
+                  isStarter: true,
+                  groupState: res.taShareRecord.status,
+                }, () => cb && cb())
+              }
             }).catch(err => {
-              console.log('err:', err)
+              console.log(err,'11111111111111')
               Taro.showToast({
                 title: '发起失败: ' + err.message,
                 icon: 'none'

src/pages/agent/recommend/index.js

@@ -246,10 +246,10 @@ export default class Index extends Component {
       this.Alert("请选择意向楼盘");
       return false;
     }
-    if (adviser == "") {
-      this.Alert("请选择置业顾问");
-      return false;
-    }
+    // if (adviser == "") {
+    //   this.Alert("请选择置业顾问");
+    //   return false;
+    // }
     // if (date == "请选择") {
     //   this.Alert("请选择预约到访时间");
     //   return false;

src/pages/person/customerAnalysis/analysis.js

@@ -25,15 +25,7 @@ export default class analysis extends Taro.Component {
     recordId: undefined, // 埋点ID
     sexInfo: [],
     checkedWhich: 0,
-    chartInfo: [
-      // { name: '周一', value: '26' },
-      // { name: '周二', value: '84' },
-      // { name: '周三', value: '107' },
-      // { name: '周四', value: '93' },
-      // { name: '周五', value: '127' },
-      // { name: '周六', value: '64' },
-      // { name: '周日', value: '94' },
-    ],
+    chartInfo: [],
     chartInfo2: [],
     chartInfo3: [],
   }
@@ -50,37 +42,39 @@ export default class analysis extends Taro.Component {
     if (value == '0') {
       querySexInfo('new').then(res => {
         this.setState({
-          sexInfo: res.slice(0,3) || []
+          sexInfo: res.slice(0, 3) || []
         })
       })
       getEchartDailyInfo('new').then(res => {
+        const arr = res.reverse()
         this.setState({
-          chartInfo: res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
+          chartInfo: arr.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
         })
       })
 
     } else if (value == '1') {
       querySexInfo('follow').then(res => {
         this.setState({
-          sexInfo: res.slice(0,3) || []
+          sexInfo: res.slice(0, 3) || []
         })
       })
       getEchartDailyInfo('follow').then(res => {
 
-        console.log(res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum })), "5555*-----------------555555")
+        const arr2 = res.reverse()
         this.setState({
-          chartInfo2: res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
+          chartInfo2: arr2.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
         })
       })
     } else {
       querySexInfo('visite').then(res => {
         this.setState({
-          sexInfo: res.slice(0,3) || []
+          sexInfo: res.slice(0, 3) || []
         })
       })
       getEchartDailyInfo('visite').then(res => {
+        const arr3 = res.reverse()
         this.setState({
-          chartInfo3: res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
+          chartInfo3: arr3.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
         })
       })
     }
@@ -94,12 +88,14 @@ export default class analysis extends Taro.Component {
   componentDidMount() {
     querySexInfo('new').then(res => {
       this.setState({
-        sexInfo: res.slice(0,3) || []
+        sexInfo: res.slice(0, 3) || []
       })
     })
+    this.changeDailyMonth(0)
     getEchartDailyInfo('new').then(res => {
+      const arr = res.reverse()
       this.setState({
-        chartInfo: res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
+        chartInfo: arr.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum }))
       })
     })
   }
@@ -110,41 +106,46 @@ export default class analysis extends Taro.Component {
     if (inx == 0) {
       if (params == 'new') {
         getEchartDailyInfo(params).then(res => {
+          const arr = res.reverse()
           this.setState({
-            chartInfo: res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum })) || []
+            chartInfo: arr.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum })) || []
           })
         })
       } else if (params == 'follow') {
         getEchartDailyInfo(params).then(res => {
+          const arr2 = res.reverse()
           this.setState({
-            chartInfo2: res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum })) || []
+            chartInfo2: arr2.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum })) || []
           })
         })
       } else {
         getEchartDailyInfo(params).then(res => {
+          const arr3 = res.reverse()
           this.setState({
-            chartInfo3: res.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum })) || []
+            chartInfo3: arr3.map(x => ({ name: `${dayjs(x.day).format('MM月DD日')}`, value: x.customerNum })) || []
           })
         })
       }
     } else {
       if (params == 'new') {
         getEchartMonthInfo(params).then(res => {
+          const arr = res.reverse()
           this.setState({
-            chartInfo: res.map(x => ({ name: `${x.month.substr(4)}月`, value: x.customerNum })) || []
+            chartInfo: arr.map(x => ({ name: `${x.month.substr(4)}月`, value: x.customerNum })) || []
           })
         })
       } else if (params == 'follow') {
+        const arr2 = res.reverse()
         getEchartMonthInfo(params).then(res => {
           this.setState({
-            chartInfo2: res.map(x => ({ name: `${x.month.substr(4)}月`, value: x.customerNum })) || []
+            chartInfo2: arr2.map(x => ({ name: `${x.month.substr(4)}月`, value: x.customerNum })) || []
           })
         })
       } else {
         getEchartMonthInfo(params).then(res => {
-
+          const arr3 = res.reverse()
           this.setState({
-            chartInfo3: res.map(x => ({ name: `${x.month.substr(4)}月`, value: x.customerNum })) || []
+            chartInfo3: arr3.map(x => ({ name: `${x.month.substr(4)}月`, value: x.customerNum })) || []
           })
         })
       }
@@ -163,7 +164,7 @@ export default class analysis extends Taro.Component {
 
     return (
       <View>
-        <AtTabs className="tab-bar" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable="false">
+        <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">
@@ -179,10 +180,7 @@ export default class analysis extends Taro.Component {
               {
                 chartInfo.length &&
 
-
-                // <View style="width:100vw;height:530rpx;position: relative;">
                 <LineChart source={chartInfo} />
-                // </View>
 
               }
               {
@@ -224,9 +222,9 @@ export default class analysis extends Taro.Component {
                 </View>
               </View>
               {chartInfo2.length &&
-                <View style="width:100vw;height:530rpx;position: relative;">
-                  <LineChart source={chartInfo2} />
-                </View>
+
+                <LineChart source={chartInfo2} />
+
               }
               {
                 !chartInfo2.length &&
@@ -267,9 +265,7 @@ export default class analysis extends Taro.Component {
               </View>
               {
                 chartInfo3.length &&
-                <View style="width:100vw;height:530rpx;position: relative;">
-                  <LineChart source={chartInfo3} />
-                </View>
+                <LineChart source={chartInfo3} />
               }
               {
                 !chartInfo3.length &&

src/pages/person/customerAnalysis/index.js

@@ -62,7 +62,7 @@ export default class customer extends Taro.Component {
     const tabList = [{ title: '客户分析' }, { title: '我的客户' }]
     const { customerNum, current } = this.state
     return (
-      <AtTabs className="tab-box" current={current} tabList={tabList} onClick={this.handleClick.bind(this)}>
+      <AtTabs className="tab-box" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
         <AtTabsPane current={current} index={0} >
           <View >
             {

src/pages/person/customerAnalysis/index.scss

@@ -164,7 +164,10 @@
     left:320px;
     display: flex;
     align-items: center;
-    max-width: 200px;
+    .text{
+      max-width: 300px;
+      @include text-ellipsis;
+    }
   }
   .user__left__phone{
     font-size:32px;

src/pages/person/customerAnalysis/myCustomer.js

@@ -3,7 +3,7 @@ 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'
+import { getCustomerDetail, getVisitRecord, getActivityList, getFollowRecord, addFollowRecord, commitCustomerInfo,getBuildingType } from '@services/person'
 import { connect } from '@tarojs/redux'
 import './index.scss'
 import ActivityItem from './item'
@@ -29,7 +29,7 @@ export default class myCustomer extends Taro.Component {
     baseVisible: false,
     followValue: '', //跟进内容
     desc: '', //客户描述
-    selector: ['高层', '别墅', '公寓'],
+    selector: [],
     sexSelector: ['男', '女'],
     customerDetail: {},
     followRecord: [],
@@ -184,7 +184,7 @@ export default class myCustomer extends Taro.Component {
       followVisible: true,
     })
   }
-  addFollowRecord
+
   followSaveBtn() {
     if (this.state.followValue == "") {
       Taro.showToast({
@@ -258,9 +258,13 @@ export default class myCustomer extends Taro.Component {
     )
   }
   perfectInformation() {
+    const {customerDetail} = this.state
     this.setState({
       baseVisible: true,
-      baseInfo: this.state.customerDetail,
+      baseInfo: customerDetail,
+    })
+    getBuildingType(customerDetail.buildingId).then(res=>{
+      console.log(res,"1111111111")
     })
   }
   // 保存
@@ -444,12 +448,13 @@ export default class myCustomer extends Taro.Component {
     return (
       <View>
         {followVisible && this.renderFollowBox()}
+        {console.log(this.props)}
         {baseVisible && this.renderBaseBox()}
         <View className="user_con">
           <Image className="bg" src={getThumbnail('https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/images/shop/background.jpg')} ></Image>
           <Image className="user__left__headimg" src={customerDetail.picture || require('@assets/default-avatar.png')} />
           <View className='user__left__name'>
-            {customerDetail.name}
+            <View className="text">{customerDetail.name}的数据哈酒好多次客户方</View>
             {
               customerDetail.sex == '1' && <Image style="width:36rpx;height:38rpx;margin-left:10rpx" src={maleImg} />
             }
@@ -546,7 +551,7 @@ export default class myCustomer extends Taro.Component {
                 <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;justify-content: space-between;align-items: center;color: #333;font-size: 34rpx; margin-bottom:24rpx;">
                         <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>

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,28 +354,28 @@ 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
-    if (personType === ROLE_CODE['DRIFT'] ) {
+    if (personType === ROLE_CODE['DRIFT']) {
       // 游客或者客户 区别是否有电话|| personType === ROLE_CODE['CUSTOMER']
       Taro.navigateTo({
         url: `/pages/agent/become/index`
@@ -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 (item) {
     Taro.navigateTo({
-      url: '/pages/activity/detail/index?id=' + id
+      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) => {
@@ -599,27 +599,27 @@ export default class Index extends Component {
                   <View className="around-tab">
                     {list.map((item, index) => {
                       const { apartmentName } = item
-                      const buildingImgList = item.buildingImgList 
+                      const buildingImgList = item.buildingImgList
                       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  style={{  textAlign: 'center' }}>({buildingImgList.length})</View>
-                              </View>
+                      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 style={{ textAlign: 'center' }}>({buildingImgList.length})</View>
                             </View>
-                          </View>)}</View>
-                        )
+                          </View>
+                        </View>)}</View>
+                      )
                       // }
 
                     })
@@ -633,7 +633,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  rendercircum () {
+  rendercircum() {
     const building = {
       ...this.props.projectDetail
     }
@@ -650,7 +650,7 @@ export default class Index extends Component {
     )
   }
 
-  renderConsuler () {
+  renderConsuler() {
     const { userInfo: { person: { phone } } } = this.props
     const { projectDetail: { consultants = [] } } = this.props
     return (
@@ -659,11 +659,30 @@ export default class Index extends Component {
           consultants.length > 0 && (
             <View className="section counselor">
               <View className="section-head">
-                <Text className="section-head__title">推荐经纪人</Text>
+                <Text className="section-head__title">置业顾问</Text>
                 <View className="section-head__more" onClick={() => { this.handleMoreClick() }}>
                   更多<Text className="iconfont icon-more"></Text>
                 </View>
               </View>
+              <View style="display:flex;align-items:center;justify-content:space-between;margin-top:30rpx">
+
+                <View style="display:flex;align-items:center;font-size: 26rpx;color: #999;">
+                  <Image style="width:30rpx;height:30rpx;margin-right:10rpx" src={require('@assets/icons/baozhang.png')} />
+                  官方保障
+                </View>
+                <View style="display:flex;align-items:center;font-size: 26rpx;color: #999;">
+                  <Image style="width:30rpx;height:30rpx;margin-right:10rpx" src={require('@assets/icons/zixun.png')} />
+                  免费咨询
+                </View>
+                <View style="display:flex;align-items:center;font-size: 26rpx;color: #999;">
+                  <Image style="width:30rpx;height:30rpx;margin-right:10rpx" src={require('@assets/icons/jiedu.png')} />
+                  户型解读
+                </View>
+                <View style="display:flex;align-items:center;font-size: 26rpx;color: #999;">
+                  <Image style="width:30rpx;height:30rpx;margin-right:10rpx" src={require('@assets/icons/fuwu.png')} />
+                  贴心服务
+                </View>
+              </View>
               <View className="section-content">
                 {
                   consultants.slice(0, 3).map(item => (
@@ -704,7 +723,7 @@ export default class Index extends Component {
     )
   }
 
-  renderStatement () {
+  renderStatement() {
     return (
       <View className='statement'>
         免责条款：以上价格仅供参考，具体一房一价的信息以售楼处展示为准。本网显示房屋位置、交通、医疗、教育、商业等配套信息，来源于第三方网络数据，不作为要约，仅供参考，双方具体权利义务应以法律规定及买卖合同约定为准。<br></br>本平台对项目周边文化教育的介绍旨在提供相关信息，并不意味着信息发布方对就学安排作出承诺。相关教育资源就学信息存在调整的可能，应以政府教育主管部门及办学颁布的政策规定为准。
@@ -713,7 +732,7 @@ export default class Index extends Component {
   }
 
 
-  renderHelp () {
+  renderHelp() {
     const { helpList } = this.state
     return (
       <Block>
@@ -734,17 +753,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>
@@ -767,7 +786,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')
@@ -790,7 +809,7 @@ export default class Index extends Component {
                       {
                         item && (
                           <View className='house__img-info'>
-                            {console.log(list,'-------')}
+                            {console.log(list, '-------')}
                             <Image className='house__img' src={getThumbnail(item.buildingImgList[0].url)} mode="widthFix" onClick={this.handlePreviewHxImage.bind(this, item.buildingImgList[0].url, imgUrls)}></Image>
                             <View className='house-type__state'>{statusOpts[item.marketStatus - 1]}</View>
                           </View>
@@ -816,7 +835,7 @@ export default class Index extends Component {
 
     )
   }
-  renderActivities() {
+  renderActivities () {
     // renderGroup () {
     //   const { groupList } = this.state
     //   return (
@@ -843,7 +862,7 @@ export default class Index extends Component {
       <Block>
         {
           activityList.length > 0 && (
-            <View className="activity">
+            <View className="activity" onClick={this.handleActivityMoreClick}>
               {console.log(activityList, '----activityList-----')}
               <View className="title">热门活动</View>
               <View
@@ -854,7 +873,7 @@ export default class Index extends Component {
                   indicatorDots={false}
                   list={activityList}
                   type='activity'
-                // onClick={this.handleGroupClick}
+                  onClick={this.handActivityItemClick}
                 >
                 </HelpGroupBanner>
 
@@ -885,7 +904,7 @@ export default class Index extends Component {
       </Block>
     )
   }
-  renderNews () {
+  renderNews() {
     const { newsList } = this.state
     return (
       <Block>
@@ -917,7 +936,7 @@ export default class Index extends Component {
     )
   }
   // 开始播放
-  plagVideo() {
+  plagVideo () {
     let videoContext = wx.createVideoContext('myVideo')
     console.log()
     // this.setState({
@@ -940,7 +959,7 @@ export default class Index extends Component {
   // }
 
 
-  renderVideo () {
+  renderVideo() {
     const { videoPlayShow } = this.state
     const { projectDetail } = this.props
     const { videoImage } = projectDetail
@@ -961,10 +980,10 @@ export default class Index extends Component {
             width: '750rpx'
           }}
           id='myVideo'
-          // controls={false}
+          controls={true}
           // autoplay={false}
           // initialTime='0'
-          loop={true}
+          // loop={true}
           // muted={false}
 
           show-mute-btn='true'
@@ -989,13 +1008,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/detail/index.scss

@@ -102,7 +102,7 @@
   }
 
   &-content {
-    margin-top: 40px;
+    margin-top: 20px;
   }
 }
 

src/pages/project/index.js

@@ -425,11 +425,12 @@ export default class Index extends Component {
   renderProjectList () {
     const { proList: { records } } = this.props
     const { helpGroupList } = this.state
+    const list = records.filter(item => item.isMain === 1)
     console.log(records, 'proList')
     return (
       <Block>
         {
-          records.length > 0 && (
+          list.length > 0 && (
             < View className="houses" >
               <View className="section-head">
                 <View style="display:flex;align-items:center">
@@ -443,7 +444,7 @@ export default class Index extends Component {
                 </View>
               </View>
               <View className="section-content">
-                {records.map(item => (
+                {list.map(item => (
                   <FormIdCollector key={item.buildingId}>
                     <ProjectItem
                       onClick={this.onViewDetail.bind(this, item)}

src/services/person.js

@@ -8,7 +8,8 @@ import {
   API_FOLLOW_LIST,
   API_SEX_INFO,
   API_ECHERTS_DAILY,
-  API_ECHERTS_MONTH
+  API_ECHERTS_MONTH,
+  API_BUILDING_TYPE,
 } from '@constants/api'
 
 
@@ -39,6 +40,11 @@ export const queryMyCustomer = payload => fetch({ url: API_MY_CUSTOMER, payload
  * @param {*} type  
  */
 export const queryCustomerList = (type, payload) => fetch({ url: `${API_CUSTOMER_LIST}/${type}`, payload })
+/**
+ * 获取项目类型
+ * @param {*} buildingId 
+ */
+export const getBuildingType = (customerId, payload) => fetch({ url: `${API_BUILDING_TYPE}/${buildingId}`, payload })
 /**
  * 获取客户详情
  * @param {*} customerId  

src/utils/request.js

@@ -71,10 +71,13 @@ export const fetch = async (options) => {
         }
       }
       console.error(res.data)
-      throw new Error(data)
+      Taro.showToast({
+        title: message,
+        icon: 'none'
+      })
     }
   }).catch((err) => {
-    console.error(err)
+    console.error(err, "444")
 
     let errMessage = `请求失败: ${err.errMsg}`
     if (err.errMsg === 'request:fail timeout') {