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

src/onlineSelling/pages/detail/index.js

@@ -22,6 +22,7 @@ export default class Index extends Component {
     grantPhoneVisible: false, // 授权电话
     grantAvatarVisible: false, // 授权头像
     houseDetail: null,
+    popVisiable: false,
   }
 
 
@@ -76,17 +77,16 @@ export default class Index extends Component {
     console.log(this.props.userInfo, "this.props")
     return true
   }
-  chooseBtn(id, buildingId) {
-    Taro.navigateTo({
-      url: `/onlineSelling/pages/detail/resultPage?type=add&id=${id}&buildingId=${buildingId}`
-    })
-  }
-  cancelChooseBtn(id, buildingId) {
+
+  chooseBtn(type) {
+    const { houseDetail: { houseId, buildingId } } = this.state
     Taro.navigateTo({
-      url: `/onlineSelling/pages/detail/resultPage?type=cancel&id=${id}&buildingId=${buildingId}`
+      url: `/onlineSelling/pages/detail/resultPage?type=${type}&id=${houseId}&buildingId=${buildingId}`
     })
+    this.setState({ popVisiable: false })
   }
 
+
   handleChat(buildingId) {
     Taro.navigateTo({
       url: `/pages/card/list/index?buildingId=${buildingId}`
@@ -95,8 +95,8 @@ export default class Index extends Component {
 
 
   render() {
-    const { grantPhoneVisible, grantAvatarVisible, houseDetail, buildingImgList } = this.state
-    const { userInfo = { person: {} } } = this.props
+    const { grantPhoneVisible, grantAvatarVisible, houseDetail, buildingImgList, popVisiable } = this.state
+    const { userInfo } = this.props
     const address = `${houseDetail.buildingName || ''}${houseDetail.termName || ''}${houseDetail.blockName || ''}${houseDetail.unitName || ''}${houseDetail.floorName || ''}${houseDetail.roomName || ''}`
 
     return (
@@ -109,6 +109,11 @@ export default class Index extends Component {
           grantAvatarVisible &&
           <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
         }
+        {popVisiable && <View className="pop-box">
+          <View className="title" >{!houseDetail.isPreselect ? `确认使用手机号${userInfo.person.phone || userInfo.person.tel}预选此房源？` : '确认取消预选此房源？'}</View>
+          <View className="sure" onClick={!houseDetail.isPreselect ? () => this.chooseBtn('add') : () => this.chooseBtn('cancel')}>确定</View>
+          <View className="cancel" onClick={() => this.setState({ popVisiable: false })}>取消</View>
+        </View>}
 
         <View className='detail'>
           <View className='detail-top'>
@@ -150,9 +155,9 @@ export default class Index extends Component {
               </View>
               <View style="padding: 0 30rpx;">
                 {!houseDetail.isPreselect ?
-                  <View className="choose-btn" onClick={() => this.chooseBtn(houseDetail.houseId, houseDetail.buildingId)}>
+                  <View className="choose-btn" onClick={() => this.setState({ popVisiable: true })}>
                     预选此房源
-                  </View> : <View className="choose-btn" onClick={() => this.cancelChooseBtn(houseDetail.houseId, houseDetail.buildingId)}>
+                  </View> : <View className="choose-btn" onClick={() => this.setState({ popVisiable: true })}>
                     取消预选
                   </View>
                 }

src/onlineSelling/pages/detail/index.scss

@@ -1,5 +1,33 @@
 @import "@/styles/mixins.scss";
 @import "@/styles/theme.scss";
+.pop-box{
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  z-index: 999;
+  text-align: center;
+  background-color: #fff;
+  box-shadow: 0px -2px 10px rgb(189, 187, 187);
+  .title{
+    line-height: 130px;
+    font-size: 26px;
+    color: #666;
+    border-bottom: 2px solid rgba(26,22,22,0.32);
+  
+  }
+  .sure{
+    line-height: 94px;
+    font-size: 36px;
+    color: $primary-color;
+    border-bottom: 2px solid rgba(26,22,22,0.32);
+  }
+  .cancel{
+    line-height: 94px;
+    font-size: 36px;
+    color: #999;
+  }
+
+}
 .detail {
   position: relative;
   width: 100%;

src/onlineSelling/pages/houseList/index.js

@@ -32,7 +32,7 @@ export default class HouseList extends Component {
     showShareMenu: false,
     showPoster: false,
     tipsList: [],
-    houseList: [],
+    houseList: [{}],
     id: null,
     qrcodeParams: {},
     current: 0,
@@ -50,6 +50,8 @@ export default class HouseList extends Component {
     posterConfig: [],
     consultData: {}, // 分享的置业顾问信息
     consultShow: false,  // 置业顾问悬浮框显示隐藏
+    noRecord: false,
+
   }
 
   componentDidShow() {
@@ -85,7 +87,11 @@ export default class HouseList extends Component {
     }
   }
   initPageData() {
-    Taro.showLoading()
+    // Taro.showLoading({ mask: true, title: '加载中...' });
+    Taro.showToast({
+      title: '加载中...',
+      icon: 'loading'
+    })
     const id = this.$router.params.id
 
     if (this.$router.params.scene) {
@@ -125,10 +131,13 @@ export default class HouseList extends Component {
     queryHouseList(params).then(res => {
       this.setState({
         houseList: this.groupHouseList(res) || []
+      }, () => {
+        Taro.hideToast()
       })
-      Taro.hideLoading()
+
+
     }).catch(err => {
-      Taro.hideLoading()
+      Taro.hideToast()
       Taro.showToast({ title: '未找到房源批次', icon: 'none', duration: 2000 })
     })
   }
@@ -139,9 +148,11 @@ export default class HouseList extends Component {
       })
     })
     querySalesInfo(id).then(res => {
+
       this.setState({
         buildingId: res.buildingId,
         salesBatchDetail: res || {},
+        noRecord: res.status == '1' ? false : true
       })
       const { templates = [], posterImg = '' } = (res.posters || [])[0]
 
@@ -557,13 +568,13 @@ export default class HouseList extends Component {
     const {
       consultData,
       consultShow,
-      salesBatchDetail,
       showShareMenu,
       showPoster,
       houseList,
       conditionVisible,
       posterData,
       posterConfig,
+      noRecord,
     } = this.state
 
     const { userInfo: { person } } = this.props
@@ -581,12 +592,12 @@ export default class HouseList extends Component {
         }
         {/* 生成海报 */}
         {showPoster && <Poster data={posterData} configs={posterConfig} onCancel={this.togglePosterStatus} onFinish={this.togglePosterStatus} ></Poster>}
-        {salesBatchDetail.status == "1" ?
+        {!noRecord ?
           <Block>
             {!conditionVisible && <Block>
               <View className="houselist">
                 {this.renderBar()}
-                {!houseList.length ? this.renderBlank() : this.renderHouses()}
+                {houseList.length ? this.renderHouses() : this.renderBlank()}
                 {this.renderBottom()}
               </View>
               {/* 分享按钮 */}

src/pages/project/detail/index.js

@@ -1307,7 +1307,7 @@ export default class Index extends Component {
 
   // onPause() {
   //   this.setState({
-  //     videoPlayShow: 'flex'e.detail
+  //     videoPlayShow: 'flex'
   //   })
   // }
   renderVideo() {