Merge branch 'dev'

config/dev.js

@@ -5,15 +5,17 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST: '"https://dev.pawoma.cn"',//测试
-    WSS_HOST: '"wss://dev.pawoma.cn"',
+    // HOST: '"https://dev.pawoma.cn"',//测试
+    // WSS_HOST: '"wss://dev.pawoma.cn"',
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://127.0.0.1:8080"',
-    // WSS_HOST: '"ws://127.0.0.1:8080"',
-    Version: 'V3.5.11'
+    HOST: '"http://127.0.0.1:8080"',
+    WSS_HOST: '"ws://127.0.0.1:8080"',
+    OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
+    OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
+    Version: 'V3.5.13'
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -3,13 +3,15 @@ module.exports = {
     NODE_ENV: '"production"'
   },
   defineConstants: {
-    // HOST: '"http://192.168.2.54:8080"',
-    // WSS_HOST: '"ws://192.168.2.54:8080"',
+    // HOST: '"http://192.168.2.52:8080"',
+    // WSS_HOST: '"ws://192.168.2.52:8080"',
     // 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.12'
+    OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
+    OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
+    Version: 'V3.5.13'
   },
   weapp: {},
   h5: {}

project.config.json

@@ -1,8 +1,8 @@
 {
 	"miniprogramRoot": "dist/",
 	"projectname": "mini-chengjiao",
-	"description": "知与行互动",
-	"appid": "wxd6f47a9bb3052175",
+	"description": "橙蕉宁房",
+	"appid": "wxbbb069a341055ef0",
 	"setting": {
 		"urlCheck": false,
 		"es6": false,
@@ -48,15 +48,22 @@
 			"list": [
 				{
 					"id": -1,
+					"name": "pages/raiseMoney/index",
+					"pathName": "onlineSelling/pages/raiseMoney/index",
+					"query": "",
+					"scene": null
+				},
+				{
+					"id": 1,
 					"name": "pages/houseList/index",
 					"pathName": "onlineSelling/pages/houseList/index",
-					"query": "id=6&buildingId=7a46e04f15c324fa9cf44ce27f9573c5",
+					"query": "id=14&buildingId=71d7e60efe75d387a9d8387d1646c0c8",
 					"scene": null
 				},
 				{
-					"id": 1,
-					"name": "pages/records/index",
-					"pathName": "onlineSelling/pages/records/index",
+					"id": 2,
+					"name": "pages/chooseConsultant/index",
+					"pathName": "onlineSelling/pages/chooseConsultant/index",
 					"query": "",
 					"scene": null
 				}

src/actions/house.js

@@ -0,0 +1,33 @@
+import { createAction, createActionNormal } from '@/utils/redux'
+import { API_CARDS_LIST, API_PRESELECTION_RECORD } from '@/constants/api'
+import {
+  ADD_CART,
+  SUB_CART,
+  FLUSH_TO_CART,
+  ADD_CONSULTANT,
+  CHOOSE_CONSULTANT,
+  MY_PRESELECT_RECORD,
+} from '@/constants/house'
+
+// 加入临时车
+export const dispatchAddCart = payload => createActionNormal({ type: ADD_CART, payload })
+// 删减临时车
+export const dispatchSubCart = payload => createActionNormal({ type: SUB_CART, payload })
+// 全部进入临时车
+export const dispatchFlush2Cart = payload => createActionNormal({ type: FLUSH_TO_CART, payload })
+// 获取置业顾问
+export const dispatchGetConsultants = payload => createAction({
+  type: ADD_CONSULTANT,
+  url: API_CARDS_LIST,
+  payload
+})
+
+// 临时选择置业
+export const dispatchChooseConsultant = payload => createActionNormal({ type: CHOOSE_CONSULTANT, payload })
+
+// 获取预选记录
+export const dispatchGetMySelection = payload => createAction({
+  type: MY_PRESELECT_RECORD,
+  url: API_PRESELECTION_RECORD,
+  payload,
+})

src/app.js

@@ -34,6 +34,9 @@ import socket from '@/utils/im'
 
 // const store = configStore()
 
+// for dev
+global.store = store
+
 class App extends Component {
   config = {
     debug: process.env.NODE_ENV === 'development',
@@ -125,13 +128,19 @@ class App extends Component {
         root: "onlineSelling",
         pages: [
           'pages/houseList/index',
+          'pages/raiseMoney/index',
           'pages/live/index',
           'pages/help/index',
           'pages/records/index',
           'pages/detail/index',
           'pages/detail/resultPage',
-          'pages/selectionRecord/index',
           'pages/screenHouse/index',
+          'pages/chooseConsultant/index',
+          'pages/protocol/index',
+          'pages/raiseProfile/index',
+          'pages/raiseProfile/houseResource',
+          'pages/addHouse/index',
+          'pages/houseCart/index',
         ],
       }
     ],
@@ -141,7 +150,6 @@ class App extends Component {
       navigationBarBackgroundColor: '#BB9C79',
       navigationBarTitleText: '',
       navigationBarTextStyle: 'white',
-
     },
     tabBar: {
       color: '#666',
@@ -258,7 +266,7 @@ class App extends Component {
     //     payload: res,
     //   })
     // })
-    wx.setBackgroundFetchToken()
+    // wx.setBackgroundFetchToken()
     wx.getBackgroundFetchData({
       fetchType: 'pre',
       success: (res) => {

src/app.scss

@@ -23,12 +23,12 @@
   border-radius: 0;
   border:none;
 }
-.at-tabs-pane--active{
-  height: 100vh!important;
-  overflow: scroll;
-  padding-bottom: 100px;
+// .at-tabs-pane--active{
+//   height: 100vh!important;
+//   overflow: scroll;
+//   padding-bottom: 100px;
 
-}
+// }
 @keyframes fadeBottomIn {
   0% {
     transform: translateY(10%);

src/constants/api.js

@@ -59,10 +59,18 @@ export const API_INDEX_ICONS = resolvePath('taMiniappOrgIcon')
 
 export const API_HOUSE_LIST = resolvePath('listHousingResources')
 export const API_PRESELECTION_RECORD = resolvePath('listPreselectionRecord')
+export const API_RAISE_CHECK = resolvePath('check/raise')
+export const API_RAISE_PROFILE = resolvePath('taRaise')
+export const API_SAVE_RAISE_RECORD = resolvePath('taRaiseRecord')
+export const API_RATSE_RECORD = resolvePath('taRaiseRecord/list')
+export const API_RATSE_DETAIL = resolvePath('taRaiseRecord')
+export const API_RATSE_ORDER = resolvePath('unifiedOrder')
+export const API_CANCEL_ORDER = resolvePath('cancel')
 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_SALESBATCH_LIST = resolvePath('taSalesBatch/choice')
 export const API_NOTICE_INFO = resolvePath('getNoticeInfo')
 export const API_SALES_BATCH = resolvePath('taSalesBatch')
 export const API_ADDLIVE_NUM = resolvePath('addVisitNum')
@@ -151,6 +159,10 @@ export const API_FEEDBACK_SUBMIT = resolvePath('taCustomerMessage')
 // getCode
 export const API_GET_CODE = resolvePath('captcha')
 
+// checkCode
+export const API_CHECK_CODE = resolvePath('check/captcha')
+
+
 // /wx/registerConsultantOneClick
 // registerConsultant
 export const API_PUT_REGISTER = resolvePath('registerConsultant')

src/constants/house.js

@@ -0,0 +1,18 @@
+
+// 加入选择-暂存
+export const ADD_CART = 'ADD_CART'
+
+// 取消选择-暂存
+export const SUB_CART = 'SUB_CART'
+
+// 所有进入-暂存
+export const FLUSH_TO_CART = 'FLUSH_TO_CART'
+
+// 置业顾问列表
+export const ADD_CONSULTANT = 'ADD_CONSULTANT'
+
+// 临时选择置业
+export const CHOOSE_CONSULTANT = 'CHOOSE_CONSULTANT'
+
+// 获取预选记录
+export const MY_PRESELECT_RECORD = 'MY_PRESELECT_RECORD'

src/onlineSelling/components/Blank/index.js

@@ -4,9 +4,8 @@ import './index.scss'
 
 export default function Blank(props) {
   return (
-    <View className="blank">
+    <View className="blank" style={props.style}>
       <Image className="nodata-img" src={require('../../assets/norecord.png')}></Image>
-      {/* <View className="nodata"></View> */}
       {
         props.tips && <View className="tips">{props.tips}</View>
       }

src/onlineSelling/components/ConsultantItem/index.js

@@ -0,0 +1,36 @@
+import { View, Block } from "@tarojs/components";
+import './index.scss'
+
+export default function ConsultantItem(props) {
+
+  const { data = {}, style, type, tips } = props
+
+  return (
+    <Block>
+      {(!data || !data.id) && tips == 'show' && (<View style="margin-top: 20px; text-align: center">暂无数据</View>)}
+      {
+        (data && (data.id || data.consultantPersonId)) &&
+        (
+          <View className="card-item" style={style}>
+            <View onClick={() => props.onClick && props.onClick(data)}>
+              <Image src={data.photo || data.avatar} className='avatar' ></Image>
+              {
+                (data.name || data.userName) &&
+                (
+                  <View className="name">
+                    {data.name || data.userName}
+                    <Image src={require('@/assets/person/card.png')} className='card' ></Image>
+                    {type == 'raiseProfile' && <View className="tip">您的专属置业顾问</View>}
+                  </View>
+                )
+              }
+              <View className="phone">{data.phone}</View>
+            </View>
+            {!type && <View className="home" onClick={props.onHomepage}>主页</View>}
+            {type == 'raiseProfile' && <View className="contact" onClick={props.contactClick}>联系我<Text className="right-icon"></Text></View>}
+          </View >
+        )
+      }
+    </Block>
+  )
+}

src/onlineSelling/components/ConsultantItem/index.scss

@@ -0,0 +1,65 @@
+.card-item{
+  width: 100vw;
+  height:156px;
+  background-color: #fff;
+  padding: 30px;
+  margin-bottom: 20px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  position: relative;
+  .avatar{
+    width:92px;
+    height:92px;
+    border-radius:50%;
+  }
+  .name{
+    font-size: 32px;
+    color: #333;
+    display: flex;
+    align-items: center;
+    position: absolute;
+    left: 134px;
+    top:30px;
+    .card{
+      width:48px;
+      height:35px;
+      margin-left: 18px;
+      border-radius: 6px;
+    }
+    .tip{
+      font-size: 24px;
+      color: #333;
+      margin-left: 20px;
+    }
+  }
+  .phone{
+    font-size: 28px;
+    color: #666;
+    position: absolute;
+    left: 134px;
+    bottom:30px;
+    font-weight:300;
+  }
+  .home{
+    font-size: 28px;
+    color: #333;
+  }
+  .contact{
+    position: absolute;
+    right: 0;
+    top: 28px;
+    font-size: 32px;
+    color: #BB9C79;
+    display: flex;
+    align-items: center;
+     .right-icon{
+      width:20px;
+      height:20px;
+      border-top: 2px solid #999;
+      border-right: 2px solid #999;
+      transform:rotate(45deg);
+      display: inline-block;
+    }
+  }
+}

src/onlineSelling/components/ContactConsultant/index.js

@@ -0,0 +1,16 @@
+import { View } from "@tarojs/components";
+import './index.scss'
+
+export default function ContactConsultant(props) {
+  const handleChat = () => {
+    const { buildingId } = props
+
+    Taro.navigateTo({
+      url: `/pages/card/list/index?buildingId=${buildingId}`
+    })
+  }
+
+  return (
+    <View className="contact" style={props.style} onClick={handleChat}>{props.text || '联系置业顾问'}</View>
+  )
+}

src/onlineSelling/components/ContactConsultant/index.scss

@@ -0,0 +1,6 @@
+.contact{
+  width: 100vw;
+  text-align: center;
+  font-size: 36px;
+  color: #3DE344;
+}

src/onlineSelling/components/GrantProfile/index.js

@@ -9,7 +9,7 @@ function noop(){}
 export default function GrantProfile(props) {
   if (isEmpty(props.person)) return <Block />;
 
-  const { tel, phone, avatarurl } = props.person
+  const { tel, phone, avatarurl } = props.person || {}
 
   const noPhone = !(tel || phone)
   const noAvatar = !avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1

src/onlineSelling/components/HotBlock/index.js

@@ -28,5 +28,5 @@ function computeLevel (num) {
 
 export default function HotBlock(props) {
   const level = computeLevel(props.number)
-  return (<View className={`hotblock bkg-${level}`}>{props.children}</View>)
+  return (<View className={`hotblock bkg-${level}`}><View className="inside">{props.children}</View></View>)
 }

src/onlineSelling/components/HotBlock/index.scss

@@ -1,45 +1,101 @@
 
 .hotblock {
+    display: inline-block;
+    height: 110px;
+    margin-top: 55px;
+    margin-left: 10px;
+    position: relative;
+    width: 132px;
+    border-radius: 6px;
+    .inside{
+      position: absolute;
+      height: 110px;
+      width: 132px;
+      left:0;
+      top: -6px;
+
+    }
+
   &.bkg-0 {
     background:#F8F8F8;
+    border-color:#F8F8F8;
   }
   &.bkg-1 {
     background:#F9DED1;
+    border-color:#F9DED1;
   }
   &.bkg-2 {
     background:#F6D4C3;
+    border-color:#F6D4C3;
   }
   &.bkg-3 {
     background:#F8C6AD;
+    border-color:#F8C6AD;
   }
   &.bkg-4 {
     background:#FDDBDB;
+    border-color:#FDDBDB;
   }
   &.bkg-5 {
     background:#F9CCCC;
+    border-color:#F9CCCC;
   }
   &.bkg-6 {
     background:#F9B7B7;
+    border-color:#F9B7B7;
   }
   &.bkg-7 {
     background:#FFADAD;
+    border-color:#FFADAD;
   }
   &.bkg-8 {
     background:#F59683;
+    border-color:#F59683;
   }
   &.bkg-9 {
     background:#F7836C;
+    border-color:#F7836C;
   }
   &.bkg-10 {
     background:#F97459;
+    border-color:#F97459;
   }
   &.bkg-11 {
     background:#FC6749;
+    border-color:#FC6749;
   }
   &.bkg-12 {
     background:#FD4E2B;
+    border-color:#FD4E2B;
   }
   &.bkg-13 {
     background:#FE2E2E;
+    border-color:#FE2E2E;
+    
   }
+}
+
+.hotblock:before {
+  border-bottom: 50px solid transparent;
+  border-left: 76px solid transparent;
+  border-right: 76px solid transparent;
+  content: "";
+  height: 0;
+  left: -10px;
+  position: absolute;
+  top: -40px;
+  width: 0;
+  border-bottom-color:inherit ;
+}
+
+.hotblock:after {
+  background: inherit;
+  position: absolute;
+  content: " ";
+  top: -34px;
+  right: 22px;
+  border-top-left-radius: 4px;
+  border-top-right-radius: 4px;
+  width: 12px;
+  height: 30px;
 }

src/onlineSelling/components/HouseCard/index.js

@@ -9,39 +9,64 @@ export default function HouseCard(props) {
   const {
     buildingName,
     termname,
+    termName,
     blockName,
+    displayHousePrice,
     unitName,
+    floorName,
     roomName,
     price,
+    housingStatus,
+    saleBatchStatus,
+    houseId,
     createDate,
-    status,
+    apartmentImgList = [],
     buildingImgList = [],
   } = props.summary || {}
 
-  const title = `${buildingName} ${termname||''} ${blockName} ${unitName} ${roomName}`
+  const title = `${buildingName || ''} ${termname || termName || ''} ${blockName || ''} ${unitName || ''} ${floorName || ''} ${roomName || ''}`
   const thumb = (buildingImgList || []).length
-  // const thumb = (buildingImgList || []).length ? transferImage((buildingImgList)[0].url) : emptyImg
+  const thumb2 = (apartmentImgList || []).length
   const showDT = dayjs(createDate).format('YYYY/MM/DD')
   const wanY = Number(price)
 
+  const toHouseDetail = () => {
+    if (props.onClick) {
+      props.onClick(props.summary)
+      return;
+    }
+
+    if (housingStatus == '0' || saleBatchStatus == '0') {
+      Taro.showToast({ title: '当前销售批次或该房源已被取消发布', icon: 'none', duration: 2000 })
+    } else {
+      Taro.navigateTo({
+        url: `/onlineSelling/pages/detail/index?id=${houseId}`
+      })
+    }
+  }
   return (
     <View className="housecard">
-      <View className="head">
-        {thumb ? <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" /> :
+      <View className="head" onClick={toHouseDetail}>
+        {thumb && <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" />
+        }
+        {!thumb && !thumb2 &&
           <Text style="font-size:26rpx;color:#666">暂无户型图</Text>
         }
-        {/* <Image className="thumb" src={thumb} mode="aspectFit" /> */}
+        {thumb2 && <Image className="thumb" src={transferImage((apartmentImgList)[0].url)} mode="aspectFit" />
+        }
       </View>
-      <View className="body">
+      <View className="body" onClick={toHouseDetail}>
         <View className="badge">已预选</View>
         <View className="title">{title}</View>
-        <View className="subtitle">
+        {displayHousePrice && <View className="subtitle">
           <Text>现价</Text>
           <Text className="red">{wanY + '万元' || '待定'}</Text>
-        </View>
+        </View>}
+
         <View className="meta">{showDT}预选</View>
-        <View className="sign bg-success"></View>
       </View>
+
+
     </View>
   )
 }

src/onlineSelling/components/HouseCard/index.scss

@@ -1,12 +1,8 @@
 .housecard {
-  // width: calc(100% - 32px);
-  width: 690px;
+  width: 100%;
   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 {
@@ -18,7 +14,6 @@
     align-items: center;
     justify-content: center;
 
-
     .thumb {
       width: 100%;
       height: 100%;
@@ -26,11 +21,11 @@
   }
 
   .body {
-    width: 438px;
+    width: 415px;
     flex: none;
     position: relative;
     line-height: 40px;
-    padding: 20px 16px;
+    padding: 16px 40px 16px 16px;
 
     .badge {
       font-size: 30px;
@@ -69,13 +64,4 @@
     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

@@ -12,7 +12,14 @@ export default function Floor(props) {
         {roomList.map((room) => {
           return (
             <View className="item" key={room.houseId} >
-              <Room dataset={room} onClick={props.onRoomClick}/>
+              <Room
+                dataset={room}
+                showDataType={props.showDataType}
+                onClick={props.onRoomClick}
+                chooseList={props.chooseList}
+                showAction={props.showAction}
+                onActionClick={props.onActionClick}
+              />
             </View>
           )
         })}

src/onlineSelling/components/HouseGrid/Room.js

@@ -1,28 +1,69 @@
+import Taro, { Component } from '@tarojs/taro'
 import { View } from "@tarojs/components";
 import HotBlock from "../HotBlock";
 import './room.scss'
+import lockImg from '../../assets/lock.png'
+import preselectionImg from '../../assets/preselection.png'
+import chipsImg from '../../assets/chips.png'
 
-export default function Room(props) {
-  const { roomName, heat, realHeat, price, apartmentName, status } = props.dataset || {}
-  const personNum = `(${realHeat + heat + 0}人)`
+export default class Room extends Component {
+  handleClick = () => {
+    const { onClick, dataset } = this.props
+    if (onClick) {
+      onClick(dataset || {})
+    }
+  }
+
+  handleActionClick = () => {
+    const { onActionClick, showAction, dataset } = this.props
 
-  const handleClick = () => {
-    if (props.onClick) {
-      props.onClick(props.dataset || {})
+    if (showAction && onActionClick) {
+      onActionClick(dataset || {})
     }
   }
 
-  const wanY = Number(price)
+  render() {
+    const { dataset, showAction, chooseList, showDataType = 1 } = this.props
 
-  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>}
+    const {
+      houseId,
+      roomName,
+      heat,
+      realHeat,
+      raiseHeat,
+      raiseRealHeat,
+      houseLockingStatus,
+      mineLocked,
+      minePreselection,
+      mineRaise
+    } = dataset || {}
 
-    </HotBlock>
-  )
+    // const personNum = `(${realHeat + heat + 0}人)`
+    const personNum = realHeat + heat + 0
+    const raisePersonNum = raiseHeat + raiseRealHeat + 0
+
+    const actionIcon = (chooseList || []).filter(x => x.houseId == houseId)[0] ? 'subtract-circle' : 'add-circle'
+
+    return (
+      <HotBlock number={showDataType === 1 ? personNum : raisePersonNum}>
+        <View className="room">
+          <View onClick={this.handleClick.bind(this)}>
+            <View className="roomname">{roomName || ''}</View>
+            <View className="yuxuan">{personNum}预选</View>
+            <View className="yuxuan">{raisePersonNum}认筹</View>
+            {!showAction && minePreselection && <Image src={preselectionImg} className="preselection-img"></Image>}
+            {!showAction && mineRaise && <Image src={chipsImg} className="chips-img"></Image>}
+            {!showAction && houseLockingStatus == 'locked' && <Image src={lockImg} className={mineLocked == 'mine' ? "lock-img2" : 'lock-img'}></Image>}
+          </View>
+          {
+            showAction && (
+              <View className="action" onClick={this.handleActionClick.bind(this)}>
+                <View className={`at-icon at-icon-${actionIcon}`}></View>
+              </View>
+            )
+          }
+        </View>
+      </HotBlock>
+    )
+  }
 }

src/onlineSelling/components/HouseGrid/Unit.js

@@ -13,7 +13,7 @@ export default class Unit extends Component {
     } else {
       item.noshow = false
     }
-    this.setState({})
+    this.setState({})  // 强制页面刷新
   }
   render() {
     const { termName, blockName, unitName, noshow = false, floorList = [] } = this.props.dataset || {}
@@ -29,7 +29,16 @@ export default class Unit extends Component {
         </View>
         <View className="body" >
           {!noshow && floorList.map((floor) => {
-            return <Floor key={floor.floorId} dataset={floor} onRoomClick={this.props.onRoomClick} />
+            return (
+              <Floor
+                key={floor.floorId}
+                dataset={floor}
+                showDataType={this.props.showDataType}
+                onRoomClick={this.props.onRoomClick}
+                chooseList={this.props.chooseList}
+                showAction={this.props.showAction}
+                onActionClick={this.props.onActionClick}                
+              />)
           })}
         </View>
       </View>

src/onlineSelling/components/HouseGrid/floor.scss

@@ -2,11 +2,14 @@
   display: flex;
 
   .head {
-    font-size: 32rpx;
-    padding-top: 68rpx;
+    font-size: 32px;
     flex: none;
-    width: 14%;
+    width: 60px;
     text-align: left;
+    height: 174px;
+    align-items: center;
+    display: flex;
+
   }
 
   .body {
@@ -17,13 +20,12 @@
     flex-wrap: wrap;
 
     .item {
-      width: 31%;
+      width: 25%;
       flex: none;
-      margin-right: 2%;
-      
-      &:nth-child(3) {
-        margin-right: 0;
-      }
+      text-align: center;
+      // &:nth-child(3) {
+      //   margin-right: 0;
+      // }
     }
   }
 }

src/onlineSelling/components/HouseGrid/index.js

@@ -3,14 +3,24 @@ import Unit from './Unit'
 
 export default (props) => {
   const unitList = (props.dataset || {}).unitList || []
-  const onRoomClick = props.onRoomClick || (() => {})
+  const handleRoomClick = props.onRoomClick || (() => {})
+  const handleActionClick = props.onActionClick || (() => {})
 
   return (
     <Block>
       {
-        unitList.map((unit) => (<Unit key={unit.unitId} dataset={unit} onRoomClick={onRoomClick} />))
+        unitList.map((unit) => (
+          <Unit
+            key={unit.unitId}
+            dataset={unit}
+            showDataType={props.showDataType}
+            onRoomClick={handleRoomClick}
+            chooseList={props.chooseList}
+            showAction={props.showAction}
+            onActionClick={handleActionClick}
+          />
+        ))
       }
     </Block>
   )
-
-}
+}

src/onlineSelling/components/HouseGrid/room.scss

@@ -1,22 +1,66 @@
+@import "~taro-ui/dist/style/components/icon.scss";
+
 .room {
   text-align: center;
   margin-bottom: 16px;
-  padding: 20px 10px;
+  padding: 10px;
   font-size: 28px;
-  line-height: 1.4em;
-  height: 192px;
+  height: 110px;
   overflow: hidden;
+  line-height: 1.24;
 
   .info {
     color: #333;
     white-space:nowrap;
   }
-
-  .warn {
+  .roomname{
     color: #730000;
   }
 
+  .yuxuan {
+   color: #333;
+   white-space: nowrap;
+  }
+
   .tip {
     color: #BB9C79;
   }
+  .lock-img{
+    width:22px;
+    height:23px;
+    position: absolute;
+    left: 2px;
+    bottom: 3px;
+  }
+  .lock-img2{
+    width:22px;
+    height:23px;
+    position: absolute;
+    right: 2px;
+    bottom: 3px;
+  }
+  .preselection-img{
+    width:18px;
+    height:18px;
+    position: absolute;
+    left: 10px;
+    top: 12px;
+  }
+  .chips-img{
+    width:18px;
+    height:18px;
+    position: absolute;
+    right: 10px;
+    top: 12px;
+  }
+
+  .action {
+    position: absolute;
+    width: 100%;
+    left: 0;
+    top: -30px;
+    height: 35px;
+    background: transparent;
+    text-align: center;
+  }
 }

src/onlineSelling/components/Picker/index.js

@@ -0,0 +1,28 @@
+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 (props) {
+  const { selector, title, currentValue, keyValue } = props || {}
+
+
+
+  return (
+    <View className="con-item">
+      <View className="title">
+        {title}
+      </View>
+      <View className="con-picker" >
+        <Picker mode='selector' range={selector} range-key={keyValue} onChange={props.handleChange}>
+          <View className='picker'>
+            {currentValue}
+          </View>
+        </Picker>
+        <View className="choose">请选择</View>
+      </View>
+    </View>
+  )
+}

src/onlineSelling/components/Picker/index.scss

@@ -0,0 +1,40 @@
+.con-item{
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid #dcdcdc;
+  line-height: 98px;
+  align-items: center;
+  position: relative;
+  .title{
+    font-size: 33px;
+    color: #333;
+  } 
+  .con-picker{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width:456px;
+    height:48px ;
+    line-height: 48px;
+    padding: 0 16px;
+    border-radius: 4px;
+    .picker{
+      width: 450px;
+      line-height:98px ;
+      height: 98px;
+      z-index: 1;
+      position: absolute;
+      top: 0;
+      font-size: 32px;
+    }
+  }
+  .choose{
+   font-size: 24px;
+   color: #E4A938;
+   float: right;
+   position: absolute;
+   right: 40px;
+
+  }
+}
+

src/onlineSelling/components/RaiseCard/index.js

@@ -0,0 +1,112 @@
+import { View, Image, Text, Block } from "@tarojs/components";
+import { transferImage } from '@/utils/tools'
+import dayjs from 'dayjs'
+import copyImg from '../../assets/copy.png'
+import closeImg from '../../assets/close.png'
+
+import './index.scss'
+
+export default function RaiseCard(props) {
+  let {
+    buildingName,
+    termName,
+    blockName,
+    unitName,
+    floorName,
+    roomName,
+    price,
+    houseLockingStatus,
+    displayHousePrice,
+    apartmentName,
+    mineLocked,
+    createDate,
+    buildingArea,
+    insideArea,
+    payStatus,
+    houseId,
+    statusType = '',
+    status,
+    taHousingResourcesList = [],
+    apartmentImgList = [],
+    taRaise = {},
+    buildingImgList = [],
+  } = props.summary || {}
+
+  if (!taRaise) {
+    taRaise = {}
+  }
+
+  const defHouse = taHousingResourcesList[0] || {}
+  const ellipsis = taHousingResourcesList.length > 1 ? `等${taHousingResourcesList.length}套房源` : ''
+  const title = `${buildingName || defHouse.buildingName || ''} ${termName || defHouse.termName || ''} ${blockName || defHouse.blockName || ''} ${unitName || defHouse.unitName || ''} ${floorName || defHouse.floorName || ''} ${roomName || defHouse.roomName || '　'}${ellipsis}`
+  const thumb = (buildingImgList || []).length
+  const thumb2 = (apartmentImgList || []).length
+  const showDT = dayjs(createDate).format('YYYY/MM/DD')
+  const wanY = Number(price)
+
+
+  const copyData = (e) => {
+    e.stopPropagation()
+    Taro.setClipboardData({
+      data: `${houseId}`,
+      onSuccess: (() => { }),
+    })
+  }
+
+  const handleCancel = () => {
+    if (props.onCancel) {
+      props.onCancel(props.summary)
+    }
+  }
+  return (
+
+    <Block>
+      {status == -1 && statusType == "raise" ? '' :
+        <View className="housecard" style={props.style} >
+          <View className="head" onClick={() => (props.handleCard && props.handleCard())}>
+            {thumb && <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" />
+            }
+            {!thumb && !thumb2 &&
+              <Text style="font-size:26rpx;color:#666">暂无户型图</Text>
+            }
+            {thumb2 && <Image className="thumb" src={transferImage((apartmentImgList)[0].url)} mode="aspectFit" />
+            }
+          </View>
+          <View className="body">
+            {props.type == 'raiseMoney' && !props.disableCancel && <Image src={closeImg} onClick={handleCancel} className="close-img"></Image>}
+            <View onClick={() => (props.handleCard && props.handleCard())}>
+              {!props.type && <View style={status == '0' ? 'color:#999' : ''} className={payStatus == 'paid' ? 'raised badge' : payStatus == 'unpaid' ? 'unraise badge' : 'badge'}>{payStatus == 'paid' ? '已缴费' : payStatus == 'unpaid' ? '未缴费' : '已退费'}</View>}
+              {(props.type == 'raiseProfile' || props.type == 'houseResource') && <View style="color:#FF3C3C" className='badge'>{mineLocked ? '已锁给我' : '　'}</View>}
+              {(props.type == 'raiseProfile' || props.type == 'raiseMoney') && <View style={props.type == 'raiseMoney' ? 'color:#BB9C79;font-size:30rpx' : 'color:#BB9C79;font-size:30rpx;margin-top:-20rpx'}>{apartmentName || '　'}</View>}
+              {props.type == 'raiseMoney' && (taRaise.displayHousePrice || displayHousePrice) && <View className="red-price">现价{wanY}万</View>}
+              {props.type == 'houseResource' && <View style="color:#BB9C79;font-size:28rpx;margin:-40rpx 0 12rpx 0">{houseLockingStatus == 'locked' ? '已锁定' : '未锁定'}</View>}
+              <View className={props.type == 'raiseMoney' && !props.disableCancel ? 'title max' : 'title'} style={status == '0' ? 'color:#999' : ''}>{title}</View>
+              {!props.type && <View className="meta">{showDT}</View>}
+              {props.type == 'raiseProfile' && (taRaise.displayHousePrice || displayHousePrice) && <View className="price">现价<Text className="red">{wanY}</Text>万</View>}
+              {status == '0' && <View style="color:#999;font-size:30rpx">已作废</View>}
+              {(props.type == 'raiseProfile' || props.type == 'raiseMoney') &&
+                <Block>
+                  {buildingArea ? <View className="area">建筑面积约 <Text className="red">{buildingArea}m²</Text>
+                  </View> : <View className="area">建筑面积待定
+             </View>}
+                </Block>
+              }
+              {(props.type == 'raiseProfile' || props.type == 'raiseMoney') &&
+                <Block>
+                  {insideArea ? <View className="area">使用面积约 <Text className="red">{insideArea}m²</Text>
+                  </View> : <View className="area">使用面积待定
+             </View>}
+                </Block>
+              }
+            </View>
+            {props.type == 'houseResource' && <View className="house-code" style="margin-top:14rpx">房源编号：{houseId}
+              <Image src={copyImg} className="copy-img" onClick={copyData}></Image>
+            </View>}
+          </View>
+
+        </View>
+      }
+    </Block>
+
+  )
+}

src/onlineSelling/components/RaiseCard/index.scss

@@ -0,0 +1,100 @@
+.housecard {
+  width: 690px;
+  min-height: 250px;
+  background:#fff;
+  display: flex;
+  font-weight: 400;
+  margin: 0 auto 30px auto;
+  box-shadow:0px 4px 15px 1px rgba(0, 0, 0, 0.12);
+  border-radius:8px;
+  .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: 440px;
+    flex: none;
+    position: relative;
+    line-height: 40px;
+    padding: 16px;
+    .close-img{
+      width: 46px;
+      height: 46px;
+      padding: 10px;
+      position: absolute;
+      right: 10px;
+      top: 10px;
+    }
+    .badge {
+      font-size: 30px;
+      color: #999;
+      text-align: right;
+      margin-right: 12px;
+    }
+    .unraise{
+      color: #FE1C1C
+    }
+    .raised{
+     color: #3DE344; 
+    }
+    .title {
+      font-size: 26px;
+      font-weight: bold;
+      color:#333;
+      line-height: 1.6;
+    }
+    .max{
+      max-width:340px
+    }
+
+    .meta {
+      font-size: 24px;
+      color:#999;
+      float: right;
+    }
+    .price{
+      font-size: 28px;
+      color: #333;
+      display: flex;
+      align-items: center;
+    }
+    .house-code{
+      font-size: 28px;
+      color: #333;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+    .area{
+      font-size: 24px;
+      color: #333;
+    }
+    .red-price{
+      color: #FF3C3C;
+      font-weight: 900;
+      line-height: 2;
+      font-size: 24px;
+    }
+    .red{
+      color: #FF3C3C;
+      margin: 0 6px;
+    }
+    .copy-img{
+      width:34px;
+      height:38px;
+    }
+
+  }
+
+}

src/onlineSelling/components/ScrollMessage/index.js

@@ -54,7 +54,6 @@ export default class ScrollMessage extends Component {
       <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>

src/onlineSelling/components/ShareButtons/ShareBtn.js

@@ -9,7 +9,6 @@ export default function ShareBtn(props) {
   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>

src/onlineSelling/components/Statement/index.js

@@ -0,0 +1,12 @@
+import { View} from "@tarojs/components";
+import './index.scss'
+
+export default function Statement(props) {
+
+  return (
+    <View className="bottom-con" style={props.style}>
+      <View className="statement">！免责声明：</View>
+      <View className="statement">房源信息、选房协议等来源于开发商,具体销售数据可能会有延迟，最终以开发商官网公告为准，请在执行具体操作前和置业顾问沟通确认，并谨慎核查。</View>
+    </View>
+  )
+}

src/onlineSelling/components/Statement/index.scss

@@ -0,0 +1,10 @@
+.bottom-con{
+  padding: 26px 30px;
+  background-color: #F8F8F8;
+
+  .statement{
+    font-size: 24px;
+    color: #999;
+    line-height: 1.6;
+  }
+} 

src/onlineSelling/pages/addHouse/index.js

@@ -0,0 +1,145 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, ScrollView, Block } from '@tarojs/components'
+import './index.scss'
+import Blank from '../../components/Blank'
+import HouseCard from '../../components/HouseCard'
+import ready from '@/utils/ready'
+import { connect } from '@tarojs/redux'
+import * as houseActions from '@/actions/house'
+
+function noop() { }
+
+@connect(
+  ({ user, house }) => ({ ...user, house }),
+  { ...houseActions }
+)
+export default class extends Component {
+  config = {
+    navigationBarTitleText: '添加预选房源',
+  }
+
+  state = {
+    chooseList: [],
+  }
+
+  componentWillMount() {
+    ready.queue(() => {
+      const { userInfo, house } = this.props
+      const { id: salesBatchId } = this.$router.params
+
+      this.props.dispatchGetMySelection({
+        source: 'raiseChoose',
+        salesBatchId,
+        personId: userInfo.person.personId,
+      })
+
+      if (house.raiseCart && house.raiseCart.length) {
+        this.setState({ chooseList: house.raiseCart })
+      }
+    })
+  }
+
+  handleCheckboxChange = (e) => {
+    const { house } = this.props
+    const houseIdList = e.detail.value.map(x => x - 0)
+    const chooseList = (house.mySelectHouses || []).filter(x => houseIdList.indexOf(x.houseId) > -1).map(x => ({
+      ...x.housingInfo,
+      buildingImgList: x.buildingImgList,
+      displayHousePrice: x.displayHousePrice,
+      displayHousePrice: x.displayHousePrice
+    }))
+
+    this.setState({ chooseList })
+  }
+
+  handleSubmit = () => {
+    const { chooseList } = this.state
+    const { house } = this.props
+
+    if (!chooseList.length) {
+      Taro.showModal({
+        title: '提示',
+        content: '您未选择房源, 确认离开?',
+        success: (res) => {
+          if (res.confirm) {
+            const leftHouses = house.raiseCart.filter(x => !(house.mySelectHouses || []).filter(it => it.houseId == x.houseId)[0])
+
+            this.props.dispatchFlush2Cart(leftHouses)
+            Taro.navigateBack({ delta: 1 })
+          }
+        }
+      })
+    } else {
+      const notInPreSelect = house.raiseCart.filter(x => !chooseList.filter(it => it.houseId == x.houseId)[0])
+
+      this.props.dispatchFlush2Cart(notInPreSelect.concat(chooseList))
+      Taro.navigateBack({ delta: 1 })
+    }
+  }
+
+  renderHead() {
+    return (
+      <View className="head">仅展示符合认筹条件的已预选房源,左侧勾选</View>
+    );
+  }
+
+  renderHouses() {
+    const { chooseList } = this.state
+    const { house } = this.props
+
+    // 从预选记录中过滤出来, 状态正常且未锁定的房源
+    const houseList = (house.mySelectHouses || []).map(x => ({
+      ...x.housingInfo,
+      buildingImgList: x.buildingImgList,
+      displayHousePrice: x.displayHousePrice,
+      displayHousePrice: x.displayHousePrice
+    })).filter(x => x.status == 1)
+
+    return houseList.length && (
+      <Block>
+        <ScrollView scrollY className="container">
+          <CheckboxGroup onChange={this.handleCheckboxChange}>
+            {
+              houseList.map((item) => {
+                const checked = !!chooseList.filter(x => x.houseId == item.houseId)[0]
+
+                return (
+                  <Label class="checkbox" key={item.houseId}>
+                    <Checkbox value={item.houseId} checked={checked} >
+                      <View className="carditem" >
+                        <HouseCard summary={item} onClick={noop} />
+                      </View>
+                    </Checkbox>
+                  </Label>
+                )
+              })
+            }
+          </CheckboxGroup>
+        </ScrollView >
+        <View className="raise-box">
+          <View className="raise-btn" onClick={this.handleSubmit}>确认以上选择</View>
+        </View>
+      </Block>
+    )
+  }
+
+
+  renderBlank() {
+    const { house } = this.props
+    const hasData = house.mySelectHouses && house.mySelectHouses.length
+
+    return !hasData && (
+      <Blank tips="没有符合认筹条件的预选房源" />
+    )
+  }
+
+  render() {
+    return (
+      <View className="add-house">
+        {this.renderHead()}
+        {this.renderBlank()}
+        {this.renderHouses()}
+      </View>
+    )
+  }
+}

src/onlineSelling/pages/addHouse/index.scss

@@ -0,0 +1,40 @@
+
+.add-house {
+  background-color: #F8F8F8;
+  min-height: 100vh;
+
+  .head {
+    padding: 0 30px;
+    font-size:28px;
+    color: #666;
+    line-height:88px;
+  }
+  .container {
+    height: calc(100vh - 242px);
+  }
+  .checkbox{
+    display: block;
+    height: 250px;
+    background-color: #fff;
+    padding-left: 30px;
+    margin-bottom: 20px;
+  }
+
+  .raise-box{
+    position: fixed;
+    width: 100vw;
+    padding: 30px;
+    .raise-btn{
+     
+      height:94px;
+      line-height: 94px;
+      background:rgba(187,156,121,1);
+      border-radius:10px;
+      color: #fff;
+      font-size: 36px;
+      text-align: center;
+    }  
+  }
+
+
+}

src/onlineSelling/pages/chooseConsultant/index.js

@@ -0,0 +1,65 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View } from '@tarojs/components'
+import ConsultantItem from '../../components/ConsultantItem/index'
+import './index.scss'
+
+import { connect } from '@tarojs/redux'
+import * as houseActions from '@/actions/house'
+import Blank from '../../components/Blank'
+
+@connect(({ house }) => ({ house }), { ...houseActions })
+export default class ConsultantList extends Component {
+  config = {
+    navigationBarTitleText: '选择置业顾问'
+  }
+
+  componentDidMount() {
+    const { buildingId } = this.$router.params
+    const { house } = this.props
+
+    // if (!house.consultantList || !house.consultantList.length) {
+    this.props.dispatchGetConsultants({
+      buildingId,
+      pageSize: 999,
+      pageNumber: 1,
+    })
+    // }
+  }
+
+  handleItemClick = (consultant) => {
+    console.log('----------------->', consultant)
+    this.props.dispatchChooseConsultant(consultant)
+
+    Taro.navigateBack({ delta: 1 })
+  }
+  toConsultantDetail(item) {
+    Taro.navigateTo({
+      url: `/pages/card/index?id=${item.id}`
+    })
+  }
+  render() {
+    const { house } = this.props
+
+    return (
+      <View className="consultantList">
+        {
+          (!house.consultantList || !house.consultantList.length) &&
+          (<Blank tips="暂无数据" />)
+        }
+
+        {
+          house.consultantList.map((item, index) => (
+            <ConsultantItem
+              data={item}
+              key={index + 'card'}
+              onClick={this.handleItemClick}
+              onHomepage={() => this.toConsultantDetail(item)}
+            >
+            </ConsultantItem>
+          ))
+        }
+      </View>
+    )
+  }
+
+}

src/onlineSelling/pages/chooseConsultant/index.scss

@@ -0,0 +1,5 @@
+.consultantList{
+  background-color: #F8F8F8;
+  min-height: 100vh;
+  padding-top: 20px;
+}

src/onlineSelling/pages/detail/index.js

@@ -9,9 +9,14 @@ import dayjs from 'dayjs'
 import { transferImage } from '@/utils/tools'
 import Blank from '../../components/Blank'
 import * as noticeType from '@/constants/common.js'
+import Statement from '../../components/Statement'
+import { View } from '@tarojs/components'
+import * as houseActions from '@/actions/house'
+import { checkRaise } from '@/services/house'
 
 @connect(
-  ({ user }) => ({ ...user })
+  ({ user, house }) => ({ ...user, house }),
+  { ...houseActions }
 )
 
 export default class Index extends Component {
@@ -22,13 +27,11 @@ export default class Index extends Component {
   state = {
     grantPhoneVisible: false, // 授权电话
     grantAvatarVisible: false, // 授权头像
-    houseDetail: null,
+    houseDetail: {},
     popVisiable: false,
   }
 
-
   componentDidShow() {
-
     ready.queue(() => {
       // 分享场景需要先授权手机, 再授权头像
       if (this.toggleGrantPhone()) {
@@ -42,7 +45,7 @@ export default class Index extends Component {
       }
       queryHouseDetail(params).then(res => {
         this.setState({
-          houseDetail: res || {},
+          houseDetail: !res ? {} : res,
           buildingImgList: res.buildingImgList || []
         })
       })
@@ -50,8 +53,6 @@ export default class Index extends Component {
     })
   }
 
-
-
   // 调起授权电话
   toggleGrantPhone = () => {
     const { userInfo: { person: { phone, tel } } } = this.props
@@ -95,7 +96,6 @@ export default class Index extends Component {
   }
 
   handlePanoramaClick(panoramaLink) {
-    console.log(panoramaLink, "panoramapanoramapanoramapanoramapanoramapanoramapanoramapanoramapanorama")
 
     if (!panoramaLink) return;
 
@@ -137,10 +137,42 @@ export default class Index extends Component {
 
   }
 
+  toRaiseMoney() {
+    const detail = this.state.houseDetail || {}
+
+    if (detail.status != 1) {
+      Taro.showToast({
+        url: '当前房源未发布, 不能认筹',
+        icon: 'none',
+      })
+
+      return;
+    }
+
+    checkRaise([detail.houseId]).then(() => {
+      this.props.dispatchAddCart(detail)
+      Taro.navigateTo({ url: `/onlineSelling/pages/raiseMoney/index?houseId=${detail.houseId}&salesBatchId=${detail.salesBatchId}` })
+    })
+  }
+
+  // 查看大图
+  onPreview = (item, e) => {
+
+    var previewArr = [];
+    for (var i = 0; i < item.length; i++) {
+      previewArr.push(item[i].url);
+    }
+
+    Taro.previewImage({
+      current: previewArr,
+      urls: previewArr
+    })
 
+  }
 
   render() {
-    const { grantPhoneVisible, grantAvatarVisible, houseDetail, buildingImgList, popVisiable } = this.state
+    const { grantPhoneVisible, grantAvatarVisible, houseDetail, buildingImgList = [], popVisiable } = this.state
+    const { taRaise } = this.state.houseDetail
     const { userInfo } = this.props
     const address = `${houseDetail.buildingName || ''}${houseDetail.termName || ''}${houseDetail.blockName || ''}${houseDetail.unitName || ''}${houseDetail.floorName || ''}${houseDetail.roomName || ''}`
 
@@ -167,12 +199,12 @@ export default class Index extends Component {
 
         <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)} />
+            {buildingImgList && buildingImgList.length ?
+              <Image className="cover-img" mode="widthFix" onClick={() => buildingImgList[0].type == '1' ? this.handlePanoramaClick(buildingImgList[0].panoramaLink) : this.onPreview(buildingImgList)} src={transferImage(buildingImgList[0].url)} />
               : <Blank tips="暂无户型信息"></Blank>
             }
           </View>
-          {buildingImgList.length && buildingImgList[0].type == '1' &&
+          {buildingImgList && buildingImgList.length && buildingImgList[0].type == '1' &&
             <Image className="vr-img" onClick={() => this.handlePanoramaClick(buildingImgList[0].panoramaLink)} src={require('@/assets/vr.png')} />
           }
           <ScrollView
@@ -181,11 +213,12 @@ export default class Index extends Component {
             scrollY>
             <View className='detail__main'>
               <View style="padding: 0 30rpx;">
-                <View className="name">{houseDetail.apartmentName || ''}</View>
+                <View className="name">{houseDetail.apartmentName || '　'}</View>
                 <View className="btn" onClick={() => this.handleChat(houseDetail.buildingId)}>询问优惠</View>
-                <View className="price">
-                  现价：{houseDetail.price}万
-              </View>
+                {
+                  (taRaise.displayHousePrice || houseDetail.displayHousePrice) && <View className="price"> 现价：{houseDetail.price}万</View>
+                }
+
                 {houseDetail.apartmentName &&
                   <View className="area">
                     {houseDetail.buildingArea ? <Text>建筑面积约<Text style="color:#FE1C1C">{houseDetail.buildingArea}</Text>m² </Text> : '建筑面积待定'}
@@ -195,35 +228,37 @@ export default class Index extends Component {
                 <View className="address">
                   <Image className="location-icon" src={require('../../assets/location.png')}></Image>{address || ''}
                 </View>
-                <View className="date">
+                {houseDetail.preselectionStartTime && <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> */}
+                }
+                {taRaise && <View className="date">认筹时间：{dayjs(taRaise.raiseStartTime).format('MM/DD HH:mm:ss')}--{dayjs(taRaise.raiseEndTime).format('MM/DD HH:mm:ss')}
+                </View>}
+
               </View>
               <View className="num">
                 已有{houseDetail.realHeat + houseDetail.heat + 0}人预选此房源，快快预选认筹~
               </View>
+              <Statement style="margin: 104rpx 0 30rpx 0" />
               <View style="padding: 0 30rpx;">
-                {!houseDetail.isPreselect ?
-                  <View className="choose-btn" onClick={() => this.open()}>
-                    预选此房源
+                {
+                  houseDetail.preselectionBtn && <View>
+                    {!houseDetail.isPreselect ?
+                      <View className="choose-btn" onClick={() => this.open()}>
+                        预选此房源
                   </View> : <View className="choose-btn" onClick={() => this.open()}>
-                    取消预选
+                        取消预选
+                  </View>
+                    }
                   </View>
                 }
-                <View className="close-btn">
-                  认筹功能未开放
-              </View>
-              </View>
-
 
+                {houseDetail.raiseBtn && <View className="raise-btn" onClick={() => this.toRaiseMoney()}>
+                  认筹此房源
+              </View>}
+              </View>
             </View>
           </ScrollView>
-
-
-
         </View>
 
       </Block >

src/onlineSelling/pages/detail/index.scss

@@ -144,7 +144,6 @@
       padding: 0 30px;
       margin-top: 10px;
       font-weight: 300;
-      margin-bottom: 78px;
    
     }
     .choose-btn{
@@ -155,10 +154,10 @@
       border-radius:10px;
       text-align: center; 
     }
-    .close-btn{
-      color: $primary-color;
+    .raise-btn{
+      color: #333;
       font-size: 36px;
-      background-color: #F8F8F8;
+      border:1px solid #dcdcdc;
       line-height: 94px;
       border-radius:10px;
       text-align: center;

src/onlineSelling/pages/detail/resultPage.js

@@ -3,12 +3,13 @@ import './index.scss'
 import { connect } from '@tarojs/redux'
 import ready from '@/utils/ready'
 import { addPreselection, cancelPreselection } from '@/services/project'
+import ContactConsultant from '../../components/ContactConsultant'
 
 @connect(
   ({ user }) => ({ ...user })
 )
 
-export default class Index extends Component {
+export default class resultPage extends Component {
   config = {
     navigationBarTitleText: '',
   }
@@ -49,7 +50,7 @@ export default class Index extends Component {
         })
       } else {
         Taro.setNavigationBarTitle({ title: '取消预选' })
-        cancelPreselection( params2).then(res => {
+        cancelPreselection(params2).then(res => {
           this.setState({
             status: 1,
             statusText: '您已成功取消预选此房源'
@@ -63,16 +64,10 @@ export default class Index extends Component {
       }
     })
   }
-  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
+    const { type, buildingId } = this.$router.params
     return (
       <View className="result">
         {status == 1 && <Image className="result-img" src={require('../../assets/success2.png')}></Image>}
@@ -82,8 +77,7 @@ export default class Index extends Component {
         {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>
+        <ContactConsultant buildingId={buildingId} style=" position: absolute;bottom: 8vh;" />
       </View>
 
     );

src/onlineSelling/pages/help/index.js

@@ -1,6 +1,7 @@
 import Taro, { Component } from '@tarojs/taro'
 import { View } from '@tarojs/components'
 import './index.scss'
+import { transferImage } from '@/utils/tools'
 import HotBlock from '../../components/HotBlock'
 
 export default class Help extends Component {
@@ -16,71 +17,71 @@ export default class Help extends Component {
     } 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,
-      },
-    ]
+    // 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>
+      {/* <View className="article"> */}
+        {/* <View className="section">
           <View className="title">1.图例解释：</View>
           <View>
             <View className="cell flex">
@@ -151,7 +152,8 @@ export default class Help extends Component {
         <View className="section">
           <View className="title">10.如何查看我的选房记录：</View>
           <View>房源页面点击下方选房记录按钮进入个人选房记录查看。或直接进入个人中心查看选房记录。</View>
-        </View>
+        </View> */}
+        <Image mode="widthFix" style="width:100%" src={transferImage('https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/explain.png')}></Image>
         <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/houseCart/index.js

@@ -0,0 +1,300 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, ScrollView } from '@tarojs/components'
+
+import './index.scss'
+import Blank from '../../components/Blank'
+import HouseGrid from '../../components/HouseGrid'
+import { queryHouseList } from '@/services/project'
+
+import ready from '@/utils/ready'
+import { connect } from '@tarojs/redux'
+import * as houseActions from '@/actions/house'
+import { fetch, apis } from '@/utils/request'
+
+const getRaiseProfile = ({ salesBatchId, raiseRecordId, personId }) => {
+  const queryString = [
+    `${raiseRecordId ? 'raiseRecordId=' + raiseRecordId : ''}`,
+    `${salesBatchId ? 'salesBatchId=' + salesBatchId : ''}`,
+    `${personId ? 'personId=' + personId : ''}`,
+  ].filter(Boolean).join('&')
+
+  return fetch({ url: `${apis.API_RAISE_PROFILE}?${queryString}` })
+}
+
+@connect(
+  ({ user, house }) => ({ ...user, house }),
+  {...houseActions}
+)
+export default class extends Component {
+  config = {
+    navigationBarTitleText: '添加其他房源',
+  }
+
+  state = {
+    loading: true,
+    dataType: 1, // maybe need change  1 预选, 2 认筹
+    houseList: [],
+    chooseList: [], // 已经选择的房源列表
+    collapsed: true,      // 已选列表默认关闭, true 关闭, false 开启
+    multiSelect: true,  // 是否多选, 自动锁房是单选
+  }
+
+  componentWillMount () {
+    ready.queue(() => {
+      const { userInfo, house } = this.props
+      const { id: salesBatchId, multi } = this.$router.params
+
+      const params = {
+        source: 'raiseChoose',
+        salesBatchId,
+        pageNum: 1,
+        pageSize: 9999,
+      }
+
+      queryHouseList(params).then(res => {
+        this.setState({
+          houseList: this.groupHouseList(res) || [],
+          loading: false,
+        })
+      })
+
+      // 获取认筹信息
+      // getRaiseProfile(salesBatchId, undefined, userInfo.person.personId)
+
+      if (house.raiseCart && house.raiseCart.length) {
+        this.setState({ chooseList: house.raiseCart })
+      }
+
+      this.setState({ multiSelect: multi !== 'false' })
+    })
+  }
+  
+  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
+    }, [])
+  }
+
+  changeShowData = (dataType) => {
+    // 此处需要按照 dataType 去切换数据
+    // 切换成功之后
+    this.setState({ dataType })
+  }
+
+  // 添加到选择列表
+  // 注意, 不是确认选择
+  add2Cart = (room) => {
+    // const locked = room.houseLockingStatus == 'locked'
+    // if (locked) {
+    //   Taro.showToast({ title: '该房源已经被锁定', icon: 'none' })
+    //   return;
+    // }
+
+    const { chooseList, multiSelect } = this.state
+    const checked = (chooseList || []).filter(x => x.houseId == room.houseId)[0]
+
+    if (checked) {
+      this.setState({ chooseList: chooseList.filter(x => x.houseId != room.houseId) })
+    } else {
+      if (multiSelect) {
+        this.setState({ chooseList: chooseList.concat(room) })
+      } else {
+        this.setState({ chooseList: [room] })
+      }
+    }
+  }
+
+  // 确认选择
+  handleSubmit = () => {
+    if (!this.state.chooseList.length) {
+      Taro.showModal({
+        title: '提示',
+        content: '您未选择房源, 确认离开?',
+        success: (res) => {
+          if (res.confirm) {
+            this.props.dispatchFlush2Cart([])
+            Taro.navigateBack({ delta: 1 })
+          }
+        }
+      })
+    } else {
+      this.props.dispatchFlush2Cart(this.state.chooseList)
+      Taro.navigateBack({ delta: 1 })
+    }
+  }
+
+  // 取消选择
+  subChooseList = (house) => {
+    const name = [house.termName, house.blockName, house.unitName, house.floorName, house.roomName].join('')
+    const { chooseList } = this.state
+
+    Taro.showModal({
+      title: '取消选择',
+      content: `确认取消 ${name} ?`,
+      success: (res) => {
+        if (res.confirm) {
+          this.setState({ chooseList: chooseList.filter(x => x.houseId != house.houseId) })
+        }
+      }
+    })
+  }
+
+  // 是否展开已选列表
+  trigCartPannel = () => {
+    const { collapsed } = this.state;
+    this.setState({ collapsed: !collapsed })
+  }
+
+  renderHead() {
+    const { dataType, houseList } = this.state
+    const hasData = houseList && houseList.length
+
+    return (
+      <View className="head">
+        <View className="tips">仅显示符合认筹条件的房源。点击房源卡片查看房源详情，不要在房源详情页做操作。请在当前页面选择提交认筹。</View>
+        {
+          hasData && (
+            <View className="actions">
+              <View className={`action ${dataType === 1 ? 'active' : ''}`} onClick={() => this.changeShowData(1)}>预选热度图</View>
+              <View className={`action ${dataType === 2 ? 'active' : ''}`} onClick={() => this.changeShowData(2)}>认筹热度图</View>
+            </View>
+          )
+        }
+      </View>
+    );
+  }
+
+  renderHouses() {
+    const { houseList, dataType, chooseList } = this.state
+    const hasData = houseList && houseList.length
+
+    return hasData && (
+      <ScrollView className="body" scrollY>
+      {
+        houseList.map((item) => {
+          return (
+            <HouseGrid
+              key={item.unitId}
+              dataset={item}
+              showAction
+              showDataType={dataType}
+              chooseList={chooseList}
+              onRoomClick={this.handleRoomClick}
+              onActionClick={this.add2Cart}
+            />
+          )
+        })
+      }
+      </ScrollView>
+    )
+  }
+
+  renderAction() {
+    const { chooseList, collapsed, houseList } = this.state;
+    const defChoose = chooseList[0] || {}
+    const defName = [defChoose.termName, defChoose.blockName, defChoose.unitName, defChoose.floorName, defChoose.roomName].join('')
+    const title = collapsed ? `已选择: ${defName} 等 ${chooseList.length} 个房源` : '已选列表'
+    const opened = collapsed ? 'off' : 'on'
+    const nodata = houseList && houseList.length ? '' : 'nodata'
+    const btnText = chooseList && chooseList.length ? '确认以上选择' : '未选择房源'
+    const choosed = chooseList && chooseList.length
+
+    return (
+      <View className="footer">
+      {
+        choosed && (
+          <View className="shoping-cart collapse">
+            <View className={`title ${opened}`} onClick={this.trigCartPannel}>
+              <Text>{title}</Text>
+              {collapsed?<Text className="at-icon at-icon-chevron-up"></Text> :<Text className="at-icon at-icon-chevron-down"></Text> }           
+            </View>
+
+            <View className={`choose-list ${opened}`}>
+              {chooseList.map((house, index) => {
+                const name = [house.termName, house.blockName, house.unitName, house.floorName, house.roomName].join('')
+
+                return (
+                  <View key={`cart-item-${index}`} className="choose-item" onClick={() => this.subChooseList(house)}>
+                    <View className="choose-item-body">{name}</View>
+                    <View className="choose-item-action">
+                      <Text className="at-icon at-icon-subtract-circle"></Text>
+                    </View>
+                  </View>
+                )
+              })}
+            </View>          
+          </View>
+        )
+      }
+        <Button className={`btn ${nodata}`} onClick={this.handleSubmit}>{btnText}</Button>
+      </View>
+    )
+  }
+
+  renderBlank() {
+    const { houseList } = this.state
+
+    return !(houseList && houseList.length) && (
+      <Blank tips="暂无符合条件的房源" />
+    )
+  }
+
+  render() {
+    return (
+      <View className="house-cart">
+        {this.renderHead()}
+        {this.renderBlank()}
+        {this.renderHouses()}
+        {this.renderAction()}
+      </View>
+    )
+  }
+}

src/onlineSelling/pages/houseCart/index.scss

@@ -0,0 +1,141 @@
+@import "~taro-ui/dist/style/components/icon.scss";
+
+.house-cart {
+
+  .head {
+    margin: 30px 0;
+    padding: 0 30px;
+    font-size:24px;
+
+    .tip {
+      color:#666;
+      line-height:36px;
+    }
+
+    .actions {
+      margin-top: 20px;
+
+      .action {
+        display: inline-block;
+        color:#333;
+        background:#fff;
+        line-height:48px;
+        padding: 0 24px;
+        border:1px solid #E4E4E4;
+        border-radius: 24px;
+  
+        &.active {
+          color:#fff;
+          background:#BB9C79;
+          border:1px solid #BB9C79;
+          box-shadow:0px 4px 12px 0px rgba(255,171,50,0.08);
+        }
+  
+        & + .action {
+          margin-left: 30px;
+        }
+      }
+    }
+  }
+
+  .body {
+    height: calc(100vh - 450px);
+
+  }
+
+  .footer {
+    position: fixed;
+    width: 100%;
+    bottom: 0;
+    background: #fff;
+    z-index: 10;
+    text-align: center;
+    padding: 0 30px 30px;
+
+    .btn {
+      font-size: 36px;
+      color: #fff;
+      height: 94px;
+      line-height: 94px;
+      background: #BB9C79;
+      border-radius: 10px;
+
+      &.nodata {
+        background:#000;
+        opacity:0.6;
+      }
+    }
+  }
+
+  .shoping-cart {
+    position: absolute;
+    bottom: 125px;
+    font-size: 28px;
+    line-height: 30px;
+    color: #333;
+    width: calc(100% - 70px);
+    box-shadow:0px 4px 12px 0px rgba(0, 0, 0, 0.08);
+    border-radius:44px 44px 0px 0px;
+    background-color: #fff;
+
+    .title {
+      text-align: center;
+      font-size: 24px;
+
+      .at-icon {
+        display: inline-block;
+        margin-left: 20px;
+      }
+    }
+
+    .choose-list {
+      padding: 30px;
+      overflow: hidden;
+
+      .choose-item {
+        display: flex;
+        
+        &-body {
+          text-align: left;
+          flex: auto;
+        }
+
+        &-action {
+          width: 30px;
+          flex: none;
+          text-align: right;
+        }
+
+        & + .choose-item {
+          margin-top: 24px;
+        }
+      }
+    }
+  }
+
+  .collapse {
+    .on {
+      &.title {
+        height: 64px;
+        padding: 20px 0;
+      }
+
+      &.choose-list{
+        height: auto;
+      }
+    }
+
+    .off {
+      &.title {
+        padding: 40px 0;
+        height: 100px;
+      }
+
+      &.choose-list {
+        height: 0;
+        padding: 0;
+      }
+    }
+  }
+
+}

src/onlineSelling/pages/houseList/index.js

@@ -23,8 +23,9 @@ import { getCardDetail } from '@/services/card'
 import Consultant from '@/components/consultant'
 import './index.scss'
 import { Loading } from '@/components/Loading'
+import * as houseActions from '@/actions/house'
 
-@connect(s => s.user)
+@connect(s => s.user, { ...houseActions })
 @withDetail({
   track: {
     event: 'house_list',
@@ -52,7 +53,6 @@ export default class HouseList extends Component {
     endPrice: '',
     apartmentId: '',
     reportedCustomer: false,
-    posterShow: false,
     posterData: {},
     buildingId: null,
     salesBatchDetail: {},
@@ -61,17 +61,20 @@ export default class HouseList extends Component {
     consultShow: false,  // 置业顾问悬浮框显示隐藏
     noRecord: false,
     loading: true,
+    dataType: 1,
   }
 
 
   componentDidShow() {
-
     ready.queue(() => {
       this.setState({ showShareMenu: false })
       this.initPageData()
     })
+
+    // 清空认筹选择
+    this.props.dispatchFlush2Cart([])
   }
-  
+
 
   componentWillReceiveProps() {
     this.reportClientFn()
@@ -127,7 +130,7 @@ export default class HouseList extends Component {
       endPrice,
       apartmentId,
       pageNum: 1,
-      pageSize: 999,
+      pageSize: 9999,
     }
     queryHouseList(params).then(res => {
       this.setState({
@@ -168,7 +171,7 @@ export default class HouseList extends Component {
         salesBatchDetail: res || {},
         noRecord: res.status == '1' ? false : true
       })
-      const { templates = [], posterImg = '' } = (res.posters || [])[0]
+      const { templates = [], posterImg = '' } = (res.posters || [])[0] || {}
 
       this.setState({
         posterData: { poster: posterImg },
@@ -260,8 +263,10 @@ export default class HouseList extends Component {
   }
 
   handleRecordBtn = e => {
-    this.goto('/onlineSelling/pages/records/index')
+    const { salesBatchDetail } = this.state
+    this.goto(`/onlineSelling/pages/records/index?id=${salesBatchDetail.salesBatchId}`)
   }
+
   currentPageAndParams() {
     const id = this.$router.params.id || this.state.id
     const {
@@ -380,12 +385,10 @@ export default class HouseList extends Component {
         </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>
@@ -393,13 +396,13 @@ export default class HouseList extends Component {
   }
 
   renderHouses() {
-    const { houseList } = this.state
+    const { houseList, dataType } = this.state
 
     return (
       <ScrollView className="container" scrollY scrollWithAnimation>
         {
           houseList.map((item) => {
-            return <HouseGrid key={item.unitId} dataset={item} onRoomClick={this.handleRoomClick} />
+            return <HouseGrid key={item.unitId} showDataType={dataType} dataset={item} onRoomClick={this.handleRoomClick} />
           })
         }
       </ScrollView>
@@ -416,12 +419,10 @@ export default class HouseList extends Component {
     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>
@@ -430,6 +431,18 @@ export default class HouseList extends Component {
   }
 
   handleCondition(value) {
+    const { salesBatchDetail: { displayHousePrice } } = this.state
+    if ((!displayHousePrice && value == 1) || value == 2) {
+      this.setState({
+        apartmentId: '',
+        startPrice: '',
+        endPrice: '',
+        conditionVisible: false,
+      }, () => {
+        const id = this.$router.params.id || this.state.id
+        this.getInfo(id)
+      })
+    }
     this.setState({
       current: value,
     })
@@ -550,28 +563,30 @@ export default class HouseList extends Component {
             </View>
           ))}
         </View>
-          : <Blank tips="暂无户型图，请按价格筛选"></Blank>
+          : <Blank tips="暂无户型"></Blank>
         }
       </Block>
     )
   }
 
   renderCondition() {
-    const { current } = this.state
-    const condition = [{ title: '按价格', value: 0 }, { title: '按户型', value: 1 }]
+    const { current, salesBatchDetail: { displayHousePrice } } = this.state
+    const condition = [{ title: '按户型', value: 0 }, { title: '按价格', value: 1 }, { title: '不限条件', value: 2 }]
+    const condition2 = [{ title: '按户型', value: 0 }, { title: '不限条件', value: 2 }]
+    const conditionList = displayHousePrice ? condition : condition2
     return (
       <View className="screen-page">
         <View className="screen-top">
           筛选房源
-            {condition.map(item => (
+            {conditionList.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()}
+        {current == 0 && this.renderApartment()}
+        {current == 1 && displayHousePrice && this.renderPrice()}
+
 
       </View>
 
@@ -581,6 +596,9 @@ export default class HouseList extends Component {
     const buildingId = this.$router.params.buildingId || this.state.buildingId
     this.goto(`/pages/project/detail/index?id=${buildingId}`)
   }
+  handleScreen(value) {
+    this.setState({ dataType: value })
+  }
 
   render() {
     const {
@@ -595,6 +613,7 @@ export default class HouseList extends Component {
       noRecord,
       loading,
       salesBatchDetail,
+      dataType
     } = this.state
 
     if (loading) {
@@ -603,8 +622,11 @@ export default class HouseList extends Component {
 
     const { userInfo: { person } } = this.props
 
-    const showCircleBtn = posterData && posterData.qrcode
+    // 必须正确生成二维码, 且维护了海报图
+    const showCircleBtn = posterData && posterData.qrcode && posterData.poster
     console.log('==============>', posterData, showPoster, posterConfig)
+
+    const screenList = [{ title: '预选热度图', value: 1 }, { title: '认筹热度图', value: 2 }]
     return (
       <Block>
         {conditionVisible && this.renderCondition()}
@@ -624,8 +646,16 @@ export default class HouseList extends Component {
                 <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>
 
+                <View className="screen-flex" >
+                  {screenList.map(item => (
+                    <View key={item.value} onClick={() => this.handleScreen(item.value)} className={dataType == item.value ? 'top-item active' : 'top-item'}>
+                      {item.title}
+                    </View>
+                  ))}
                 </View>
+
                 {houseList.length ? this.renderHouses() : this.renderBlank()}
                 {this.renderBottom()}
               </View>
@@ -635,7 +665,6 @@ export default class HouseList extends Component {
                   circleBtn={showCircleBtn}
                   onShareFrineds={this.handleShareFrineds}
                   onSharingCircleOfFriends={() => this.togglePosterStatus(true)}
-                // onSharingCircleOfFriends={this.handleSharingCircleOfFriends}
                 />
               </ActSheet>
             </Block>

src/onlineSelling/pages/houseList/index.scss

@@ -41,7 +41,34 @@
       display: inline-block;
     }
   }
-  
+  .screen-flex{
+    display: flex;
+    align-items: center;
+    background:#fff;
+    font-size: 34px;
+    color: #666;
+    padding-bottom: 30px;
+    font-size: 400;
+    .top-item{
+      width:164px;
+      height:48px;
+      font-size:24px;
+      font-weight:300;
+      color: #333;
+      line-height: 48px;
+      background:rgba(255,255,255,1);
+      border:1px solid rgba(228,228,228,1);
+      box-shadow:0px 4px 12px 0px rgba(255,171,50,0.08);
+      border-radius:24px;
+      margin-left: 30px;
+      text-align: center;
+
+    }
+    .active{
+      background-color: #BB9C79;
+      color: #fff;
+    }
+  }
   .bottombar {
     height: 168px;
     box-shadow:0px 16px 48px 0px rgba(0, 0, 0, 0.12);
@@ -84,7 +111,7 @@
 
   .container {
     // top + margin + bottom
-    height: calc(100% - 350px);
+    height: calc(100% - 428px);
   }
 }
 .screen-page{
@@ -98,18 +125,23 @@
     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;
+      width:128px;
+      height:48px;
+      font-size:24px;
+      font-weight:300;
+      color: #333;
+      line-height: 48px;
+      background:rgba(255,255,255,1);
+      border:1px solid rgba(228,228,228,1);
+      box-shadow:0px 4px 12px 0px rgba(255,171,50,0.08);
+      border-radius:24px;
+      margin-left: 30px;
+      text-align: center;
 
     }
     .active{
-      background-color: #fff;
-      box-shadow:0px 4px 12px 0px rgba(0, 0, 0, 0.08);
+      background-color: #BB9C79;
+      color: #fff;
     }
   }
   .price-con{
@@ -135,12 +167,12 @@
         text-align: center;
         margin: 18px;
         line-height:60px;
-        background-color: #fff;
+        background-color: #BB9C79;
+        border:1px solid rgba(187,156,121,1);
         box-shadow:0px 4px 12px 0px rgba(0, 0, 0, 0.08);
         border-radius:6px;
         font-size: 28px;
-        color: #999;
-        border:1px solid #bb9c79;
+        color: #fff;
       }
     }
   }

src/onlineSelling/pages/protocol/index.js

@@ -0,0 +1,33 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, RichText } from '@tarojs/components'
+import Statement from '../../components/Statement'
+import ContactConsultant from '../../components/ContactConsultant'
+
+import './index.scss'
+
+export default class Protocol extends Component {
+  config = {
+    navigationBarTitleText: '线上选房协议',
+  }
+
+  state = {
+
+  }
+
+  render() {
+
+    const { agreement, buildingId } = this.$router.params
+
+    return (
+      <View className="protocal-box">
+        <View className="content">
+          <RichText nodes={agreement} />
+        </View>
+        <View className="contact">
+          <ContactConsultant text="如有问题，请联系置业顾问" buildingId={buildingId} />
+        </View>
+        <Statement />
+      </View>
+    )
+  }
+}

src/onlineSelling/pages/protocol/index.scss

@@ -0,0 +1,13 @@
+.protocal-box {
+  width: 100vw;
+
+  .content {
+    margin-top: 48px;
+    width: 100%;
+    padding: 0 40px;
+  }
+
+  .contact {
+    margin: 40px 0;
+  }
+}

src/onlineSelling/pages/raiseMoney/Captcha/index.js

@@ -0,0 +1,53 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View } from '@tarojs/components'
+
+import './index.scss'
+
+export default class extends Component {
+
+  state = {
+    sec: 0
+  }
+
+  handleClick = (left) => {
+    if (!this.props.require()) return;
+    if (!this.props.countdown) return;
+
+    // 计时中
+    if (left > 0 && left < this.props.countdown) return;
+    
+    if (this.props.onClick) {
+      this.props.onClick().then(() => {
+        // 开始跑表
+        if (this.props.countdown) {
+          let s = 0
+          this.setState({ sec: s })
+    
+          const tk = setInterval(() => {
+            if (s >= this.props.countdown) {
+              clearInterval(tk)
+              this.setState({ sec: 0 })
+            } else {
+              s += 1
+              this.setState({ sec: s })
+            }
+          }, 1000)
+        }
+      })
+    }
+  }
+
+  render() {
+    const { sec } = this.state
+    const { countdown } = this.props
+    const left = countdown - sec
+
+    return (
+      <View className="captcha" onClick={() => this.handleClick(left)}>
+        {
+          left > 0 && left < countdown ? `${left}s 后重试` : '获取验证码'
+        }        
+      </View>
+    )
+  }
+}

src/onlineSelling/pages/raiseMoney/Captcha/index.scss

@@ -0,0 +1,9 @@
+.captcha {  
+  font-size: 32px;
+  color: #F6B61D;
+  line-height:64px;
+  border:1px solid #F6B61D;
+  border-radius:8px;
+  width: 220px;
+  text-align: center;
+}

src/onlineSelling/pages/raiseMoney/NextStep/index.js

@@ -0,0 +1,48 @@
+import Taro, { Component } from '@tarojs/taro'
+import './index.scss'
+
+export default class extends Component {
+  state = {
+    sec: 0,
+  }
+
+  componentWillReceiveProps(nextProps) {
+    if (nextProps.countdown !== this.props.countdown) {
+      if (nextProps.countdown) {
+        let s = 0
+        const tk = setInterval(() => {
+          s += 1
+          this.setState({ sec: s })
+  
+          if (s >= this.props.countdown) {
+            clearInterval(tk)
+          }
+        }, 1000)
+      } else {
+        this.setState({ sec: 0 })
+      }
+    }
+  }
+
+  handleClick = (disable) => {
+    if (disable) return;
+
+    if (this.props.onClick) {
+      this.props.onClick()
+    }
+  }
+
+  render() {
+    const disable = this.props.countdown > 0 && this.state.sec < this.props.countdown ? 'disable' : ''
+    
+    return (
+      <View className={`btn-step ${disable}`} onClick={() => this.handleClick(disable)}>
+        {this.props.text}
+        {
+          disable ? ` (${this.props.countdown - this.state.sec}s) ` : ''
+        }
+      </View>
+    )
+
+  }
+}

src/onlineSelling/pages/raiseMoney/NextStep/index.scss

@@ -0,0 +1,14 @@
+.btn-step {
+  height:94px;
+  line-height: 94px;
+  background:rgba(187,156,121,1);
+  border-radius:10px;
+  color: #fff;
+  font-size: 36px;
+  text-align: center;
+
+  &.disable {
+    background: #000;
+    opacity:0.6;
+  }
+}

src/onlineSelling/pages/raiseMoney/RadioList/index.js

@@ -0,0 +1,33 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Label, Radio } from "@tarojs/components";
+import './index.scss'
+
+export default class extends Component {
+
+  render() {
+    const { value, color, size, dataset = [], onChange } = this.props
+
+    return (
+      <RadioGroup onChange={onChange}>
+        {
+          dataset.map((item) => {
+
+            const checked = item.value === value
+            const checkedColor = color && checked ? `border-color: ${color}` : ''
+            const btnSize = size ? `width: ${size}; height: ${size}` : ''
+            const btnStyle = `${checkedColor};${btnSize}`
+
+            return (
+              <Label key={item.value} className="radio-btn">
+                <Radio hidden value={item.value} checked={checked}></Radio>
+                <View className={`icon ${checked ? 'checked' : ''}`} style={btnStyle}></View>
+                <View className="label">{item.label}</View>
+              </Label>
+            )
+          })
+        }
+      </RadioGroup>
+    )
+  }
+
+}

src/onlineSelling/pages/raiseMoney/RadioList/index.scss

@@ -0,0 +1,28 @@
+.radio-btn {
+  display: inline-block;
+
+  .icon {
+    width: 20px;
+    height: 20px;
+    display: inline-block;
+    border:2px solid #999;
+    border-radius:50%;
+    position: relative;
+    margin-right: 10px;
+    vertical-align: middle;
+
+    &.checked {
+      border-width: 6px;
+      border-style: solid;
+      border-color: #f00;
+    }
+  }
+
+  .label {
+    display: inline-block;
+  }
+
+  & + .radio-btn {
+    margin-left: 40px;
+  }
+}

src/onlineSelling/pages/raiseMoney/index.js

@@ -0,0 +1,810 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Block, RichText } from '@tarojs/components'
+import './index.scss'
+import RaiseCard from '../../components/RaiseCard'
+import Statement from '../../components/Statement'
+import ConsultantItem from '../../components/ConsultantItem/index'
+import ready from '@/utils/ready'
+import dayjs from 'dayjs'
+import { connect } from '@tarojs/redux'
+import * as houseActions from '@/actions/house'
+import NextStep from './NextStep'
+import { fetch, apis } from '@/utils/request'
+import Captcha from './Captcha'
+import { raiseOrder, cancelOrder, queryPreselectionRecord, raiseOffline } from '@/services/project'
+import { getCodeMessage, checkCaptcha } from '@/services/getCode'
+import { checkRaise } from '@/services/house'
+import { checkIDCard, isEmpty } from '@/utils/tools'
+import ContactConsultant from '../../components/ContactConsultant'
+import RadioList from './RadioList'
+import * as noticeType from '@/constants/common.js'
+
+const getRaiseProfile = ({ salesBatchId, raiseRecordId }) => {
+  const queryString = [
+    `${raiseRecordId ? 'raiseRecordId=' + raiseRecordId : ''}`,
+    `${salesBatchId ? 'salesBatchId=' + salesBatchId : ''}`,
+  ].filter(Boolean).join('&')
+
+  return fetch({ url: `${apis.API_RAISE_PROFILE}?${queryString}` })
+}
+
+const saveRaiseRecord = (record, raise) => {
+  const payload = {
+    ...record,
+    raiseId: raise.raiseId,
+    orgId: raise.orgId,
+    salesBatchId: raise.salesBatchId,
+    buildingId: raise.buildingId,
+  }
+
+  return fetch({ url: `${apis.API_SAVE_RAISE_RECORD}`, method: 'POST', payload })
+}
+
+@connect(({ user, house }) => ({ ...user, house }), { ...houseActions })
+export default class raiseMoney extends Component {
+  config = {
+    navigationBarTitleText: '认筹确认'
+  }
+  state = {
+    current: 0,
+    inputName: '',
+    raiseProfile: undefined,  // 认筹主记录
+    record: {},               // 认筹单
+    preselectList: [],        // 我的预选 - 当前批次
+    protocolCountdown: 5,    // 单位 s
+    captchaCountdown: 60,     // 单位 s
+    payType: 'onLine',          // 缴费方式
+    failInfo: undefined,      // 操作失败 - 对象 { title, desc }
+    disableCaptcha: false,    // 锁定验证码输入
+    payTypeList: [
+      { label: '线上缴费', value: 'onLine' },
+      { label: '线下缴费', value: 'offLine' },
+    ],
+  }
+
+  captchaLock = false
+  paying = false
+
+  // 此页面不支持分享，以及二维码
+  componentWillMount() {
+    ready.queue(() => {
+      if (this.$router.params.type != 'pay') {
+        this.props.dispatchChooseConsultant() //清空默认选择的置业顾问
+      }
+      const {
+        salesBatchId,    // 批次, 从房源详情进入的
+        houseId,       // 房源号, 备用
+        raiseRecordId,  // 认筹单ID, // 从认筹列表进入
+      } = this.$router.params
+
+      if (!salesBatchId && !raiseRecordId) {
+        this.setState({ current: 4, failInfo: { title: '认筹失败', desc: '未确定批次或者认筹单记录' } })
+        return;
+      }
+
+      this.loadInfo(salesBatchId, raiseRecordId)
+
+      if (this.$router.params.type == 'pay') {
+        this.setState({ current: 3 })
+      }
+    })
+  }
+
+  loadInfo(salesBatchId, raiseRecordId) {
+    const { userInfo, house } = this.props
+    const { personId } = userInfo.person
+    const defaultRecord = this.initRecord()
+
+    // 请求认筹信息
+    getRaiseProfile({ salesBatchId, raiseRecordId }).then(res => {
+      let { payType } = this.state
+      const payTypeSettings = (res.payType || '').split(',')
+      if (payTypeSettings.length === 1) {
+        payType = payTypeSettings[0]
+      }
+
+      this.setState({ raiseProfile: res, payType, record: res.record || defaultRecord })
+
+      // 销售批次已被取消发布
+      if (res.status != 1) {
+        this.setState({ current: 4, failInfo: { title: '认筹失败', desc: '销售批次已被取消发布' } })
+      }
+
+      // 不在认筹时间内
+      if (!dayjs().isBefore(res.raiseEndTime) || !dayjs().isAfter(res.raiseStartTime)) {
+        this.setState({ current: 4, failInfo: { title: '认筹失败', desc: '不在认筹时间内' } })
+      }
+
+      // 请求置业顾问列表
+      // if (!house.consultantList || !house.consultantList.length) {
+      this.props.dispatchGetConsultants({
+        buildingId: res.buildingId,
+        pageSize: 999,
+        pageNumber: 1,
+      })
+      // }
+
+      this.getMyPreselection({
+        personId,
+        pageNumber: 1,
+        pageSize: 999,
+        salesBatchId: res.salesBatchId,
+      }).then((houseList) => {
+        // 如果认筹必须预选
+        if (res.needPreselection && house.raiseCart.length > 0) {
+          if (!houseList || !houseList.length) {
+            this.setState({ current: 4, failInfo: { title: '认筹失败', desc: '需要先预选才能认筹' } })
+            return
+          }
+
+          for (let i in house.raiseCart) {
+            const exists = houseList.filter(x => x.houseId === house.raiseCart[i].houseId)[0]
+            if (!exists) {
+              this.setState({ current: 4, failInfo: { title: '认筹失败', desc: '需要先预选才能认筹' } })
+              return
+            }
+          }
+        }
+      })
+    })
+  }
+
+  // 我的预选
+  getMyPreselection = (params) => {
+    return new Promise((resolve, reject) => {
+      queryPreselectionRecord(params).then((res) => {
+        this.setState({ preselectList: res.records })
+        resolve(res.records)
+      }).catch(() => {
+        resolve([])
+        // reject()
+      })
+    })
+  }
+
+  initRecord = () => {
+    const { userInfo } = this.props
+    const { personId, name, nickname, idcard, tel, phone } = userInfo.person
+
+    return { personId, name: name || nickname, idcard, tel: tel || phone }
+  }
+
+  handleCancel = (house) => {
+    Taro.showModal({
+      title: '提示',
+      content: '确认取消选择该房源?',
+      success: (res) => {
+        if (res.confirm) {
+          this.props.dispatchSubCart(house)
+        }
+      }
+    })
+  }
+
+  gotoHouseSelect = (pageType) => {
+    const { raiseProfile } = this.state
+    const isMulti = raiseProfile.houseLockingType != 'auto'
+
+    const url = pageType == 'all' ?
+      `/onlineSelling/pages/houseCart/index?id=${raiseProfile.salesBatchId}&multi=${isMulti}` :
+      `/onlineSelling/pages/addHouse/index?id=${raiseProfile.salesBatchId}`
+
+    Taro.navigateTo({ url })
+  }
+
+  renderTop() {
+    const tabList = [
+      { title: '确认房源', value: 0 },
+      { title: '阅读协议', value: 1 },
+      { title: '填写资料', value: 2 },
+      { title: '缴纳定金', value: 3 },
+      { title: '认筹结果', value: 4 },
+    ]
+    const { current } = this.state
+
+    return (
+      <View className="top-con">
+        {tabList.map((item, index) => (
+          <View className="flex" key={index + 'top'} style={current == item.value ? 'color:#333;font-weight:700' : ''}>
+            {item.title}
+            {item.value != 4 &&
+              <View className="flex" style="margin:0 12rpx 0 4rpx">
+                <View className='right-icon'></View>
+                <View className='right-icon icon2'></View>
+                <View className='right-icon icon3'></View>
+              </View>
+            }
+
+          </View>
+        ))
+        }
+      </View>
+    )
+  }
+  renderHouse() {
+    const { house: { raiseCart } } = this.props
+    const { raiseProfile = {}, record } = this.state
+    const disabled = raiseProfile.houseLockingType === 'auto' || !!record.raiseRecordId
+
+    return (
+      <ScrollView scrollY className="container">
+        {
+          raiseCart.map(item => (
+            <View key={item.houseId} >
+              <RaiseCard type="raiseMoney" style="height:auto" summary={item} onCancel={this.handleCancel} disableCancel={disabled} />
+            </View>
+          ))
+        }
+        {
+          !disabled &&
+          (
+            <Block>
+              {
+                !raiseProfile.needPreselection &&
+                (<View className="addhouse">从 <Text style="color:#F3B82E" onClick={this.gotoHouseSelect.bind(this, 'all')}>房源列表</Text> 中添加其他房源</View>)
+              }
+              <View className="addhouse">从 <Text style="color:#BB9C79" onClick={this.gotoHouseSelect.bind(this, 'select')}>预选记录</Text> 中添加其他房源</View>
+            </Block>
+          )
+        }
+        <Statement style="margin-top:80rpx" />
+      </ScrollView>
+    )
+  }
+  renderAgreement() {
+    const { raiseProfile = {} } = this.state
+
+    return (
+      <ScrollView scrollY className="container3">
+        <View className="agent-box">
+          <View className="center-title">线上选房协议</View>
+          <View className="rich-text">
+            <RichText nodes={raiseProfile.payProtocol || ''} />
+          </View>
+        </View>
+      </ScrollView >
+    )
+  }
+
+  // 获取输入
+  handleInput = (key, e) => {
+    const { person } = this.props.userInfo
+
+    this.setState({
+      record: {
+        ...(this.state.record || {}),
+        personId: person.personId,
+        [`${key}`]: e.detail.value,
+      }
+    })
+  }
+
+  //
+  prepareGetCaptcha = () => {
+    const { record } = this.state
+    const disabled = !!record.raiseRecordId
+    if (disabled) return false;
+
+    if (this.captchaLock) {
+      Taro.showToast({
+        title: '发送中, 请稍后',
+        icon: 'none'
+      })
+      return false;
+    }
+
+    const { tel } = this.state.record || {}
+
+    if (isEmpty(tel) || tel.length < 11) {
+      Taro.showToast({
+        title: '请填写正确的手机号',
+        icon: 'none'
+      })
+      return false;
+    }
+
+    return true
+  }
+
+  // 获取验证码
+  handleCaptcha = e => {
+    const { tel } = this.state.record || {}
+
+    if (!tel) {
+      Taro.showToast({
+        title: '请填写手机号',
+        icon: 'none'
+      })
+      return Promise.reject();
+    }
+
+    return new Promise((resolve, reject) => {
+      this.captchaLock = true
+      getCodeMessage(tel).then(() => {
+        Taro.showToast({ title: '发送成功' })
+        this.captchaLock = false
+        resolve()
+      }).catch(() => {
+        this.captchaLock = false
+        reject()
+      })
+    })
+  }
+
+  tochooseConsultant() {
+    const { raiseProfile: { buildingId } } = this.state
+    Taro.navigateTo({
+      url: '/onlineSelling/pages/chooseConsultant/index?buildingId=' + buildingId
+    })
+  }
+
+  getConsultant = () => {
+    const { house } = this.props
+    const { record } = this.state
+    return house.chooseConsultant || (house.consultantList || []).filter(x => x.userId == record.userId)[0]
+  }
+
+  renderProfile() {
+    const { record, captchaCountdown, disableCaptcha } = this.state
+    const consultant = this.getConsultant()
+    const disabled = !!record.raiseRecordId
+
+    return (
+      <ScrollView scrollY className="container2">
+        <View className="profile-box">
+          <View className="title">我的个人信息</View>
+          <View style="font-size:24rpx;color:#999;line-height:60rpx">除手机号外其他信息修改后会保存到个人信息中</View>
+          <View className="profile-item">
+            <View className="name">
+              <Text style="color:#FF3C3C;font-size:32rpx;margin-right:8rpx">*</Text>
+              姓名
+            </View>
+            <Input className='input' placeholder-style="color:#999" maxlength="10" disabled={disabled} value={record.name} onInput={this.handleInput.bind(this, 'name')} type='text' placeholder='请填写真实姓名' />
+          </View>
+          <View className="profile-item">
+            <View className="name">
+              <Text style="color:#FF3C3C;font-size:32rpx;margin-right:8rpx">*</Text>
+              身份证号
+            </View>
+            <Input className='input' placeholder-style="color:#999" disabled={disabled} value={record.idcard} onInput={this.handleInput.bind(this, 'idcard')} type='text' placeholder='请填写身份证号' />
+          </View>
+          <View className="profile-item">
+            <View className="name">
+              <Text style="color:#FF3C3C;font-size:32rpx;margin-right:8rpx">*</Text>
+              手机号
+            </View>
+            <Input className='input' placeholder-style="color:#999" disabled={disabled || disableCaptcha} value={record.tel} type='text' onInput={this.handleInput.bind(this, 'tel')} placeholder='请填写手机号' />
+          </View>
+          <View className="profile-item">
+            <View className="name">
+              <Text style="color:#FF3C3C;font-size:32rpx;margin-right:8rpx">*</Text>
+              验证码
+            </View>
+            <Input className='inputCode' placeholder-style="color:#999" type='text' disabled={disabled || disableCaptcha} onInput={this.handleInput.bind(this, 'captcha')} placeholder='请填写验证码' />
+            <Captcha countdown={captchaCountdown} require={this.prepareGetCaptcha.bind(this)} onClick={this.handleCaptcha} />
+          </View>
+          <View className="profile-flex" style="margin-top:20rpx">
+            <View className="title">我的置业顾问信息</View>
+            <View className="choose" onClick={this.tochooseConsultant}>选择置业顾问</View>
+          </View>
+          <ConsultantItem
+            data={consultant}
+            style="padding:30rpx 0;width:690rpx; border-bottom: 1px solid #dcdcdc;"
+            type="raiseMoney"
+            tips="show"
+          />
+        </View>
+      </ScrollView >
+    )
+  }
+  toDecimal2 = (x) => {
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+      return false;
+    }
+    var f = Math.round(x * 100) / 100;
+    var s = f.toString();
+    var rs = s.indexOf('.');
+    if (rs < 0) {
+      rs = s.length;
+      s += '.';
+    }
+    while (s.length <= rs + 2) {
+      s += '0';
+    }
+    return s;
+  }
+  regFenToYuan = (fen) => {
+    var num = fen;
+    num = fen * 0.01;
+    num += '';
+    var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
+    num = num.replace(reg, '$1');
+    num = this.toDecimal2(num)
+    return num
+  }
+
+  handleChangeType = (e) => {
+    this.setState({ payType: e.detail.value })
+  }
+
+  renderMoney() {
+    const { raiseProfile = {}, payTypeList, payType } = this.state
+    const payTypeSettings = (raiseProfile.payType || '').split(',')
+    const showTypes = payTypeList.filter(x => (payTypeSettings.indexOf(x.value) > -1))
+    const showProtocal = payType === 'onLine' ? raiseProfile.payDescriptionOnline : raiseProfile.payDescriptionOffline
+    const payTip = payType === 'onLine' ? '线上缴费说明' : '线下缴费说明'
+
+    return (
+      <ScrollView scrollY className="container2" style="padding:0 30rpx">
+        <View className="profile-flex">
+          <View className="title">认筹金额</View>
+          <View className="price">{this.regFenToYuan(raiseProfile.raisePrice)}元</View>
+        </View>
+        {
+          (payTypeSettings.length > 1) &&
+          (
+            <View className="pay-type">
+              <View className="head">请选择缴费方式：</View>
+              <View className="body">
+                <RadioList dataset={showTypes} value={payType} onChange={this.handleChangeType} />
+              </View>
+            </View>
+          )
+        }
+        <View className="center-title">{payTip}</View>
+        <RichText nodes={showProtocal || ''} />
+      </ScrollView >
+    )
+  }
+
+  validRaise = () => {
+    const { record } = this.state
+    const { house } = this.props
+
+    // 从认筹单页面进来, 不验证
+    if (record.raiseRecordId) {
+      return Promise.resolve()
+    }
+
+    // 当前选中房源
+    const houseList = house.raiseCart || []
+
+    if (!houseList.length) {
+      Taro.showToast({ title: '请选择房源', icon: 'none' })
+      return Promise.reject()
+    }
+
+    return new Promise((resolve, reject) => {
+      checkRaise(houseList.map(x => x.houseId)).then(resolve).catch(reject)
+    })
+
+    // // 如果要求预选, 预先房源跟当前列表必须一致
+    // if (raiseProfile.needPreselection) {
+    //   for (let i in houseList) {
+    //     const exists = preselectList.filter(x => x.houseId === houseList[i].houseId)[0]
+    //     if (!exists) {
+    //       Taro.showToast({ title: '需要先预选才能认筹', icon: 'none' })
+    //       return Promise.reject()
+    //     }
+    //   }
+    // }
+
+    // if (record.raiseRecordId) {
+    //   // 如果认筹单跟预选的房源不一致, 说明是新的认筹
+    //   let found = true
+    //   for (let inx in houseList) {
+    //     const has = (record.taHousingResourcesList || []).filter(x => x.houseId == houseList[inx].houseId)[0]
+
+    //     if (!has) {
+    //       found = false;
+    //       break;
+    //     }
+    //   }
+
+    //   if (!found) {
+    //     const defaultRecord = this.initRecord()
+    //     this.setState({ record: defaultRecord })
+    //   }
+    // }
+
+    // return Promise.resolve()
+  }
+
+  makeRaiseRecord = () => {
+    const { record, raiseProfile } = this.state
+    const { house } = this.props
+    const houseList = house.raiseCart.map(x => x.houseId)
+    const disabled = !!record.raiseRecordId
+    if (disabled) return Promise.resolve();
+
+    return new Promise((resolve, reject) => {
+      if (isEmpty(record.name)) {
+        Taro.showToast({
+          title: '姓名不能为空',
+          icon: 'none',
+        })
+
+        return reject()
+      }
+
+      // 校验身份证号
+      if (isEmpty(record.idcard) || !checkIDCard(record.idcard)) {
+        Taro.showToast({
+          title: '身份证号码不合法',
+          icon: 'none',
+        })
+
+        return reject()
+      }
+
+      // 校验手机号
+      if (isEmpty(record.tel) || record.tel.length < 11) {
+        Taro.showToast({
+          title: '手机号格式不正确',
+          icon: 'none',
+        })
+
+        return reject()
+      }
+
+      // 验证码 不能为空
+      if (isEmpty(record.captcha)) {
+        Taro.showToast({
+          title: '验证码不能为空',
+          icon: 'none',
+        })
+
+        return reject()
+      }
+
+      // 校验置业
+      const consultant = this.getConsultant()
+      if (!consultant || !consultant.id) {
+        Taro.showToast({
+          title: '置业顾问不能为空',
+          icon: 'none',
+        })
+        return reject()
+      }
+
+      // 最后, 校验验证码      
+      checkCaptcha(record.tel, record.captcha).then(() => {
+        this.setState({ disableCaptcha: true })
+
+        saveRaiseRecord({
+          ...record,
+          houseList,
+          userId: consultant.userId,
+          userName: consultant.name,
+        }, raiseProfile).then((res) => {
+          this.setState({ record: res, disableCaptcha: false })
+          resolve(res)
+        }).catch((err) => {
+          this.setState({ disableCaptcha: false, current: 4, failInfo: { title: '认筹失败', desc: err.message || err } })
+        })
+
+      }).catch(() => {
+        Taro.showToast({
+          title: '验证码不正确',
+          icon: 'none',
+        })
+
+        this.setState({ disableCaptcha: false })
+        reject()
+      })
+
+    })
+  }
+
+  makePay = () => {
+    const { payType, record = {} } = this.state
+    if (!payType) {
+      Taro.showToast({
+        title: '请确定支付方式',
+        icon: 'none'
+      })
+      return Promise.reject()
+    }
+
+    if (payType === 'offLine') {
+      const paramsId = this.$router.params.raiseRecordId || record.raiseRecordId
+      return new Promise((resolve, reject) => {
+        raiseOffline(paramsId).then(res => {
+          resolve()
+        }).catch(err => {
+          reject()
+        })
+      })
+    }
+
+    const params = {
+      targetId: this.$router.params.raiseRecordId || record.raiseRecordId,
+      targetType: 'house'
+    }
+
+    return new Promise((resolve, reject) => {
+      raiseOrder(params).then(res => {
+
+        Taro.requestPayment({
+          timeStamp: String(res.timeStamp),
+          nonceStr: res.nonceStr,
+          package: res.package,
+          signType: res.signType,
+          paySign: res.sign,
+
+          success(res) {
+            // 最后
+            resolve()
+          },
+          fail(err) {
+            cancelOrder(params).then(res => { })
+
+            // 然后
+            reject()
+          }
+        })
+      })
+    })
+
+  }
+
+  toRaiseProfile(id) {
+    const { userInfo: { miniApp: { tpls } } } = this.props
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
+
+    wx.requestSubscribeMessage({
+      tmplIds: [tplId],
+      success(res) {
+      },
+      fail(res) {
+
+      },
+      complete() {
+        Taro.navigateTo({
+          url: `/onlineSelling/pages/raiseProfile/index?id=${id}`
+        })
+      }
+    })
+
+  }
+  renderResult() {
+    const { raiseProfile = {}, record = {}, failInfo } = this.state
+    const isOk = !failInfo
+    const showIcon = isOk ? require('../../assets/success2.png') : require('../../assets/fail2.png')
+    const showTitle = isOk ? '提交成功' : failInfo.title
+
+    return (
+      <View className="result">
+        <Image className="result-img" src={showIcon}></Image>
+
+        <View className="status">{showTitle}</View>
+
+        {
+          isOk &&
+          (
+            <Block>
+              <View className="tip" style="margin-bottom:10rpx">详情请查看认筹单</View>
+              <View className="tip">支付结果请留意微信支付通知</View>
+            </Block>
+          )
+        }
+
+        {
+          !isOk && (<View className="tip">{(failInfo || {}).desc}</View>)
+        }
+
+        <ContactConsultant buildingId={raiseProfile.buildingId} style=" position: absolute;bottom: 11vh;" />
+        {
+          record.raiseRecordId &&
+          (<View className="look-btn" onClick={() => this.toRaiseProfile(record.raiseRecordId)}>查看认筹单</View>)
+        }
+      </View>
+
+    );
+  }
+
+  nextStep(current) {
+    if (this.paying) return;
+
+    // 缴费的下一步
+    if (current > 3) {
+      this.setState({
+        current: current + 1
+      })
+
+      return;
+    }
+
+    this.validRaise().then(() => {
+
+      switch (current) {
+        // 认筹确认
+        case 2:
+          this.makeRaiseRecord().then((res) => {
+            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({
+                  current: current + 1
+                })
+              }
+            })
+          })
+          return;
+
+        // 缴费
+        case 3:
+          this.paying = true
+
+          this.makePay().then(() => {
+            this.setState({
+              current: current + 1
+            })
+
+            this.paying = false
+          }).catch(() => {            
+            this.paying = false
+          })
+
+          return;
+
+        //
+        default:
+          this.setState({
+            current: current + 1
+          })
+      }
+
+    })
+
+  }
+
+  upStep(current) {
+    this.setState({
+      current: current - 1
+    })
+  }
+
+  renderBottomBtn() {
+    const { current, protocolCountdown } = this.state
+    const { payType } = this.state
+    return (
+      <View className="bottom-btn">
+        {current == 1 && <View style="font-size:24rpx;color:#999;line-height:70rpx">请仔细阅读选房协议直到结尾才能进入下一步</View>}
+        {current != 4 &&
+          <NextStep
+            countdown={current == 1 ? protocolCountdown : 0}
+            onClick={() => this.nextStep(current)}
+            text={current == 3 && payType === 'onLine' ? '现在缴费' : '下一步'}
+          />
+        }
+        {current != 0 && current != 4 && <View className="up-btn" onClick={() => this.upStep(current)}>上一步</View>}
+      </View>
+    )
+  }
+
+  render() {
+    const { current } = this.state
+    return (
+      <View className="raiseMoney">
+        {this.renderTop()}
+        {current == 0 && this.renderHouse()}
+        {current == 1 && this.renderAgreement()}
+        {current == 2 && this.renderProfile()}
+        {current == 3 && this.renderMoney()}
+        {current == 4 && this.renderResult()}
+        {this.renderBottomBtn()}
+      </View>
+    )
+  }
+
+}

src/onlineSelling/pages/raiseMoney/index.scss

@@ -0,0 +1,199 @@
+.raiseMoney{
+  .top-con{
+    display: flex;
+    align-items: center;
+    padding: 0 30px;
+    line-height: 100px;
+    color: #666;
+    font-size: 24px;
+    .flex{
+      display: flex;
+      align-items: center;
+      .right-icon{
+        width:10px;
+        height:10px;
+        border-top: 1px solid rgba(0,0,0,0.4);
+        border-right: 1px solid rgba(0,0,0,0.4);
+        transform:rotate(45deg);
+        display: inline-block;
+      }
+      .icon2{
+        width:13px;
+        height:13px;
+        border-top: 1px solid rgba(0,0,0,0.7);
+        border-right: 1px solid rgba(0,0,0,0.7);
+        margin-left: -2px;
+      }
+      .icon3{
+        width:17px;
+        height:17px;
+        border-top: 0.6px solid rgba(0,0,0,1);
+        border-right: 0.6px solid rgba(0,0,0,1);
+        margin-left: -2px;
+      }
+    }
+  }
+  .addhouse{
+    font-size:28px;
+    color: #333;
+    line-height: 70px;
+    text-align: center;
+  }
+  .container {
+    height: calc(100vh - 254px);
+  }
+  .container2 {
+    height: calc(100vh - 382px);
+
+    .pay-type {
+      display: flex;
+      margin: 30px 0 40px;
+      font-size:28px;
+      color: #333;
+
+      .head {
+        width: 240px;
+        flex: none;
+      }
+
+      .body {
+        flex: auto;
+
+        .item {
+          display: inline-block;
+        }
+      }
+    }
+  }
+  .container3 {
+    height: calc(100vh - 452px);
+
+    .rich-text {
+      width: 100%;
+      overflow-x: hidden;
+    }
+  }
+  .agent-box{
+    padding: 30px;
+  }
+  .center-title{
+    font-size: 24px;
+    color: #333;
+    text-align: center;
+    line-height: 2;
+  }
+  .profile-box{
+    padding: 0 30px;
+    .title{
+      font-size: 36px;
+      color: #333;
+      font-weight: 700;
+    }
+    .profile-item{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      height:98px;
+      border-bottom: 1px solid #dcdcdc;
+      .name{
+        font-size: 32px;
+        color: #333;
+      }
+      .input{
+        font-size:32px ;
+        width: 480px;
+      }
+      .inputCode{
+        font-size:32px ;
+        width: 222px;
+        margin-right: -40px;
+      }
+      .getCode{
+        font-size: 32px;
+        color: #F6B61D;
+        line-height:64px;
+        border:1px solid #F6B61D;
+        border-radius:8px;
+        width: 220px;
+        text-align: center;
+      }
+    }
+  }
+  .profile-flex{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    .choose{
+      font-size: 24px;
+      color: #BB9C79;
+    }
+    .title{
+      font-size: 36px;
+      color: #333;
+      font-weight: 700;
+    }
+    .price{
+      color: #FF3C3C;
+      font-size: 44px;
+    }
+  }
+  .bottom-btn{
+      position: fixed;
+      width: 100vw;
+      padding: 30px;
+      .next-btn{
+        height:94px;
+        line-height: 94px;
+        background:rgba(187,156,121,1);
+        border-radius:10px;
+        color: #fff;
+        font-size: 36px;
+        text-align: center; 
+    }
+      .up-btn{
+        height:94px;
+        line-height: 94px;
+        border-radius:10px;
+        color: #BB9C79;
+        border: 2px solid #BB9C79;
+        font-size: 36px;
+        text-align: center; 
+        margin-top: 36px;
+    }
+  }
+  .result{
+    background-color: #fff;
+    height: 88vh;
+    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;
+    }
+   .look-btn{
+     width: 690px;
+     height:94px;
+     background:rgba(187,156,121,1);
+     border-radius:10px;
+     color: #fff;
+     font-size: 36px;
+     line-height: 94px;
+     position: absolute;
+     bottom: 1vh;
+     left: 30px;
+   }
+  }
+}

src/onlineSelling/pages/raiseProfile/Cell.js

@@ -0,0 +1,34 @@
+import { View, Block } from '@tarojs/components'
+import './index.scss'
+import NamedIcon from '../../components/NamedIcon'
+
+export default function (props) {
+  const disable = props.disable ? 'disable' : ''
+  console.log('------->', props)
+
+  return (
+    <Block>
+      {
+        !props.hide && <View className={`raiseCell ${disable}`}>
+          <View className="row">
+            <View className="head">{props.head}</View>
+            <View className="body">{props.body}</View>
+            <View className="action" onClick={props.onActionClick}>
+              {
+                props.action && (<Image src={require('../../assets/copy.png')} style="width:34rpx;height:34rpx"></Image>)
+              }
+            </View>
+          </View>
+          {
+            props.desc &&
+            (
+              <View className="row desc">
+                <View className="desc">{props.desc}</View>
+              </View>
+            )
+          }
+        </View>
+      }
+    </Block>
+  )
+}

src/onlineSelling/pages/raiseProfile/CellBlock.js

@@ -0,0 +1,34 @@
+
+import Cell from './Cell'
+import './index.scss'
+
+export default function(props) {
+  const dataset = props.dataset || []
+  const disable = props.disable
+
+  const handleActionClick = (item) => {
+    if (item.action && props.onActionClick) {
+      props.onActionClick(item)
+    }
+  }
+
+  return (
+    <View className="cell-block">
+      {
+        dataset.map((item, inx) => (
+          <View key={`cell-${inx}`} className="cell-block-item">
+            <Cell
+              disable={disable}
+              head={item.head}
+              body={item.body}
+              action={item.action}
+              hide={item.hide}
+              desc={item.desc}
+              onActionClick={handleActionClick.bind(this, item)}
+              />
+          </View>
+        ))
+      }
+    </View>
+  )
+}

src/onlineSelling/pages/raiseProfile/houseResource.js

@@ -0,0 +1,49 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View } from '@tarojs/components'
+import './index.scss'
+import RaiseCard from '../../components/RaiseCard'
+import { queryRaiseDetail } from '@/services/project'
+
+export default class HouseResource extends Component {
+  config = {
+    navigationBarTitleText: '房源清单'
+  }
+  state = {
+    houseList: [],
+  }
+
+  componentWillMount() {
+    const { raiseRecordId } = this.$router.params
+    queryRaiseDetail(raiseRecordId).then(res => {
+      this.setState({
+        houseList: res.houseList || [],
+
+      })
+    })
+  }
+  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 { houseList } = this.state
+    return (
+      <View style="padding-top:30rpx">
+        {
+          houseList.map(item => (
+            <View key={item.raiseRecordId} >
+              <RaiseCard type="houseResource" handleCard={() => this.toHouseDetail(item)} summary={item} />
+            </View>
+          )
+          )
+        }
+      </View>
+    )
+  }
+
+}

src/onlineSelling/pages/raiseProfile/index.js

@@ -0,0 +1,278 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Block } from '@tarojs/components'
+import dayjs from 'dayjs'
+import CellBlock from './CellBlock'
+import Statement from '../../components/Statement'
+import ContactConsultant from '../../components/ContactConsultant'
+import ConsultantItem from '../../components/ConsultantItem/index'
+import NamedIcon from '../../components/NamedIcon'
+import RaiseCard from '../../components/RaiseCard'
+import { queryRaiseDetail } from '@/services/project'
+import { connect } from '@tarojs/redux'
+import * as noticeType from '@/constants/common.js'
+import './index.scss'
+
+@connect(({ user }) => ({ user }))
+
+export default class Raise extends Component {
+  config = {
+    navigationBarTitleText: '认筹单',
+  }
+
+  state = {
+    buildingId: '',
+    raiseDeatil: {},
+    houseList: [],
+    raiseOrder: {},
+    orderDetail: {},
+    refundOrder: {},
+    payDisable: true,
+  }
+
+  componentWillMount() {
+    const { id: raiseRecordId } = this.$router.params
+    queryRaiseDetail(raiseRecordId).then(res => {
+      this.setState({
+        buildingId: res.taRaiseRecord.buildingId,
+        raiseDeatil: res.taRaiseRecord || {},
+        houseList: res.houseList || [],
+        raiseOrder: res.taRaise || {},
+        orderDetail: res.taOrder || {},
+        refundOrder: res.refundOrder || {},
+      })
+    })
+  }
+
+  // 复制数据
+  copyData(data) {
+    Taro.setClipboardData({
+      data: `${data}`,
+      onSuccess: (() => { }),
+    })
+  }
+
+  // 查看所有认筹房源
+  viewAllHouses = () => {
+    const { id } = this.$router.params
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/raiseProfile/houseResource?raiseRecordId=${id}`
+    })
+  }
+
+  renderHead() {
+    const { houseList } = this.state
+    const showHouse = (houseList || []).filter(x => x.mineLocked == 'mine')[0] || houseList[0]
+    return (
+      <Block>
+        <View className="head flexSpace">
+          <View className="flexSpace-fixed">
+            <View className="title">认筹房源</View>
+          </View>
+          <View className="flexSpace-fixed">
+            {houseList.length > 1 && <View className="gray" onClick={this.viewAllHouses}>
+              <Text>查看全部（{houseList.length}）</Text>
+              <Text className='at-icon at-icon-chevron-right'></Text>
+            </View>}
+          </View>
+        </View>
+        <RaiseCard summary={showHouse} type="raiseProfile" style="height:auto" />
+      </Block>
+    )
+  }
+
+  // 取消认购原因
+  renderCancelReason() {
+    const { raiseDeatil } = this.state;
+    return (
+      <Block>
+        <View className="cancelReason flexSpace">
+          <View className="flexSpace-fixed">
+            <Image src={require('../../assets/void.png')} style="width:120rpx;height:120rpx"></Image>
+          </View>
+          <View className="flexSpace-item" style="margin-left: 20px">
+            <View>认筹单作废原因：</View>
+            <View className="gray">{raiseDeatil.invalidReason}</View>
+          </View>
+        </View>
+        <View className="hr"></View>
+      </Block>
+    )
+  }
+  // 跳转去交费
+  toPay = () => {
+    this.setState({
+      payDisable: false,
+    })
+    const { raiseDeatil: { raiseRecordId } } = this.state
+    const { user: { 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({
+          payDisable: true
+        })
+        Taro.navigateTo({
+          url: `/onlineSelling/pages/raiseMoney/index?type=pay&raiseRecordId=${raiseRecordId}`
+        })
+      }
+    })
+
+  }
+  // 未交费提示
+  renderUnpayNotice() {
+    const { raiseOrder, payDisable } = this.state
+    return (
+      <Block>
+        <View className="unpayNotice flexSpace" onClick={payDisable ? this.toPay : ''}>
+          <View className="flexSpace-fixed">
+            <Image src={require('../../assets/pay.png')} style="width:64rpx;height:64rpx"></Image>
+            <View className="a-line txt">未缴费？点我缴费</View>
+          </View>
+          <View className="flexSpace-fixed">
+            <Text className="a-line">认筹金额</Text>
+            <Text className="a-line price">{this.regFenToYuan(raiseOrder.raisePrice)}元</Text>
+          </View>
+        </View>
+        <View className="hr"></View>
+      </Block>
+    )
+  }
+  handleChatClick(item) {
+
+    const { user: { userInfo: { miniApp: { tpls }, person: { personId, nickname, name } } } } = this.props
+    const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true)[0] || {}).tplId
+    wx.requestSubscribeMessage({
+      tmplIds: [tplId],
+      success(res) {
+      },
+      fail(res) {
+
+      },
+      complete() {
+        Taro.navigateTo({
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${item.consultantPersonId}&receiverName=${encodeURIComponent(item.name || item.nickname || item.userName)}`
+        })
+      }
+    })
+  }
+  toDecimal2 = (x) => {
+    var f = parseFloat(x);
+    if (isNaN(f)) {
+      return false;
+    }
+    var f = Math.round(x * 100) / 100;
+    var s = f.toString();
+    var rs = s.indexOf('.');
+    if (rs < 0) {
+      rs = s.length;
+      s += '.';
+    }
+    while (s.length <= rs + 2) {
+      s += '0';
+    }
+    return s;
+  }
+  regFenToYuan = (fen) => {
+    var num = fen;
+    num = fen * 0.01;
+    num += '';
+    var reg = num.indexOf('.') > -1 ? /(\d{1,3})(?=(?:\d{3})+\.)/g : /(\d{1,3})(?=(?:\d{3})+$)/g;
+    num = num.replace(reg, '$1');
+    num = this.toDecimal2(num)
+    return num
+  }
+  toAgreement(agreement, buildingId) {
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/protocol/index?agreement=${agreement}&buildingId=${buildingId}`
+    })
+  }
+
+  render() {
+    const { buildingId, raiseDeatil, orderDetail, refundOrder, raiseOrder } = this.state;
+
+
+    // 认筹信息
+    const raiseInfo = [
+      { head: '认筹人', body: raiseDeatil.name || '', },
+      { head: '身份证号', body: raiseDeatil.idcard || '' },
+      { head: '手机号', body: raiseDeatil.tel || '' },
+    ]
+
+    // 缴费信息
+    const payInfo = [
+      { head: '缴费方式', body: `${raiseDeatil.payType == 'onLine' ? '线上缴费' : '线下缴费'}` },
+      { head: '实际支付费用', body: raiseDeatil.payType == 'onLine' ? this.regFenToYuan(orderDetail.totalFee) + '元' : this.regFenToYuan(raiseOrder.raisePrice) + '元' },
+      { head: '缴费成功时间', body: dayjs(orderDetail.payTime).format('YYYY/MM/DD HH:mm:ss') },
+    ]
+
+    // 退费信息
+    const refundInfo = [
+      { head: '退费状态', body: refundOrder.payStatus == 'refunded' ? '退费完成' : '退费中' },
+      { head: '退费结果', body: refundOrder.payStatus == 'refunded' ? '成功' : '失败' },
+      { head: '退费发起时间', body: dayjs(refundOrder.createDate).format('YYYY/MM/DD HH:mm:ss') },
+      { head: '实退费用', body: this.regFenToYuan(refundOrder.totalFee) + '元' },
+      { head: '退费到账时间', body: dayjs(refundOrder.payTime).format('YYYY/MM/DD HH:mm:ss') },
+      { head: '退费原因', desc: raiseDeatil.refundReason },
+    ]
+
+    // 其他信息
+    const otherInfo = [
+      { head: '其他信息', body: '供核对数据使用' },
+      { head: '认筹单编号', body: raiseDeatil.raiseRecordId || '', action: true },
+      { head: '缴费单编号', body: raiseDeatil.orderId || '', action: true, hide: (raiseDeatil.payStatus != 'refunded' && raiseDeatil.payStatus != 'paid') || raiseDeatil.payType != 'onLine' },
+      { head: '退费单编号', body: refundOrder.orderId || '', action: true, hide: raiseDeatil.payStatus != 'refunded' },
+    ]
+
+
+    return (
+      <View className="raiseProfilePage">
+        <View className="main">
+          {this.renderHead()}
+          <View className="tip">{raiseOrder.raisePrecautions || ''}</View>
+          {raiseDeatil.status == '0' && this.renderCancelReason()}
+          {raiseDeatil.payStatus == 'unpaid' && raiseDeatil.status == 1 && this.renderUnpayNotice()}
+          <View className="raise-flex">
+            <View className="date">认筹提交时间  {dayjs(raiseDeatil.createDate).format('YYYY/MM/DD HH:mm:ss')}</View>
+            <View className="agreement" onClick={() => this.toAgreement(raiseOrder.payProtocol, raiseOrder.buildingId)}>线上选房协议<Text className="right-icon"></Text></View>
+          </View>
+          <View>
+            <CellBlock dataset={raiseInfo} />
+            {raiseDeatil.consultantInfo && <ConsultantItem
+              data={raiseDeatil.consultantInfo}
+              type="raiseProfile"
+              style="height:140rpx;margin-bottom:0rpx;width:690rpx"
+              contactClick={() => this.handleChatClick(raiseDeatil.consultantInfo)}
+            />}
+            <View className="hr" />
+            {(raiseDeatil.payStatus == 'paid' || raiseDeatil.payStatus == 'refunded') &&
+              <Block>
+                <CellBlock dataset={payInfo} />
+                <View className="hr" />
+              </Block>}
+
+            {/* unpaid未缴费paid已缴费refunded已退费 */}
+            {raiseDeatil.payStatus == 'refunded' &&
+              <Block>
+                <CellBlock dataset={refundInfo} />
+                <View className="hr" />
+              </Block>}
+            <CellBlock dataset={otherInfo} disable onActionClick={dt => this.copyData(dt.body)} />
+          </View>
+          <View></View>
+          <View></View>
+        </View>
+        <View className="contact">
+          <ContactConsultant text="如有问题，请联系置业顾问" buildingId={buildingId} />
+        </View>
+        <Statement />
+      </View>
+    )
+  }
+}

src/onlineSelling/pages/raiseProfile/index.scss

@@ -0,0 +1,156 @@
+
+@import "~taro-ui/dist/style/components/icon.scss";
+
+.raiseProfilePage {
+
+  .main {
+    padding: 0 30px;
+    font-size: 30px;
+
+    .head {
+      margin: 40px 0 30px;
+    }
+
+    .title {
+      font-weight: 700;
+    }
+
+    .tip {
+      font-size: 24px;
+      line-height: 36px;
+      color: #FF3C3C;
+    }
+
+    .cancelReason {
+      font-size: 21px;
+      line-height: 32px;
+      color: #333;
+      margin: 40px 0 30px;
+    }
+
+    .unpayNotice {
+      margin: 30px 0 20px;
+      font-size: 28px;
+      color: #333;
+
+      .a-line {
+        display: inline-block;
+        height: 64px;
+        line-height: 64px;
+        vertical-align: bottom;
+      }
+
+      .txt {
+        margin-left: 10px;
+        font-size: 30px;
+        color: #666;
+      }
+
+      .price {
+        margin-left: 20px;
+        font-size: 44px;
+        color: #FF3C3C;
+      }
+    }
+
+    .gray {
+      color: #999;
+    }
+  }
+
+  .hr {
+    height: 2px;
+    box-shadow:0px 2px 0px 0px rgba(0, 0, 0, 0.08);
+  }
+
+  .contact {
+    margin: 44px 0;
+  } 
+}
+
+.flexSpace {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+
+  &-fixed {
+    flex: none;
+  }
+
+  &-item {
+    flex: auto;
+    font-size: 22px;
+  }
+}
+
+.cell-block {
+  padding: 45px 0;
+
+  .cell-block-item {
+    & + .cell-block-item {
+      margin-top: 70px;
+    }
+  }
+}
+
+
+.raiseCell {
+  color: #333;
+  text-align: left;
+  font-size: 30px;
+
+  &.disable {
+    color: #999;
+  }
+
+  .row {
+    display: flex;
+    line-height: 1.1em;
+
+    .head {
+      width: 260px;
+      flex: none;
+    }
+
+    .action {
+      width: 54px;
+      text-align: right;
+      flex: none;
+    }
+
+    .body {
+      flex: auto;
+    }
+
+    .desc {
+      color: #999;
+      font-size: 32px;
+      line-height: 40px;
+      margin-top: 28px;
+    }
+  }
+}
+.raise-flex{
+  margin-top: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  .date{
+    font-size: 28px;
+    color: #666;
+  }
+  .agreement{
+    color: #BB9C79;
+    font-size: 32px;
+    display: flex;
+    align-items: center;
+     .right-icon{
+      width:20px;
+      height:20px;
+      border-top: 2px solid #999;
+      border-right: 2px solid #999;
+      transform:rotate(45deg);
+      display: inline-block;
+    }
+  }
+}

src/onlineSelling/pages/records/index.js

@@ -1,41 +1,161 @@
 import Taro, { Component } from '@tarojs/taro'
 import { View, ScrollView, Block } from '@tarojs/components'
 import HouseCard from '../../components/HouseCard'
-import { queryPreselectionRecord } from '@/services/project'
+import RaiseCard from '../../components/RaiseCard'
+import { getItemList } from '@/services/item'
+import { queryPreselectionRecord, queryRaiseRecord, querySalesList, queryApartmentType } from '@/services/project'
 import { connect } from '@tarojs/redux'
 import ready from '@/utils/ready'
 import Blank from '../../components/Blank'
+import Statement from '../../components/Statement'
+import { transferImage } from '@/utils/tools'
+import PickerComponent from '../../components/Picker'
 import './index.scss'
+import * as houseActions from '@/actions/house'
+import * as noticeType from '@/constants/common.js'
+
 
 @connect(
-  ({ user }) => ({ ...user })
+  ({ user, city, house }) => ({ ...user, ...city, house }),
+  { ...houseActions }
 )
-
 export default class Records extends Component {
   config = {
     navigationBarTitleText: '选房记录'
   }
 
   state = {
-    recordList: []
+
+    current: 0,
+    recordList: [],
+    noRecord: false,
+    raiseList: [],
+    noRaiseRecord: false,
+    screenVisible: false,
+    buildingList: [],
+    buildingValue: '',
+    buildingId: '',
+
+    salesList: [],
+    saleBatch: '',
+    salesBatchId: '',
+
+    apartmentList: [],
+    apartmentValue: '',
+    apartmentId: '',
+
+    lockStatus: [{ value: '不限', code: '' }, { value: '未锁定', code: 'unlocked' }, { value: '已锁定', code: 'locked' }],
+    lockStatusValue: '',
+    houseLockingStatus: '',
+
+    lockCustomer: [{ value: '不限', code: '' }, { value: '我自己', code: 'mine' }, { value: '其他人', code: 'other' }],
+    lockCustomerValue: '',
+    customerLocked: '',
+
+    chooseList: [], // 选中的房源ID列表
+    clickDisable: true,
   }
   componentDidShow() {
     ready.queue(() => {
 
-      const { userInfo: { person: { personId } } } = this.props
+      const { id: salesBatchId = '' } = this.$router.params
+      const { userInfo: { person: { personId } }, house } = this.props
       const params = {
         personId,
-        pageNum: 1,
+        // salesBatchId,
+        pageNumber: 1,
         pageSize: 999,
       }
-      queryPreselectionRecord(params).then(res => {
-        const list = res.records
+      this.getPreselection(params)
+      this.getRaise(params)
+      querySalesList().then(res => {
+        res.unshift({ salesBatchName: '请选择', salesBatchId })
+        this.setState({
+          salesList: res || [],
+        })
+      })
+      this.loadBuildingList()
+
+      if (house.raiseCart.length) {
+        this.setState({ chooseList: house.raiseCart.map(x => x.houseId) })
+      }
+
+      this.setState({ salesBatchId })
+
+      // 清空认筹选择
+      this.props.dispatchFlush2Cart([])
+    })
+  }
+  getPreselection(params) {
+    queryPreselectionRecord(params).then(res => {
+      const list = res.records
+      this.setState({
+        recordList: list.filter(item => item.status == '1') || [],
+
+      }, () => {
         this.setState({
-          recordList: list.filter(item => item.status == '1') || []
+          noRecord: this.state.recordList.length > 0 ? false : true
         })
       })
     })
   }
+  getRaise(params) {
+    queryRaiseRecord(params).then(res => {
+      this.setState({
+        raiseList: res.records || [],
+
+      }, () => {
+        this.setState({
+          noRaiseRecord: this.state.raiseList.length > 0 ? false : true
+        })
+      })
+    })
+  }
+  loadBuildingList() {
+    const params = {
+      pageNumber: 1,
+      pageSize: 50,
+      // cityId: this.props.curCity.id || ''
+    }
+    getItemList(params).then(res => {
+      res.records.unshift({ buildingName: '请选择', buildingId: '' })
+      this.setState({
+        buildingList: res.records,
+      })
+    })
+
+  }
+
+  CheckboxChange = (e) => {
+    // 加了一个转整型的处理
+    // 因为所有的 houseId 都是整型
+    this.setState({ chooseList: e.detail.value.map(x => (x - 0)) })
+  }
+
+  handleSubmit = () => {
+    const { recordList, chooseList } = this.state
+    if (!chooseList.length) {
+      Taro.showToast({ title: '请选择房源', icon: 'none' })
+      return;
+    }
+
+    const houseList = recordList.map(x => x.housingInfo).filter(x => chooseList.indexOf(x.houseId) > -1)
+
+    // 选择房源必须同一批次
+    const checkHouse = houseList[0]
+    for (let inx in houseList) {
+      if (houseList[inx].salesBatchId != checkHouse.salesBatchId) {
+        Taro.showToast({ title: '所选房源不属于同一销售批次, 请筛选后重选', icon: 'none', duration: 2000, })
+        return;
+      }
+    }
+
+    this.props.dispatchFlush2Cart(houseList);
+
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/raiseMoney/index?salesBatchId=${checkHouse.salesBatchId}`
+    })
+  }
   toHouseDetail(item) {
     if (item.housingStatus == '0' || item.saleBatchStatus == '0') {
       Taro.showToast({ title: '当前销售批次或该房源已被取消发布', icon: 'none', duration: 2000 })
@@ -45,29 +165,297 @@ export default class Records extends Component {
       })
     }
   }
+  renderPreselection() {
+    const { recordList, noRecord, chooseList } = this.state
+
+    return (
+      <Block>
+        <ScrollView scrollY className="container">
+          <CheckboxGroup onChange={this.CheckboxChange}>
+            {
+              noRecord ? <Blank style="margin:10vh 0 22vh 0" tips="暂无预选记录" /> :
+                <View>
+                  {
+                    recordList.map((item) => {
+                      // const checked = (chooseList || []).filter(x => x == item.houseId)[0]
+                      // const disabled = item.housingInfo.houseLockingStatus == 'locked'
+
+                      return (
+                        <Label class="checkbox" >
+                          {/* <Checkbox value={item.houseId - 0} checked={checked} disabled={disabled}> */}
+                          <View className="carditem" key={item.preselectionRecordId} >
+                            <HouseCard summary={item} onClick={() => this.toHouseDetail(item)} />
+                          </View>
+                          {/* </Checkbox> */}
+                        </Label>
+                      )
+                    })
+                  }
+                </View>
+            }
+          </CheckboxGroup>
+          <Statement />
+        </ScrollView >
+
+        {/* <View className="raise-box"> <View className="raise-btn" onClick={this.handleSubmit}>认筹房源</View></View> */}
+
+      </Block>
+    )
+  }
+  toRaiseProfile(id) {
+    this.setState({
+      clickDisable: false
+    })
+
+    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({
+          clickDisable: true
+        })
+        Taro.navigateTo({
+          url: `/onlineSelling/pages/raiseProfile/index?id=${id}`
+        })
+      }
+    })
+
+  }
+  renderRaise() {
+    const { raiseList, noRaiseRecord, clickDisable } = this.state
+    return (
+      <Block>
+        <ScrollView scrollY className="container">
+          {
+            noRaiseRecord ? <Blank style="margin:10vh 0 22vh 0" tips="暂无认筹记录" /> :
+              <Block>
+                {
+                  raiseList.map(item => (
+                    <View key={item.raiseRecordId} >
+                      <RaiseCard handleCard={clickDisable ? () => this.toRaiseProfile(item.raiseRecordId) : ''} summary={item} statusType="raise" />
+                    </View>
+                  )
+                  )
+                }
+
+              </Block>
+          }
+          <Statement styel="margin-top:80rpx" />
+        </ScrollView >
+
+      </Block>
+    )
+  }
+
+
+  handleBuildingChange = e => {
+    const { buildingList } = this.state
+    this.setState({
+      buildingValue: buildingList[e.detail.value].buildingName,
+      buildingId: buildingList[e.detail.value].buildingId,
+    })
+  }
+  handleSaleBatchChange = e => {
+    const { salesList } = this.state
+    this.setState({
+      saleBatch: salesList[e.detail.value].salesBatchName,
+      salesBatchId: salesList[e.detail.value].salesBatchId,
 
+    }, () => {
+      if (this.state.salesBatchId) {
+        this.loadAparamentType(this.state.salesBatchId)
+      } else {
+        this.setState({
+          apartmentList: [{ apartmentName: '请选择', apartmentId: '' }]
+        })
+      }
+    })
+  }
+
+  loadAparamentType(salesBatchId) {
+    queryApartmentType({ salesBatchId: salesBatchId }).then(res => {
+      res.unshift({ apartmentName: '请选择', apartmentId: '' })
+      this.setState({
+        apartmentList: res || []
+      })
+    })
+  }
+
+  handleApartmentChange = e => {
+    const { apartmentList } = this.state
+
+    this.setState({
+      apartmentValue: apartmentList[e.detail.value].apartmentName,
+      apartmentId: apartmentList[e.detail.value].apartmentId,
+    })
+
+  }
+  handleLockStatusChange = e => {
+    const { lockStatus } = this.state
+    this.setState({
+      lockStatusValue: lockStatus[e.detail.value].value,
+      houseLockingStatus: lockStatus[e.detail.value].code,
+    })
+  }
+  handleCustomerChange = e => {
+    const { lockCustomer } = this.state
+    this.setState({
+      lockCustomerValue: lockCustomer[e.detail.value].value,
+      customerLocked: lockCustomer[e.detail.value].code,
+    })
+  }
+
+
+  unlimitedBtn() {
+
+    this.setState({
+      screenVisible: false,
+      buildingValue: '',
+      buildingId: '',
+      saleBatch: '',
+      salesBatchId: '',
+      apartmentValue: '',
+      apartmentId: '',
+      lockStatusValue: '',
+      houseLockingStatus: '',
+      lockCustomerValue: '',
+      customerLocked: '',
+    })
+    const { userInfo: { person: { personId } } } = this.props
+    const params = {
+      personId,
+      pageNumber: 1,
+      pageSize: 999,
+    }
+    this.getPreselection(params)
+    this.getRaise(params)
+  }
+  ScreenBtn() {
+    this.setState({
+      screenVisible: false
+    })
+    const { userInfo: { person: { personId } } } = this.props
+    const { buildingId, salesBatchId, houseLockingStatus, apartmentId, customerLocked } = this.state
+
+    if (this.state.current == '0') {
+
+      const params = {
+        personId,
+        pageNumber: 1,
+        pageSize: 999,
+        buildingId,
+        salesBatchId,
+        apartmentId,
+        houseLockingStatus,
+        customerLocked
+      }
+      this.getPreselection(params)
+    } else {
+
+      const params = {
+        personId,
+        pageNumber: 1,
+        pageSize: 999,
+        buildingId,
+        salesBatchId,
+        houseLockingStatus,
+      }
+
+      this.getRaise(params)
+    }
+
+
+  }
+
+  renderPreselectScreen() {
+    const { current, buildingValue, buildingList, saleBatch, salesList, apartmentList, apartmentValue, lockCustomerValue, lockCustomer, lockStatusValue, lockStatus } = this.state
+
+    const selector = [{ buildingTypeName: '楼盘1' }, { buildingTypeName: '楼盘2' }, { buildingTypeName: '楼盘3' }, { buildingTypeName: '楼盘4' }]
+
+    return (
+
+      <View className="base-con">
+        <PickerComponent title="选择楼盘" selector={buildingList} keyValue={"buildingName"} currentValue={buildingValue || ''} handleChange={this.handleBuildingChange} />
+        <PickerComponent title="选择销售批次" selector={salesList} keyValue={"salesBatchName"} currentValue={saleBatch || ''} handleChange={this.handleSaleBatchChange} />
+        {current == '0' && <PickerComponent title="选择户型" selector={apartmentList} keyValue={"apartmentName"} currentValue={apartmentValue || ''} handleChange={this.handleApartmentChange} />}
+        <PickerComponent title="锁定状态" selector={lockStatus} keyValue={"value"} currentValue={lockStatusValue || ''} handleChange={this.handleLockStatusChange} />
+        {current == '0' && <PickerComponent title="锁定客户" keyValue={"value"} selector={lockCustomer} currentValue={lockCustomerValue || ''} handleChange={this.handleCustomerChange} />}
+
+        <View className="bottom-btn">
+          <View className="save" onClick={this.ScreenBtn}>
+            筛选
+            </View>
+          <View className="cancel" onClick={this.unlimitedBtn}>
+            不限
+          </View>
+        </View>
+      </View>
+    )
+  }
+
+
+  handleScreenClick() {
+
+
+    this.setState({
+      screenVisible: true
+    })
+
+  }
+  handleCondition(value) {
+    this.setState({
+      current: value,
+      buildingValue: '',
+      buildingId: '',
+      saleBatch: '',
+      salesBatchId: '',
+      apartmentValue: '',
+      apartmentId: '',
+      lockStatusValue: '',
+      houseLockingStatus: '',
+      lockCustomerValue: '',
+      customerLocked: '',
+
+
+    })
+  }
+  renderBar() {
+    const { current } = this.state
+    const condition = [{ title: '预选记录', value: 0 }, { title: '认筹单', value: 1 }]
+
+    return (
+      <Block>
+        <View className="screen-top">
+          <View className="flex">
+            {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>
+          <View onClick={this.handleScreenClick}>
+            <Image style="width:50rpx;height:50rpx" src={transferImage(require('../../assets/screen.png'))}></Image>
+          </View>
+        </View>
+        {current == 0 && this.renderPreselection()}
+        {current == 1 && this.renderRaise()}
+      </Block>
+    )
+  }
   render() {
-    const { recordList } = this.state
 
+    const { screenVisible } = 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 >
-        }
+        {!screenVisible && this.renderBar()}
+        {screenVisible && this.renderPreselectScreen()}
 
       </View >
     )

src/onlineSelling/pages/records/index.scss

@@ -1,9 +1,132 @@
+@import "@/styles/theme.scss";
+
 .records {
-  padding: 10px 0;
+  background-color: #F8F8F8;
+  min-height: 100vh;
+  .screen-top{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    height:100px;
+    background:rgba(248,248,248,1);
+    font-size: 34px;
+    color: #666;
+    padding: 0 30px;
+    font-size: 400;
+    .flex{
+      display: flex;
+      align-items: center;
+      .top-item{
+        width:164px;
+        height:48px;
+        font-size:24px;
+        font-weight:300;
+        color: #333;
+        line-height: 48px;
+        background:rgba(255,255,255,1);
+        border:1px solid rgba(228,228,228,1);
+        box-shadow:0px 4px 12px 0px rgba(255,171,50,0.08);
+        border-radius:24px;
+        margin-right: 30px;
+        text-align: center;
+  
+      }
+      .active{
+        background-color: #BB9C79;
+        color: #fff;
+      }
+    }
+  }
+  .checkbox{
+    display: block;
+    height: 250px;
+    background-color: #fff;
+    padding-left: 30px;
+    margin-bottom: 20px;
+  }
+  .container {
+    height: calc(100vh - 100px);
+  }
+  .raise-box{
+    position: fixed;
+    width: 100vw;
+    padding: 30px;
+    .raise-btn{
+     
+      height:94px;
+      line-height: 94px;
+      background:rgba(187,156,121,1);
+      border-radius:10px;
+      color: #fff;
+      font-size: 36px;
+      text-align: center;
+    }  
+  }
+}
 
-  .carditem {
-    & + .carditem {
-      margin-top: 40px;
+.base-con{
+  width: 100vw;
+  height:100vh;
+  background-color: #fff;
+  padding: 0 30px;
+  border-radius:12px;
+  .con-item{
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 30px;
+   
+    .title{
+      font-size: 33px;
+      color: #333;
+    } 
+  }
+
+  .con-picker{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    width:456px;
+    height:48px ;
+    line-height: 48px;
+    padding: 0 16px;
+    border: 1px solid #dcdcdc;
+    border-radius: 4px;
+    .picker{
+      width: 400px;
+    }
+  }
+  .right-icon{
+    width:18px;
+    height:18px;
+    border-top: 2px solid #999;
+    border-right: 2px solid #999;
+    transform:rotate(45deg);
+    float: right;
+  }
+  .bottom-btn{
+
+    font-size: 34px;
+    position: absolute;
+    width: 690px;
+    top: 70vh;
+  
+    .save{
+      background-color: $primary-color;
+      color:#fff;
+      height: 94px;
+      line-height: 94px;
+      text-align: center;
+      border-radius:10px;
+      border:2px solid $primary-color;
+      margin-bottom: 40px;
+    }
+    .cancel{
+      color: 333;
+      text-align: center;
+      height: 94px;
+      line-height: 94px;
+      border-radius:10px;
+      border:2px solid #dcdcdc;
     }
   }
 }

src/onlineSelling/pages/screenHouse/index.js

@@ -18,11 +18,7 @@ export default class Index extends Component {
     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' },
-    ]
+    apartmentList: []
   }
 
   componentWillMount() {
@@ -118,7 +114,7 @@ export default class Index extends Component {
               <View className='construction__area'>
                 <Text>{apartmentItem.buildingArea ? '建筑面积约' + apartmentItem.buildingArea + 'm²' : '建筑面积待定'}</Text>
                 {
-                  apartmentItem.area2 ? <Text>使用面积约{apartmentItem.area2}m²</Text> : <Text>使用面积待定</Text>
+                  apartmentItem.insideArea ? <Text>使用面积约{apartmentItem.insideArea}m²</Text> : <Text>使用面积待定</Text>
                 }
               </View>
             </View>

src/onlineSelling/pages/selectionRecord/index.js

@@ -1,105 +0,0 @@
-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

@@ -1,28 +0,0 @@
-@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/index.js

@@ -134,6 +134,7 @@ export default class Index extends Component {
     return (
       <ListView
         className="wrap"
+        style="height: calc(100vh - 118rpx);"
         needInit
         isEmpty={isEmpty}
         emptyText="暂无活动~"

src/pages/activity/index.scss

@@ -31,3 +31,9 @@
   }
 
 }
+.at-tabs-pane--active{
+  height: 100vh!important;
+  overflow: scroll;
+  padding-bottom: 100px;
+
+}

src/pages/news/index.js

@@ -115,6 +115,7 @@ export default class Index extends Component {
     return (
       <ListView
         className="wrap"
+        style="height: calc(100vh - 118rpx);"
         needInit
         isEmpty={isEmpty}
         emptyText="暂无资讯~"

src/pages/person/spread/index.js

@@ -78,7 +78,7 @@ export default class Index extends Component {
       <Block>
         {/* 生成海报 */}
         {makePosterStatus && (<Poster data={posterData} toggle={this.toggleVisiblePoster}></Poster>)}
-        <View className='page'>
+        <View className='spread-page'>
           <View className='spread-code'>
             <View className='spread-code-head'>
               <Image src={avatarurl} className='spread-code-head_img'></Image>

src/pages/person/spread/index.scss

@@ -1,8 +1,8 @@
 @import "@/styles/theme.scss";
-.page {
+.spread-page {
   position: relative;
   width: 100%;
-  height: 100%;
+  height: 100vh;
   background: #f0f0f0;
 }
 .spread-code {

src/pages/project/NavIcons/icons.js

@@ -0,0 +1,111 @@
+import { ROLE_CODE } from '@/constants/user'
+
+export default [
+  {
+    iconCode: 'integralMall',
+    iconName: '赚积分',
+    iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811839725-mall-icon.png',
+    tab: '/pages/shop/index',
+    default: true,
+  },
+  {
+    iconCode: 'refercustomers',
+    iconName: '推荐客户',
+    page: ({ city, personType }) => {
+      if (personType === ROLE_CODE['CONSULTANT']) return false;
+
+      return `/useless/pages/agent/recommend/index?type=index&cityId=${(city || {}).id}`
+    },
+    iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811691300-recommend-icon.png',
+    default: true,
+  },
+  {
+    iconCode: 'buyingEncyclopedia',
+    iconName: '购房须知',
+    iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811865979-encyclopedia-icon.png',
+    page: '/pages/policy/index?from=mine',
+    default: true,
+  },
+  {
+    iconCode: 'findRoom',
+    iconName: '选好房',
+    page: '/pages/project/map/index',
+    iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811880140-map-icon.png',
+    default: true,
+  },
+  {
+    iconCode: 'Highlyrecommented',
+    iconName: '重点推荐',
+    page: '/pages/project/highlyRecommented',
+  },
+  {
+    iconCode: 'MortgageCalculator',
+    iconName: '算房贷',
+    page: '/pages/toolKit/index',
+  },
+  {
+    iconCode: 'PropertyListing',
+    iconName: '楼盘列表',
+    page: '/pages/project/list/index',
+  },
+  {
+    iconCode: 'EventInformation',
+    iconName: '活动资讯',
+    tab: '/pages/activity/activity',
+  },
+  {
+    iconCode: 'Popularactivities',
+    iconName: '参加活动',
+    tab: '/pages/activity/activity',
+  },
+  {
+    iconCode: 'LatestInformation',
+    iconName: '最新资讯',
+    tab: '/pages/activity/activity',
+  },
+  {
+    iconCode: 'Myclient',
+    iconName: '我的客户',
+    page: '/useless/pages/agent/client/index',
+  },
+  {
+    iconCode: 'MyActivities',
+    iconName: '我的活动',
+    page: '/pages/activity/myActivity?from=mine',
+  },
+  {
+    iconCode: 'Myhelp',
+    iconName: '我的助力',
+    page: '/pages/activity/assistancePage',
+  },
+  {
+    iconCode: 'Mygroup',
+    iconName: '我的拼团',
+    page: '/pages/activity/assemblePage',
+  },
+  {
+    iconCode: 'MyFavorites',
+    iconName: '我的收藏',
+    page: '/pages/person/favorite/index',
+  },
+  {
+    iconCode: 'MyInformation',
+    iconName: '我的资料',
+    page: '/useless/pages/person/profile/index',
+  },
+  {
+    iconCode: 'Mymessage',
+    iconName: '我的消息',
+    page: '/pages/im/list/index',
+  },
+  {
+    iconCode: 'Exchangerecords',
+    iconName: '兑换记录',
+    page: '/useless/pages/shop/record/index',
+  },
+  {
+    iconCode: 'Feedback',
+    iconName: '意见反馈',
+    page: '/useless/pages/person/feedback/index',
+  },
+]

src/pages/project/NavIcons/index.js

@@ -0,0 +1,56 @@
+import { isFunction, isEmpty } from '@/utils/tools'
+import allIcons from './icons'
+import './index.scss'
+
+const defaultIcons = allIcons.filter(x => x.default)
+
+export default function (props) {
+  const iconList = props.iconList && props.iconList.length ? props.iconList : defaultIcons
+  const showIcons = iconList.map((icon) => {
+    const defIcon = allIcons.filter(x => icon.iconCode === x.iconCode)[0]
+
+    if (!defIcon) return false;
+
+    const navIcon = {
+      ...defIcon,
+      ...icon,
+    }
+
+    if (isEmpty(navIcon.page) && isEmpty(navIcon.tab)) return false;
+
+    if (isFunction(navIcon.page)) {
+      const pg = navIcon.page(props)
+      if (!pg) return false;
+
+      return { ...navIcon, page: pg }
+    }
+
+    return navIcon
+  }).filter(Boolean)
+
+  const naviTo = (icon) => {
+    const { page, tab } = icon || {}
+
+    if (tab) {
+      Taro.switchTab({ url: tab })
+    } else {
+      Taro.navigateTo({ url: page })
+    }
+  }
+
+  return (
+    <View className="navicons" style={showIcons.length == 3 ? "padding:0 8%" : ""}>
+        {showIcons.map((item) => (
+            <View onClick={() => naviTo(item)} className="nav-item" key={item.iconCode}>
+                <Image className="icon" src={item.iconUrl} ></Image>
+                <View className="nav-text">
+                  <Text>{item.iconName}</Text>
+                  { item.iconCode== 'refercustomers' && 
+                    <Image style="width:30rpx;height:30rpx;margin-left:4rpx" src={require('@/assets/award.png')} ></Image>
+                  }
+                </View>
+            </View>
+        ))}
+    </View>
+  )
+}

src/pages/project/NavIcons/index.scss

@@ -0,0 +1,26 @@
+.navicons {
+  width:690px;
+  height:188px;
+  background:#fff;
+  box-shadow:0px 4px 12px 0px rgba(0,0,0,0.12);
+  border-radius:12px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: -64px auto 0 auto;
+  position: relative;
+  .nav-item{
+    text-align: center;
+    width: 25%;
+    .icon{
+      width:84px;
+      height:84px;
+    }
+    .nav-text{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      
+    }
+  }
+}

src/pages/project/h5Page.js

@@ -9,7 +9,7 @@ import { connect } from '@tarojs/redux'
 import { ROLE_CODE } from '@/constants/user'
 import { getQrCodeParams } from '@/utils/qrcode'
 import { getMiniQrcode, savePoint, updatePoint } from '@/services/common'
-import { isEmpty } from '@/utils/tools'
+import { isEmpty, parseURL } from '@/utils/tools'
 import { rule as ruleToast } from '@/utils/ruleToast'
 import { share as shareSavePoint } from '@/utils/shareSavePoint'
 import { report as reportCustomer } from '@/utils/customer'
@@ -381,12 +381,14 @@ export default class Index extends Component {
 
     const showH5 = !isEmpty(h5Id) && pageInfo.h5Address && pageInfo.h5Address !== 'about' && pageInfo.h5Address !== 'http://about' && pageInfo.h5Address !== 'https://about'
 
-    // console.log('----web-h5------>', showH5, `${pageInfo.h5Address}?${webUrlParams}`)
+    const originURL = parseURL(pageInfo.h5Address) || {}
+    const queryString = [webUrlParams, originURL.query].join('&')
+    const webURL = [`${originURL.origin}${originURL.path}?${queryString}`, originURL.hash].join('#')
 
     return (
       <Block>
         {this.renderMaskBanner()}
-        {webViewVisible && showH5 && <WebView src={`${pageInfo.h5Address}?${webUrlParams}`} />}
+        {webViewVisible && showH5 && <WebView src={webURL} />}
       </Block>
     )
   }

src/pages/project/icons.js

@@ -1,144 +0,0 @@
-import { ROLE_CODE } from '@/constants/user'
-
-const icons = {
-    shop: require('@/assets/index/mall-icon.png'),
-    encyclopedia: require('@/assets/index/encyclopedia-icon.png'),
-    recommend: require('@/assets/index/recommend-icon.png'),
-    map: require('@/assets/index/map-icon.png'),
-    calculator: require('@/assets/index/calculator-icon.png'),
-    Highlyrecommented: require('@/assets/index/recommend.png'),
-}
-
-const DRIFT = ROLE_CODE['DRIFT']
-const CUSTOMER = ROLE_CODE['CUSTOMER']
-const CONSULTANT = ROLE_CODE['CONSULTANT']
-// const ESTATE_AGENT = ROLE_CODE['ESTATE_AGENT']
-// const CHANNEL_AGENT = ROLE_CODE['CHANNEL_AGENT']
-
-const menus = [
-
-    {
-        name: '赚积分',
-        url: '/pages/shop/index',
-        icon: icons.shop,
-        switchTab: true,
-        iconCode: 'integralMall',
-    },
-    {
-        name: '购房须知',
-        url: '/pages/policy/index?from=mine',
-        icon: icons.encyclopedia,
-        iconCode: 'buyingEncyclopedia'
-    },
-    {
-        name: '推荐客户',
-        url: '/useless/pages/agent/recommend/index?type=index&cityId=',
-        icon: icons.recommend,
-        iconCode: 'refercustomers',
-        city: true,
-    },
-    {
-        name: '选好房',
-        url: '/pages/project/map/index',
-        icon: icons.map,
-        iconCode: 'findRoom'
-    },
-    {
-        name: '重点推荐',
-        url: '/pages/project/highlyRecommented',
-        icon: icons.Highlyrecommented,
-        iconCode: 'Highlyrecommented'
-    },
-    {
-        name: '算房贷',
-        url: '/pages/toolKit/index',
-        icon: icons.calculator,
-        iconCode: 'MortgageCalculator'
-    },
-
-    {
-        name: '楼盘列表',
-        url: '/pages/project/list/index',
-        icon: icons.buildingList,
-        iconCode: 'PropertyListing'
-    },
-    {
-        name: '活动资讯',
-        url: '/pages/activity/activity',
-        icon: icons.calculator,
-        iconCode: 'EventInformation',
-        switchTab: true,
-    },
-    {
-        name: '参加活动',
-        url: '/pages/activity/activity',
-        icon: icons.activity,
-        iconCode: 'Popularactivities',
-        switchTab: true,
-    },
-    {
-        name: '最新资讯',
-        url: '/pages/activity/activity',
-        icon: icons.news,
-        iconCode: 'LatestInformation',
-        switchTab: true,
-    },
-    {
-        name: '我的客户',
-        url: '/useless/pages/agent/client/index',
-        icon: icons.myGuest,
-        iconCode: 'Myclient',
-    },
-    {
-        name: '我的活动',
-        url: '/pages/activity/myActivity?from=mine',
-        icon: icons.activities,
-        iconCode: 'MyActivities'
-    },
-    {
-        name: '我的助力',
-        url: '/pages/activity/assistancePage',
-        icon: icons.help,
-        iconCode: 'Myhelp'
-    },
-    {
-        name: '我的拼团',
-        url: '/pages/activity/assemblePage',
-        icon: icons.group,
-        iconCode: 'Mygroup'
-    },
-    {
-        name: '我的收藏',
-        url: '/pages/person/favorite/index',
-        icon: icons.collection,
-        iconCode: 'MyFavorites'
-    },
-    {
-        name: '我的资料',
-        url: '/useless/pages/person/profile/index',
-        icon: icons.profile,
-        iconCode: 'MyInformation'
-    },
-    {
-        name: '我的消息',
-        url: '/pages/im/list/index',
-        icon: icons.chatList,
-        iconCode: 'Mymessage'
-    },
-    {
-        name: '兑换记录',
-        url: '/useless/pages/shop/record/index',
-        icon: icons.exchange,
-        iconCode: 'Exchangerecords'
-    },
-    {
-        name: '意见反馈',
-        url: '/useless/pages/person/feedback/index',
-        icon: icons.feedback,
-        iconCode: 'Feedback'
-    },
-
-
-]
-
-export { icons, menus }

src/pages/project/index.js

@@ -5,29 +5,17 @@ import Banner from './banner'
 import Newsbanner from './newsbanner'
 import Activity from './activity'
 import BannerTwo from './swiper'
-// import ActivityItem from '../activity/item'
 import ready from '@/utils/ready'
-import { getLocationCity } from '@/services/map'
-import { queryBanners, savePoint, updatePoint, queryExtContents, queryIndexIcons } from '@/services/common'
+import { savePoint, updatePoint, queryExtContents, queryIndexIcons } from '@/services/common'
 import { queryHelpGroup } from '@/services/news'
 import { getIndexShare } from '@/services/user'
-// import { queryActivityList } from '@/services/activity'
 import { dispatchCitySelected } from '@/actions/city'
-import { ROLE_CODE, DECREASE_UNREADNUM } from '@/constants/user'
 import { SET_SCREEN_SHOWED } from '@/constants/project'
 import { getStore, connect } from '@tarojs/redux'
 import * as actions from '@/actions/project'
 import { transferImage } from '@/utils/tools'
 import Notice from '@/components/Notice'
-import { menus } from './icons'
-import Menus from '@/components/indexMenus'
-
-const bgImg = "https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1578724562550-background.png"
-// import { getIndexPreloadData } from '@/utils/preload'
-// import Authorize from '@/components/authorize'
-// import * as noticeType from '@/constants/common.js'
-
-// const { miniProgram: { appId } } = wx.getAccountInfoSync();
+import NavIcons from './NavIcons'
 
 @connect(
   state => ({ ...state.project, ...state.city, ...state.user, system: state.system }),
@@ -57,7 +45,7 @@ export default class Index extends Component {
     propagandaBanner: [],
     newsShow: false,
     city: null,
-    menusList: [],
+    iconList: [],
   }
 
   componentWillMount() {
@@ -66,7 +54,7 @@ export default class Index extends Component {
 
     ready.queue(() => {
 
-      Taro.setNavigationBarTitle({ title: `${this.props.userInfo.miniApp.name}欢迎你` })
+      Taro.setNavigationBarTitle({ title: `${this.props.userInfo.miniApp.name}欢迎您` })
       const city = this.state.city || this.props.curCity
       this.loadData({ curCity: city })
 
@@ -87,58 +75,9 @@ export default class Index extends Component {
   }
 
   getIndexIcons() {
-
     queryIndexIcons().then(res => {
-      if (res.length) {
-        const Arr = [];
-
-        res.forEach(item => {
-          menus.forEach(menu => {
-            if (menu.iconCode == item.iconCode) {
-              Arr.push(menu);
-            }
-          })
-        })
-        const { userInfo: { person: { personType } } } = this.props
-        this.setState({
-          menusList: personType == ROLE_CODE['CONSULTANT'] ? Arr.filter(item => item.iconCode != 'refercustomers') : Arr
-        })
-      } else {
-        const iconList = [
-          {
-            iconCode: 'integralMall',
-            iconName: '赚积分',
-            iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811839725-mall-icon.png'
-          },
-          {
-            iconCode: 'refercustomers',
-            iconName: '推荐客户',
-            iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811691300-recommend-icon.png',
-          },
-          {
-            iconCode: 'buyingEncyclopedia',
-            iconName: '购房须知',
-            iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811865979-encyclopedia-icon.png'
-          },
-          {
-            iconCode: 'findRoom',
-            iconName: '选好房',
-            iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811880140-map-icon.png',
-
-          },
-        ]
-        const newArr = [];
-        iconList.forEach(item => {
-          menus.forEach(menu => {
-            if (menu.iconCode == item.iconCode) {
-              newArr.push(menu);
-            }
-          })
-        })
-        const { userInfo: { person: { personType } } } = this.props
-        this.setState({
-          menusList: personType == ROLE_CODE['CONSULTANT'] ? newArr.filter(item => item.iconCode != 'refercustomers') : newArr
-        })
+      if (res && res.length) {
+        this.setState({ iconList: res })
       }
     })
   }
@@ -179,57 +118,6 @@ export default class Index extends Component {
     recordId && updatePoint(recordId)
   }
 
-  // getLocation() {
-  //   Taro.getLocation().then(location => {
-  //     Taro.setStorageSync('lat', location.latitude)
-  //     Taro.setStorageSync('lon', location.longitude)
-
-  //     const payload = { location: `${location.longitude},${location.latitude}` }
-
-  //     getLocationCity(payload).then(res => {
-  //       if (!res || !res.id) {
-  //         Taro.showToast({
-  //           title: '未查询到当前城市信息, 请手动选择',
-  //           icon: 'none',
-  //           duration: 3000,
-  //         })
-  //       } else {
-  //         this.setState({ city: res })
-  //         this.loadData({ curCity: res })
-  //         this.updateCity(res)
-  //       }
-  //     }).catch(err => {
-  //       console.error(err)
-
-  //       Taro.showToast({
-  //         title: '服务错误, 请手动选择城市',
-  //         icon: 'none',
-  //         duration: 3000,
-  //       })
-  //     })
-  //   }).catch(err => {
-  //     if (err.errMsg === 'getLocation:fail auth deny') {
-  //       Taro.showModal({
-  //         content: '请同意授权您的定位功能',
-  //         showCancel: false,
-  //         duration: 3000,
-  //       })
-  //     } else {
-  //       Taro.showToast({
-  //         title: `定位失败, 请手动选择城市: ${err.errMsg}`,
-  //         icon: 'none',
-  //         duration: 3000,
-  //       })
-  //     }
-
-  //     console.error(err)
-  //   })
-  // }
-
-  // updateCity(payload) {
-  //   this.props.dispatchCitySelected(payload)
-  // }
-
   loadData(props = {}) {
     this.loadHelpGroupList(props)
     this.loadList(props)
@@ -606,10 +494,9 @@ export default class Index extends Component {
     })
   }
   render() {
-    const { curCity } = this.props
-    const { achieve, helpGroupList, propagandaBanner, newsShow, menusList } = this.state
-    const { userInfo: { person: { personType, phone } } } = this.props
-    const { unReadNum, userInfo: { person } } = this.props
+    const { achieve, helpGroupList, propagandaBanner, newsShow, iconList } = this.state
+    const { curCity, unReadNum, userInfo: { person } } = this.props
+
     return (
       <Block>
         {this.state.loaded && (
@@ -653,7 +540,7 @@ export default class Index extends Component {
                 </View>
               </View>
               {/* 菜单栏 */}
-              <Menus menusList={menusList}></Menus>
+              <NavIcons city={curCity} person={person} iconList={iconList} ></NavIcons>
               {/* <View style={propagandaBanner.length > 0 ? "border-bottom:20rpx solid #f5f5f5" : ''}> */}
               <View style={(newsShow || propagandaBanner.length > 0) ? "border-bottom:20rpx solid #f5f5f5" : ''}>
                 {/* 展示位轮播图 */}

src/pages/shop/index.scss

@@ -156,7 +156,12 @@
     font-weight: bold;
   }
 }
+.at-tabs-pane--active{
+  height: 100vh!important;
+  overflow: scroll;
+  padding-bottom: 100px;
 
+}
 .list__wrap {
   margin-top: 20px;
   overflow: hidden;

src/reducers/house.js

@@ -0,0 +1,73 @@
+/**
+ * 房源相关
+ */
+
+ import {
+   ADD_CART,
+   SUB_CART,
+   FLUSH_TO_CART,
+   ADD_CONSULTANT,
+   CHOOSE_CONSULTANT,
+   MY_PRESELECT_RECORD,
+ } from '@/constants/house'
+
+const INITIAL_STATE = {
+  // 认筹临时选中房源
+  raiseCart: [],
+
+  // 置业顾问列表
+  consultantList: [],
+
+  // 认筹选中置业
+  chooseConsultant: undefined,
+
+  // 预选房源列表
+  mySelectHouses: [],
+}
+
+export default function(state = INITIAL_STATE, action) {
+  const { type, payload } = action
+
+  switch(type) {
+    // 加入临时选择
+    case ADD_CART:
+      return {
+        ...state,
+        raiseCart: state.raiseCart.filter(x => x.houseId != payload.houseId).concat(payload),
+      };
+
+    // 取消临时选择
+    case SUB_CART:
+      return {
+        ...state,
+        raiseCart: state.raiseCart.filter(x => x.houseId != payload.houseId),
+      };
+
+    //
+    case FLUSH_TO_CART:
+      return {
+        ...state,
+        raiseCart: payload,
+      };
+
+    case ADD_CONSULTANT:
+      return {
+        ...state,
+        consultantList: payload.records,
+      };
+
+    case CHOOSE_CONSULTANT:
+      return {
+        ...state,
+        chooseConsultant: payload,
+      };
+
+    case MY_PRESELECT_RECORD:
+      return {
+        ...state,
+        mySelectHouses: payload.records,
+      };
+    default:
+      return state;
+  }
+}

src/reducers/index.js

@@ -6,6 +6,7 @@ import shop from './shop'
 import news from './news'
 import city from './city'
 import system from './system'
+import house from './house'
 
 export default combineReducers({
   user,
@@ -15,4 +16,5 @@ export default combineReducers({
   news,
   city,
   system,
+  house,
 })

src/services/getCode.js

@@ -2,7 +2,8 @@ import { fetch } from '@/utils/request'
 import {
   API_GET_CODE,
   API_PUT_REGISTER,
-  API_PUT_REGISTERCONSULTANT
+  API_PUT_REGISTERCONSULTANT,
+  API_CHECK_CODE
 } from '@/constants/api'
 
 /**
@@ -11,6 +12,8 @@ import {
  */
 export const getCodeMessage = tel => fetch({ url: `${API_GET_CODE}?tel=${tel}`, method: 'POST' })
 
+export const checkCaptcha = (tel, captcha) => fetch({ url: `${API_CHECK_CODE}?tel=${tel}&captcha=${captcha}`, method: 'POST' })
+
 export const putRegister = payload => fetch({ url: `${API_PUT_REGISTER}?phone=${payload.tel}&&code=${payload.code}`, payload, method: 'PUT' })
 
 export const putRegisterConsultant = payload => fetch({ url: `${API_PUT_REGISTERCONSULTANT}`, method: 'PUT' })

src/services/house.js

@@ -0,0 +1,3 @@
+import { fetch, apis } from '@/utils/request'
+
+export const checkRaise = houseIdList => fetch({ url: `${apis.API_RAISE_CHECK}?houseIds=${houseIdList.join(',')}`, method: 'GET' })

src/services/project.js

@@ -2,12 +2,18 @@ import { fetch } from '@/utils/request'
 import {
   API_HOUSE_LIST,
   API_PRESELECTION_RECORD,
+  API_SALESBATCH_LIST,
+  API_RATSE_RECORD,
   API_HOUSE_DETAIL,
   API_ADD_PRESELECTION,
   API_CANCEL_PRESELECTION,
   API_APARTMENT_TYPE,
   API_NOTICE_INFO,
-  API_SALES_BATCH
+  API_SALES_BATCH,
+  API_RATSE_DETAIL,
+  API_RATSE_ORDER,
+  API_CANCEL_ORDER
+
 } from '@/constants/api'
 
 
@@ -21,12 +27,22 @@ export const queryHouseList = payload => fetch({ url: API_HOUSE_LIST, payload })
  * 获取房源分享信息
  * @param {*} id
  */
-export const querySalesInfo = id => fetch({ url: `${API_SALES_BATCH}/${id}`})
+export const querySalesInfo = id => fetch({ url: `${API_SALES_BATCH}/${id}` })
+/**
+ * 获取认筹单详情
+ * @param {*} id
+ */
+export const queryRaiseDetail = id => fetch({ url: `${API_RATSE_DETAIL}/${id}` })
+/**
+ * 认筹单线下缴费
+ * @param {*} id
+ */
+export const raiseOffline = id => fetch({ url: `${API_RATSE_DETAIL}/${id}`, method: 'PUT' })
 /**
  * 获取房源列表滚动提示
  * @param {*} id
  */
-export const queryNoticeInfo = id => fetch({ url: `${API_NOTICE_INFO}/${id}`})
+export const queryNoticeInfo = id => fetch({ url: `${API_NOTICE_INFO}/${id}` })
 
 /**
  * 预选房源
@@ -37,7 +53,7 @@ export const addPreselection = payload => fetch({ url: API_ADD_PRESELECTION, pay
  * 取消预选房源
  * @param {*} payload
  */
-export const cancelPreselection = payload => fetch({ url: `${API_CANCEL_PRESELECTION}?${'houseId='+payload.houseId}&${'personId='+payload.personId}`, method: 'DELETE' })
+export const cancelPreselection = payload => fetch({ url: `${API_CANCEL_PRESELECTION}?${'houseId=' + payload.houseId}&${'personId=' + payload.personId}`, method: 'DELETE' })
 /**
  * 获取房源详情
  * @param {*} payload
@@ -49,11 +65,31 @@ export const queryHouseDetail = payload => fetch({ url: API_HOUSE_DETAIL, payloa
  * @param {*} payload
  */
 export const queryPreselectionRecord = payload => fetch({ url: API_PRESELECTION_RECORD, payload })
+/**
+ * 获取认筹记录
+ * @param {*} payload
+ */
+export const queryRaiseRecord = payload => fetch({ url: API_RATSE_RECORD, payload })
+/**
+ * 获取销售批次列表
+ * @param {*} payload
+ */
+export const querySalesList = payload => fetch({ url: API_SALESBATCH_LIST, payload })
 /**
  * 获取某销售批次下所有房源户型
  * @param {*} payload
  */
-export const queryApartmentType= payload => fetch({ url: API_APARTMENT_TYPE, payload })
+export const queryApartmentType = payload => fetch({ url: API_APARTMENT_TYPE, payload })
+/**
+ *认筹下单接口
+ * @param {*} payload
+ */
+export const raiseOrder = payload => fetch({ url: API_RATSE_ORDER, payload, method: 'POST' })
+/**
+ *认筹单取消支付接口
+ * @param {*} payload
+ */
+export const cancelOrder = payload => fetch({ url: API_CANCEL_ORDER, payload, method: 'POST' })
 
 
 

src/useless/pages/agent/recommend/index.js

@@ -102,7 +102,6 @@ export default class Index extends Component {
       this.setState({
         recordId: res.recordId
       })
-      console.log('新增客户')
     })
   }
   componentWillUnmount() {
@@ -499,7 +498,7 @@ export default class Index extends Component {
     const visable = (!phone && !tel)
 
     return (
-      <View style="width:100%;height:100%">
+      <View style="width:100%;height:100vh">
         {visable ? this.renderLogin() : this.renderDetail()}
       </View>
     );

src/useless/pages/person/customerAnalysis/followUpCustomer/index.js

@@ -284,6 +284,7 @@ export default class followUpCustomer extends Taro.Component {
         <View style="padding:0 10px 10px 10px">
           <ListView
             className="wrap"
+            style="height: calc(100vh - 234rpx)"
             needInit
             isEmpty={isEmpty}
             emptyText="暂无跟进客户~"

src/useless/pages/person/customerAnalysis/index.scss

@@ -3,7 +3,7 @@
 .wrap {
   background: white;
   position: relative;
-  height:100vh;
+  // height:100vh;
 }
 .my-customer{
   flex: 0 0 50%;
@@ -55,6 +55,9 @@
   
   }
 }
+.at-tabs{
+  height: 100vh;
+}
 .tab-box{
   .at-tabs__header{
     width: 86%;

src/useless/pages/person/customerAnalysis/transactionCustomer/index.js

@@ -115,6 +115,7 @@ export default class transactionCustomer extends Taro.Component {
       <View style="padding:0 10px 10px 10px">
         <ListView
           className="wrap"
+          style="height: calc(100vh - 78rpx)"
           needInit
           isEmpty={isEmpty}
           emptyText="暂无成交客户~"