Merge branch 'dev'

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "editor.fontFamily": "'Cascadia Code', Consolas, 'Courier New', monospace"
+  "editor.fontFamily": "'Cascadia Code', Consolas, 'Courier New', monospace",
+  "editor.tabSize": 2
 }

config/dev.js

@@ -13,7 +13,7 @@ module.exports = {
     // WSS_HOST: '"wss://lt.pawoma.cn"',
     // HOST: '"http://127.0.0.1:8080"',
     // WSS_HOST: '"ws://127.0.0.1:8080"',
-    Version: 'V3.5.9'
+    Version: 'V3.5.11'
   },
   weapp: {},
   h5: {}

config/index.js

@@ -49,6 +49,10 @@ const config = {
   },
   copy: {
     patterns: [
+      {
+        from: 'src/onlineSelling/assets/',
+        to: 'dist/onlineSelling/assets/'
+      }
     ],
     options: {
     }

config/prod.js

@@ -7,11 +7,11 @@ module.exports = {
     // WSS_HOST: '"ws://192.168.2.54:8080"',
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
-    HOST: '"https://dev.pawoma.cn"',// 新测试
-    WSS_HOST: '"wss://dev.pawoma.cn"',
-    // HOST: '"https://lt.pawoma.cn"',
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
-    Version: 'V3.5.9'
+    // HOST: '"https://dev.pawoma.cn"',// 新测试
+    // WSS_HOST: '"wss://dev.pawoma.cn"',
+    HOST: '"https://lt.pawoma.cn"',
+    WSS_HOST: '"wss://lt.pawoma.cn"',
+    Version: 'V3.5.11'
   },
   weapp: {},
   h5: {}

project.config.json

@@ -1,8 +1,8 @@
 {
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
-	"description": "知与行联调",
-	"appid": "wxd9ee3a9480a4e544",
+	"description": "知与行互动",
+	"appid": "wxd6f47a9bb3052175",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,
@@ -48,23 +48,16 @@
 			"list": [
 				{
 					"id": -1,
-					"name": "pages/im/list/index",
-					"pathName": "pages/im/list/index",
-					"query": "",
+					"name": "pages/houseList/index",
+					"pathName": "onlineSelling/pages/houseList/index",
+					"query": "id=6&buildingId=7a46e04f15c324fa9cf44ce27f9573c5",
 					"scene": null
 				},
 				{
-					"id": -1,
-					"name": "pages/activity/detail/assistance",
-					"pathName": "pages/activity/detail/assistance",
-					"query": "id=85",
-					"scene": null
-				},
-				{
-					"id": -1,
-					"name": "pages/project/detail/index",
-					"pathName": "pages/project/detail/index",
-					"query": "id=93e6d86b8b48e3ea359084e3ceaf2d03",
+					"id": 1,
+					"name": "pages/records/index",
+					"pathName": "onlineSelling/pages/records/index",
+					"query": "",
 					"scene": null
 				}
 			]

src/app.js

@@ -42,6 +42,13 @@ class App extends Component {
         "desc": "你的位置信息将用于显示当前区域信息"
       }
     },
+    navigateToMiniProgramAppIdList: [
+      "wxb825ab501296672e",
+      "wxca1e7ba3fe18ff12",
+      "wx74767bf0b684f7d3",
+      "wx6fa58869f7b65e7f",
+      "wxc4f812079fc9ff0d",
+    ],
     pages: [
       'pages/project/index',
       'pages/project/h5Page',
@@ -113,6 +120,19 @@ class App extends Component {
           'pages/person/feedback/index',
           'pages/shop/record/index',
         ],
+      },
+      {
+        root: "onlineSelling",
+        pages: [
+          'pages/houseList/index',
+          'pages/live/index',
+          'pages/help/index',
+          'pages/records/index',
+          'pages/detail/index',
+          'pages/detail/resultPage',
+          'pages/selectionRecord/index',
+          'pages/screenHouse/index',
+        ],
       }
     ],
     window: {
@@ -136,7 +156,7 @@ class App extends Component {
         },
         {
           pagePath: "pages/shop/index",
-          text: "积分商城",
+          text: "赚好礼",
           iconPath: './assets/tabbar/shop1.png',
           selectedIconPath: './assets/tabbar/shop2.png',
         },
@@ -148,7 +168,7 @@ class App extends Component {
         },
         {
           pagePath: "pages/person/index",
-          text: "我的",
+          text: "我的地盘",
           iconPath: './assets/tabbar/mine1.png',
           selectedIconPath: './assets/tabbar/mine2.png',
         }

src/components/Loading/index.js

@@ -0,0 +1,21 @@
+import { View } from "@tarojs/components";
+
+import './index.scss'
+
+export default function Loading(props) {
+  const size = props.size || '200';
+  const color = props.color || '#333';
+
+  const boxStyle = `width: ${size}px; height: ${size}px;`
+  const loadingStyle = `border-color: transparent ${color} transparent ${color};`
+  const textStyle = `color: ${color};`
+
+  const text = props.text || 'LOADING';
+
+  return (
+    <View className="loading-box" style={boxStyle}>
+      <View className="loading" style={loadingStyle}></View>
+      <View className="loading-text" style={textStyle}>{text}</View>
+    </View>
+  )
+}

src/components/Loading/index.scss

@@ -0,0 +1,41 @@
+.loading-box {
+  // width: 200px;
+  // height: 200px;
+  position: relative;
+  margin: 0 auto;
+
+  .loading {
+    width: calc(100% - 4px);
+    height: calc(100% - 4px);
+    border-radius: 100%;
+    border: 4px solid transparent;
+    border-color: transparent #333 transparent #333;
+    animation: rotate-loading 1.5s linear 0s infinite normal;
+    transform-origin: 50% 50%;
+  }
+
+  .loading-text {
+    width: calc(100% - 4px);
+    animation: loading-text-opacity 2s linear 0s infinite normal;
+    color: #333;
+    font-size: 20px;
+    font-weight: bold;
+    margin-top: 40%;
+    opacity: 0;
+    position: absolute;
+    text-align: center;
+    top: 0;
+  }
+
+  @keyframes rotate-loading {
+    0%  {transform: rotate(0deg);}
+    100% {transform: rotate(360deg);}
+  }
+
+  @keyframes loading-text-opacity {
+    0%  {opacity: 0}
+    20% {opacity: 0}
+    50% {opacity: 1}
+    100%{opacity: 0}
+  }
+}

src/components/Poster/index.js

@@ -75,6 +75,7 @@ export default class Poster extends Component {
 
   onCreateSuccess = (inx) => {
     return (result) => {
+      // debugger
       const { tempFilePath, errMsg } = result;
       if (errMsg === 'canvasToTempFilePath:ok') {
         this.tmpImgs[inx] = tempFilePath

src/components/authorizationComponent/index.scss

@@ -3,7 +3,7 @@
 .auth-page{
   position: relative;
   width: 100%;
-  height: 100%;
+  height: 100vh;
   .avatar_img{
     position: absolute;
     width:120px;

src/components/authorize/index.scss

@@ -3,7 +3,7 @@
 .auth-page{
   position: relative;
   width: 100%;
-  height: 100%;
+  height: 100vh;
   .avatar_img{
     position: absolute;
     width:120px;

src/components/indexMenus/icons.js

@@ -18,14 +18,14 @@ const CONSULTANT = ROLE_CODE['CONSULTANT']
 const menus = [
 
     {
-        name: '积分商城',
+        name: '赚积分',
         url: '/pages/shop/index',
         icon: icons.shop,
         switchTab: true,
         iconCode: 'integralMall',
     },
     {
-        name: '购房百科',
+        name: '购房须知',
         url: '/pages/policy/index?from=mine',
         icon: icons.encyclopedia,
         iconCode: 'buyingEncyclopedia'
@@ -38,7 +38,7 @@ const menus = [
         city: true,
     },
     {
-        name: '地图找房',
+        name: '选好房',
         url: '/pages/project/map/index',
         icon: icons.map,
         iconCode: 'findRoom'
@@ -50,7 +50,7 @@ const menus = [
         iconCode: 'Highlyrecommented'
     },
     {
-        name: '房贷计算器',
+        name: '算房贷',
         url: '/pages/toolKit/index',
         icon: icons.calculator,
         iconCode: 'MortgageCalculator'
@@ -70,7 +70,7 @@ const menus = [
         switchTab: true,
     },
     {
-        name: '热门活动',
+        name: '参加活动',
         url: '/pages/activity/activity',
         icon: icons.activity,
         iconCode: 'Popularactivities',

src/components/indexMenus/index.js

@@ -42,7 +42,8 @@ export default class Menus extends Component {
                 {menusList.map((item, ginx) => (
                     <View onClick={() => this.toMenuePage(item)} className="mune-item" key={`menu- ${ginx}`}>
                         <Image className="icon" src={item.icon} ></Image>
-                        <View className="mune-text">{item.name}</View>
+                        <View className="mune-text"><Text>{item.name} </Text>{item.iconCode== 'refercustomers'&&<Image style="width:30rpx;height:30rpx;margin-left:4rpx" src={require('@/assets/award.png')} ></Image>}</View>
+                      
                     </View>
                 ))}
             </View>

src/components/indexMenus/index.scss

@@ -16,6 +16,12 @@
         width:84px;
         height:84px;
       }
+      .mune-text{
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        
+      }
     }
   }
   

src/components/taro-plugin-canvas/index.js

@@ -9,6 +9,7 @@ import {
   drawLine,
 } from './utils/draw';
 import './index.css';
+import rtLog from '@/utils/rtLog';
 
 let count = 1;
 export default class CanvasDrawer extends Component {
@@ -167,6 +168,7 @@ export default class CanvasDrawer extends Component {
       .catch((err) => {
         Taro.hideLoading();
         Taro.showToast({ icon: 'none', title: err.message || err.errMsg || '下载图片失败' });
+        rtLog.error('下载图片失败, 图片地址 ('+ imageUrl +'), 错误消息: ' + ( err.message || err.errMsg || err))
         console.error(err);
         if (!onCreateFail) {
           console.warn('您必须实现 taro-plugin-canvas 组件的 onCreateFail 方法，详见文档 https://github.com/chuyun/taro-plugin-canvas#fail');

src/constants/api.js

@@ -54,6 +54,19 @@ export const API_LOCATION_CITYP = resolvePath('location/city')
 export const API_TACUSTOMIMG = resolvePath('taCustomImg')
 export const API_INDEX_PROJECTS = resolvePath('building/main')
 export const API_INDEX_ICONS = resolvePath('taMiniappOrgIcon')
+
+
+
+export const API_HOUSE_LIST = resolvePath('listHousingResources')
+export const API_PRESELECTION_RECORD = resolvePath('listPreselectionRecord')
+export const API_HOUSE_DETAIL = resolvePath('getHousingDetailById')
+export const API_ADD_PRESELECTION = resolvePath('taPreselectionRecord')
+export const API_CANCEL_PRESELECTION = resolvePath('taPreselectionRecordCancel')
+export const API_APARTMENT_TYPE = resolvePath('listBuildApartmentBySalesBatchId')
+export const API_NOTICE_INFO = resolvePath('getNoticeInfo')
+export const API_SALES_BATCH = resolvePath('taSalesBatch')
+export const API_ADDLIVE_NUM = resolvePath('addVisitNum')
+export const API_LIVE_DEATIL = resolvePath('taLiveActivity')
 // /wx/location/city?location=lon,lat
 
 
@@ -97,6 +110,10 @@ 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('houseApp/share')
+export const API_HOUSE_POSTER = resolvePath('housePost/share')
+export const API_LIVE_SHARE = resolvePath('liveApp/share')
+export const API_LIVE_POSTER = resolvePath('livePost/share')
 
 export const API_ACTIVITY_FAVOR = resolvePath('activity/save')
 export const API_NEWS_FAVOR = resolvePath('news/save')

src/constants/common.js

@@ -7,6 +7,9 @@ export const TPL_HELP = "help-result";
 // 拼团消息
 export const TPL_GROUP = "group-result";
 
+// 预选消息
+export const TPL_HOUSE = "house";
+
 // 更新预拉取数据
 export const UPDATE_PRELOAD = 'UPDATE_PRELOAD';
 

src/onlineSelling/components/ActSheet/index.js

@@ -0,0 +1,49 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Button } from "@tarojs/components";
+
+import './index.scss'
+
+export default class ActSheet extends Component {
+
+  state = {
+    visible: this.props.show,
+    showMask: this.props.mask === void 0 ? true : this.props.mask,
+    localVisibleChange: false,
+  }
+
+  static getDerivedStateFromProps(props, state) {
+    if (!state.localVisibleChange) {
+      return { visible: props.show }
+    }
+
+    return { localVisibleChange: false }
+  }
+
+  handleCancel = e => {
+    this.setState({ visible: false, localVisibleChange: true })
+
+    if (this.props.onCancel) {
+      this.props.onCancel()
+    }
+  }
+
+  handleTouchMove = e => {
+    e.stopPropagation()
+  }
+
+  render() {
+    const { visible, showMask } = this.state
+    const cls = `actsheet ${ showMask ? 'mask' : '' }`
+
+    return visible && (
+      <View className={cls} onTouchMove={this.handleTouchMove}>
+        <View className="content sheetitem">
+          <View className="body sheetitem">{this.props.children}</View>
+          <View className="foot sheetitem">
+            <Button className="cancel" onClick={this.handleCancel}>取消</Button>
+          </View>
+        </View>
+      </View>
+    )
+  }
+}

src/onlineSelling/components/ActSheet/index.scss

@@ -0,0 +1,42 @@
+.actsheet {
+  z-index: 10000;
+  width: 100vw;
+  height: 100vh;
+  position:fixed;
+  left: 0;
+  top: 0;
+  background: transparent;
+  &.mask {
+    background-color: rgba(0,0,0,0.34);
+  }
+
+  .sheetitem {
+    width: 100%;
+  }
+
+  .content {
+    position: absolute;
+    left: 0;
+    bottom: 0;
+    background: transparent;
+
+    .body {
+      background: #fff;
+      border-radius: 22rpx 22rpx 0px 0px;
+      overflow: hidden;
+    }
+  
+    .foot {
+      margin-top: 2rpx;
+      background: #fff;
+  
+      .cancel {
+        width: 100%;
+        line-height: 94rpx;
+        font-size: 36rpx;
+        color:#BB9C79;
+        text-align: center;
+      }
+    }
+  }
+}

src/onlineSelling/components/Blank/index.js

@@ -0,0 +1,15 @@
+
+import { View } from '@tarojs/components'
+import './index.scss'
+
+export default function Blank(props) {
+  return (
+    <View className="blank">
+      <Image className="nodata-img" src={require('../../assets/norecord.png')}></Image>
+      {/* <View className="nodata"></View> */}
+      {
+        props.tips && <View className="tips">{props.tips}</View>
+      }
+    </View>
+  )
+}

src/onlineSelling/components/Blank/index.scss

@@ -0,0 +1,37 @@
+
+// .blank {
+//   width: 280rpx;
+//   transform: translateY(50%);
+//   margin: 0 auto;
+
+//   .nodata {
+//     height: 220rpx;
+//     background: url('../../assets/norecord.png');
+//     background-size: cover;
+//   }
+
+//   .tips {
+//     margin-top: 10rpx;
+//     font-size: 28rpx;
+//     line-height: 1.8em;
+//     color: #999;
+//     text-align: center;
+//   }
+// }
+.blank {
+  width: 100%;
+  transform: translateY(50%);
+  margin: 0 auto;
+  text-align: center;
+  .nodata-img{
+    width:280px;
+    height:220px;
+  }
+
+  .tips {
+    font-size: 28px;
+    line-height: 2;
+    color: #999;
+    text-align: center;
+  }
+}

src/onlineSelling/components/GrantProfile/index.js

@@ -0,0 +1,39 @@
+import { useState } from '@tarojs/taro'
+import { Block } from "@tarojs/components"
+import AchievePhone from '@/components/achievePhone'
+import AchieveAvatar from '@/components/achieveAvatar'
+import { isEmpty } from '@/utils/tools'
+
+function noop(){}
+
+export default function GrantProfile(props) {
+  if (isEmpty(props.person)) return <Block />;
+
+  const { tel, phone, avatarurl } = props.person
+
+  const noPhone = !(tel || phone)
+  const noAvatar = !avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1
+  
+  const grantPhone = (props.phone || props.both) && noPhone
+  const grantAvatar = (props.avatar || props.both) && noAvatar
+  
+  if (!grantPhone && !grantAvatar) {
+    if (props.onSuccess) {
+      props.onSuccess()
+    }
+  }
+  
+  return (
+    <Block>
+      {
+        grantPhone &&
+        (<AchievePhone user={props.person} onSuccess={noop}></AchievePhone>)
+      }
+
+      {
+        grantAvatar && !grantPhone &&
+        (<AchieveAvatar user={props.person} onSuccess={noop} ></AchieveAvatar>)
+      }
+    </Block>
+  )
+}

src/onlineSelling/components/HotBlock/index.js

@@ -0,0 +1,32 @@
+import { View } from "@tarojs/components";
+import './index.scss'
+
+function computeLevel (num) {
+  switch (true) {
+    case num > 200:
+      return 13;
+    case num > 100:
+      return 12;
+    case num > 50:
+      return 11;
+    case num > 40:
+      return 10;
+    case num > 30:
+      return 9;    
+    case num > 20:
+      return 8;
+    case num > 10:
+      return 7;
+    case num >= 6:
+      return 6;
+    case num > 0:
+      return num;
+    default:
+      return 0;
+  }
+}
+
+export default function HotBlock(props) {
+  const level = computeLevel(props.number)
+  return (<View className={`hotblock bkg-${level}`}>{props.children}</View>)
+}

src/onlineSelling/components/HotBlock/index.scss

@@ -0,0 +1,45 @@
+
+.hotblock {
+  &.bkg-0 {
+    background:#F8F8F8;
+  }
+  &.bkg-1 {
+    background:#F9DED1;
+  }
+  &.bkg-2 {
+    background:#F6D4C3;
+  }
+  &.bkg-3 {
+    background:#F8C6AD;
+  }
+  &.bkg-4 {
+    background:#FDDBDB;
+  }
+  &.bkg-5 {
+    background:#F9CCCC;
+  }
+  &.bkg-6 {
+    background:#F9B7B7;
+  }
+  &.bkg-7 {
+    background:#FFADAD;
+  }
+  &.bkg-8 {
+    background:#F59683;
+  }
+  &.bkg-9 {
+    background:#F7836C;
+  }
+  &.bkg-10 {
+    background:#F97459;
+  }
+  &.bkg-11 {
+    background:#FC6749;
+  }
+  &.bkg-12 {
+    background:#FD4E2B;
+  }
+  &.bkg-13 {
+    background:#FE2E2E;
+  }
+}

src/onlineSelling/components/HouseCard/index.js

@@ -0,0 +1,47 @@
+import { View, Image, Text } from "@tarojs/components";
+import { transferImage } from '@/utils/tools'
+import dayjs from 'dayjs'
+import emptyImg from '@/assets/empty.png'
+
+import './index.scss'
+
+export default function HouseCard(props) {
+  const {
+    buildingName,
+    termname,
+    blockName,
+    unitName,
+    roomName,
+    price,
+    createDate,
+    status,
+    buildingImgList = [],
+  } = props.summary || {}
+
+  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)
+
+  return (
+    <View className="housecard">
+      <View className="head">
+        {thumb ? <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" /> :
+          <Text style="font-size:26rpx;color:#666">暂无户型图</Text>
+        }
+        {/* <Image className="thumb" src={thumb} mode="aspectFit" /> */}
+      </View>
+      <View className="body">
+        <View className="badge">已预选</View>
+        <View className="title">{title}</View>
+        <View className="subtitle">
+          <Text>现价</Text>
+          <Text className="red">{wanY + '万元' || '待定'}</Text>
+        </View>
+        <View className="meta">{showDT}预选</View>
+        <View className="sign bg-success"></View>
+      </View>
+    </View>
+  )
+}

src/onlineSelling/components/HouseCard/index.scss

@@ -0,0 +1,81 @@
+.housecard {
+  // width: calc(100% - 32px);
+  width: 690px;
+  height: 250px;
+  background:#fff;
+  border-radius: 8px;
+  display: flex;
+  margin: 16px 30px;
+  box-shadow: 0 4px 15px 1px rgba(0, 0, 0, 0.12);
+  font-weight: 400;
+
+  .head {
+    width: 250px;
+    flex: none;
+    border-right: 2px solid rgba(0, 0, 0, 0.04);
+    padding: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+
+    .thumb {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .body {
+    width: 438px;
+    flex: none;
+    position: relative;
+    line-height: 40px;
+    padding: 20px 16px;
+
+    .badge {
+      font-size: 30px;
+      color: #BB9C79;
+      text-align: right;
+      margin-right: 12px;
+    }
+
+    .title {
+      font-size: 26px;
+      font-weight: bold;
+      color:#333;
+      line-height: 1.8;
+    }
+
+    .subtitle {
+      font-size: 28px;
+      color:#333;
+    }
+
+    .meta {
+      font-size: 24px;
+      color:#999;
+    }
+
+    .sign {
+      width: 86px;
+      height: 86px;
+      position: absolute;
+      right: 10px;
+      bottom: 10px;
+    }
+  }
+
+  .red {
+    color: #FF3C3C;
+  }
+
+  .bg-success {
+    background: url(../../assets/success.png);
+    background-size: cover;
+  }
+
+  .bg-fail {
+    background: url(../../assets/fail.png);
+    background-size: cover;
+  }
+}

src/onlineSelling/components/HouseGrid/Floor.js

@@ -0,0 +1,22 @@
+import { View } from "@tarojs/components";
+import Room from "./Room";
+import './floor.scss'
+
+export default function Floor(props) {
+  const { floorName, roomList = [] } = props.dataset || {}
+
+  return (
+    <View className="floor">
+      <View className="head">{floorName}</View>
+      <View className="body">
+        {roomList.map((room) => {
+          return (
+            <View className="item" key={room.houseId} >
+              <Room dataset={room} onClick={props.onRoomClick}/>
+            </View>
+          )
+        })}
+      </View>
+    </View>
+  );
+}

src/onlineSelling/components/HouseGrid/Room.js

@@ -0,0 +1,28 @@
+import { View } from "@tarojs/components";
+import HotBlock from "../HotBlock";
+import './room.scss'
+
+export default function Room(props) {
+  const { roomName, heat, realHeat, price, apartmentName, status } = props.dataset || {}
+  const personNum = `(${realHeat + heat + 0}人)`
+
+  const handleClick = () => {
+    if (props.onClick) {
+      props.onClick(props.dataset || {})
+    }
+  }
+
+  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">{apartmentName || ''}</View>
+      </View>}
+
+    </HotBlock>
+  )
+}

src/onlineSelling/components/HouseGrid/Unit.js

@@ -0,0 +1,39 @@
+import Taro, { Component, render } from '@tarojs/taro'
+import { View, Text } from "@tarojs/components";
+import Floor from "./Floor";
+import './unit.scss'
+
+
+export default class Unit extends Component {
+
+  onShowMoreClick = (item) => {
+
+    if (!item.noshow) {
+      item.noshow = true
+    } else {
+      item.noshow = false
+    }
+    this.setState({})
+  }
+  render() {
+    const { termName, blockName, unitName, noshow = false, floorList = [] } = this.props.dataset || {}
+    return (
+      <View className="unit">
+        <View className="head" onClick={() => this.onShowMoreClick(this.props.dataset)} >
+          <View>
+            <Text className="item">{termName}</Text>
+            <Text className="item">{blockName}</Text>
+            <Text className="item">{unitName}</Text>
+          </View>
+          <Image className="arrow" style={!noshow ? 'transform:rotate(90deg);' : ''} src={require('@/assets/person/arrow2.png')} mode="widthFix"></Image>
+        </View>
+        <View className="body" >
+          {!noshow && floorList.map((floor) => {
+            return <Floor key={floor.floorId} dataset={floor} onRoomClick={this.props.onRoomClick} />
+          })}
+        </View>
+      </View>
+    )
+  }
+
+}

src/onlineSelling/components/HouseGrid/floor.scss

@@ -0,0 +1,29 @@
+.floor {
+  display: flex;
+
+  .head {
+    font-size: 32rpx;
+    padding-top: 68rpx;
+    flex: none;
+    width: 14%;
+    text-align: left;
+  }
+
+  .body {
+    text-align: center;
+    flex: auto;
+    display: flex;
+    justify-content: flex-start;
+    flex-wrap: wrap;
+
+    .item {
+      width: 31%;
+      flex: none;
+      margin-right: 2%;
+      
+      &:nth-child(3) {
+        margin-right: 0;
+      }
+    }
+  }
+}

src/onlineSelling/components/HouseGrid/index.js

@@ -0,0 +1,16 @@
+import { Block } from "@tarojs/components"
+import Unit from './Unit'
+
+export default (props) => {
+  const unitList = (props.dataset || {}).unitList || []
+  const onRoomClick = props.onRoomClick || (() => {})
+
+  return (
+    <Block>
+      {
+        unitList.map((unit) => (<Unit key={unit.unitId} dataset={unit} onRoomClick={onRoomClick} />))
+      }
+    </Block>
+  )
+
+}

src/onlineSelling/components/HouseGrid/room.scss

@@ -0,0 +1,22 @@
+.room {
+  text-align: center;
+  margin-bottom: 16px;
+  padding: 20px 10px;
+  font-size: 28px;
+  line-height: 1.4em;
+  height: 192px;
+  overflow: hidden;
+
+  .info {
+    color: #333;
+    white-space:nowrap;
+  }
+
+  .warn {
+    color: #730000;
+  }
+
+  .tip {
+    color: #BB9C79;
+  }
+}

src/onlineSelling/components/HouseGrid/unit.scss

@@ -0,0 +1,25 @@
+.unit {
+  .head {
+    margin-bottom: 20px;
+    padding: 0 30px;
+    font-size: 32px;
+    line-height: 1.8em;
+    color: #333;
+    background-color: #F2F2F2;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .item {
+      display: inline-block;
+      margin-right: 32px;
+    }
+    .arrow{
+      width: 16px;
+      transition: transform 0.6s ;
+    }
+  }
+
+  .body {
+    padding: 0 30px 20px 30px;
+  }
+}

src/onlineSelling/components/NamedIcon/index.js

@@ -0,0 +1,12 @@
+import { Text } from "@tarojs/components";
+import './index.scss'
+
+export default function NamedIcon(props) {
+  // const bg = `require('../../assets/${props.name}.png')`
+  const bg = `background: url(../../assets/${props.name}.png); background-size:cover;`
+  const size = props.size || 48
+  const bound = `width: ${size}rpx; height: ${size}rpx;`
+
+  // return <Text><Image src={bg}></Image><Text className="namedicon" style={`${bg} ${bound}`}></Text></Text> 
+  return <Text className="namedicon" style={`${bg} ${bound}`}></Text>
+}

src/onlineSelling/components/NamedIcon/index.scss

@@ -0,0 +1,4 @@
+.namedicon {
+  display: inline-block;
+  vertical-align: middle;
+}

src/onlineSelling/components/ScrollMessage/index.js

@@ -0,0 +1,73 @@
+import Taro, { Component, render } from '@tarojs/taro'
+import { Swiper, View, SwiperItem } from "@tarojs/components";
+import NamedIcon from '../NamedIcon';
+import { formateLeftTime } from '@/utils/tools'
+import dayjs from 'dayjs'
+import './index.scss'
+import TimeTicker from '../TimeTicker';
+
+export default class ScrollMessage extends Component {
+  formateTM = (dt) => {
+    const now = dayjs(new Date);
+    const { preselectionStartTime, preselectionEndTime } = this.props.summary || {}
+    const start = dayjs(preselectionStartTime)
+    const end = dayjs(preselectionEndTime)
+
+    let tip = ''
+    let useTK = true
+
+    if (now.isBefore(start)) {
+      tip = '距离预选开始还有'
+    } else if (now.isBefore(end)) {
+      tip = '距离预选结束还有'
+    } else {
+      tip = '预选已结束，请关注下轮预选'
+      useTK = false
+    }
+
+    return `${tip} ${useTK ? formateLeftTime(dt, 'min') : ''}`
+  }
+
+  computeDate = () => {
+    const now = dayjs(new Date);
+    const { preselectionStartTime, preselectionEndTime } = this.props.summary || {}
+    const start = dayjs(preselectionStartTime)
+    const end = dayjs(preselectionEndTime)
+
+    if (now.isBefore(start)) {
+      return [now, start]
+    } else if (now.isBefore(end)) {
+      return [now, end]
+    } else {
+      return [now, now]
+    }
+  }
+
+  render() {
+    const [start, end] = this.computeDate()
+    const { salesNumber, preselectionNumber, heatNumber } = this.props.summary || {}
+    const personNum = heatNumber + preselectionNumber + 0
+  
+    const notice = `当前 ${salesNumber} 套房源已有 ${personNum} 人成功预选`
+
+    return (
+      <View className="scrollmessage">
+        <View className="head">
+          <Image style="width:44rpx;height:44rpx;margin-top: 10rpx;" src={require('../../assets/notice.png')}></Image>
+          {/* <NamedIcon name="notice" size={44} /> */}
+        </View>
+        <View className="body">
+          <Swiper vertical autoplay>
+            <SwiperItem>
+              <TimeTicker startTime={start} endTime={end} translate={this.formateTM} />
+            </SwiperItem>
+            {personNum > 0 && <SwiperItem>
+              <View>{notice}</View>
+            </SwiperItem>}
+          </Swiper>
+        </View>
+      </View>
+    )
+  }
+}
+

src/onlineSelling/components/ScrollMessage/index.scss

@@ -0,0 +1,12 @@
+.scrollmessage {
+  display: flex;
+
+  .head {
+    flex: none;
+    width: 60px;
+  }
+
+  .body {
+    flex: auto;
+  }
+}

src/onlineSelling/components/ShareButtons/ShareBtn.js

@@ -0,0 +1,21 @@
+import { View, Button } from "@tarojs/components";
+import './index.scss'
+import NamedIcon from "../NamedIcon";
+
+export default function ShareBtn(props) {
+
+  const handleClick = props.onClick || (() => {})
+
+  return (
+    <Button className="sharebtn" onClick={handleClick} openType={props.openType}>
+      <View>
+        {/* <NamedIcon name={props.name} size={props.size || 56} /> */}
+        {props.name=='share-friends'&&<Image style="width:56rpx;height:56rpx" src={require('../../assets/share-friends.png')}></Image>}
+        {props.name=='sharing-circleoffriends'&&<Image style="width:56rpx;height:56rpx" src={require('../../assets/sharing-circleoffriends.png')}></Image>}
+      </View>
+      <View>
+        <Text>{props.tips}</Text>
+      </View>
+    </Button>
+  )
+}

src/onlineSelling/components/ShareButtons/index.js

@@ -0,0 +1,27 @@
+
+import { View } from '@tarojs/components'
+import './index.scss'
+import ShareBtn from './ShareBtn'
+
+export default function ShareButtons(props) {
+
+  const tips = !props.circleBtn ? '后台暂未配置海报图，请选择分享给好友或群' : ''
+
+  return (
+    <View className="sharebuttons">
+      <View className="btns">
+        <View className="btn">
+          <ShareBtn name="share-friends" tips="发送朋友或群" openType="share" onClick={props.onShareFrineds} />
+        </View>
+        {props.circleBtn &&
+        (
+          <View className="btn">
+            <ShareBtn name="sharing-circleoffriends" tips="分享至朋友圈" onClick={props.onSharingCircleOfFriends} />
+          </View>
+        )
+        }
+      </View>
+      <View className="tips">{tips}</View>
+    </View>
+  )
+}

src/onlineSelling/components/ShareButtons/index.scss

@@ -0,0 +1,32 @@
+.sharebuttons {
+  padding-top: 36rpx;
+  text-align: center;
+
+  .btns {
+    display: flex;
+    justify-content: center;
+
+    .btn {
+      flex: none;
+      & + .btn {
+        margin-left: 30rpx;
+      }
+    }
+  }
+
+  .tips {
+    padding-bottom: 20rpx;
+    height: 44rpx;
+    font-size: 24rpx;
+    line-height: 1em;
+    color: #BCBCBC;
+  }
+}
+
+.sharebtn {
+  font-size: 26rpx;
+  line-height: 56rpx;
+  color: #666;
+  text-align: center;
+  background: transparent;
+}

src/onlineSelling/components/TimeTicker/index.js

@@ -0,0 +1,47 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Text } from '@tarojs/components'
+import dayjs from 'dayjs'
+import { formateLeftTime } from '@/utils/tools'
+import './index.scss'
+
+export default class TimeTicker extends Component {
+
+    state = {
+      tips: '',
+    }
+
+    tk = undefined
+
+    componentWillMount() {
+      this.tk = setInterval(() => {
+        const now = dayjs()
+        const start = dayjs(this.props.startTime || now)
+        const end = dayjs(this.props.endTime || now)
+
+        const tm = end.diff(start)
+        const translate = this.props.translate || (x => formateLeftTime(x, 'min'))
+
+        if (tm >= 0) {
+          this.setState({
+            tips: translate(tm)
+          })
+        }
+
+      }, this.props.interval || 1000)
+    }
+
+    componentWillUnmount() {
+      if (this.tk) {
+        clearInterval(this.tk)
+      }
+    }
+
+    render() {
+        return (
+            <View className="timeticker">
+                <Text></Text>
+                <Text>{tips}</Text>
+            </View>
+        )
+    }
+}

src/onlineSelling/components/TimeTicker/index.scss

@@ -0,0 +1,4 @@
+.timeticker {
+  // color: #999;
+  // background:rgba(248,248,248,1);
+}

src/onlineSelling/pages/detail/index.js

@@ -0,0 +1,232 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+import AchievePhone from '@/components/achievePhone'
+import AchieveAvatar from '@/components/achieveAvatar'
+import { connect } from '@tarojs/redux'
+import ready from '@/utils/ready'
+import { queryHouseDetail } from '@/services/project'
+import dayjs from 'dayjs'
+import { transferImage } from '@/utils/tools'
+import Blank from '../../components/Blank'
+import * as noticeType from '@/constants/common.js'
+
+@connect(
+  ({ user }) => ({ ...user })
+)
+
+export default class Index extends Component {
+  config = {
+    navigationBarTitleText: '房源详情',
+  }
+
+  state = {
+    grantPhoneVisible: false, // 授权电话
+    grantAvatarVisible: false, // 授权头像
+    houseDetail: null,
+    popVisiable: false,
+  }
+
+
+  componentDidShow() {
+
+    ready.queue(() => {
+      // 分享场景需要先授权手机, 再授权头像
+      if (this.toggleGrantPhone()) {
+        this.toggleGrantAvatar()
+      }
+      const id = this.$router.params.id
+      const { userInfo: { person: { personId } } } = this.props
+      const params = {
+        houseId: id,
+        personId,
+      }
+      queryHouseDetail(params).then(res => {
+        this.setState({
+          houseDetail: res || {},
+          buildingImgList: res.buildingImgList || []
+        })
+      })
+
+    })
+  }
+
+
+
+  // 调起授权电话
+  toggleGrantPhone = () => {
+    const { userInfo: { person: { phone, tel } } } = this.props
+    if (!phone && !tel) {
+      this.setState({ grantPhoneVisible: true })
+      return false
+    }
+    console.log('phone:', phone, 'tel:', tel, '!!!!!')
+    console.log(this.props, 'this.propsphone!!!!!')
+
+    return true
+  }
+
+  // 调起授权头像
+  toggleGrantAvatar = () => {
+    const { userInfo: { person: { avatarurl } } } = this.props
+
+    if (!avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1) {
+      this.setState({ grantAvatarVisible: true })
+      return false
+    }
+
+    console.log(avatarurl, "avatarurl")
+    console.log(this.props.userInfo, "this.props")
+    return true
+  }
+
+  chooseBtn(type) {
+    const { houseDetail: { houseId, buildingId } } = this.state
+    Taro.navigateTo({
+      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}`
+    })
+  }
+
+  handlePanoramaClick(panoramaLink) {
+    console.log(panoramaLink, "panoramapanoramapanoramapanoramapanoramapanoramapanoramapanoramapanorama")
+
+    if (!panoramaLink) return;
+
+    Taro.navigateTo({ url: `/pages/project/panorama/index?url=${encodeURIComponent(panoramaLink)}` })
+
+  }
+
+  goToPanorama(panoramaLink) {
+    if (!panoramaLink) return;
+
+    this.navigateTo(`/pages/project/panorama/index?url=${encodeURIComponent(panoramaLink)}`)
+
+  }
+
+  handlePanoramaClick(panoramaLink) {
+    this.goToPanorama(panoramaLink)
+  }
+  navigateTo(url) {
+    Taro.navigateTo({ url: url })
+  }
+  open() {
+    const { houseDetail: { isPreselect } } = this.state
+    if (!isPreselect) {
+      const { userInfo: { miniApp: { tpls } } } = this.props
+
+      const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
+      const that = this
+      wx.requestSubscribeMessage({
+        tmplIds: [tplId],
+        success(res) { },
+        fail(res) { },
+        complete() {
+          that.setState({ popVisiable: true })
+        }
+      })
+    } else {
+      this.setState({ popVisiable: true })
+    }
+
+  }
+
+
+
+  render() {
+    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 (
+      <Block>
+        {
+          grantPhoneVisible &&
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
+        }
+        {
+          grantAvatarVisible &&
+          <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
+        }
+        {popVisiable &&
+          <Block>
+            <View className="mask"> </View>
+            <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>
+          </Block>
+        }
+
+        <View className='detail'>
+          <View className='detail-top'>
+            {buildingImgList.length ?
+              <Image className="cover-img" mode="widthFix" onClick={() => buildingImgList[0].type == '1' ? this.handlePanoramaClick(buildingImgList[0].panoramaLink) : ''} src={transferImage(buildingImgList[0].url)} />
+              : <Blank tips="暂无户型信息"></Blank>
+            }
+          </View>
+          {buildingImgList.length && buildingImgList[0].type == '1' &&
+            <Image className="vr-img" onClick={() => this.handlePanoramaClick(buildingImgList[0].panoramaLink)} src={require('@/assets/vr.png')} />
+          }
+          <ScrollView
+            enableBackToTop
+            className="wrap"
+            scrollY>
+            <View className='detail__main'>
+              <View style="padding: 0 30rpx;">
+                <View className="name">{houseDetail.apartmentName || ''}</View>
+                <View className="btn" onClick={() => this.handleChat(houseDetail.buildingId)}>询问优惠</View>
+                <View className="price">
+                  现价：{houseDetail.price}万
+              </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>
+                <View className="date">
+                  预选时间：{dayjs(houseDetail.preselectionStartTime).format('MM/DD HH:mm:ss')}--{dayjs(houseDetail.preselectionEndTime).format('MM/DD HH:mm:ss')}
+                </View>
+                {/* <View className="date">
+                  认筹时间：2/12 12:23:33--2/13 12:23:34
+              </View> */}
+              </View>
+              <View className="num">
+                已有{houseDetail.realHeat + houseDetail.heat + 0}人预选此房源，快快预选认筹~
+              </View>
+              <View style="padding: 0 30rpx;">
+                {!houseDetail.isPreselect ?
+                  <View className="choose-btn" onClick={() => this.open()}>
+                    预选此房源
+                  </View> : <View className="choose-btn" onClick={() => this.open()}>
+                    取消预选
+                  </View>
+                }
+                <View className="close-btn">
+                  认筹功能未开放
+              </View>
+              </View>
+
+
+            </View>
+          </ScrollView>
+
+
+
+        </View>
+
+      </Block >
+    );
+  }
+}

src/onlineSelling/pages/detail/index.scss

@@ -0,0 +1,201 @@
+@import "@/styles/mixins.scss";
+@import "@/styles/theme.scss";
+.mask{
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background-color: rgba(0,0,0,.34);
+  z-index: 99;
+
+}
+.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;
+  }
+
+}
+.vr-img{
+  position: fixed;
+  top: 452px;
+  left: 327px;
+  width:96px;
+  height:88px;
+}
+.detail {
+  position: relative;
+  width: 100%;
+  font-weight: 300;
+  background-color: #F8F8F8;
+  .detail-top{
+    width:100%;
+    height:600px;
+    position: fixed;
+    top: 0;
+    background-color: #F8F8F8;
+ 
+    
+    .cover-img{
+      width:100%;
+      height:100%;
+      min-height: 600px;
+    }
+    
+    .norecord-img{
+      width:280px;
+      height:220px;
+      margin: 140px auto 4px auto;
+    }
+    .norecord-text{
+     font-size: 28px;
+     color: #999;
+    }
+  }
+ 
+  .wrap {
+    margin-top: 570px;
+    background: transparent;
+    position: relative;
+
+  }
+
+  &__main {
+    background: #fff;
+    border-radius: 40px 40px 0 0;
+    padding: 60px 0;
+   
+    .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;
+      font-weight: 600;
+    }
+    .area{
+      font-size: 34px;
+      color: #666;
+      font-weight: 300;
+      line-height: 50px;
+    }
+    .address{
+      font-size: 30px;
+      color: #666;
+      font-weight: 300;
+      margin-bottom: 10px;
+      display: flex;
+      align-items: center;
+      margin: 0;
+      line-height: 60px;
+      .location-icon{
+        width:40px;
+        height:40px;
+        margin-left: -6px;
+        margin-right: 6px;
+      }
+    }
+    .date{
+      font-size: 22px;
+      color: #999;
+      line-height: 1.7;
+    }
+    .num{
+      font-size: 26px;
+      color: #999;
+      background-color: #F8F8F8;
+      line-height: 54px;
+      padding: 0 30px;
+      margin-top: 10px;
+      font-weight: 300;
+      margin-bottom: 78px;
+   
+    }
+    .choose-btn{
+      color: #fff;
+      font-size: 36px;
+      background-color: $primary-color;
+      line-height: 94px;
+      border-radius:10px;
+      text-align: center; 
+    }
+    .close-btn{
+      color: $primary-color;
+      font-size: 36px;
+      background-color: #F8F8F8;
+      line-height: 94px;
+      border-radius:10px;
+      text-align: center;
+      margin: 40px 0;
+    }
+  }
+}
+
+
+.result{
+  background-color: #fff;
+  height: 100vh;
+  width: 100vw;
+  position: relative;
+  text-align: center;
+  padding-top: 20vh;
+  font-weight: 300;
+  .result-img{
+    width:168px;
+    height:168px;
+  }
+  .status{
+    font-size: 36px;
+    color: #333;
+    line-height: 1.8;
+  }
+  .tip{
+    font-size: 34px;
+    color: #999;
+    padding: 0 100px;
+  }
+  .contact{
+    position: absolute;
+    bottom: 8vh;
+    font-size: 36px;
+    color: #3DE344;
+    left: 50%;
+    margin-left: -108px;
+  }
+}

src/onlineSelling/pages/detail/resultPage.js

@@ -0,0 +1,91 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+import { connect } from '@tarojs/redux'
+import ready from '@/utils/ready'
+import { addPreselection, cancelPreselection } from '@/services/project'
+
+@connect(
+  ({ user }) => ({ ...user })
+)
+
+export default class Index extends Component {
+  config = {
+    navigationBarTitleText: '',
+  }
+
+  state = {
+    status: 2, // 1为成功 2为处理中 3为失败
+    statusText: '',// 文案
+    statusText2: null// 文案2
+  }
+
+  componentWillMount() {
+
+    ready.queue(() => {
+      const { type, id } = this.$router.params
+      const { userInfo: { person: { personId, orgId } } } = this.props
+      const params = {
+        houseId: id,
+        personId,
+        orgId,
+      }
+      const params2 = {
+        houseId: id,
+        personId,
+      }
+      if (type == 'add') {
+        Taro.setNavigationBarTitle({ title: '预选结果' })
+        addPreselection(params).then(res => {
+          this.setState({
+            status: 1,
+            statusText: '您已成功预选此房源',
+            statusText2: '以后可以到个人中心查看选房记录',
+          })
+        }).catch(err => {
+          this.setState({
+            status: 3,
+            statusText: err.message
+          })
+        })
+      } else {
+        Taro.setNavigationBarTitle({ title: '取消预选' })
+        cancelPreselection( params2).then(res => {
+          this.setState({
+            status: 1,
+            statusText: '您已成功取消预选此房源'
+          })
+        }).catch(err => {
+          this.setState({
+            status: 3,
+            statusText: err.message
+          })
+        })
+      }
+    })
+  }
+  handleChat() {
+    const { buildingId } = this.$router.params
+
+    Taro.navigateTo({
+      url: `/pages/card/list/index?buildingId=${buildingId}`
+    })
+  }
+  render() {
+    const { status, statusText2 } = this.state
+    const { type } = this.$router.params
+    return (
+      <View className="result">
+        {status == 1 && <Image className="result-img" src={require('../../assets/success2.png')}></Image>}
+        {status == 2 && <Image className="result-img" src={require('../../assets/going.png')}></Image>}
+        {status == 3 && <Image className="result-img" src={require('../../assets/fail2.png')}></Image>}
+        {type == 'add' && <View className="status">{status == 1 ? '预选成功' : status == 2 ? '正在处理' : '预选失败'}</View>}
+        {type != 'add' && <View className="status">{status == 1 ? '取消成功' : status == 2 ? '正在处理' : '取消失败'}</View>}
+        <View className="tip" style="margin-bottom:10rpx">{statusText}</View>
+        {statusText2 && <View className="tip">{statusText2}</View>}
+
+        <View className="contact" onClick={() => this.handleChat()}>联系置业顾问</View>
+      </View>
+
+    );
+  }
+}

src/onlineSelling/pages/help/index.js

@@ -0,0 +1,160 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View } from '@tarojs/components'
+import './index.scss'
+import HotBlock from '../../components/HotBlock'
+
+export default class Help extends Component {
+  config = {
+    navigationBarTitleText: '帮助说明'
+  }
+  handleChat() {
+    const { buildingId } = this.$router.params
+    if (buildingId) {
+      Taro.navigateTo({
+        url: `/pages/card/list/index?buildingId=${buildingId}`
+      })
+    } else {
+      Taro.showToast({ title: '未获取到buildingId', icon: 'none', duration: 2000 })
+    }
+
+  }
+  render() {
+    const hots = [
+      {
+        label: '(0)',
+        value: 0,
+      },
+      {
+        label: '(1)',
+        value: 1,
+      },
+      {
+        label: '(2)',
+        value: 2,
+      },
+      {
+        label: '(3)',
+        value: 3,
+      },
+      {
+        label: '(4)',
+        value: 4,
+      },
+      {
+        label: '(5)',
+        value: 5,
+      },
+      {
+        label: '(6~10)',
+        value: 8,
+      },
+      {
+        label: '(11~20)',
+        value: 15,
+      },
+      {
+        label: '(21~30)',
+        value: 25,
+      },
+      {
+        label: '(31~40)',
+        value: 35,
+      },
+      {
+        label: '(41~50)',
+        value: 45,
+      },
+      {
+        label: '(51~100)',
+        value: 80,
+      },
+      {
+        label: '(101~200)',
+        value: 150,
+      },
+      {
+        label: '(200以上)',
+        value: 201,
+      },
+    ]
+
+    return (
+      <View className="article">
+        <View className="section">
+          <View className="title">1.图例解释：</View>
+          <View>
+            <View className="cell flex">
+              <View className="head item-0">1号楼</View>
+              <View className="body item-1">楼栋/幢</View>
+            </View>
+            <View className="cell flex">
+              <View className="head item-0">2 单元</View>
+              <View className="body item-1">单元</View>
+            </View>
+            <View className="cell flex">
+              <View className="head item-0">3 楼</View>
+              <View className="body item-1">楼层</View>
+            </View>
+            <View className="cell flex">
+              <View className="head item-0">
+                <View>301 (1人)</View>
+                <View>234万</View>
+                <View>A户型</View>
+              </View>
+              <View className="body item-1">
+                <View>房号（预选人数）</View>
+                <View>价格</View>
+                <View>户型名</View>
+              </View>
+            </View>
+          </View>
+        </View>
+        <View className="section">
+          <View className="title">2.预选人数（热度）：</View>
+          <View>每有一位客户预选此房源，热度自动增加1，热度越大说明想购买此房源的用户越多，认筹摇号购买难度越大</View>
+        </View>
+        <View className="section">
+          <View className="title">3.热度指标值与颜色关系：</View>
+          <View className="flex" style="flex-wrap: wrap">
+            {hots.map(b => (<View className="item-0 hot-box" key={b.value}><HotBlock number={b.value}>{b.label}</HotBlock></View>))}
+          </View>
+        </View>
+        <View className="section">
+          <View className="title">4.为何需要登录：</View>
+          <View>预选房源和认筹房源按相关法律法规需要实名认证，通过手机号授权登录可以实现快捷认证。登录预选认筹后可以登录账号查看预选记录和认筹记录而不会遗失数据。</View>
+        </View>
+        <View className="section">
+          <View className="title">5.楼盘、房源问题：</View>
+          <View>和楼盘、房源相关问题可以联系置业顾问->在线置业顾问</View>
+        </View>
+        <View className="section">
+          <View className="title">6.如何按面积或价格筛选房源：</View>
+          <View>房源页面点击筛选按钮，选择一个户型或者价格即可查看按户型或价格筛选后的房源。</View>
+        </View>
+        <View className="section">
+          <View className="title">7.如何把在线选房分享我的亲朋好友：</View>
+          <View>房源页面点击分享按钮，选择直接分享发送链接给好友或群，选择生成海报保存图片，相册中找海报图片发送给好友或者朋友圈即可。</View>
+        </View>
+        <View className="section">
+          <View className="title">8.为什么房源详情中预选/取消按钮或认筹/取消按钮操作失败：</View>
+          <View>
+            <View>可能原因：</View>
+            <View>1）没有到预选或认筹时间，请关注通知或联系置业顾问</View>
+            <View>2）已过预选或认筹时间，请关注通知 或 联系置业顾问</View>
+            <View>3）其他原因，请 联系置业顾问</View>
+          </View>
+        </View>
+        <View className="section">
+          <View className="title">9.为什么之前看到的房源现在找不到了：</View>
+          <View>可能由于线上线下销售工作同步不及时原因，临时取消了此房源的线上预选和销售工作，有疑问请  联系置业顾问</View>
+        </View>
+        <View className="section">
+          <View className="title">10.如何查看我的选房记录：</View>
+          <View>房源页面点击下方选房记录按钮进入个人选房记录查看。或直接进入个人中心查看选房记录。</View>
+        </View>
+        <Image onClick={() => this.handleChat()} style="width: 110rpx;height: 110rpx;position: fixed;bottom: 40px;right: 20rpx;" src={require('../../assets/consultant.png')}></Image>
+      </View>
+    )
+  }
+
+}

src/onlineSelling/pages/help/index.scss

@@ -0,0 +1,45 @@
+.article {
+  padding: 30rpx;
+  font-size: 28rpx;
+  line-height: 1.6em;
+  color: #666;
+
+  .section {
+    margin-bottom: 40rpx;
+
+    .title {
+      color: #333;
+    }
+  }
+
+
+  .flex {
+    display: flex;
+
+    .item-0 {
+      flex: none;
+    }
+
+    .item-1 {
+      flex: auto;
+    }
+  }
+
+  .cell {
+    padding: 28rpx 0;
+    box-shadow:0px 1rpx 0px 0px rgba(0, 0, 0, 0.08);
+
+    .head {
+      width: 180rpx;
+    }
+  }
+
+  .hot-box {
+    width: 23%;
+    height: 60rpx;
+    line-height: 60rpx;
+    text-align: center;
+    
+    margin: 2% 2% 0 0;
+  }
+}

src/onlineSelling/pages/houseList/index.js

@@ -0,0 +1,652 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, ScrollView, Button, Swiper, Block } from '@tarojs/components'
+import HouseGrid from '../../components/HouseGrid'
+import NamedIcon from '../../components/NamedIcon'
+import ScrollMessage from '../../components/ScrollMessage'
+import Blank from '../../components/Blank'
+import ActSheet from '../../components/ActSheet'
+import ShareButtons from '../../components/ShareButtons'
+import GrantProfile from '../../components/GrantProfile'
+// import Poster from './poster'
+import Poster from '@/components/Poster'
+import { connect } from '@tarojs/redux'
+import ready from '@/utils/ready'
+import { queryHouseList, queryNoticeInfo, queryApartmentType, querySalesInfo } from '@/services/project'
+import { getQrCodeParams } from '@/utils/qrcode'
+import { withDetail } from '@/utils/page'
+import { share as shareSavePoint } from '@/utils/shareSavePoint'
+import { ROLE_CODE } from '@/constants/user'
+import { report as reportCustomer } from '@/utils/customer'
+import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
+import { getCanvasConfig, transferImage } from '@/utils/tools'
+import { getCardDetail } from '@/services/card'
+import Consultant from '@/components/consultant'
+import './index.scss'
+import { Loading } from '@/components/Loading'
+
+@connect(s => s.user)
+@withDetail({
+  track: {
+    event: 'house_list',
+    eventType: 'house',
+    propertyName: '查看房源列表',
+    data: '{}',
+  }
+})
+export default class HouseList extends Component {
+  config = {
+    navigationBarTitleText: '房源',
+  }
+  state = {
+    showShareMenu: false,
+    showPoster: false,
+    tipsList: [],
+    houseList: [{}],
+    id: null,
+    qrcodeParams: {},
+    current: 0,
+    priceCurrent: -1,
+    apartmentList: [],
+    conditionVisible: false,
+    startPrice: '',
+    endPrice: '',
+    apartmentId: '',
+    reportedCustomer: false,
+    posterShow: false,
+    posterData: {},
+    buildingId: null,
+    salesBatchDetail: {},
+    posterConfig: [],
+    consultData: {}, // 分享的置业顾问信息
+    consultShow: false,  // 置业顾问悬浮框显示隐藏
+    noRecord: false,
+    loading: true,
+  }
+
+
+  componentDidShow() {
+
+    ready.queue(() => {
+      this.setState({ showShareMenu: false })
+      this.initPageData()
+    })
+  }
+  
+
+  componentWillReceiveProps() {
+    this.reportClientFn()
+  }
+
+  transTPLs2Configs(tpls, params) {
+    return tpls.map((tpl) => {
+      const conf = getCanvasConfig(tpl.configs, params)
+      return { ...conf }
+    })
+  }
+
+  // 报备客户
+  reportClientFn() {
+
+    const { qrcodeParams } = this.state
+    const consultant = this.$router.params.consultant || qrcodeParams.consultant || ""
+    const { userInfo: { person } } = this.props
+
+    if (!this.state.reportedCustomer) {
+      reportCustomer(person, consultant).then(() => {
+        this.setState({ reportedCustomer: true })
+      })
+    }
+  }
+  initPageData() {
+
+    Taro.showToast({
+      title: '加载中...',
+      icon: 'loading'
+    })
+    const id = this.$router.params.id
+
+    if (this.$router.params.scene) {
+      getQrCodeParams(this.$router.params.scene).then((res) => {
+        this.setState({ id: res.id, qrcodeParams: res }, () => {
+          this.getInfo(res.id)
+          this.anotherInfo(res.id)
+        })
+      })
+    } else {
+      this.getInfo(id)
+      this.anotherInfo(id)
+    }
+    this._$_dataReady()
+  }
+
+  getInfo(id) {
+    const { startPrice, endPrice, apartmentId } = this.state
+    const params = {
+      salesBatchId: id,
+      startPrice,
+      endPrice,
+      apartmentId,
+      pageNum: 1,
+      pageSize: 999,
+    }
+    queryHouseList(params).then(res => {
+      this.setState({
+        houseList: this.groupHouseList(res) || [],
+        loading: false,
+      }, () => {
+        Taro.hideToast()
+      })
+
+
+    }).catch(err => {
+      Taro.hideToast()
+      Taro.showToast({ title: '未找到房源批次', icon: 'none', duration: 2000 })
+    })
+  }
+  anotherInfo(id) {
+    queryNoticeInfo(id).then(res => {
+      this.setState({
+        tipsList: res || {}
+      })
+    })
+    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
+        })
+      })
+    }
+    querySalesInfo(id).then(res => {
+
+      this.setState({
+        buildingId: res.buildingId,
+        salesBatchDetail: res || {},
+        noRecord: res.status == '1' ? false : true
+      })
+      const { templates = [], posterImg = '' } = (res.posters || [])[0]
+
+      this.setState({
+        posterData: { poster: posterImg },
+      }, () => {
+        this.getPosterData().then(posterData => {
+          const posterConfig = this.transTPLs2Configs(templates, posterData)
+          this.setState({ posterConfig, posterData })
+        })
+      })
+    })
+    queryApartmentType({ salesBatchId: id }).then(res => {
+      this.setState({
+        apartmentList: res || []
+      })
+    })
+  }
+  groupHouseList(houseList = []) {
+    // 先按照楼层分组
+    const floorList = houseList.reduce((list, room) => {
+      let found = false
+
+      list.forEach((floor) => {
+        if (floor.floorId === room.floorId) {
+          found = true
+          floor.roomList.push(room)
+        }
+      })
+
+      if (!found) {
+        list.push({ ...room, roomList: [room] })
+      }
+
+      return list
+    }, [])
+
+    // 再按照单元分组
+    const unitList = floorList.reduce((list, floor) => {
+      let found = false
+      list.forEach((unit) => {
+        if (unit.unitId === floor.unitId) {
+          found = true
+          unit.floorList.push(floor)
+        }
+      })
+
+      if (!found) {
+        list.push({ ...floor, floorList: [floor] })
+      }
+
+      return list
+    }, [])
+
+    // 最后按照楼栋分组
+    return unitList.reduce((list, unit) => {
+      let found = false
+      list.forEach((block) => {
+        if (block.blockId === unit.blockId) {
+          found = true
+          block.unitList.push(unit)
+        }
+      })
+
+      if (!found) {
+        list.push({ ...unit, unitList: [unit] })
+      }
+
+      return list
+    }, [])
+  }
+
+  goto = url => Taro.navigateTo({ url })
+
+  handleExplainClick = e => {
+    const buildingId = this.$router.params.buildingId || this.state.buildingId
+    this.goto(`/onlineSelling/pages/help/index?buildingId=${buildingId}`)
+  }
+
+  handleSearchClick = e => {
+    // Taro.setNavigationBarTitle({ title: '房源筛选' })
+    this.setState({
+      conditionVisible: true
+    })
+    // const id = this.$router.params.id || this.state.id
+    // this.goto(`/onlineSelling/pages/screenHouse/index?id=${id}`)
+  }
+
+  handleShareBtn = e => {
+    this.setState({ showShareMenu: true })
+  }
+
+  handleRecordBtn = e => {
+    this.goto('/onlineSelling/pages/records/index')
+  }
+  currentPageAndParams() {
+    const id = this.$router.params.id || this.state.id
+    const {
+      userInfo: { person: { personId, personType, userId } }
+    } = this.props
+
+    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
+
+    const queryParams = [
+      `id=${id}`,
+      'from=house_share',
+      `recommender=${personId}`,
+      `consultant=${consultant}`,
+      `consultantId=${consultantId}`,
+    ]
+
+    return [
+      'onlineSelling/pages/houseList/index',
+      queryParams.join('&'),
+    ]
+  }
+  // handleShareFrineds = e => {
+  onShareAppMessage = () => {
+    this.setState({ showShareMenu: false })
+    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 { salesBatchDetail: { shareContents } } = this.state
+    const shareData = shareContents && shareContents.length ? shareContents[0] : { shareContentTitle: '房源列表', shareContentImg: null };
+    // 分享埋点
+    shareSavePoint({
+      event: 'share',
+      eventType: 'house',
+      propertyName: '房源列表分享',
+      consultantId: consultantId,
+      sharePersonId: personId,
+      targetId: id,
+      data: '{}'
+    }, 'houseApp')
+
+    const [page, params] = this.currentPageAndParams()
+
+    console.log(`/${page}?${params}`, "`/${page}?${params}`")
+    return {
+      title: shareData.shareContentTitle,//分享标题
+      path: `/${page}?${params}`,//分享地址
+      imageUrl: shareData.shareContentImg
+    }
+  }
+
+  // 开始生成海报
+  togglePosterStatus = (flag) => {
+    if (flag) {
+      this.getPosterData().then(posterData => {
+        this.setState({
+          showPoster: !!flag,
+          posterData,
+          showShareMenu: false
+        })
+        const id = this.$router.params.id || this.state.id
+        shareSavePoint({
+          event: 'poster',
+          eventType: 'house',
+          propertyName: '生成房源列表海报',
+          targetId: id,
+          data: '{}'
+        }, 'housePoster')
+      })
+
+
+    } else {
+      this.setState({
+        showPoster: !!flag,
+        showShareMenu: false
+      })
+    }
+
+
+  }
+  getPosterData = () => {
+    return new Promise(resolve => {
+      const { posterData } = this.state
+      if (posterData.qrcode) {
+        resolve(posterData)
+        return
+      }
+
+      const [page, scene] = this.currentPageAndParams()
+      const payload = { page, scene, showToast: false }
+
+      getMiniQrcode(payload).then(qrcode => {
+        const { posterData = {} } = this.state
+        let data = {
+          qrcode,//小程序二维码
+          ...posterData,
+        }
+        resolve(data)
+      })
+    })
+  }
+
+
+
+  handleRoomClick = room => {
+    this.goto(`/onlineSelling/pages/detail/index?id=${room.houseId}`)
+  }
+
+  renderBar() {
+    const { tipsList } = this.state
+
+    return (
+      <View className="topbar">
+        <View className="body">
+          <ScrollMessage summary={tipsList} />
+        </View>
+        <View className="action">
+          <View onClick={this.handleExplainClick}>
+            {/* <NamedIcon name="explain" size={50} /> */}
+            <Image style="width:50rpx;height:50rpx" src={transferImage(require('../../assets/explain.png'))}></Image>
+          </View>
+          <View onClick={this.handleSearchClick}>
+            <Image style="width:50rpx;height:50rpx" src={transferImage(require('../../assets/screen.png'))}></Image>
+            {/* <NamedIcon name="screen" size={50} /> */}
+          </View>
+        </View>
+      </View>
+    )
+  }
+
+  renderHouses() {
+    const { houseList } = this.state
+
+    return (
+      <ScrollView className="container" scrollY scrollWithAnimation>
+        {
+          houseList.map((item) => {
+            return <HouseGrid key={item.unitId} dataset={item} onRoomClick={this.handleRoomClick} />
+          })
+        }
+      </ScrollView>
+    )
+  }
+
+  renderBlank() {
+    return (
+      <View className="container"><Blank tips="暂无可选房源" /></View>
+    )
+  }
+
+  renderBottom() {
+    return (
+      <View className="bottombar">
+        <Button className="btn record" onClick={this.handleRecordBtn}>
+          {/* <NamedIcon name="record" size="42" /> */}
+          <Image style="width:42rpx;height:42rpx" src={transferImage(require('../../assets/record.png'))}></Image>
+          <Text className="txt">选房记录</Text>
+        </Button>
+        <Button className="btn share" onClick={this.handleShareBtn}>
+          {/* <NamedIcon name="share" size="42" /> */}
+          <Image style="width:42rpx;height:42rpx" src={transferImage(require('../../assets/share.png'))}></Image>
+          <Text className="txt">分享</Text>
+        </Button>
+      </View>
+    )
+  }
+
+  handleCondition(value) {
+    this.setState({
+      current: value,
+    })
+  }
+  handlePriceItem(item) {
+    this.setState({
+      priceCurrent: item.value,
+      startPrice: item.startPrice,
+      endPrice: item.endPrice,
+      apartmentId: '',
+      conditionVisible: false
+    }, () => {
+      const id = this.$router.params.id || this.state.id
+      this.getInfo(id)
+    })
+  }
+  handleInput(e) {
+    this.setState({ startPrice: e.detail.value })
+  }
+  handleInput2(e) {
+    this.setState({ endPrice: e.detail.value })
+  }
+  sureFilter() {
+    this.setState({
+      conditionVisible: false,
+      apartmentId: ''
+    }, () => {
+      // Taro.setNavigationBarTitle({ title: '房源' })
+      const id = this.$router.params.id || this.state.id
+      this.getInfo(id)
+    })
+  }
+  renderPrice() {
+    const { priceCurrent, startPrice, endPrice } = this.state
+    const priceList = [
+      { startPrice: null, endPrice: '100', value: 0 },
+      { startPrice: '100', endPrice: '150', value: 1 },
+      { startPrice: '150', endPrice: '200', value: 2 },
+      { startPrice: '200', endPrice: '250', value: 3 },
+      { startPrice: '250', endPrice: '300', value: 4 },
+      { startPrice: '300', endPrice: '400', value: 5 },
+      { startPrice: '400', endPrice: '500', value: 6 },
+      { startPrice: '500', endPrice: '600', value: 7 },
+      { startPrice: '600', endPrice: null, value: 8 },
+    ]
+    return (
+      <View>
+        <View className="price-con">
+          {priceList.map(priceItem => (
+            <View key={priceItem.value} className={priceCurrent == priceItem.value ? 'active-item' : 'price-item'} onClick={() => { this.handlePriceItem(priceItem) }}>
+              {!priceItem.startPrice && <View className="item-con">{priceItem.endPrice}万以下</View>}
+              {priceItem.startPrice && priceItem.endPrice && <View className="item-con">{priceItem.startPrice}万-{priceItem.endPrice}万</View>}
+              {!priceItem.endPrice && <View className="item-con">{priceItem.startPrice}万以上</View>}
+            </View>
+          ))}
+        </View>
+        <View style="color:#666;font-size:28rpx;margin-left:40rpx">
+          填写价格（万元）
+        </View>
+        <View className="search">
+          <Input
+            type="number"
+            placeholder="最低价"
+            class="search-input"
+            placeholder-style="color:#dcdcdc;font-size:28rpx"
+            maxlength="6"
+            value={startPrice}
+            onInput={this.handleInput}
+          />
+          <Text style="margin:0 8rpx;color:#999;font-size:28rpx">-</Text>
+          <Input
+            type="number"
+            placeholder="最高价"
+            class="search-input"
+            placeholder-style="color:#dcdcdc;font-size:28rpx"
+            maxlength="6"
+            value={endPrice}
+            onInput={this.handleInput2}
+          />
+          <View className="sure-btn" onClick={() => this.sureFilter()}>
+            确定
+              </View>
+        </View>
+      </View>
+    )
+  }
+  apartmentFilter(apartmentId) {
+    this.setState({
+      apartmentId,
+      startPrice: '',
+      endPrice: '',
+      conditionVisible: false,
+    }, () => {
+      // Taro.setNavigationBarTitle({ title: '房源' })
+      const id = this.$router.params.id || this.state.id
+      this.getInfo(id)
+    })
+  }
+  renderApartment() {
+    const { apartmentList } = this.state
+    return (
+      <Block>
+        {apartmentList.length ? <View style="padding:40rpx 20rpx">
+          {apartmentList.map((apartmentItem, index) => (
+            <View className='item' key={index + 'apartment'} onClick={() => this.apartmentFilter(apartmentItem.apartmentId)}>
+              <View className='house__img-info'>
+                <Image className='house__img' src={transferImage(apartmentItem.buildingImgList[0].url)} mode="widthFix"></Image>
+              </View>
+              <View className="rest-info">
+                <View className='house-type__name'>{apartmentItem.apartmentName || ''}</View>
+                <View className='construction__area'>
+                  <Text>{apartmentItem.buildingArea ? '建筑面积约' + apartmentItem.buildingArea + 'm²' : '建筑面积待定'}</Text>
+                  {
+                    apartmentItem.insideArea ? <Text>使用面积约{apartmentItem.insideArea}m²</Text> : <Text>使用面积待定</Text>
+                  }
+                </View>
+              </View>
+            </View>
+          ))}
+        </View>
+          : <Blank tips="暂无户型图，请按价格筛选"></Blank>
+        }
+      </Block>
+    )
+  }
+
+  renderCondition() {
+    const { current } = this.state
+    const condition = [{ title: '按价格', value: 0 }, { title: '按户型', value: 1 }]
+    return (
+      <View className="screen-page">
+        <View className="screen-top">
+          筛选房源
+            {condition.map(item => (
+            <View key={item.value} onClick={() => this.handleCondition(item.value)} className={current == item.value ? 'top-item active' : 'top-item'}>
+              {item.title}
+            </View>
+          ))}
+        </View>
+        {current == 0 && this.renderPrice()
+        }
+        {current == 1 && this.renderApartment()}
+
+      </View>
+
+    );
+  }
+  toBuildingDetail() {
+    const buildingId = this.$router.params.buildingId || this.state.buildingId
+    this.goto(`/pages/project/detail/index?id=${buildingId}`)
+  }
+
+  render() {
+    const {
+      consultData,
+      consultShow,
+      showShareMenu,
+      showPoster,
+      houseList,
+      conditionVisible,
+      posterData,
+      posterConfig,
+      noRecord,
+      loading,
+      salesBatchDetail,
+    } = this.state
+
+    if (loading) {
+      return <View style="margin: 80px auto;"><Loading color="#BB9C79" size={100} /></View>
+    }
+
+    const { userInfo: { person } } = this.props
+
+    const showCircleBtn = posterData && posterData.qrcode
+    console.log('==============>', posterData, showPoster, posterConfig)
+    return (
+      <Block>
+        {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>}
+        {!noRecord ?
+          <Block>
+            {!conditionVisible && <Block>
+              <View className="houselist">
+                {this.renderBar()}
+                <View className="building-top">
+                  <View style="color:#333;font-size:28rpx">{salesBatchDetail.buildingName || ''}</View>
+                  <View style="color:#666;font-size:24rpx;" onClick={() => this.toBuildingDetail()}>查看楼盘详情<Text className="right-icon"></Text></View>
+
+                </View>
+                {houseList.length ? this.renderHouses() : this.renderBlank()}
+                {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

@@ -0,0 +1,210 @@
+.houselist {
+  height: 100vh;
+  overflow: hidden;
+
+  .topbar {
+    height: 64px;
+    font-size: 24px;
+    line-height: 64px;
+    display: flex;
+    margin: 24px 0;
+  
+    .body {
+      flex: auto;
+      color: #999;
+      background:rgba(248,248,248,1);
+      padding-left: 30px;
+      font-size: 24px;
+      overflow: hidden;
+    }
+  
+    .action {
+      flex: none;
+      width: 30%;
+      display: flex;
+      justify-content: space-around;
+    }
+  }
+  .building-top{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    padding: 6px 26px 26px 26px;
+    height: 70px;
+  
+    .right-icon{
+      width:17px;
+      height:17px;
+      border-top: 2px solid #999;
+      border-right: 2px solid #999;
+      transform:rotate(45deg);
+      display: inline-block;
+    }
+  }
+  
+  .bottombar {
+    height: 168px;
+    box-shadow:0px 16px 48px 0px rgba(0, 0, 0, 0.12);
+    width: 100%;
+    padding: 0 35px;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+
+    .btn {
+      height: 88px;
+      flex: none;
+      border-radius: 10px;
+      line-height: 88px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .txt {
+        display: inline-block;
+        padding-left: 10px;
+        font-size: 30px;
+        line-height: 88px;
+        text-align: center;
+      }
+    }
+
+    .record {
+      background: #BB9C79;
+      color: #fff;
+      width: 58%;
+    }
+
+    .share {
+      background: #FF7500;
+      color: #fff;
+      width: 32%;
+    }
+  }
+
+  .container {
+    // top + margin + bottom
+    height: calc(100% - 350px);
+  }
+}
+.screen-page{
+  .screen-top{
+    display: flex;
+    align-items: center;
+    height:100px;
+    background:rgba(248,248,248,1);
+    font-size: 34px;
+    color: #666;
+    padding: 0 30px;
+    font-size: 400;
+    .top-item{
+      font-size: 28px;
+      color: #999;
+      padding: 0 18px;
+      border-radius: 32px;
+      line-height: 60px;
+      background-color: #EEEEEE;
+      margin-left: 22px;
+
+    }
+    .active{
+      background-color: #fff;
+      box-shadow:0px 4px 12px 0px rgba(0, 0, 0, 0.08);
+    }
+  }
+  .price-con{
+    padding: 20px;
+    display: flex;
+    flex-wrap: wrap;
+    align-content: center;
+    .price-item{
+      flex: 0 0 33.3%;
+      .item-con{
+        text-align: center;
+        margin: 18px;
+        line-height:60px;
+        background:rgba(248,248,248,1);
+        border-radius:6px;
+        font-size: 28px;
+        color: #999;
+      }
+    }
+    .active-item{
+      flex: 0 0 33.3%;
+      .item-con{
+        text-align: center;
+        margin: 18px;
+        line-height:60px;
+        background-color: #fff;
+        box-shadow:0px 4px 12px 0px rgba(0, 0, 0, 0.08);
+        border-radius:6px;
+        font-size: 28px;
+        color: #999;
+        border:1px solid #bb9c79;
+      }
+    }
+  }
+  .search{
+    padding: 20px 40px;
+    display: flex;
+    align-items: center;
+    .search-input{
+      width:209px;
+      line-height:60px;
+      height:60px;
+      background:rgba(250,250,250,1);
+      border-radius:30px;
+      text-align: center;
+    }
+    .sure-btn{
+      width:120px;
+      line-height:60px;
+      background:rgba(187,156,121,1);
+      border-radius:10px;
+      text-align: center;
+      color: #fff;
+      font-size: 28px;
+      margin-left: 60px;
+    }
+  }
+  .item {
+    position: relative;
+    width: 340px;
+    margin: 2px 7.5px 20px 7.5px;
+    box-shadow: 0 0 16px rgba(0, 0, 0, 0.15);
+    border: 1px solid rgba(232, 232, 232, 1);
+    border-radius: 12px;
+    display: inline-block;
+
+    .house__img-info {
+      position: relative;
+      padding: 30px;
+      border-bottom: 1px solid #eee;
+
+      .house__img {
+        width: 100%;
+        border-radius: 10px;
+        height: 200px !important;
+      }
+    }
+    .rest-info {
+      padding: 10px  20px;
+
+      .house-type__name {
+        font-weight: bold;
+        margin: 10px 0;
+        font-size: 32px;
+        color: #333;
+      }
+      .construction__area {
+        color: rgba(0, 0, 0, 0.54);
+        font-size: 25px;
+        height: 80px;
+        display: flex;
+        flex-direction: column;
+        text-align: left;
+
+      }
+    }
+  }
+}

src/onlineSelling/pages/houseList/poster.js

@@ -0,0 +1,183 @@
+import Taro, { Component } from '@tarojs/taro';
+import { TaroCanvasDrawer } from '@/components/taro-plugin-canvas';
+import './poster.scss'
+/**
+ * 文档参考
+ * http://taro-ext.jd.com/plugin/view/5d23051670a0f46a87c9785b
+ */
+export default class Index extends Component {
+  static options = {
+    addGlobalClass: true,
+  }
+  static defaultProps = {
+    data: {}
+  }
+  state = {
+    // 绘制的图片
+    shareImage: null,
+    canvasStatus: false,
+    configs: null,
+    visible: false,
+    basicConfig: {
+      width: 640,
+      height: 1136,
+      backgroundColor: '#ffffff',
+      debug: false
+    }
+  }
+  componentWillMount() {
+    this.initConfig()
+    Taro.showLoading({
+      title: '生成中...',
+      icon: 'none'
+    })
+  }
+  initConfig() {
+    const { data } = this.props
+    console.log(data,"datadatadatadatadatadatadatadatadatadatadatadatadatadata")
+    const { basicConfig } = this.state
+    // const texts = [
+    //   {
+    //     x: 170,
+    //     y: 720,
+    //     text: data.nickname + ' 邀您参与' || '',
+    //     fontSize: 28,
+    //     color: '#666',
+    //     baseLine: 'middle',
+    //     lineHeight: 48,
+    //     // textAlign: 'left',
+    //     width: 260,
+    //     zIndex: 999
+    //   },
+    // ]
+    const images = [
+      {
+        url: data.poster,
+        width: 640,
+        height: 670,
+        y: 0,
+        x: 0
+      },
+      {
+        url: data.qrcode,
+        width: 160,
+        height: 160,
+        y: 950,
+        x: 450,
+        zIndex: 999
+      },
+    ]
+
+    const blocks = [
+      {
+        x: 0,
+        y: 936,
+        width: 640,
+        height: 200,
+        backgroundColor: 'rgba(248,248,248,1)',
+        zIndex: 1
+      }
+    ]
+    const configs = Object.assign(basicConfig, { images, blocks})
+    this.setState({
+      configs,
+      canvasStatus: true
+    })
+  }
+
+  onCreateSuccess = (result) => {
+    const { tempFilePath, errMsg } = result;
+    Taro.hideLoading();
+    if (errMsg === 'canvasToTempFilePath:ok') {
+      this.setState({
+        shareImage: tempFilePath,
+        canvasStatus: false,
+        configs: null,
+        visible: true
+      });
+    } else {
+      this.setState({
+        canvasStatus: false,
+        configs: null
+      });
+      Taro.showToast({ icon: 'none', title: errMsg || '出现错误' });
+      console.log(errMsg);
+      this.hidePoster()
+    }
+  }
+
+  onPreview(e) {
+    e.stopPropagation()
+    e.preventDefault()
+    Taro.previewImage({
+      current: this.state.shareImage,
+      urls: [this.state.shareImage]
+    })
+  }
+
+  onCreateFail = (error) => {
+    console.log(error);
+  }
+
+  hidePoster(e) {
+    Taro.hideLoading();
+    this.props.toggle(false)
+  }
+
+  // 保存图片至本地
+  saveToAlbum = (e) => {
+    e.stopPropagation()
+    e.preventDefault()
+
+    Taro.authorize({ scope: "scope.writePhotosAlbum" }).then(res => {
+      console.log('auth:', res)
+      Taro.saveImageToPhotosAlbum({
+        filePath: this.state.shareImage,
+      }).then(res => {
+        Taro.showToast({
+          title: '保存图片成功',
+          icon: 'success',
+          duration: 2000,
+        });
+      })
+    }).catch(err => {
+      console.log('err:', err)
+      Taro.showToast({
+        title: '未开启相册权限',
+        icon: 'none'
+      })
+    })
+  }
+
+  render() {
+    return (
+      <Block>
+        {
+          this.state.canvasStatus && (
+            <TaroCanvasDrawer
+              configs={this.state.configs}
+              onCreateSuccess={this.onCreateSuccess}
+              onCreateFail={this.onCreateFail}
+            />
+          )
+        }
+        {
+          this.state.visible && (
+            <View className="poster">
+              <View className="con">
+                <View className="con-head">
+                  <Text>保存后分享图片</Text>
+                  <Text className="iconfont icon-buoumaotubiao20" onClick={this.hidePoster}></Text>
+                </View>
+                <View className="con-body">
+                  <Image className="result-img" mode="aspectFit" lazy-load src={this.state.shareImage} onClick={this.onPreview}></Image>
+                </View>
+                <Button className="save-btn" onClick={this.saveToAlbum}>保存海报</Button>
+              </View>
+            </View>
+          )
+        }
+      </Block>
+    )
+  }
+}

src/onlineSelling/pages/houseList/poster.scss

@@ -0,0 +1,56 @@
+@import "@/styles/theme.scss";
+.poster {
+  position: fixed;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.6);
+  z-index: 999;
+  justify-content: space-around;
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+  animation: fadeBottomIn 1s ease both;
+
+  .con {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    padding: 0 60px;
+    background: white;
+    margin: 0 auto;
+    box-shadow: 0 0 20px rgba(0, 0, 0, 0.2);
+    border-top-left-radius: 20px;
+    border-top-right-radius: 20px;
+
+    &-head {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      padding: 20px 0;
+      font-size: 32px;
+      font-weight: bold;
+
+      .iconfont {
+        font-size: 40px;
+        color: #545454;
+        font-weight: normal;
+      }
+    }
+
+      .result-img {
+        height: 60vh;
+        display: block;
+        margin: 0 auto;
+      }
+  }
+
+  .save-btn {
+    margin: 0 auto;
+    color: white;
+    border: none;
+    font-size: 36px;
+    background: $primary-color;
+    border-radius: 12px;
+    margin: 20px 0;
+  }
+}

src/onlineSelling/pages/live/index.js

@@ -0,0 +1,349 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, ScrollView, Button, Swiper, Block } from '@tarojs/components'
+import ActSheet from '../../components/ActSheet'
+import ShareButtons from '../../components/ShareButtons'
+import GrantProfile from '../../components/GrantProfile'
+import Poster from '@/components/Poster'
+import { connect } from '@tarojs/redux'
+import ready from '@/utils/ready'
+import { queryLiveDetail, addLiveNum } from '@/services/item'
+import { getQrCodeParams } from '@/utils/qrcode'
+import { withDetail } from '@/utils/page'
+import { share as shareSavePoint } from '@/utils/shareSavePoint'
+import { ROLE_CODE } from '@/constants/user'
+import { report as reportCustomer } from '@/utils/customer'
+import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
+import { getCanvasConfig, transferImage } from '@/utils/tools'
+import { getCardDetail } from '@/services/card'
+import Consultant from '@/components/consultant'
+import Blank from '../../components/Blank'
+import './index.scss'
+const bgImg = "https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/images/helpgroup/bg.png"
+
+@connect(s => s.user)
+@withDetail({
+  track: {
+    event: 'detail',
+    eventType: 'activity',
+    targetType: 'live',
+    propertyName: '查看直播详情页',
+    data: '{}',
+  }
+})
+export default class livePage extends Component {
+  config = {
+    navigationBarTitleText: '直播活动详情',
+  }
+  state = {
+    showShareMenu: false,
+    showPoster: false,
+    qrcodeParams: {},
+    reportedCustomer: false,
+    posterShow: false,
+    posterData: {},
+    liveDetail: {},
+    posterConfig: [],
+    consultData: {}, // 分享的置业顾问信息
+    consultShow: false,  // 置业顾问悬浮框显示隐藏
+    noRecord: false,
+  }
+
+
+  componentDidShow() {
+    this.setState({ showShareMenu: false })
+    ready.queue(() => {
+
+      this.initPageData()
+
+    })
+  }
+
+  componentWillReceiveProps() {
+    this.reportClientFn()
+  }
+
+  transTPLs2Configs(tpls, params) {
+    return tpls.map((tpl) => {
+      const conf = getCanvasConfig(tpl.configs, params)
+      return { ...conf }
+    })
+  }
+
+  // 报备客户
+  reportClientFn() {
+
+    const { qrcodeParams } = this.state
+    const consultant = this.$router.params.consultant || qrcodeParams.consultant || ""
+    const { userInfo: { person } } = this.props
+
+    if (!this.state.reportedCustomer) {
+      reportCustomer(person, consultant).then(() => {
+        this.setState({ reportedCustomer: true })
+      })
+    }
+  }
+  initPageData() {
+
+    Taro.showToast({
+      title: '加载中...',
+      icon: 'loading'
+    })
+    const id = this.$router.params.id
+
+    if (this.$router.params.scene) {
+      getQrCodeParams(this.$router.params.scene).then((res) => {
+        this.setState({ id: res.id, qrcodeParams: res }, () => {
+          this.anotherInfo(res.id)
+        })
+      })
+    } else {
+      this.anotherInfo(id)
+    }
+    this._$_dataReady()
+  }
+
+
+  anotherInfo(id) {
+
+    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
+        })
+      })
+    }
+
+    queryLiveDetail(id).then(res => {
+     
+      this.setState({
+        liveDetail: res || {},
+        noRecord: res.status == '1' ? false : true
+      })
+      Taro.hideToast()
+      const { templates = [], posterImg = '' } = (res.posters || [])[0]
+
+      this.setState({
+        posterData: { poster: posterImg },
+      }, () => {
+        this.getPosterData().then(posterData => {
+          const posterConfig = this.transTPLs2Configs(templates, posterData)
+          this.setState({ posterConfig, posterData })
+        })
+      })
+    }).catch(err => {
+      Taro.hideToast()
+    })
+  }
+
+
+  goto = url => Taro.navigateTo({ url })
+
+
+  handleShareBtn = e => {
+    this.setState({ showShareMenu: true })
+  }
+
+  handleLiveBtn = e => {
+    const { liveDetail: { liveAppAppId, liveAppPath } } = this.state
+    if (liveAppAppId && liveAppPath) {
+      const id = this.$router.params.id || this.state.liveDetail.liveActivityId
+      addLiveNum(id).then(res => { })
+
+      Taro.navigateToMiniProgram({
+        appId: liveAppAppId,
+        path: liveAppPath,
+        extraData: {
+          foo: 'bar'
+        },
+        success(res) {
+          console.log(res, "navigateToMiniProgram")
+        }
+      })
+
+    } else {
+      Taro.showToast({ title: '后台未配置跳转链接', icon: 'none', duration: 2000 })
+    }
+
+  }
+  currentPageAndParams() {
+    const id = this.$router.params.id || this.state.liveDetail.liveActivityId
+    const {
+      userInfo: { person: { personId, personType, userId } }
+    } = this.props
+
+    const consultant = personType == ROLE_CODE['CONSULTANT'] ? personId : ""
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
+
+    const queryParams = [
+      `id=${id}`,
+      'from=live_share',
+      `recommender=${personId}`,
+      `consultant=${consultant}`,
+      `consultantId=${consultantId}`,
+    ]
+
+    return [
+      'onlineSelling/pages/live/index',
+      queryParams.join('&'),
+    ]
+  }
+
+  onShareAppMessage = () => {
+    this.setState({ showShareMenu: false })
+    const id = this.$router.params.id || this.state.liveDetail.liveActivityId
+    const { userInfo: { person: { personId, personType, userId } } } = this.props
+    const consultantId = personType == ROLE_CODE['CONSULTANT'] ? userId : ""
+    const { liveDetail: { shareContents } } = this.state
+    const shareData = shareContents && shareContents.length ? shareContents[0] : { shareContentTitle: '房源列表', shareContentImg: null };
+    // 分享埋点
+
+    shareSavePoint({
+      event: 'share',
+      eventType: 'activity',
+      targetType: 'live',
+      propertyName: '直播详情页分享',
+      consultantId: consultantId,
+      sharePersonId: personId,
+      targetId: id,
+      data: '{}',
+    }, 'liveApp')
+
+    const [page, params] = this.currentPageAndParams()
+
+    console.log(`/${page}?${params}`, "`/${page}?${params}`")
+    return {
+      title: shareData.shareContentTitle,//分享标题
+      path: `/${page}?${params}`,//分享地址
+      imageUrl: shareData.shareContentImg
+    }
+  }
+
+  // 开始生成海报
+  togglePosterStatus = (flag) => {
+    if (flag) {
+      this.getPosterData().then(posterData => {
+        this.setState({
+          showPoster: !!flag,
+          posterData,
+          showShareMenu: false
+        })
+        const id = this.$router.params.id || this.state.liveDetail.liveActivityId
+        shareSavePoint({
+          event: 'poster',
+          eventType: 'activity',
+          targetType: 'live',
+          propertyName: '生成直播详情海报',
+          targetId: id,
+          data: '{}'
+        }, 'livePoster')
+      })
+
+
+    } else {
+      this.setState({
+        showPoster: !!flag,
+        showShareMenu: false
+      })
+    }
+  }
+  getPosterData = () => {
+    return new Promise(resolve => {
+      const { posterData } = this.state
+      if (posterData.qrcode) {
+        resolve(posterData)
+        return
+      }
+
+      const [page, scene] = this.currentPageAndParams()
+      const payload = { page, scene, showToast: false }
+
+      getMiniQrcode(payload).then(qrcode => {
+        const { posterData = {} } = this.state
+        let data = {
+          qrcode,//小程序二维码
+          ...posterData,
+        }
+        resolve(data)
+      })
+    })
+  }
+  toBuildingDetail = () => {
+    const { liveDetail: { buildingId } } = this.state
+    this.goto(`/pages/project/detail/index?id=${buildingId}`)
+  }
+
+  renderBottom() {
+    const { liveDetail: { buildingId } } = this.state
+    return (
+      <View className="bottombar">
+        <View className="bt-nav__left">
+          {buildingId &&
+            <Button class='bt-nav__item' onClick={this.toBuildingDetail}>
+              <Image src={transferImage(require('@/assets/news/property.png'))} style="width:42rpx;height:42rpx"></Image>
+              <Text className="text">查看楼盘</Text>
+            </Button>
+          }
+          <Button className='bt-nav__item' onClick={this.handleShareBtn} >
+            <Image src={transferImage(require('@/assets/news/fasong.png'))} className='icon-img'></Image>
+            <Text className="text">分享</Text>
+          </Button>
+        </View>
+        <Button className="btn tolive" onClick={this.handleLiveBtn}>
+          <Image style="width:54rpx;height:40rpx" src={transferImage(require('../../assets/seeding.png'))}></Image>
+          <Text className="txt">观看直播</Text>
+        </Button>
+      </View>
+    )
+  }
+
+
+  render() {
+    const {
+      consultData,
+      consultShow,
+      showShareMenu,
+      showPoster,
+      posterData,
+      posterConfig,
+      liveDetail,
+      noRecord
+    } = this.state
+
+    const { userInfo: { person } } = this.props
+    const showCircleBtn = posterData && posterData.qrcode
+    console.log('==============>', posterData, showPoster, posterConfig)
+    return (
+      <Block>
+        {/* 授权电话与头像 */}
+        <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>}
+        {!noRecord ?
+          <View className="live-page">
+            <Image onClick={this.handleLiveBtn} src={transferImage(liveDetail.detailTypeImg || bgImg)} mode='widthFix' className="bg_img"></Image>
+            {this.renderBottom()}
+          </View>
+          : <Blank tips="当前直播活动已取消或下架" />
+        }
+        {/* 分享按钮 */}
+        <ActSheet show={showShareMenu}>
+          <ShareButtons
+            circleBtn={showCircleBtn}
+            onSharingCircleOfFriends={() => this.togglePosterStatus(true)}
+          />
+        </ActSheet>
+
+      </Block>
+    )
+  }
+}
+

src/onlineSelling/pages/live/index.scss

@@ -0,0 +1,88 @@
+.live-page {
+  padding-bottom: 164px;
+  .bg_img{
+    width: 100vw;
+    min-height: 100vh;
+    height: auto;
+  }
+  
+  .bottombar {
+    height: 168px;
+    box-shadow:0px 16px 48px 0px rgba(0, 0, 0, 0.12);
+    width: 100%;
+    padding: 0 35px;
+    overflow: hidden;
+    display: flex;
+    align-items: center;
+    position: fixed;
+    bottom: 0;
+    background-color: #fff;
+
+    .btn {
+      height: 88px;
+      flex: none;
+      border-radius: 10px;
+      line-height: 88px;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+
+      .txt {
+        display: inline-block;
+        padding-left: 14px;
+        font-size: 30px;
+        line-height: 88px;
+        text-align: center;
+        font-weight: 300;
+
+      }
+    }
+    .bt-nav {
+    
+      &__item {
+        margin: 0;
+        padding: 0;
+        line-height: 1;
+        width: 50%;
+        box-sizing: border-box;
+        background: transparent;
+        border-radius: none;
+        height: 80px;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        .icon-img{
+          width: 50px;
+          height: 50px;
+        }
+    
+        .text {
+          margin-top: 10px;
+          text-align: center;
+          font-size: 24px;
+          color: #a1a1a1;
+        }
+      }
+    
+      &__left {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+        padding: 20px 0;
+      }
+      
+    }
+
+    .tolive {
+      background: #BB9C79;
+      color: #fff;
+      width: 66%;
+      margin-left: 2%;
+    }
+
+  }
+}
+  
+ 

src/onlineSelling/pages/records/index.js

@@ -0,0 +1,75 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, ScrollView, Block } from '@tarojs/components'
+import HouseCard from '../../components/HouseCard'
+import { queryPreselectionRecord } from '@/services/project'
+import { connect } from '@tarojs/redux'
+import ready from '@/utils/ready'
+import Blank from '../../components/Blank'
+import './index.scss'
+
+@connect(
+  ({ user }) => ({ ...user })
+)
+
+export default class Records extends Component {
+  config = {
+    navigationBarTitleText: '选房记录'
+  }
+
+  state = {
+    recordList: []
+  }
+  componentDidShow() {
+    ready.queue(() => {
+
+      const { userInfo: { person: { personId } } } = this.props
+      const params = {
+        personId,
+        pageNum: 1,
+        pageSize: 999,
+      }
+      queryPreselectionRecord(params).then(res => {
+        const list = res.records
+        this.setState({
+          recordList: list.filter(item => item.status == '1') || []
+        })
+      })
+    })
+  }
+  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() {
+    const { recordList } = this.state
+
+    return (
+      <View className="records" >
+
+        {
+          !recordList.length ? <Blank tips="暂无预选记录" /> :
+            <ScrollView scrollY>
+              {
+                recordList.map((item) => {
+                  return (
+                    <Block>
+                      {item.status == '1' && <View className="carditem" key={item.preselectionRecordId} onClick={() => this.toHouseDetail(item)}>
+                        <HouseCard summary={item} />
+                      </View>}
+                    </Block>
+                  )
+                })
+              }
+            </ScrollView >
+        }
+
+      </View >
+    )
+  }
+}

src/onlineSelling/pages/records/index.scss

@@ -0,0 +1,9 @@
+.records {
+  padding: 10px 0;
+
+  .carditem {
+    & + .carditem {
+      margin-top: 40px;
+    }
+  }
+}

src/onlineSelling/pages/screenHouse/index.js

@@ -0,0 +1,152 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+import { connect } from '@tarojs/redux'
+import ready from '@/utils/ready'
+import { queryApartmentType } from '@/services/project'
+
+@connect(
+  ({ user }) => ({ ...user })
+)
+
+export default class Index extends Component {
+  config = {
+    navigationBarTitleText: '筛选房源',
+  }
+
+  state = {
+    current: 0,
+    priceCurrent: 0,
+    startPrice: '100',
+    endPrice: null,
+    apartmentList: [
+      // { apartmentName: 'A 户型', buildingArea: '149', area2: '131' },
+      // { apartmentName: 'B 户型', buildingArea: '95', area2: '84.7' },
+      // { apartmentName: 'C 户型', buildingArea: '95', area2: '84.7' },
+    ]
+  }
+
+  componentWillMount() {
+
+    ready.queue(() => {
+      const id = this.$router.params.id
+      queryApartmentType({ salesBatchId: id }).then(res => {
+        this.setState({
+          apartmentList: res || []
+        })
+      })
+
+    })
+  }
+  handleCondition(value) {
+    this.setState({
+      current: value,
+    })
+  }
+  handlePriceItem(item) {
+    this.setState({
+      priceCurrent: item.value,
+      startPrice: item.startPrice,
+      endPrice: item.endPrice,
+    })
+  }
+  renderPrice() {
+    const { priceCurrent, startPrice, endPrice } = this.state
+    const priceList = [
+      { startPrice: null, endPrice: '100', value: 0 },
+      { startPrice: '100', endPrice: '150', value: 1 },
+      { startPrice: '150', endPrice: '200', value: 2 },
+      { startPrice: '200', endPrice: '250', value: 3 },
+      { startPrice: '250', endPrice: '300', value: 4 },
+      { startPrice: '300', endPrice: '400', value: 5 },
+      { startPrice: '400', endPrice: '500', value: 6 },
+      { startPrice: '500', endPrice: '600', value: 7 },
+      { startPrice: '600', endPrice: null, value: 8 },
+    ]
+    return (
+      <View>
+        <View className="price-con">
+          {priceList.map(priceItem => (
+            <View key={priceItem.value} className={priceCurrent == priceItem.value ? 'active-item' : 'price-item'} onClick={() => { this.handlePriceItem(priceItem) }}>
+              {!priceItem.startPrice && <View className="item-con">{priceItem.endPrice}万以下</View>}
+              {priceItem.startPrice && priceItem.endPrice && <View className="item-con">{priceItem.startPrice}万-{priceItem.endPrice}万</View>}
+              {!priceItem.endPrice && <View className="item-con">{priceItem.startPrice}万以上</View>}
+            </View>
+          ))}
+        </View>
+        <View style="color:#666;font-size:28rpx;margin-left:40rpx">
+          填写价格（万元）
+        </View>
+        <View className="search">
+          <Input
+            type="number"
+            placeholder="最低价"
+            class="search-input"
+            placeholder-style="color:#dcdcdc;font-size:28rpx"
+            maxlength="6"
+            value={startPrice}
+            onInput={() => this.handleInput}
+          />
+          <Text style="margin:0 8rpx;color:#999;font-size:28rpx">-</Text>
+          <Input
+            type="number"
+            placeholder="最低价"
+            class="search-input"
+            placeholder-style="color:#dcdcdc;font-size:28rpx"
+            maxlength="6"
+            value={endPrice}
+            onInput={() => this.handleInput}
+          />
+          <View className="sure-btn">
+            确定
+              </View>
+        </View>
+      </View>
+    )
+  }
+  renderApartment() {
+    const { apartmentList } = this.state
+    return (
+
+      <View style="padding:40rpx 20rpx">
+        {apartmentList.map((apartmentItem, index) => (
+          <View className='item' key={index + 'apartment'}>
+            <View className='house__img-info'>
+              <Image className='house__img' src={apartmentItem.buildingImgList[0].url} mode="widthFix"></Image>
+            </View>
+            <View className="rest-info">
+              <View className='house-type__name'>{apartmentItem.apartmentName || ''}</View>
+              <View className='construction__area'>
+                <Text>{apartmentItem.buildingArea ? '建筑面积约' + apartmentItem.buildingArea + 'm²' : '建筑面积待定'}</Text>
+                {
+                  apartmentItem.area2 ? <Text>使用面积约{apartmentItem.area2}m²</Text> : <Text>使用面积待定</Text>
+                }
+              </View>
+            </View>
+          </View>
+        ))}
+      </View>
+    )
+  }
+
+  render() {
+    const { current } = this.state
+    const condition = [{ title: '按价格', value: 0 }, { title: '按户型', value: 1 }]
+    return (
+      <View className="screen-page">
+        <View className="screen-top">
+          筛选房源
+            {condition.map(item => (
+            <View key={item.value} onClick={() => this.handleCondition(item.value)} className={current == item.value ? 'top-item active' : 'top-item'}>
+              {item.title}
+            </View>
+          ))}
+        </View>
+        {current == 0 && this.renderPrice()
+        }
+        {current == 1 && this.renderApartment()}
+
+      </View>
+
+    );
+  }
+}

src/onlineSelling/pages/screenHouse/index.scss

@@ -0,0 +1,125 @@
+@import "@/styles/mixins.scss";
+@import "@/styles/theme.scss";
+.screen-page{
+  .screen-top{
+    display: flex;
+    align-items: center;
+    height:100px;
+    background:rgba(248,248,248,1);
+    font-size: 34px;
+    color: #666;
+    padding: 0 30px;
+    font-size: 400;
+    .top-item{
+      font-size: 28px;
+      color: #999;
+      padding: 0 18px;
+      border-radius: 32px;
+      line-height: 60px;
+      background-color: #EEEEEE;
+      margin-left: 22px;
+
+    }
+    .active{
+      background-color: #fff;
+      box-shadow:0px 4px 12px 0px rgba(0, 0, 0, 0.08);
+    }
+  }
+  .price-con{
+    padding: 20px;
+    display: flex;
+    flex-wrap: wrap;
+    align-content: center;
+    .price-item{
+      flex: 0 0 33.3%;
+      .item-con{
+        text-align: center;
+        margin: 18px;
+        line-height:60px;
+        background:rgba(248,248,248,1);
+        border-radius:6px;
+        font-size: 28px;
+        color: #999;
+      }
+    }
+    .active-item{
+      flex: 0 0 33.3%;
+      .item-con{
+        text-align: center;
+        margin: 18px;
+        line-height:60px;
+        background-color: #fff;
+        box-shadow:0px 4px 12px 0px rgba(0, 0, 0, 0.08);
+        border-radius:6px;
+        font-size: 28px;
+        color: #999;
+      }
+    }
+  }
+  .search{
+    padding: 20px 40px;
+    display: flex;
+    align-items: center;
+    .search-input{
+      width:209px;
+      line-height:60px;
+      height:60px;
+      background:rgba(250,250,250,1);
+      border-radius:30px;
+      text-align: center;
+    }
+    .sure-btn{
+      width:120px;
+      line-height:60px;
+      background:rgba(187,156,121,1);
+      border-radius:10px;
+      text-align: center;
+      color: #fff;
+      font-size: 28px;
+      margin-left: 60px;
+    }
+  }
+  .item {
+    position: relative;
+    width: 340px;
+    margin: 2px 7.5px 20px 7.5px;
+    box-shadow: 0 0 16px rgba(0, 0, 0, 0.15);
+    border: 1px solid rgba(232, 232, 232, 1);
+    border-radius: 12px;
+    display: inline-block;
+
+    .house__img-info {
+      position: relative;
+      padding: 30px;
+      border-bottom: 1px solid #eee;
+
+      .house__img {
+        width: 100%;
+        border-radius: 10px;
+        height: 200px !important;
+      }
+    }
+    .rest-info {
+      padding: 10px  20px;
+
+      .house-type__name {
+        font-weight: bold;
+        margin: 10px 0;
+        font-size: 32px;
+        color: #333;
+      }
+      .construction__area {
+        color: rgba(0, 0, 0, 0.54);
+        font-size: 25px;
+        height: 80px;
+        display: flex;
+        flex-direction: column;
+        font-size: 28px;
+        text-align: left;
+
+      }
+    }
+
+  
+  }
+}

src/onlineSelling/pages/selectionRecord/index.js

@@ -0,0 +1,105 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+import HouseCard from '../../components/HouseCard'
+import Blank from '../../components/Blank'
+import { AtTabs, AtTabsPane } from 'taro-ui'
+import "taro-ui/dist/style/components/tabs.scss"
+import { connect } from '@tarojs/redux'
+
+
+@connect(({ user, city }) => ({ user, city }))
+export default class selectionRecord extends Component {
+
+  config = {
+    navigationBarTitleText: '选房记录'
+  }
+
+  state = {
+    current: 0,
+    recordId: undefined, // 埋点ID
+    testData: [
+      {
+        preselectionRecordId: 1,
+        buildingName: '艾菲国际二期',
+        blockName: '6栋',
+        unitName: '一单元',
+        roomName: '1502',
+        aerialViewImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1573738541467-25667811-b020-4c1f-b57d-e65a410d6fbd3103856559286073565.jpg',
+        price: '234万',
+        createDate: '2020-02-8',
+        status: 1
+      },
+      {
+        preselectionRecordId: 2,
+        buildingName: '艾菲国际二期',
+        blockName: '6栋',
+        unitName: '一单元',
+        roomName: '1502',
+        aerialViewImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1573738541467-25667811-b020-4c1f-b57d-e65a410d6fbd3103856559286073565.jpg',
+        price: '234万',
+        createDate: '2020-02-9',
+        status: 0
+      },
+      {
+        preselectionRecordId: 3,
+        buildingName: '艾菲国际二期',
+        blockName: '6栋',
+        unitName: '二单元',
+        roomName: '1503',
+        aerialViewImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1573738541467-25667811-b020-4c1f-b57d-e65a410d6fbd3103856559286073565.jpg',
+        price: '234万',
+        createDate: '2020-02-10',
+        status: 1
+      },
+      {
+        preselectionRecordId: 4,
+        buildingName: '艾菲国际二期',
+        blockName: '6栋',
+        unitName: '二单元',
+        roomName: '1504',
+        aerialViewImg: 'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1573738541467-25667811-b020-4c1f-b57d-e65a410d6fbd3103856559286073565.jpg',
+        price: '234万',
+        createDate: '2020-02-11',
+        status: 0
+      },
+    ]
+  }
+
+  componentWillMount() {
+
+  }
+
+
+  handleClick(value) {
+    this.setState({
+      current: value
+    })
+  }
+
+
+  render() {
+    const { testData } = this.state
+    return (
+      <View style="height:100vh">
+        <AtTabs className="selectionRecord" scroll current={this.state.current} tabList={[{ title: '预选记录' }, { title: '认筹记录' }]} onClick={this.handleClick.bind(this)}>
+          <AtTabsPane current={this.state.current} index={0} >
+            {
+              testData.map((item) => {
+                return (
+                  <View className="carditem" key={item.preselectionRecordId}>
+                    <HouseCard summary={item} />
+                  </View>
+                )
+              })
+            }
+          </AtTabsPane>
+          <AtTabsPane current={this.state.current} index={1}>
+            <View>
+              <Blank tips="暂无认筹记录" />
+            </View>
+          </AtTabsPane>
+        </AtTabs>
+      </View>
+    )
+  }
+}

src/onlineSelling/pages/selectionRecord/index.scss

@@ -0,0 +1,28 @@
+@import "@/styles/mixins.scss";
+@import "@/styles/theme.scss";
+.selectionRecord{
+    .at-tabs__header{
+      width: 86%;
+      background-color: #fff;
+      box-shadow:0px 4px 12px 0px rgba(0,0,0,0.12);
+      margin: 20px auto 10px auto;
+      border-radius: 44px;
+    }
+    .at-tabs__item{
+      width:50%;
+      flex: none;
+      color: #333;
+      font-size: 28px;
+    }
+    .at-tabs__item--active{
+      color: $primary-color;
+      background-color: #f4f4f4;
+    }
+    .at-tabs__item-underline{
+      height: 0;
+    }
+    .at-tabs__underline{
+      display: none;
+    }
+  
+}

src/pages/activity/activity.js

@@ -70,7 +70,7 @@ export default class active extends Component {
 
     return !phone && !tel ? this.renderLogin() : (
       <View style="height:100vh">
-        <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '热门活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
+        <AtTabs className="tab-box" scroll current={this.state.current} tabList={[{ title: '参加活动' }, { title: '最新资讯' }]} onClick={this.handleClick.bind(this)}>
           <AtTabsPane current={this.state.current} index={0} >
             <Activity />
           </AtTabsPane>

src/pages/activity/detail/poster.js

@@ -100,36 +100,36 @@ export default class Index extends Component {
       {
         x: 30,
         y: 1065,
-        text: '进入',
+        text: '进入活动查看详情',
         fontSize: 26,
         color: '#999',
         baseLine: 'middle',
         lineHeight: 48,
-        width: 50,
-        zIndex: 11
-      },
-      {
-        x: 100,
-        y: 1065,
-        text: data.miniAppName,
-        fontSize: 34,
-        color: 'red',
-        baseLine: 'middle',
-        lineHeight: 48,
-        width: (data.miniAppName || '').length * 30 + 60,
-        zIndex: 11
-      },
-      {
-        x: (data.miniAppName || '').length * 30 + 130,
-        y: 1065,
-        text: '热门活动',
-        fontSize: 26,
-        color: '#999',
-        baseLine: 'middle',
-        lineHeight: 48,
-        width: 150,
+        width: 450,
         zIndex: 11
       },
+      // {
+      //   x: 100,
+      //   y: 1065,
+      //   text: data.miniAppName,
+      //   fontSize: 34,
+      //   color: 'red',
+      //   baseLine: 'middle',
+      //   lineHeight: 48,
+      //   width: (data.miniAppName || '').length * 30 + 60,
+      //   zIndex: 11
+      // },
+      // {
+      //   x: (data.miniAppName || '').length * 30 + 130,
+      //   y: 1065,
+      //   text: '参加活动',
+      //   fontSize: 26,
+      //   color: '#999',
+      //   baseLine: 'middle',
+      //   lineHeight: 48,
+      //   width: 150,
+      //   zIndex: 11
+      // },
     ]
     const images = [
       {

src/pages/activity/index.js

@@ -10,7 +10,7 @@ import { connect } from '@tarojs/redux'
 export default class Index extends Component {
 
   config = {
-    navigationBarTitleText: '热门活动'
+    navigationBarTitleText: '参加活动'
   }
 
   state = {
@@ -37,13 +37,13 @@ export default class Index extends Component {
       console.log('活动列表')
     })
   }
- 
-  componentDidShow () {
+
+  componentDidShow() {
     // // this.onPullDownRefresh()
     // console.log('----', this)
     this.loadData(1)
   }
-  
+
   componentWillUnmount() {
     const { recordId } = this.state
     recordId && updatePoint(recordId)
@@ -82,6 +82,11 @@ export default class Index extends Component {
           url: '/pages/activity/detail/assemble?id=' + item.id
         })
         return
+      case 'live':
+        Taro.navigateTo({
+          url: '/onlineSelling/pages/live/index?id=' + item.id
+        })
+        return;
       default:
         Taro.navigateTo({
           url: '/pages/activity/detail/index?id=' + item.id
@@ -99,7 +104,7 @@ export default class Index extends Component {
 
     // debugger
     rest && rest()
-    
+
     this.refreshing = false
   }
 
@@ -111,9 +116,9 @@ export default class Index extends Component {
 
   loadData = (page) => {
     this.loadList(page).then(res => {
-      const {records, list, total, current, pages} = res || {}
+      const { records, list, total, current, pages } = res || {}
       const _list = records || list || []
-      const newList = current <= 1 ? _list: this.state.list.concat(_list)
+      const newList = current <= 1 ? _list : this.state.list.concat(_list)
 
       this.setState({
         list: newList,
@@ -138,10 +143,10 @@ export default class Index extends Component {
       >
         <View className="list">
           {
-            list.map(item => (
+            list.map((item,index) => (
               <ActivityItem
                 data={item}
-                key={item.dynamicId}
+                key={index+'activity'}
                 onClick={this.handleItemClick}>
               </ActivityItem>
             ))

src/pages/activity/item/index.js

@@ -14,6 +14,12 @@ export default class Item extends Component {
   }
   render() {
     const { data, style } = this.props
+    const now = dayjs()
+    const start = dayjs(data.startDate)
+    const end = dayjs(data.endDate)
+    const endNow = end.diff(now)
+    const nowStart = now.diff(start)
+    
     return (
       <View className="item" style={style} onClick={this.handleClick.bind(this, data)}>
         <Image className="pic" mode="aspectFill" src={transferImage(data.mainImg || data.img || data.listImgUrl || data.imgUrl)}></Image>
@@ -25,29 +31,39 @@ export default class Item extends Component {
           }
           {(data.type == 'help' || data.type == 'group') &&
             <View className={data.type == 'help' ? 'type' : 'type2'}>{data.type == 'help' ? '助力' : '拼团'}</View>
-
+          }
+          {data.type == 'live' &&
+            <View className="live">直播</View>
           }
           {(data.type == 'help' || data.type == 'group') && data.successNum > 0 &&
             <View className="success-num">
               <View className="triangle"></View>
               <View className="text">已成功 {data.successNum}</View>
             </View>
-
           }
 
-          {/* <View className="time">活动开始时间：{`${dayjs(data.startDate).format('YYYY-MM-DD HH:mm:ss')}`}</View> */}
-
           <View className="left">
-            {data.endDate &&
+            {data.endDate && data.type != 'live' &&
               <View className="time">参与截止时间：{`${dayjs(data.endDate).format('YYYY年MM月DD日 HH:mm:ss')}`}</View>
             }
-            {!data.endDate &&
+            {!data.endDate && data.type != 'live' &&
               <View className="time">{data.type != 'dynamic' ? '参与截止时间：' : ''}</View>
             }
-            {data.endDate &&
+            {!data.startDate && data.type == 'live' &&
+              <View className="time">直播开始时间：</View>
+            }
+            {data.startDate && data.type == 'live' &&
+              <View className="time">直播开始时间：{`${dayjs(data.startDate).format('YYYY-MM-DD HH:mm:ss')}`}</View>
+            }
+            {data.endDate && data.type != 'live' &&
               <View className={data.activityStatus == 0 ? "btn jionin " : data.activityStatus == 1 ? "btn nostart" : data.activityStatus == 2 ? "btn jioned" : "btn"}>{data.activityStatus == 0 ? "立即参与" : data.activityStatus == 1 ? "未开始" : data.activityStatus == 2 ? "已结束" : "已参与"}</View>
             }
+            {data.startDate && data.type == 'live' && data.endDate &&
+              <View className={nowStart <= 0 ? "btn nostart" : endNow <= 0 ? "btn jioned" : "btn jionin"}>{nowStart <= 0 ? "即将直播" : endNow <= 0 ? "直播结束" : "正在直播"}</View>
+            }
           </View>
+          <View >{}</View>
+          <View ></View>
         </View>
       </View >
     );

src/pages/activity/item/index.scss

@@ -15,6 +15,16 @@
   width: 100%;
   position: relative;
   padding-bottom: 4px;
+  .live{
+    position: absolute;
+    left:0;
+    top:0;
+    color: #fff;
+    background:#FF3838;
+    padding: 10px 36px;
+    border-radius: 12px 0 12px 0;
+    font-size: 24px;
+  }
   .type{
     position: absolute;
     left:0;

src/pages/card/index.js

@@ -53,6 +53,7 @@ export default class Index extends Component {
       // if (sceneInShare(options.scene)) {
 
       // 必须授权电话
+
       if (this.toggleGrantPhone()) {
         this.toggleGrantAvatar()
       }
@@ -402,9 +403,14 @@ export default class Index extends Component {
 
   handleModalConfirm(phoneNumber) {
     const {
-      cardInfo: { id, projects = [] },
-      userInfo: { person: { phone, tel, personType, avatarurl } }
+      cardInfo: { id, name, projects = [] },
+      userInfo: { person: { phone, tel, personType, avatarurl, personId } }
     } = this.props
+    if (id != personId) {
+      Taro.setNavigationBarTitle({ title: `${name}为您服务` })
+    }
+
+
     if (personType === ROLE_CODE['CONSULTANT']) {
       return
     }
@@ -419,8 +425,8 @@ export default class Index extends Component {
         buildingId,
         phone: realPhone
       }
-      const { cardInfo, userInfo: { person } } = this.props
-      if (person.personId != cardInfo.id) {
+
+      if (personId != id) {
         reportClient(payload).then(res => {
           this.setState({ bound: true })
           if (res !== 'bound') {
@@ -617,7 +623,7 @@ export default class Index extends Component {
 
               {buildingId && (
                 <View className="pro__info">
-                  <View className='project__title'>项目信息</View>
+                  <View className='project__title'>{isSelf ? '项目信息' : '为您推荐'}</View>
                   <ProjectItem data={projectDetail} onClick={this.toProjectDetail.bind(this)} />
                 </View>
               )}

src/pages/card/poster.js

@@ -52,7 +52,7 @@ export default class Index extends Component {
         y: 210,
         text: `${data.company}`,
         fontSize: 30,
-        color: '#999',
+        color: 'red',
         baseLine: 'middle',
         lineHeight: 48,
         width: 260,
@@ -107,36 +107,37 @@ export default class Index extends Component {
       {
         x: 80,
         y: 755,
-        text: '进入',
-        fontSize: 26,
-        color: '#999',
-        baseLine: 'middle',
-        lineHeight: 48,
-        width: 50,
-        zIndex: 100
-      },
-      {
-        x: 140,
-        y: 755,
-        text: data.miniAppName,
-        fontSize: 34,
-        color: 'red',
-        baseLine: 'middle',
-        lineHeight: 48,
-        width: (data.miniAppName || '').length * 30 + 50,
-        zIndex: 100
-      },
-      {
-        x: (data.miniAppName || '').length * 30 + 156,
-        y: 755,
-        text: '查看',
+        text: '进入名片查看详情',
+        // text: '进入',
         fontSize: 26,
         color: '#999',
         baseLine: 'middle',
         lineHeight: 48,
-        width: 150,
+        width: 450,
         zIndex: 100
       },
+      // {
+      //   x: 140,
+      //   y: 755,
+      //   text: data.miniAppName,
+      //   fontSize: 34,
+      //   color: 'red',
+      //   baseLine: 'middle',
+      //   lineHeight: 48,
+      //   width: (data.miniAppName || '').length * 30 + 50,
+      //   zIndex: 100
+      // },
+      // {
+      //   x: (data.miniAppName || '').length * 30 + 156,
+      //   y: 755,
+      //   text: '查看',
+      //   fontSize: 26,
+      //   color: '#999',
+      //   baseLine: 'middle',
+      //   lineHeight: 48,
+      //   width: 150,
+      //   zIndex: 100
+      // },
       {
         x: 320,
         y: 1075,

src/pages/im/msgItem/index.js

@@ -34,6 +34,10 @@ export default class MsgItem extends Component {
     this.props.getPhone(e)
   }
 
+  gotPhone() {
+    Taro.showToast({ title: '您已成功授权手机号', icon: 'none' })
+  }
+
   renderMsgContent(row, phone) {
     if (row.messageType === 'card') {
       return (
@@ -47,7 +51,7 @@ export default class MsgItem extends Component {
 
           {
             phone ? (
-              <View className="card-btn" onClick={this.getPhoneNumber}>
+              <View className="card-btn" onClick={this.gotPhone}>
                 <Text className="iconfont icon-shouji"></Text>
                 <Text>留下您的电话</Text>
               </View>

src/pages/news/detail/poster.js

@@ -100,36 +100,36 @@ export default class Index extends Component {
       {
         x: 30,
         y: 1065,
-        text: '进入',
+        text: '进入资讯查看详情',
         fontSize: 26,
         color: '#999',
         baseLine: 'middle',
         lineHeight: 48,
-        width: 50,
-        zIndex: 11
-      },
-      {
-        x: 100,
-        y: 1065,
-        text: data.miniAppName,
-        fontSize: 34,
-        color: 'red',
-        baseLine: 'middle',
-        lineHeight: 48,
-        width: (data.miniAppName || '').length * 30 + 60,
-        zIndex: 11
-      },
-      {
-        x: (data.miniAppName || '').length * 30 + 130,
-        y: 1065,
-        text: '查看资讯',
-        fontSize: 26,
-        color: '#999',
-        baseLine: 'middle',
-        lineHeight: 48,
-        width: 150,
+        width: 450,
         zIndex: 11
       },
+      // {
+      //   x: 100,
+      //   y: 1065,
+      //   text: data.miniAppName,
+      //   fontSize: 34,
+      //   color: 'red',
+      //   baseLine: 'middle',
+      //   lineHeight: 48,
+      //   width: (data.miniAppName || '').length * 30 + 60,
+      //   zIndex: 11
+      // },
+      // {
+      //   x: (data.miniAppName || '').length * 30 + 130,
+      //   y: 1065,
+      //   text: '查看资讯',
+      //   fontSize: 26,
+      //   color: '#999',
+      //   baseLine: 'middle',
+      //   lineHeight: 48,
+      //   width: 150,
+      //   zIndex: 11
+      // },
     ]
     const images = [
       {

src/pages/news/index.js

@@ -10,7 +10,7 @@ import { connect } from '@tarojs/redux'
 export default class Index extends Component {
 
   config = {
-    navigationBarTitleText: '热门活动'
+    navigationBarTitleText: '资讯列表'
   }
 
   state = {

src/pages/person/authorize/index.scss

@@ -3,7 +3,7 @@
 .auth-page{
   position: relative;
   width: 100%;
-  height: 100%;
+  height: 100vh;
   .avatar_img{
     position: absolute;
     width:120px;

src/pages/person/index.js

@@ -18,7 +18,7 @@ import { rule as ruleToast } from '@/utils/ruleToast'
 
 export default class Person extends Component {
   config = {
-    navigationBarTitleText: '我的'
+    navigationBarTitleText: '我的地盘'
   }
 
   state = {
@@ -194,7 +194,7 @@ export default class Person extends Component {
 
   renderDetail() {
     const { users, menus, roleName } = this.state
-    const { user: { userInfo: { person: { org: { waterMark } }, miniApp: { name } } } } = this.props
+    const { user: { userInfo: { person: { org: { waterMark } = {} }, miniApp: { name } } } } = this.props
     
     // const showQRCode = user.personType === ROLE_CODE['CONSULTANT'] || ROLE_CODE['ESTATE_AGENT'] || ROLE_CODE['CHANNEL_AGENT']
     // const isConsultant = user.personType == ROLE_CODE['CONSULTANT']

src/pages/person/menus.js

@@ -18,6 +18,7 @@ const icons = {
   customerAnalysis: require('@/assets/mine/customerAnalysis.png'),
   fenxi: require('@/assets/mine/fenxi.png'),
   share: require('@/assets/mine/share.png'),
+  selection: require('@/assets/mine/selection.png'),
 }
 
 const DRIFT = ROLE_CODE['DRIFT']
@@ -121,6 +122,13 @@ const menus = [
     },
   ],
   [
+    {
+      name: '选房记录',
+      url: '/onlineSelling/pages/records/index',
+      icon: icons.selection,
+      extends: undefined,
+      userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
+    },
     {
       name: '我的收藏',
       url: '/pages/person/favorite/index',
@@ -143,14 +151,14 @@ const menus = [
       userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
     },
     {
-      name: '房贷计算器',
+      name: '算房贷',
       url: '/pages/toolKit/index',
       icon: icons.calculator,
       extends: undefined,
       userTypes: [CUSTOMER, CONSULTANT, ESTATE_AGENT, CHANNEL_AGENT],
     },
     {
-      name: '购房百科',
+      name: '购房须知',
       url: '/pages/policy/index?from=mine',
       icon: icons.encyclopedia,
       extends: undefined,

src/pages/person/myShare/index.js

@@ -118,16 +118,17 @@ export default class Person extends Taro.Component {
               <View className="share-item" key={item.targetId + 'share'} onClick={this.handleItemClick.bind(this, item)}>
                 <Image className="img" mode="aspectFill" src={transferImage(item.activityImg || emptyImg)}></Image>
                 <View className={item.eventType == 'project' ? 'building' : 'name'}>{item.activityName || ''}</View>
-                {/* {item.eventType == 'project' && <View className="price"> {item.price ? <Text>约{item.price}{item.priceType == 'total' ? '万元/套' : '元/m²'}</Text> : '暂无均价'} </View>} */}
+  
                 {item.eventType == 'project' && <View className="price"> {item.price || '暂无均价'} </View>}
 
                 {item.eventType == 'h5' && <View className="num"> {item.drainageShareNum || '0'}人查看了分享 </View>}
+                {item.eventType == 'house' && <View className="num"> {item.houseShareNum || '0'}人查看了分享 </View>}
+                {item.eventType == 'live' && <View className="num"> {item.liveShareNum || '0'}人查看了分享 </View>}
                 {item.eventType == 'project' && <View className="num"> {item.buildingNum || '0'}人查看了分享 </View>}
                 {item.eventType == 'group' && <View className="num"> {item.groupActivityShareNum || '0'}人查看了分享 </View>}
                 {item.eventType == 'help' && <View className="num"> {item.helpActivityShareNum || '0'}人查看了分享 </View>}
                 {item.eventType == 'activity' && <View className="num"> {item.activityShareNum || '0'}人查看了分享 </View>}
                 {item.eventType == 'news' && <View className="num"> {item.newsNum || '0'}人查看了分享 </View>}
-
                 {item.eventType == 'project' && <View className="address"> {item.address || ''} </View>}
               </View>
             ))

src/pages/policy/detail/index.js

@@ -14,7 +14,7 @@ import { transferImage } from '@/utils/tools'
 @connect(state => state.user)
 export default class PolicyDetail extends Component {
   config = {
-    navigationBarTitleText: '购房百科详情'
+    navigationBarTitleText: '购房须知详情'
   }
 
   state = {

src/pages/policy/index.js

@@ -13,14 +13,14 @@ let pageIndex = 1
   track: {
     event: 'policy',
     eventType: 'main',
-    propertyName: '查看购房百科',
+    propertyName: '查看购房须知',
     data: '{}',
   }
 })
 export default class Index extends Component {
 
   config = {
-    navigationBarTitleText: '购房百科列表'
+    navigationBarTitleText: '购房须知'
   }
 
   state = {

src/pages/project/activity/index.js

@@ -48,7 +48,7 @@ export default class SwiperBanner extends Component {
         return (
             <View className="activity-box" style={`background: url(${transferImage(bgImg)}) no-repeat center;background-size: 100% 100%;`}>
                 <View className="section-head">
-                    <View className="section-head__title">热门活动 </View>
+                    <View className="section-head__title">参加活动 </View>
                     <View className="section-head__more" onClick={this.toActivity}>
                         查看更多<Text className="iconfont icon-more"></Text>
                     </View>

src/pages/project/detail/index.js

@@ -12,7 +12,8 @@ import {
   addItemUv,
   // addItemShareNum,
   favorProject,
-  cancelFavorProject
+  cancelFavorProject,
+  queryLiveList
 } from '@/services/item'
 import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
 import { queryNewsList, queryHelpGroup } from '@/services/news'
@@ -66,6 +67,7 @@ export default class Index extends Component {
     activityList: [],
     helpList: [],
     groupList: [],
+    liveList: [],
     statusOpts: ['待售', '售罄', '在售'],
     statusBgColors: ['#BB9C79', '#CECECE', '#F6B61D'],
     // circumOpts: [],
@@ -252,8 +254,14 @@ export default class Index extends Component {
     }
   }
 
+
   loadHelpGroupList() {
     const { buildingId } = this.state
+    queryLiveList({ buildingId }).then(res => {
+      this.setState({
+        liveList: res.records || []
+      })
+    })
 
     queryHelpGroup({ buildingId: buildingId }).then(res => {
       console.log(res, "buildingId")
@@ -769,7 +777,7 @@ export default class Index extends Component {
         <View className="bt-nav__left">
           <Button class='bt-nav__item' style={{ display: posterShow }} onClick={() => { this.togglePosterStatus(true) }}>
             <Image src={require('@/assets/news/tupian.png')} className='poster-img'></Image>
-            <Text className="text">海报</Text>
+            <Text className="text">生成海报</Text>
           </Button>
           <Button class='bt-nav__item' open-type="share">
             <Image src={require('@/assets/news/fasong.png')} className='fenxiang-img'></Image>
@@ -876,7 +884,7 @@ export default class Index extends Component {
         {listimg.length > 0 &&
           (
             <View className='photos__type'>
-              <View className='photos__type__title'>相册</View>
+              <View className='photos__type__title'>高清大图</View>
               <ScrollView scrollX>
                 <View className='photos__type__content' >
 
@@ -933,7 +941,7 @@ export default class Index extends Component {
       <View onClick={this.tomapDetail}>
         <View className="section circum">
           <View className="section-head">
-            <Text className="section-head__title">位置及周边配套</Text>
+            <Text className="section-head__title">楼盘位置及配套</Text>
             <View className="section-head__more">
               更多<Text className="iconfont icon-more"></Text>
             </View>
@@ -953,7 +961,7 @@ export default class Index extends Component {
           consultants.length > 0 && (
             <View className="section counselor">
               <View className="section-head">
-                <Text className="section-head__title">置业顾问</Text>
+                <Text className="section-head__title">咨询置业顾问</Text>
                 <View className="section-head__more" onClick={() => { this.handleMoreClick() }}>
                   更多<Text className="iconfont icon-more"></Text>
                 </View>
@@ -1031,11 +1039,11 @@ export default class Index extends Component {
       <Block>
         {helpList.length > 0 &&
           <View className="activity">
-            <View className="title">助力活动</View>
+            <View className="title">助力赢好礼</View>
             <View style={{ position: 'relative' }}>
               <HelpGroupBanner
                 style={{ height: '250rpx' }}
-                indicatorDots={false}
+                indicatorDots={helpList.length > 1}
                 list={helpList}
                 onClick={this.handleHelpClick}>
               </HelpGroupBanner>
@@ -1054,7 +1062,6 @@ export default class Index extends Component {
     } else {
       return
     }
-
   }
 
   renderPoints() {
@@ -1070,6 +1077,30 @@ export default class Index extends Component {
       </Block>
     )
   }
+  toHouseList(id) {
+    const { projectDetail: { buildingId } } = this.props
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/houseList/index?id=${id}&buildingId=${buildingId}`
+    })
+  }
+  renderChooseHouse() {
+    console.log('----------------renderChooseHouse----------------')
+    const { projectDetail: { salesBatch = [] } } = this.props
+    return (
+      <Block>
+        {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'} >
+              <Image style="height:388rpx;width:100%;border-radius: 24rpx;margin-bottom:20rpx" onClick={() => { this.toHouseList(item.salesBatchId) }} src={transferImage(item.aerialViewImg || require('@/assets/empty.png'))} mode="aspectFill"></Image>
+            </View>
+          ))}
+
+        </View>}
+
+      </Block>
+    )
+  }
 
   handleHelpClick(item) {
     Taro.navigateTo({
@@ -1096,12 +1127,12 @@ export default class Index extends Component {
       <Block>
         {groupList.length > 0 &&
           <View className="activity">
-            <View className="title">拼团活动</View>
+            <View className="title">发起拼单</View>
             <View
               style={{ position: 'relative' }}>
               <HelpGroupBanner
                 style={{ height: '250rpx' }}
-                indicatorDots={false}
+                indicatorDots={groupList.length > 1}
                 list={groupList}
                 onClick={this.handleGroupClick}>
               </HelpGroupBanner>
@@ -1111,6 +1142,32 @@ export default class Index extends Component {
       </Block>
     )
   }
+  handleLiveClick(item) {
+    Taro.navigateTo({
+      url: '/onlineSelling/pages/live/index?id=' + item.liveActivityId
+    })
+  }
+  renderLive() {
+    const { liveList } = this.state
+    return (
+      <Block>
+        {liveList.length > 0 &&
+          <View className="activity">
+            <View className="title">直播活动</View>
+            <View
+              style={{ position: 'relative' }}>
+              <HelpGroupBanner
+                style={{ height: '255rpx' }}
+                indicatorDots={liveList.length > 1}
+                list={liveList}
+                onClick={this.handleLiveClick}>
+              </HelpGroupBanner>
+            </View>
+          </View>
+        }
+      </Block>
+    )
+  }
 
   renderHouseTypeList() {
     const { statusOpts, statusBgColors } = this.state
@@ -1136,7 +1193,7 @@ export default class Index extends Component {
         {
           list.length > 0 && (
             <View className='house-type'>
-              <View className='house-type__title'>户型介绍({list.length})</View>
+              <View className='house-type__title'>看户型({list.length})</View>
               <ScrollView scrollX>
 
                 <View className='house-type__list'>
@@ -1147,7 +1204,7 @@ export default class Index extends Component {
                           <Block>
                             <View className='house-type__state' style={`background-color: ${statusBgColors[item.marketStatus - 1]}`}>{statusOpts[item.marketStatus - 1]}</View>
                             <View className='house__img-info'>
-                              <Image className='house__img' src={transferImage(item.buildingImgList[0].url)} mode="widthFix" onClick={this.handleHouseTypePosterClick.bind(this, item, imgUrls)}></Image>
+                              <Image className='house__img' src={transferImage(item.buildingImgList[0].url)} mode="aspectFill" onClick={this.handleHouseTypePosterClick.bind(this, item, imgUrls)}></Image>
                               {item.panoramaArr && (
                                 <View className='house-type__panorama'>
                                   <Image mode="aspectFill" src={vrLogo} style={{ width: '100%', height: '100%' }} />
@@ -1185,7 +1242,7 @@ export default class Index extends Component {
           activityList.length > 0 && (
             <View className="activity" >
               <View className="section-head">
-                <Text className="section-head__title" style={{ margin: '10rpx 0 40rpx 35rpx' }}>热门活动</Text>
+                <Text className="section-head__title" style={{ margin: '10rpx 0 40rpx 35rpx' }}>参加活动</Text>
                 <View className="section-head__more" style={{ marginRight: '20rpx' }} onClick={this.handleActivityMoreClick}>
                   更多活动<Text className="iconfont icon-more"></Text>
                 </View>
@@ -1284,14 +1341,14 @@ export default class Index extends Component {
 
   // onPause() {
   //   this.setState({
-  //     videoPlayShow: 'flex'e.detail
+  //     videoPlayShow: 'flex'
   //   })
   // }
   renderVideo() {
     const { videoPlayShow } = this.state
     const { projectDetail } = this.props
     const { videoImage } = projectDetail
-    const imgSrc = videoImage[0].url
+    const imgSrc = videoImage ? videoImage[0].url : ''
 
     return (
       <View
@@ -1414,6 +1471,11 @@ export default class Index extends Component {
     const { uvList = {} } = projectDetail
     const { total = 0, records = [] } = uvList
     const openDate = projectDetail.openingDate ? dayjs(projectDetail.openingDate).locale('zh-cn').format('YYYY年M月D日') : '暂无'
+    const showBuildingImgs = projectDetail.buildingImg && projectDetail.buildingImg.length > 0
+    const showBuildingVRs = projectDetail.panoramaList && projectDetail.panoramaList.length > 0
+    const shwoBuildingVideo = projectDetail.videoUrl ? true : false
+    const showMediaBtn = showBuildingImgs + showBuildingVRs + shwoBuildingVideo > 1 // 满足2个就展示
+
     return (
       <Block>
         {
@@ -1424,10 +1486,6 @@ export default class Index extends Component {
           grantAvatarVisible &&
           <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
         }
-        {/* {
-          (userInfo.person.personId && !userInfo.person.phone && !userInfo.person.tel) &&
-          <AchievePhone user={userInfo.person} onSuccess={this.handleAuthPhoneSuccess}></AchievePhone>
-        } */}
         {
           loaded && (
             <View className='detail'>
@@ -1440,13 +1498,12 @@ export default class Index extends Component {
               {btnstate === 2 && this.renderBannerPanorama()}
 
               {
-                projectDetail.buildingImg && projectDetail.buildingImg.length &&
-                projectDetail.panoramaList && projectDetail.panoramaList.length &&
+                showMediaBtn &&
                 (
                   <View className="media-btn">
-                    {/* <View className={`btn ${btnstate === 1 && 'active'}`} onClick={this.handleBannerBtnClick.bind(this, 1)}>视频</View> */}
-                    <View className={`btn ${btnstate === 2 && 'active'}`} onClick={this.handleBannerBtnClick.bind(this, 2)}>全景</View>
-                    <View className={`btn ${!btnstate && 'active'}`} onClick={this.handleBannerBtnClick.bind(this, 0)}>图片</View>
+                    {shwoBuildingVideo && <View className={`btn ${btnstate === 1 && 'active'}`} onClick={this.handleBannerBtnClick.bind(this, 1)}>视频</View>}
+                    {showBuildingVRs && <View className={`btn ${btnstate === 2 && 'active'}`} onClick={this.handleBannerBtnClick.bind(this, 2)}>全景</View>}
+                    {showBuildingImgs && <View className={`btn ${!btnstate && 'active'}`} onClick={this.handleBannerBtnClick.bind(this, 0)}>图片</View>}
                   </View>
                 )
               }
@@ -1531,13 +1588,17 @@ export default class Index extends Component {
                   {this.rendercircum()}
                   {/* 户型介绍 */}
                   {this.renderHouseTypeList()}
+                  {/* 在线选房 */}
+                  {this.renderChooseHouse()}
                   {/* 助力活动 */}
                   {this.renderHelp()}
                   {/* 拼团活动 */}
                   {this.renderGroup()}
+                  {/* 直播活动 */}
+                  {this.renderLive()}
                   {/* 新鲜资讯 */}
                   {this.renderNews()}
-                  {/* 热门活动 */}
+                  {/* 参加活动 */}
                   {this.renderActivities()}
                   {/* 相册 */}
                   {this.renderPhotoAlbum()}

src/pages/project/detail/index.scss

@@ -14,11 +14,8 @@
   padding-bottom: 50px;
 
   .media-btn {
-    position: absolute;
-    width: 184px;
     height: 64px;
     top: 440px;
-    left: 284px;
     font-size: 30px;
     font-family: PingFangSC-Regular, PingFang SC;
     font-weight: 400;
@@ -27,6 +24,7 @@
     color: rgba(53, 53, 53, 1);
     display: flex;
     position: fixed;
+    transform: translateX(calc(50vw - 50%));
 
     .btn {
       width: 92px;
@@ -884,7 +882,7 @@
 
     .item {
       position: relative;
-      width: 350px;
+      width: 338px;
       margin: 2px 36px 2px 2px;
       box-shadow: 0 0 16px rgba(0, 0, 0, 0.15);
       border: 1px solid rgba(232, 232, 232, 1);
@@ -892,7 +890,7 @@
 
       .house__img-info {
         position: relative;
-        padding: 70px 30px;
+        // padding: 70px 20px 40px 20px;
         border-bottom: 1px solid rgba(232, 232, 232, 1);
       
         .house-type__panorama {
@@ -904,25 +902,13 @@
         }
 
         .house__img {
-          width: 100%;
+          width: 336px;
           border-radius: 10px;
-          height: 200px !important;
+          height: 336px;
+          display: block;
         }
       }
 
-      // .house__img__len {
-      //   position: absolute;
-      //   width: 80px;
-      //   height: 50px;
-      //   text-align: center;
-      //   line-height: 50px;
-      //   color: #fff;
-      //   background: rgba(0, 0, 0, 0.5);
-      //   right: 4%;
-      //   top: 47%;
-      //   font-size: 20px;
-      //   border-radius: 20px;
-      // }
       .rest-info {
         padding: 10px 26px 20px 26px;
 
@@ -969,6 +955,7 @@
         padding: 10px 36px;
         border-radius: 16px 0 14px 0;
         font-size: 24px;
+        z-index: 1;
       }
     }
   }

src/pages/project/detail/poster.js

@@ -127,37 +127,37 @@ export default class Index extends Component {
       {
         x: 30,
         y: 1070,
-        text: '进入',
+        text: '进入项目查看详情',
         fontSize: 26,
         color: '#999',
         baseLine: 'middle',
         lineHeight: 48,
-        width: 50,
-        zIndex: 11
-      },
-      {
-        x: 100,
-        y: 1070,
-        text: data.miniAppName,
-        fontSize: 34,
-        color: '#000',
-        baseLine: 'middle',
-        lineHeight: 48,
-        width: (data.miniAppName || '').length * 30 + 60,
-        zIndex: 11
-      },
-      {
-        x: (data.miniAppName || '').length * 30 + 120,
-        y: 1070,
-        text: '项目详情',
-        fontSize: 26,
-        color: '#999',
-        baseLine: 'middle',
-        lineHeight: 48,
-        lineNum: 1,
-        width: 150,
+        width: 450,
         zIndex: 11
       },
+      // {
+      //   x: 100,
+      //   y: 1070,
+      //   text: data.miniAppName,
+      //   fontSize: 34,
+      //   color: '#000',
+      //   baseLine: 'middle',
+      //   lineHeight: 48,
+      //   width: (data.miniAppName || '').length * 30 + 60,
+      //   zIndex: 11
+      // },
+      // {
+      //   x: (data.miniAppName || '').length * 30 + 120,
+      //   y: 1070,
+      //   text: '项目详情',
+      //   fontSize: 26,
+      //   color: '#999',
+      //   baseLine: 'middle',
+      //   lineHeight: 48,
+      //   lineNum: 1,
+      //   width: 150,
+      //   zIndex: 11
+      // },
     ]
     const images = [
       {

src/pages/project/floor/index.js

@@ -72,7 +72,7 @@ export default class Index extends Component {
           </View>
           <View className='item'>
             <Text className='txt left-txt'>物业类型</Text>
-            <Text className='txt right-txt'>{projectDetail.serviceCompany || '暂无'}</Text>
+            <Text className='txt right-txt'>{projectDetail.propertyType || '暂无'}</Text>
           </View>
           <View className='item'>
             <Text className='txt left-txt'>物业费</Text>