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

src/components/charts/Line.js

@@ -163,9 +163,8 @@ export default class LineChart extends Component {
 
   render() {
     // this.refreshChart(this.props.source)
-
     return (
-      <View style="width:100vw;height:500rpx;position: relative;">
+      <View style="width:100vw;height:480rpx;position: relative;">
         <View className="map-container">
           <ec-canvas ref={this.handleEcComponent} ec={this.state.ec}></ec-canvas>
         </View>

src/pages/agent/recommend/index.js

@@ -271,7 +271,7 @@ export default class Index extends Component {
       status: 1
     }
     recommendClient(param).then(res => {
-
+      // if (res) {
       Taro.showToast({
         title: '提交成功'
       })
@@ -279,6 +279,7 @@ export default class Index extends Component {
         Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
       }, 700)
       this.clearInputEvent()
+      // }
     })
   }
   // 性别
@@ -444,7 +445,7 @@ export default class Index extends Component {
             <Text className='customers__txt'>意向楼盘</Text>
             {
               reType == 'index' ? (<Picker className='input customers__name' onChange={this.bindFloorChange} value={this.state.floorID} range={this.state.floorArray} range-key="buildingName">
-                <View class="picker" style={this.state.floorColor}>
+                <View class="picker overtext" style={this.state.floorColor}>
                   {this.state.floorArray[this.state.floorID].buildingName}
                 </View>
               </Picker>) : (<Input className="input customers__name" style='color:#999;' disabled='disabled' name="name" value={this.state.intention} onInput={this.bindFloorChange.bind(this)} placeholder="" />)
@@ -454,7 +455,7 @@ export default class Index extends Component {
           <View className='info info__4__1'>
             <Text className='customers__txt'>置业顾问</Text>
             <Picker className='input customers__adviser' onChange={this.bindAdviserChange} value={this.state.adviserID} range={this.state.adviserArray} range-key="name">
-              <View class="picker" style={this.state.adviserColor}>
+              <View class="picker overtext" style={this.state.adviserColor}>
                 {this.state.adviserArray[this.state.adviserID].name}
               </View>
             </Picker>

src/pages/agent/recommend/index.scss

@@ -2,6 +2,10 @@
 .ani {
   position: absolute;
 }
+.overtext{
+  max-width: 100%;
+  @include text-ellipsis;
+}
 
 .recommend__customers {
   position: relative;

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)} swipeable={false}>
+      <AtTabs  className="tab-box overflow-tab" current={current} tabList={tabList} onClick={this.handleClick.bind(this)} swipeable={false}>
         <AtTabsPane current={current} index={0} >
           <View >
             {

src/pages/person/customerAnalysis/index.scss

@@ -113,6 +113,11 @@
     }
   }
 }
+.overflow-tab{
+  .at-tabs-pane{
+    overflow-y: hidden;
+  }
+}
 .empty{
   width:100%;
   height:40vh;
@@ -250,7 +255,7 @@
       }
     }
     .tab-pane3{
-      padding: 20px 40px;
+      padding: 20px 30px;
     }
   }
   .tab-pane4{

src/pages/person/customerAnalysis/item/index.scss

@@ -15,6 +15,7 @@
   width: 98%;
   margin: 0 1%;
   position: relative;
+  margin-bottom: 16px ;
   .type{
     position: absolute;
     left:0;

src/pages/person/customerAnalysis/myCustomer.js

@@ -59,6 +59,9 @@ export default class myCustomer extends Taro.Component {
     if (value == 1) {
       this.queryVisitRecord(1);
     } else if (value == 2) {
+      this.setState({
+        activityList: []
+      })
       this.queryActivityList(1);
     } else if (value == 3) {
       this.queryFollowRecord(1);
@@ -461,7 +464,7 @@ export default class myCustomer extends Taro.Component {
           </View>
           <View onClick={this.handleTelClick.bind(this, customerDetail)} className='user__left__phone'>{customerDetail.phone}<Image style="width:36rpx;height:36rpx;margin-left:20rpx;" src={phoneImg} /></View>
         </View>
-        <AtTabs height="calc(100vh - 320rpx)" className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
+        <AtTabs height="calc(100vh - 300rpx)" 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>
@@ -477,7 +480,7 @@ export default class myCustomer extends Taro.Component {
             <View className="tab-pane2 pane">
               <ListView
                 className="wrap"
-                style="height:calc(100vh - 320rpx)"
+                style="height:calc(100vh - 300rpx)"
                 needInit
                 isEmpty={isEmpty}
                 emptyText="暂无访问记录~"
@@ -513,7 +516,7 @@ export default class myCustomer extends Taro.Component {
             <View className="tab-pane3 pane">
               <ListView
                 className="wrap"
-                style="height:calc(100vh - 320rpx)"
+                style="height:calc(100vh - 300rpx)"
                 needInit
                 isEmpty={isEmpty2}
                 emptyText="暂无活动信息~"
@@ -528,13 +531,13 @@ export default class myCustomer extends Taro.Component {
                   <View className="empty__text">暂无活动信息~</View> */}
                     </View>
                   }
-                  {activityList.length &&
-                    activityList.map(item => (
-                      <ActivityItem
-                        data={item}
-                        key={item.id + 'activity'}>
-                      </ActivityItem>
-                    ))
+                  {activityList.length && activityList.map(item => (
+                    <ActivityItem
+                      data={item}
+                      key={item.id + 'activity'}
+                    >
+                    </ActivityItem>
+                  ))
                   }
                 </View>
               </ListView>

src/pages/project/detail/index.js

@@ -170,7 +170,7 @@ export default class Index extends Component {
     const { buildingId } = this.state
     const payload = { pageSize: 999, pageNumber: 1, buildingId }
     queryActivityList(payload).then(res => {
-      console.log(res,'Activity')
+      console.log(res, 'Activity')
       this.setState({
         activityList: res || []
       })
@@ -893,11 +893,11 @@ export default class Index extends Component {
             <View className="activity" >
               {console.log(activityList, '----activityList-----')}
               <View className="section-head">
-                 <Text className="section-head__title">热门活动</Text>
-                 <View className="section-head__more" onClick={this.handleActivityMoreClick}>
-                   更多活动<Text className="iconfont icon-more"></Text>
-                 </View>
-               </View>
+                <Text className="section-head__title">热门活动</Text>
+                <View className="section-head__more" onClick={this.handleActivityMoreClick}>
+                  更多活动<Text className="iconfont icon-more"></Text>
+                </View>
+              </View>
               <View
                 style={{ position: 'relative' }}>
                 <HelpGroupBanner
@@ -1162,7 +1162,7 @@ export default class Index extends Component {
 
                       {/* 围观人数 */}
                       <View className='watch__people__num'>
-                        <View className='top__txt'>{total}人围观</View>
+                        <View className='top__txt'>{projectDetail.pvNum || 0}人围观</View>
                         <View className='bottom__img' onClick={this.onViewFans.bind(this)}>
                           <View className="records">
                             {records.slice(0, 9).map(item => <Image src={item.photoOravatar} className='user__img' key={item.personId} />)}

src/pages/project/detail/index.scss

@@ -610,13 +610,12 @@
 
       .top__txt {
         font-size: 26px;
-        width: 20%;
+        width: 30%;
         color: rgba(0, 0, 0, 0.37);
       }
 
       .bottom__img {
-        margin-top: 20px;
-        width: 80%;
+        width: 70%;
         display: flex;
         align-items: center;
         margin-left: 5px;

src/pages/project/item/index.js

@@ -25,7 +25,7 @@ export default class Index extends Component {
     return (
       <View className='item' onClick={onClick.bind(this, data)}>
         <View className='item__top'>
-          {console.log(data,'data')}
+          {console.log(data, 'data')}
           <Image className='item__img' mode="aspectFill" src={getThumbnail(imgSrc)}></Image>
           {data.marketStatus &&
             <View className={data.marketStatus == '在售' ? 'item__status sale' : data.marketStatus == '售罄' ? 'item__status soldout' : 'item__status waitsale'}>{data.marketStatus}</View>}
@@ -38,7 +38,7 @@ export default class Index extends Component {
             </View>
           </View>
 
-          <View className='item__right__region row'><Text className="location-icon iconfont icon-daohangdizhi"></Text>{data.buildingArea||''}</View>
+          <View className='item__right__region row'><Text className="location-icon iconfont icon-daohangdizhi"></Text>{data.buildingArea || ''}</View>
           {buildingTag.length > 0 && (
             <View className="item__tags row">
               {buildingTag.slice(0, 3).map(tag => <View className='tag' key={tag.tagId}>{tag.tagName}</View>)}
@@ -54,13 +54,11 @@ export default class Index extends Component {
 
           {total > 0 && (
             <View className='item__bottom__right'>
-              <Text className='item__bottom__seenum'>{total}人围观</Text>
-
+              <Text className='item__bottom__seenum'>{data.pvNum || 0}人围观</Text>
               <View className='see__img'>
                 {records.slice(0, 4).map(item => <Image className='userImg' key={item.uvId} src={getThumbnail(item.photoOravatar)}></Image>)}
                 {records.length > 4 && <Image className="dot-img" src={getThumbnail(dotImg)}></Image>}
               </View>
-
             </View>
           )}
         </View>

src/pages/signin/index.js

@@ -31,7 +31,6 @@ export default class Index extends Component {
         }
       })
     })
-
   }
 
   getPhoneNumber(e) {