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

src/constants/api.js

@@ -108,7 +108,8 @@ export const API_HELP_SHARE = resolvePath('help/share')
 export const API_GROUP_SHARE = resolvePath('group/share')
 export const API_HFIVE_SHARE = resolvePath('h5/share')
 export const API_NEWS_SHARE = resolvePath('news/share')
-export const API_HOUSE_SHARE = resolvePath('house/share')
+export const API_HOUSE_SHARE = resolvePath('houseApp/share')
+export const API_HOUSE_POSTER = resolvePath('housePost/share')
 
 export const API_ACTIVITY_FAVOR = resolvePath('activity/save')
 export const API_NEWS_FAVOR = resolvePath('news/save')

src/onlineSelling/components/HotBlock/index.js

@@ -3,7 +3,7 @@ import './index.scss'
 
 function computeLevel (num) {
   switch (true) {
-    case num >= 200:
+    case num > 200:
       return 13;
     case num > 100:
       return 12;
@@ -12,9 +12,7 @@ function computeLevel (num) {
     case num > 40:
       return 10;
     case num > 30:
-      return 9;
-    case num > 20:
-      return 8;
+      return 9;    
     case num > 20:
       return 8;
     case num > 10:

src/onlineSelling/components/HouseCard/index.js

@@ -21,7 +21,7 @@ export default function HouseCard(props) {
   const thumb = (buildingImgList || []).length
   // const thumb = (buildingImgList || []).length ? transferImage((buildingImgList)[0].url) : emptyImg
   const showDT = dayjs(createDate).format('YYYY/MM/DD')
-  const wanY = Number(price / 10000).toFixed(0)
+  const wanY = Number(price).toFixed(0)
 
   return (
     <View className="housecard">
@@ -36,7 +36,7 @@ export default function HouseCard(props) {
         <View className="title">{title}</View>
         <View className="subtitle">
           <Text>现价</Text>
-          <Text className="red">{wanY+'万' || '待定'}</Text>
+          <Text className="red">{wanY + '万元' || '待定'}</Text>
         </View>
         <View className="meta">{showDT}预选</View>
         <View className="sign bg-success"></View>

src/onlineSelling/components/HouseGrid/Room.js

@@ -3,7 +3,7 @@ import HotBlock from "../HotBlock";
 import './room.scss'
 
 export default function Room(props) {
-  const { roomName, heat, realHeat, price, apartmentName } = props.dataset || {}
+  const { roomName, heat, realHeat, price, apartmentName, status } = props.dataset || {}
   const personNum = `(${realHeat + heat + 0}人)`
 
   const handleClick = () => {
@@ -12,16 +12,17 @@ export default function Room(props) {
     }
   }
 
-  const wanY = Number(price / 10000).toFixed(0)
+  const wanY = Number(price).toFixed(0)
 
   return (
     <HotBlock number={heat + realHeat + 0}>
-      <View className="room" onClick={handleClick}>
+      {status == '1' && <View className="room" onClick={handleClick}>
         <View className="warn">{roomName || ''}</View>
         <View className="warn">{personNum || ''}</View>
-        <View className="info">{wanY}万</View>
+        <View className="info">{wanY}万元</View>
         <View className="info">{apartmentName || ''}</View>
-      </View>
+      </View>}
+
     </HotBlock>
   )
 }

src/onlineSelling/components/ScrollMessage/index.js

@@ -45,8 +45,10 @@ export default class ScrollMessage extends Component {
 
   render() {
     const [start, end] = this.computeDate()
-    const { salesNumber, preselectionNumber } = this.props.summary || {}
-    const notice = `当前 ${salesNumber} 套房源已有 ${preselectionNumber} 人成功预选`
+    const { salesNumber, preselectionNumber, heatNumber } = this.props.summary || {}
+    const personNum = heatNumber + preselectionNumber + 0
+  
+    const notice = `当前 ${salesNumber} 套房源已有 ${personNum} 人成功预选`
 
     return (
       <View className="scrollmessage">
@@ -59,9 +61,9 @@ export default class ScrollMessage extends Component {
             <SwiperItem>
               <TimeTicker startTime={start} endTime={end} translate={this.formateTM} />
             </SwiperItem>
-            <SwiperItem>
+            {personNum > 0 && <SwiperItem>
               <View>{notice}</View>
-            </SwiperItem>
+            </SwiperItem>}
           </Swiper>
         </View>
       </View>

src/onlineSelling/pages/detail/index.js

@@ -95,9 +95,9 @@ export default class Index extends Component {
 
 
   render() {
-    const { grantPhoneVisible, grantAvatarVisible, houseDetail,buildingImgList } = this.state
+    const { grantPhoneVisible, grantAvatarVisible, houseDetail, buildingImgList } = this.state
     const { userInfo = { person: {} } } = this.props
-    const address = `${houseDetail.buildingName}${houseDetail.blockName}${houseDetail.unitName}${houseDetail.floorName}${houseDetail.roomName}`
+    const address = `${houseDetail.buildingName || ''}${houseDetail.termName || ''}${houseDetail.blockName || ''}${houseDetail.unitName || ''}${houseDetail.floorName || ''}${houseDetail.roomName || ''}`
 
     return (
       <Block>
@@ -124,17 +124,17 @@ export default class Index extends Component {
             scrollY>
             <View className='detail__main'>
               <View style="padding: 0 30rpx;">
-                <View className="title">
-                  <View className="name">{houseDetail.apartmentName || ''}</View>
-                  <View className="btn" onClick={() => this.handleChat(houseDetail.buildingId)}>询问优惠</View>
-                </View>
+                <View className="name">{houseDetail.apartmentName || ''}</View>
+                <View className="btn" onClick={() => this.handleChat(houseDetail.buildingId)}>询问优惠</View>
                 <View className="price">
                   现价：{houseDetail.price}万
               </View>
-                <View className="area">
-                  {houseDetail.buildingArea ? <Text>建筑面积约<Text style="color:#FE1C1C">{houseDetail.buildingArea}</Text>m² </Text> : '建筑面积待定'}
-                  <Text style="margin-left:20rpx">{houseDetail.insideArea ? <Text>使用面积约<Text style="color:#FE1C1C">{houseDetail.insideArea}</Text>m² </Text> : '使用面积待定'}</Text>
-                </View>
+                {houseDetail.apartmentName &&
+                  <View className="area">
+                    {houseDetail.buildingArea ? <Text>建筑面积约<Text style="color:#FE1C1C">{houseDetail.buildingArea}</Text>m² </Text> : '建筑面积待定'}
+                    <Text style="margin-left:20rpx">{houseDetail.insideArea ? <Text>使用面积约<Text style="color:#FE1C1C">{houseDetail.insideArea}</Text>m² </Text> : '使用面积待定'}</Text>
+                  </View>
+                }
                 <View className="address">
                   <Image className="location-icon" src={require('../../assets/location.png')}></Image>{address || ''}
                 </View>

src/onlineSelling/pages/detail/index.scss

@@ -29,30 +29,31 @@
   .wrap {
     padding-top: 570px;
     background: transparent;
+    position: relative;
   }
 
   &__main {
     background: #fff;
     border-radius: 40px 40px 0 0;
     padding: 60px 0;
-    .title{
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      .name{
-        font-size: 44px;
-        color: #333333;
-        font-weight: 600;
-      }
-      .btn{
-        background-color: #F3B82E;
-        font-size: 30px;
-        color: #fff;
-        padding: 14px 28px;
-        font-weight: 300;
-        border-radius: 36px;
-      }
+   
+    .name{
+      font-size: 44px;
+      color: #333333;
+      font-weight: 600;
+    }
+    .btn{
+      background-color: #F3B82E;
+      font-size: 30px;
+      color: #fff;
+      padding: 14px 28px;
+      font-weight: 300;
+      border-radius: 36px;
+      position: absolute;
+      right: 30px;
+      top: 48px;
     }
+    
     .price{
       color: #FE1C1C;
       font-size: 38px;

src/onlineSelling/pages/houseList/index.js

@@ -36,7 +36,7 @@ export default class HouseList extends Component {
     id: null,
     qrcodeParams: {},
     current: 0,
-    priceCurrent: 0,
+    priceCurrent: -1,
     apartmentList: [],
     conditionVisible: false,
     startPrice: '',
@@ -45,22 +45,23 @@ export default class HouseList extends Component {
     reportedCustomer: false,
     posterShow: false,
     posterData: {},
-    shareContents: [],
     buildingId: null,
+    salesBatchDetail: {},
     posterConfig: [],
   }
 
-  componentWillMount() {
+  componentDidShow() {
 
     ready.queue(() => {
 
       this.initPageData()
     })
   }
+
   componentWillReceiveProps() {
     this.reportClientFn()
   }
-  
+
   transTPLs2Configs(tpls, params) {
     return tpls.map((tpl) => {
       const conf = getCanvasConfig(tpl.configs, params)
@@ -126,14 +127,15 @@ export default class HouseList extends Component {
       })
     })
     querySalesInfo(id).then(res => {
+      this.setState({
+        buildingId: res.buildingId,
+        salesBatchDetail: res || {},
+      })
       const { templates = [], posterImg = '' } = (res.posters || [])[0]
 
       this.setState({
-        buildingId: res.buildingId,
         posterData: { poster: posterImg },
-        shareContents: res.shareContents || [],
       }, () => {
-        // debugger
         this.getPosterData().then(posterData => {
           const posterConfig = this.transTPLs2Configs(templates, posterData)
           this.setState({ posterConfig, posterData })
@@ -234,7 +236,7 @@ export default class HouseList extends Component {
 
     const queryParams = [
       `id=${id}`,
-      'from=building_share',
+      'from=house_share',
       `recommender=${personId}`,
       `consultant=${consultant}`,
       `consultantId=${consultantId}`,
@@ -251,7 +253,7 @@ export default class HouseList extends Component {
     const id = this.$router.params.id || this.state.id
     const { userInfo: { person: { personId, personType, userId } } } = this.props
     const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
-    const { shareContents } = this.state
+    const { salesBatchDetail: { shareContents } } = this.state
     const shareData = shareContents && shareContents.length ? shareContents[0] : { shareContentTitle: '房源列表', shareContentImg: null };
     // 分享埋点
     shareSavePoint({
@@ -262,7 +264,7 @@ export default class HouseList extends Component {
       sharePersonId: personId,
       targetId: id,
       data: '{}'
-    }, 'house')
+    }, 'houseApp')
 
     const [page, params] = this.currentPageAndParams()
 
@@ -290,9 +292,9 @@ export default class HouseList extends Component {
           propertyName: '生成房源列表海报',
           targetId: id,
           data: '{}'
-        }, 'house')
+        }, 'housePoster')
       })
-    
+
 
     } else {
       this.setState({
@@ -300,7 +302,7 @@ export default class HouseList extends Component {
         showShareMenu: false
       })
     }
-   
+
 
   }
   getPosterData = () => {
@@ -345,7 +347,7 @@ export default class HouseList extends Component {
             <Image style="width:50rpx;height:50rpx" src={require('../../assets/explain.png')}></Image>
           </View>
           <View onClick={this.handleSearchClick}>
-          <Image style="width:50rpx;height:50rpx" src={require('../../assets/screen.png')}></Image>
+            <Image style="width:50rpx;height:50rpx" src={require('../../assets/screen.png')}></Image>
             {/* <NamedIcon name="screen" size={50} /> */}
           </View>
         </View>
@@ -402,7 +404,6 @@ export default class HouseList extends Component {
       endPrice: item.endPrice,
       conditionVisible: false
     }, () => {
-      // Taro.setNavigationBarTitle({ title: '房源' })
       const id = this.$router.params.id || this.state.id
       this.getInfo(id)
     })
@@ -462,7 +463,7 @@ export default class HouseList extends Component {
           <Text style="margin:0 8rpx;color:#999;font-size:28rpx">-</Text>
           <Input
             type="number"
-            placeholder="最低价"
+            placeholder="最高价"
             class="search-input"
             placeholder-style="color:#dcdcdc;font-size:28rpx"
             maxlength="6"
@@ -537,11 +538,11 @@ export default class HouseList extends Component {
   }
 
   render() {
-    const { showShareMenu, showPoster, houseList, conditionVisible, posterData, posterShow, posterConfig } = this.state
+    const { salesBatchDetail, showShareMenu, showPoster, houseList, conditionVisible, posterData, posterShow, posterConfig } = this.state
     const { userInfo: { person } } = this.props
 
     const showCircleBtn = posterData && posterData.qrcode
-console.log('==============>', posterData, showPoster, posterConfig)
+    console.log('==============>', posterData, showPoster, posterConfig)
     return (
       <Block>
         {conditionVisible && this.renderCondition()}
@@ -550,23 +551,30 @@ console.log('==============>', posterData, showPoster, posterConfig)
 
         {/* 生成海报 */}
         {showPoster && <Poster data={posterData} configs={posterConfig} onCancel={this.togglePosterStatus} onFinish={this.togglePosterStatus} ></Poster>}
-        {!conditionVisible && <Block>
-          <View className="houselist">
-            {this.renderBar()}
-            {!houseList.length ? this.renderBlank() : this.renderHouses()}
-            {this.renderBottom()}
-          </View>
-          {/* 分享按钮 */}
-          <ActSheet show={showShareMenu}>
-            <ShareButtons
-              circleBtn={showCircleBtn}
-              onShareFrineds={this.handleShareFrineds}
-              onSharingCircleOfFriends={() => this.togglePosterStatus(true)}
-            // onSharingCircleOfFriends={this.handleSharingCircleOfFriends}
-            />
-          </ActSheet>
-        </Block>
+        {salesBatchDetail.status == "1" ?
+          <Block>
+            {!conditionVisible && <Block>
+              <View className="houselist">
+                {this.renderBar()}
+                {!houseList.length ? this.renderBlank() : this.renderHouses()}
+                {this.renderBottom()}
+              </View>
+              {/* 分享按钮 */}
+              <ActSheet show={showShareMenu}>
+                <ShareButtons
+                  circleBtn={showCircleBtn}
+                  onShareFrineds={this.handleShareFrineds}
+                  onSharingCircleOfFriends={() => this.togglePosterStatus(true)}
+                // onSharingCircleOfFriends={this.handleSharingCircleOfFriends}
+                />
+              </ActSheet>
+            </Block>
+            }
+          </Block>
+          :
+          <View style="text-align: center;margin-top: 30vh;font-size: 28rpx;color: #999;">当前销售批次已被取消发布，请在发布后再试。</View>
         }
+
       </Block>
     )
   }

src/onlineSelling/pages/houseList/index.scss

@@ -124,6 +124,7 @@
         border-radius:6px;
         font-size: 28px;
         color: #999;
+        border:1px solid #bb9c79;
       }
     }
   }

src/onlineSelling/pages/records/index.js

@@ -1,5 +1,5 @@
 import Taro, { Component } from '@tarojs/taro'
-import { View, ScrollView } from '@tarojs/components'
+import { View, ScrollView, Block } from '@tarojs/components'
 import HouseCard from '../../components/HouseCard'
 import { queryPreselectionRecord } from '@/services/project'
 import { connect } from '@tarojs/redux'
@@ -21,7 +21,7 @@ export default class Records extends Component {
   }
   componentWillMount() {
     ready.queue(() => {
-      console.log(this.props, "hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
+  
       const { userInfo: { person: { personId } } } = this.props
       const params = {
         personId,
@@ -35,6 +35,16 @@ export default class Records extends Component {
       })
     })
 
+  }
+  toHouseDetail(item) {
+    if (item.housingStatus == '0' || item.saleBatchStatus == '0') {
+      Taro.showToast({ title: '当前销售批次或该房源已被取消发布', icon: 'none', duration: 2000 })
+    } else {
+      Taro.navigateTo({
+        url: `/onlineSelling/pages/detail/index?id=${item.houseId}`
+      })
+    }
+
   }
 
   render() {
@@ -49,9 +59,11 @@ export default class Records extends Component {
               {
                 recordList.map((item) => {
                   return (
-                    <View className="carditem" key={item.preselectionRecordId}>
-                      <HouseCard summary={item} />
-                    </View>
+                    <Block>
+                      {item.status == '1' && <View className="carditem" key={item.preselectionRecordId} onClick={() => this.toHouseDetail(item)}>
+                        <HouseCard summary={item} />
+                      </View>}
+                    </Block>
                   )
                 })
               }

src/pages/card/index.js

@@ -620,7 +620,7 @@ export default class Index extends Component {
 
               {buildingId && (
                 <View className="pro__info">
-                  <View className='project__title'>为您推荐</View>
+                  <View className='project__title'>{person.personId != cardInfo.id?'为您推荐':'项目信息'}</View>
                   <ProjectItem data={projectDetail} onClick={this.toProjectDetail.bind(this)} />
                 </View>
               )}

src/pages/project/detail/index.js

@@ -1079,7 +1079,7 @@ export default class Index extends Component {
     const { projectDetail: { salesBatch } } = this.props
     return (
       <Block>
-        <View className="activity" style="padding:40rpx 0 20rpx 0 ">
+        {salesBatch.length && <View className="activity" style="padding:40rpx 0 20rpx 0 ">
           <View className="title">在线选房</View>
           {salesBatch.map((item, index) => (
             <View style={{ position: 'relative', padding: '0 30rpx' }} key={index + 'salesBatch'} >
@@ -1087,7 +1087,8 @@ export default class Index extends Component {
             </View>
           ))}
 
-        </View>
+        </View>}
+
       </Block>
     )
   }
@@ -1553,7 +1554,7 @@ export default class Index extends Component {
                   {/* 户型介绍 */}
                   {this.renderHouseTypeList()}
                   {/* 在线选房 */}
-                  {projectDetail.salesBatch && this.renderChooseHouse()}
+                  {this.renderChooseHouse()}
                   {/* 助力活动 */}
                   {this.renderHelp()}
                   {/* 拼团活动 */}

src/services/news.js

@@ -5,6 +5,7 @@ import {
   API_NEWS_UV,
   API_NEWS_SHARE,
   API_HOUSE_SHARE,
+  API_HOUSE_POSTER,
   API_ACTIVITY_GROUP
 } from '@/constants/api'
 
@@ -21,7 +22,12 @@ export const addNewsUv = id => fetch({ url: `${API_NEWS_UV}/${id}`, method: 'PUT
 export const addNewsShareNum = id => fetch({ url: `${API_NEWS_SHARE}/${id}`, method: 'POST' })
 
 /**
- * 房源列表分享埋点
+ * 房源列表分享埋点（海报）
+ * @param {*} id  id
+ */
+export const addHousePosterNum = id => fetch({ url: `${API_HOUSE_POSTER}/${id}`, method: 'POST' })
+/**
+ * 房源列表分享埋点（小程序）
  * @param {*} id  id
  */
 export const addHouseShareNum = id => fetch({ url: `${API_HOUSE_SHARE}/${id}`, method: 'POST' })

src/utils/shareSavePoint.js

@@ -2,8 +2,8 @@ import { savePoint } from '@/services/common'
 import { addItemShareNum } from '@/services/item'
 import { addActivityShareNum, addHelpShareNum, addGroupShareNum, addHFiveShareNum } from '@/services/activity'
 import { addCardShareNum } from '@/services/card'
-import { addNewsShareNum } from '@/services/news'
-import { addHouseShareNum } from '@/services/news'
+import { addNewsShareNum, addHousePosterNum, addHouseShareNum } from '@/services/news'
+
 /**
  * 积分提示
  * @param {*} options
@@ -29,10 +29,14 @@ export function share(options, type) {
                 addNewsShareNum(options.targetId)
                 savePoint(options)
                 break;
-            case 'house':
+            case 'houseApp':
                 addHouseShareNum(options.targetId)
                 savePoint(options)
                 break;
+            case 'housePoster':
+                addHousePosterNum(options.targetId)
+                savePoint(options)
+                break;
             case 'help':
                 addHelpShareNum(options.targetId)
                 savePoint(options)