recommend

src/pages/activity/assembleItem/index.js

@@ -87,7 +87,7 @@ export default class Item extends Component {
             <View className="hexiaoma">核销码：{data.verificationCode}</View>
           </Block>
         }
-        <View className="start-date">{`${dayjs(data.createTime).format('YYYY-MM-DD HH:mm:ss')}`}</View>
+        {data.createTime&&<View className="start-date">{`${dayjs(data.createTime).format('YYYY-MM-DD HH:mm:ss')}`}</View>}
         {data.status == 0 &&
           <Image className="status-icon" src={groupSuccess} ></Image>
         }

src/pages/activity/assistanceItem/index.js

@@ -71,14 +71,14 @@ export default class Item extends Component {
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
         <Image className="pic" src={data.img} ></Image>
         <View className="title">{data.title}</View>
-        {(!data.verification &&data.status == 1 )&&
-          <View className="time">参与截止时间: 
-          {data.endDate&&
-            <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</Text>
-          }
+        {(!data.verification && data.status == 1) &&
+          <View className="time">参与截止时间:
+          {data.endDate &&
+              <Text className="count-time">{`${dayjs(data.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</Text>
+            }
           </View>
         }
-        {(!data.verification &&data.status != 1)&&
+        {(!data.verification && data.status != 1) &&
           <View className="time"><Text className="count-time">活动已结束</Text></View>
         }
         {data.verification &&
@@ -87,7 +87,7 @@ export default class Item extends Component {
             <View className="hexiaoma">核销码：{data.verification}</View>
           </Block>
         }
-        <View className="start-date">{`${dayjs(data.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</View>
+        {data.createDate && <View className="start-date">{`${dayjs(data.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</View>}
         {data.status == 0 &&
           <Image className="status-icon" src={helpSuccess} ></Image>
         }

src/pages/activity/detail/assistance.js

@@ -204,7 +204,6 @@ export default class Detail extends Component {
         isStarter: !initiateDetail.personId || userInfo.person.personId === initiateDetail.personId,
         actState,
         leftTime,
-        isJoin: res.isJoin
       })
 
       if (actState != ActFinished) {
@@ -301,7 +300,6 @@ export default class Detail extends Component {
         this.setState({
           submitting: false,
           helpList,
-          isJoin: res.isJoin,
           initiateDetail: res.helpInitiateRecord,
           initiateId: res.helpInitiateRecord.helpRecordInitiateId,
           helpState: res.helpInitiateRecord.status === undefined ? HelpInProcess : res.helpInitiateRecord.status,
@@ -311,6 +309,7 @@ export default class Detail extends Component {
           title: '助力成功',
           icon: 'success'
         })
+
       }).catch(err => {
         console.log('err:', err)
         Taro.hideLoading()
@@ -424,6 +423,8 @@ export default class Detail extends Component {
       avatarurl: getDownloadURL(userInfo.person.avatarurl, 'avatar') || '',
     }
 
+    const isJoin = helpList.filter(x => x.personId === userInfo.person.personId)[0] || isStarter
+
     return (
       <Block>
         {/* 生成海报 */}
@@ -526,10 +527,10 @@ export default class Detail extends Component {
                       <View className="btn-box" style="padding:25px 0;">
 
                         {
-                          (helpState === HelpInProcess && !this.state.isJoin) &&
+                          (helpState === HelpInProcess && !isJoin) &&
                           (<Button className="assistance-btn" onClick={this.handleHelp}>立即助力好友</Button>)
                         }
-                        <Button className={(helpState === HelpInProcess && !this.state.isJoin) ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的助力</Button>
+                        <Button className={(helpState === HelpInProcess && !isJoin) ? "set-btn" : "assistance-btn"} onClick={this.startMine}>发起我的助力</Button>
                       </View>
                     )
                   }

src/pages/activity/detail/index.js

@@ -317,7 +317,7 @@ export default class Detail extends Component {
               <ScrollView
                 scrollY
                 className="detail-wrap">
-                <View className="detail">
+                <View className="detail bottom-box">
                   {detail.isEnlist == 0 &&
                     <View className="detail-sign__num">不需要报名</View>
                   }

src/pages/activity/detail/index.scss

@@ -85,7 +85,9 @@
 .detail-wrap {
   background: transparent;
 }
-
+.bottom-box{
+  padding-bottom:120px!important; 
+}
 .detail {
   background: white;
   border-top-left-radius: 28px;
@@ -93,7 +95,7 @@
   padding: 30px 40px 0 40px;
   position: relative;
   overflow: hidden;
-  padding-bottom:120px; 
+
   .status__img{
     width: 176px;
     height: 176px;

src/pages/agent/recommend/index.js

@@ -70,7 +70,16 @@ export default class Index extends Component {
         this.setState({
           intention: this.props.projectDetail.buildingName ? this.props.projectDetail.buildingName : this.props.proList.records[0].buildingName,
           floor: this.props.projectDetail.buildingId ? this.props.projectDetail.buildingId : this.props.proList.records[0].buildingId
+        }, () => {
+          if (this.state.floorID != 0 || this.state.intention) {
+            this.loadCardList()
+          } else {
+            this.setState({
+              adviserArray: [{ name: '请选择', id: 0 }]
+            })
+          }
         })
+
       }
     })
 
@@ -92,8 +101,12 @@ export default class Index extends Component {
     const { recordId } = this.state
     updatePoint(recordId)
   }
+
   loadData() {
+
     this.loadAgentList()
+
+
     this.loadSelectOpts()
   }
   loadAgentList() {
@@ -112,8 +125,17 @@ export default class Index extends Component {
       })
     })
 
+  }
+
+  loadCardList() {
+    const params = {
+      pageNumber: 1,
+      pageSize: 50,
+      buildingId: this.state.floor || this.props.projectDetail.buildingId
+    }
     getCardList(params).then(res => {
       res.records.unshift({ name: '请选择', id: 0 })
+      console.log(res, "res")
       this.setState({
         adviserArray: res.records
       })
@@ -217,7 +239,7 @@ export default class Index extends Component {
       this.Alert('请输入正确的手机号码');
       return false;
     }
-    if (floor == "" ) {
+    if (floor == "") {
       this.Alert("请选择意向楼盘");
       return false;
     }
@@ -241,7 +263,7 @@ export default class Index extends Component {
       describe: remarks,//客户描述
       realtyConsultant: adviser,//置业顾问
       recommendPerson: personId,
-      buildingId,
+      buildingId: buildingId || floor,
       status: 1
     }
     recommendClient(param).then(res => {
@@ -279,7 +301,16 @@ export default class Index extends Component {
         floorID: e.detail.value,
         floor: ID,
         floorColor: 'color:#000'
+      }, () => {
+        if (this.state.floorID != 0 || this.state.intention) {
+          this.loadCardList()
+        } else {
+          this.setState({
+            adviserArray: [{ name: '请选择', id: 0 }]
+          })
+        }
       })
+
     } else {
       this.setState({
         floorID: e.detail.value,
@@ -290,6 +321,7 @@ export default class Index extends Component {
   }
   // 置业顾问
   bindAdviserChange(e) {
+
     var index = e.detail.value;
     var ID = this.state.adviserArray[index].id;
     if (e.detail.value != 0) {
@@ -305,6 +337,7 @@ export default class Index extends Component {
         adviserColor: 'color:#716D6D'
       })
     }
+
   }
   // 物业
   bindPropertyChange(e) {
@@ -411,7 +444,6 @@ export default class Index extends Component {
               </Picker>) : (<Input className="input customers__name" style='color:#999;' disabled='disabled' name="name" value={this.state.intention} onInput={this.bindFloorChange.bind(this)} placeholder="" />)
             }
 
-
           </View>
           <View className='info info__4__1'>
             <Text className='customers__txt'>置业顾问</Text>

src/pages/im/index.js

@@ -78,7 +78,7 @@ export default class Chat extends Component {
       const { sendId, sendName, receiverId, receiverName } = this.$router.params
       const { scene } = Taro.getStorageSync('router')
 
-      
+
       /**
        * 当 scene ==1014 时，是从服务消息直接进入聊天页面，
        * 则id为 sendId,反之是为receiverId
@@ -398,7 +398,11 @@ export default class Chat extends Component {
         list: [data]
       })
     }
-
+    this.setState({
+      inputText: '',
+      imageFile: '',
+      msgList: list
+    }, this.toBottom)
     this.setState({
       inputText: '',
       imageFile: '',

src/pages/project/index.js

@@ -158,10 +158,9 @@ export default class Index extends Component {
   }
 
   loadHelpGroupList() {
-    queryHelpGroup().then(res => {
+    queryHelpGroup({cityId:this.props.curCity.id,buildingId:''}).then(res => {
       console.log(res, "res")
       this.setState({
-
         helpGroupList: res || []
       })
     }