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

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/HotBlock/index.scss

@@ -9,10 +9,10 @@
     border-radius: 6px;
     .inside{
       position: absolute;
-      height: 130px;
+      height: 110px;
       width: 132px;
       left:0;
-      top: -4px;
+      top: -6px;
 
     }
 

src/onlineSelling/components/HouseGrid/Room.js

@@ -1,6 +1,9 @@
 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 || {}
@@ -13,15 +16,17 @@ export default function Room(props) {
     }
   }
 
-  const wanY = Number(price)
-
   return (
     <HotBlock number={heat + realHeat + 0}>
       {status == '1' && <View className="room" onClick={handleClick}>
         <View className="roomname">{roomName || ''}</View>
         <View className="yuxuan">{personNum}预选</View>
-        <View className="info" >{wanY}万元</View>
-        <View className="info">{apartmentName || ''}</View>
+        <View className="yuxuan">{personNum}认筹</View>
+        <Image src={preselectionImg} className="preselection-img"></Image>
+        <Image src={chipsImg} className="chips-img"></Image>
+        <Image src={lockImg} className="lock-img"></Image>
+        
+       
       </View>}
 
     </HotBlock>

src/onlineSelling/components/HouseGrid/room.scss

@@ -3,9 +3,9 @@
   margin-bottom: 16px;
   padding: 10px;
   font-size: 28px;
-  height: 130px;
+  height: 110px;
   overflow: hidden;
-  line-height: 1.2;
+  line-height: 1.24;
 
   .info {
     color: #333;
@@ -22,4 +22,25 @@
   .tip {
     color: #BB9C79;
   }
+  .lock-img{
+    width:22px;
+    height:23px;
+    position: absolute;
+    left: 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;
+  }
 }

src/onlineSelling/components/Statement/index.js

@@ -1,4 +1,4 @@
-import { View, Image, Text } from "@tarojs/components";
+import { View} from "@tarojs/components";
 import './index.scss'
 
 export default function Statement(props) {

src/onlineSelling/pages/detail/resultPage.js

@@ -3,6 +3,7 @@ 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 })
@@ -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/houseList/index.js

@@ -61,6 +61,7 @@ export default class HouseList extends Component {
     consultShow: false,  // 置业顾问悬浮框显示隐藏
     noRecord: false,
     loading: true,
+    currentHot: 0,
   }
 
 
@@ -592,6 +593,12 @@ 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({
+      currentHot: value,
+    })
+  }
 
   render() {
     const {
@@ -606,6 +613,7 @@ export default class HouseList extends Component {
       noRecord,
       loading,
       salesBatchDetail,
+      currentHot
     } = this.state
 
     if (loading) {
@@ -616,6 +624,7 @@ export default class HouseList extends Component {
 
     const showCircleBtn = posterData && posterData.qrcode
     console.log('==============>', posterData, showPoster, posterConfig)
+    const screenList = [{ title: '预选热度图', value: 0 }, { title: '认筹热度图', value: 1 }]
     return (
       <Block>
         {conditionVisible && this.renderCondition()}
@@ -635,8 +644,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={currentHot == item.value ? 'top-item active' : 'top-item'}>
+                      {item.title}
+                    </View>
+                  ))}
                 </View>
+                
                 {houseList.length ? this.renderHouses() : this.renderBlank()}
                 {this.renderBottom()}
               </View>

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{

src/onlineSelling/pages/records/index.js

@@ -91,11 +91,9 @@ export default class Records extends Component {
           }
         </CheckboxGroup>
         <Statement />
-        {/* <View className="bottom-con">
-          <View className="raise-btn">认筹房源</View>
-          <View className="statement"> ！免责声明：</View>
-          <View className="statement">房源信息、选房协议等来源于开发商,具体销售数据可能会有延迟，最终以开发商官网公告为准，请在执行具体操作前和置业顾问沟通确认，并谨慎核查。</View>
-        </View> */}
+
+        {/* <View className="raise-btn">认筹房源</View> */}
+
       </Block>
     )
   }
@@ -117,6 +115,7 @@ export default class Records extends Component {
               }
             </ScrollView >
         }
+        <Statement />
 
 
       </Block>

src/onlineSelling/pages/records/index.scss

@@ -44,26 +44,16 @@
     padding-left: 30px;
     margin-bottom: 20px;
   }
-  .bottom-con{
-    padding: 0 30px;
-    margin-top: 20vh;
-    .raise-btn{
-      width: 690px;
-      height:94px;
-      line-height: 94px;
-      background:rgba(187,156,121,1);
-      border-radius:10px;
-      color: #fff;
-      font-size: 36px;
-      text-align: center;
-      margin-bottom: 20px;
-
-    }
-    .statement{
-      font-size: 24px;
-      color: #999;
-      line-height: 1.6;
-    }
+  .raise-btn{
+    width: 690px;
+    height:94px;
+    line-height: 94px;
+    background:rgba(187,156,121,1);
+    border-radius:10px;
+    color: #fff;
+    font-size: 36px;
+    text-align: center;
+    margin-bottom: 20px;
   }  
 }