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

config/dev.js

@@ -5,14 +5,14 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    // HOST: '"https://dev.pawoma.cn"',//测试
-    // WSS_HOST: '"wss://dev.pawoma.cn"',
+    HOST: '"https://dev.pawoma.cn"',//测试
+    WSS_HOST: '"wss://dev.pawoma.cn"',
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    HOST: '"http://127.0.0.1:8080"',
-    WSS_HOST: '"ws://127.0.0.1:8080"',
+    // HOST: '"http://127.0.0.1:8080"',
+    // WSS_HOST: '"ws://127.0.0.1:8080"',
     Version: 'V3.5.10'
   },
   weapp: {},

src/onlineSelling/components/HouseCard/index.js

@@ -8,6 +8,7 @@ import './index.scss'
 export default function HouseCard(props) {
   const {
     buildingName,
+    termname,
     blockName,
     unitName,
     roomName,
@@ -17,11 +18,11 @@ export default function HouseCard(props) {
     buildingImgList = [],
   } = props.summary || {}
 
-  const title = `${buildingName} ${blockName} ${unitName} ${roomName}`
+  const title = `${buildingName} ${termname||''} ${blockName} ${unitName} ${roomName}`
   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).toFixed(0)
+  const wanY = Number(price)
 
   return (
     <View className="housecard">

src/onlineSelling/components/HouseGrid/Room.js

@@ -12,14 +12,14 @@ export default function Room(props) {
     }
   }
 
-  const wanY = Number(price).toFixed(0)
+  const wanY = Number(price)
 
   return (
     <HotBlock number={heat + realHeat + 0}>
       {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" style="white-space:nowrap;">{wanY}万元</View>
         <View className="info">{apartmentName || ''}</View>
       </View>}
 

src/onlineSelling/components/HouseGrid/room.scss

@@ -1,9 +1,10 @@
 .room {
   text-align: center;
-  margin-bottom: 16rpx;
-  padding: 20rpx;
-  font-size: 28rpx;
+  margin-bottom: 16px;
+  padding: 20px 10px;
+  font-size: 28px;
   line-height: 1.4em;
+  overflow: hidden;
 
   .info {
     color: #333;

src/onlineSelling/pages/houseList/index.js

@@ -19,8 +19,8 @@ import { ROLE_CODE } from '@/constants/user'
 import { report as reportCustomer } from '@/utils/customer'
 import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
 import { getCanvasConfig } from '@/utils/tools'
-// import Consultant from '@/components/consultant'
-
+import { getCardDetail } from '@/services/card'
+import Consultant from '@/components/consultant'
 import './index.scss'
 
 @connect(s => s.user)
@@ -48,6 +48,8 @@ export default class HouseList extends Component {
     buildingId: null,
     salesBatchDetail: {},
     posterConfig: [],
+    consultData: {}, // 分享的置业顾问信息
+    consultShow: false,  // 置业顾问悬浮框显示隐藏
   }
 
   componentDidShow() {
@@ -99,6 +101,16 @@ export default class HouseList extends Component {
     }
 
     this.reportClientFn()
+    let { qrcodeParams } = this.state
+    const consultant = this.$router.params.consultant || qrcodeParams.consultant
+    if (consultant) {
+      getCardDetail(consultant).then(res => {
+        this.setState({
+          consultData: res,
+          consultShow: true
+        })
+      })
+    }
   }
   getInfo(id) {
     const { startPrice, endPrice, apartmentId } = this.state
@@ -402,6 +414,7 @@ export default class HouseList extends Component {
       priceCurrent: item.value,
       startPrice: item.startPrice,
       endPrice: item.endPrice,
+      apartmentId: '',
       conditionVisible: false
     }, () => {
       const id = this.$router.params.id || this.state.id
@@ -416,7 +429,8 @@ export default class HouseList extends Component {
   }
   sureFilter() {
     this.setState({
-      conditionVisible: false
+      conditionVisible: false,
+      apartmentId: ''
     }, () => {
       // Taro.setNavigationBarTitle({ title: '房源' })
       const id = this.$router.params.id || this.state.id
@@ -480,6 +494,8 @@ export default class HouseList extends Component {
   apartmentFilter(apartmentId) {
     this.setState({
       apartmentId,
+      startPrice: '',
+      endPrice: '',
       conditionVisible: false,
     }, () => {
       // Taro.setNavigationBarTitle({ title: '房源' })
@@ -538,7 +554,18 @@ export default class HouseList extends Component {
   }
 
   render() {
-    const { salesBatchDetail, showShareMenu, showPoster, houseList, conditionVisible, posterData, posterShow, posterConfig } = this.state
+    const {
+      consultData,
+      consultShow,
+      salesBatchDetail,
+      showShareMenu,
+      showPoster,
+      houseList,
+      conditionVisible,
+      posterData,
+      posterConfig,
+    } = this.state
+
     const { userInfo: { person } } = this.props
 
     const showCircleBtn = posterData && posterData.qrcode
@@ -548,7 +575,10 @@ export default class HouseList extends Component {
         {conditionVisible && this.renderCondition()}
         {/* 授权电话与头像 */}
         <GrantProfile both person={person} />
-
+        {/* 置业顾问悬框 */}
+        {
+          consultShow && <Consultant style="bottom:150rpx" smallStyle="bottom:178rpx" personId={person.personId} name={person.name || person.nickname} data={consultData}></Consultant>
+        }
         {/* 生成海报 */}
         {showPoster && <Poster data={posterData} configs={posterConfig} onCancel={this.togglePosterStatus} onFinish={this.togglePosterStatus} ></Poster>}
         {salesBatchDetail.status == "1" ?

src/onlineSelling/pages/records/index.js

@@ -19,7 +19,7 @@ export default class Records extends Component {
   state = {
     recordList: []
   }
-  componentWillMount() {
+  componentDidShow() {
     ready.queue(() => {
 
       const { userInfo: { person: { personId } } } = this.props