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

src/components/ListView/index.scss

@@ -17,7 +17,7 @@
 .loading,
 .loaded {
   text-align: center;
-  padding: 50px;
+  padding: 40px 0 90px 0;
   color: #999;
   font-size:28px;
   //animation: loading infinite 1000ms ease;

src/pages/activity/detail/index.js

@@ -280,13 +280,19 @@ export default class Detail extends Component {
     }
 
     signupActivity(payload).then(res => {
-      Taro.showToast({
-        title: '报名成功'
-      })
-      this.setState({
-        isSign: true,
-        canChoose: 'none'
-      })
+      if (res) {
+        Taro.showToast({
+          title: '报名成功'
+        })
+        this.setState({
+          isSign: true,
+          canChoose: 'none'
+        })
+      }else{
+        this.setState({
+          canChoose: 'none'
+        })
+      }
     })
 
     savePoint({

src/pages/agent/recommend/index.js

@@ -159,6 +159,7 @@ export default class Index extends Component {
     })
   }
   BindInfo(e) {
+    console.log(e, "8888888888")
     console.log(e.currentTarget.dataset.id)
     switch (e.currentTarget.dataset.id) {
       case 'name':
@@ -270,13 +271,16 @@ export default class Index extends Component {
       status: 1
     }
     recommendClient(param).then(res => {
-      Taro.showToast({
-        title: '提交成功'
-      })
+      if (res) {
+        Taro.showToast({
+          title: '提交成功'
+        })
+      }
       this.clearInputEvent()
-      Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
+      setTimeout(() => {
+        Taro.navigateTo({ url: '/pages/agent/client/index' })//测试用
+      }, 700)
     })
-
   }
   // 性别
   bindSexChange(e) {

src/pages/person/customerAnalysis/index.scss

@@ -132,10 +132,6 @@
 
 
 .user_con{
-  margin: 0 20px 40px 20px;
-  height:256px;
-  box-shadow:0px 4px 12px 0px rgba(0,0,0,0.12);
-  border-radius:12px;
   position: relative;
  
   .bg{

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

@@ -12,7 +12,8 @@
   border-radius:  12px;
   overflow: hidden;
   margin-bottom: 20px;
-  width: 100%;
+  width: 98%;
+  margin: 0 1%;
   position: relative;
   .type{
     position: absolute;

src/pages/person/customerAnalysis/myCustomer.js

@@ -277,18 +277,10 @@ export default class myCustomer extends Taro.Component {
       this.setState({
         customerDetail: res || {}
       })
-      const params = {
-        recordType: '添加跟进',
-        customerSex: this.state.customerDetail.sex,
-        customerId,
-      }
       Taro.showToast({
         title: '完善信息成功',
         icon: 'none'
       })
-      addFollowRecord(params).then(res => {
-        this.queryFollowRecord(1)
-      })
     })
     this.setState({
       baseVisible: false,
@@ -455,7 +447,7 @@ export default class myCustomer extends Taro.Component {
       <View>
         {followVisible && this.renderFollowBox()}
         {baseVisible && this.renderBaseBox()}
-        <View className="user_con">
+        <View className="user_con" style=" margin: 0 20rpx 40rpx 20rpx; height:256rpx;box-shadow:0rpx 4rpx 12rpx 0rpx rgba(0,0,0,0.12); border-radius:12rpx;">
           <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'>
@@ -469,7 +461,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 - 400rpx)" className="my-tab" current={this.state.current} tabList={tabList} onClick={this.handleClick.bind(this)}>
+        <AtTabs height="calc(100vh - 320rpx)" 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>
@@ -485,7 +477,7 @@ export default class myCustomer extends Taro.Component {
             <View className="tab-pane2 pane">
               <ListView
                 className="wrap"
-                style="height:calc(100vh - 400rpx)"
+                style="height:calc(100vh - 320rpx)"
                 needInit
                 isEmpty={isEmpty}
                 emptyText="暂无访问记录~"
@@ -521,7 +513,7 @@ export default class myCustomer extends Taro.Component {
             <View className="tab-pane3 pane">
               <ListView
                 className="wrap"
-                style="height:calc(100vh - 400rpx)"
+                style="height:calc(100vh - 320rpx)"
                 needInit
                 isEmpty={isEmpty2}
                 emptyText="暂无活动信息~"
@@ -553,7 +545,7 @@ export default class myCustomer extends Taro.Component {
               <ListView
                 className="wrap"
                 needInit
-                style="height:calc(100vh - 600rpx)"
+                style="height:calc(100vh - 560rpx)"
                 isEmpty={isEmpty3}
                 emptyText="暂无跟进记录~"
                 hasMore={hasMore3}