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

src/app.js

@@ -132,6 +132,7 @@ class App extends Component {
           'pages/detail/index',
           'pages/detail/resultPage',
           'pages/screenHouse/index',
+          'pages/chooseConsultant/index',
           'pages/protocol/index',
           'pages/raiseProfile/index',
         ],

src/onlineSelling/components/Picker/index.js

@@ -23,7 +23,7 @@ export default function HouseCard(props) {
             </View>
           </Picker>
         </View>
-        <View className="right-icon"></View>
+        <View className="choose">请选择</View>
       </View>
     </View>
   )

src/onlineSelling/components/Picker/index.scss

@@ -21,13 +21,9 @@
       width: 400px;
     }
   }
-  .right-icon{
-    width:18px;
-    height:18px;
-    border-top: 2px solid #999;
-    border-right: 2px solid #999;
-    transform:rotate(45deg);
-    float: right;
+  .choose{
+   font-size: 24px;
+   color: #E4A938;
   }
 }
 

src/onlineSelling/pages/chooseConsultant/index.js

@@ -0,0 +1,35 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View } from '@tarojs/components'
+import ConsultantItem from './item'
+import './index.scss'
+
+
+export default class ConsultantList extends Component {
+  config = {
+    navigationBarTitleText: '选择置业顾问'
+  }
+ 
+  render() {
+    const list = [
+      {name:'哈哈哈1',phone:'138541369741',avatar:'http://img5.imgtn.bdimg.com/it/u=3299138037,391931528&fm=26&gp=0.jpg'},
+      {name:'哈哈哈2',phone:'131600514722',avatar:'http://pic1.zhimg.com/50/v2-03d53b468e27ddc99f1ffcd17eec9700_hd.jpg'},
+      {name:'哈哈哈3',phone:'131600514722',avatar:'http://img0.imgtn.bdimg.com/it/u=3024308660,1355431406&fm=26&gp=0.jpg'},
+    ]
+    return (
+      <View className="consultantList">
+          {
+            list.map((item,index) => (
+              <ConsultantItem
+                data={item}
+                key={index+'card'}
+                onClick={this.handleItemClick}>
+              </ConsultantItem>
+            ))
+          }
+        {/* <ConsultantItem consultantList={list}/> */}
+    
+      </View>
+    )
+  }
+
+}

src/onlineSelling/pages/chooseConsultant/index.scss

@@ -0,0 +1,49 @@
+.consultantList{
+  background-color: #F8F8F8;
+  min-height: 100vh;
+  padding-top: 20px;
+}
+.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;
+    }
+  }
+  .phone{
+    font-size: 28px;
+    color: #666;
+    position: absolute;
+    left: 134px;
+    bottom:30px;
+    font-weight:300;
+  }
+  .home{
+    font-size: 28px;
+    color: #333;
+  }
+ 
+}

src/onlineSelling/pages/chooseConsultant/item.js

@@ -0,0 +1,19 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+
+
+export default class Item extends Component {
+
+
+  render() {
+    const { data } = this.props
+    return (
+      <View className="card-item">
+        <Image src={data.photo || data.avatar} className='avatar' ></Image>
+        <View className="name">{data.name}<Image src={require('@/assets/person/card.png')} className='card' ></Image></View>
+        <View className="phone">{data.phone}</View>
+        <View className="home">主页</View>
+      </View >
+    );
+  }
+}

src/onlineSelling/pages/records/index.js

@@ -68,10 +68,11 @@ export default class Records extends Component {
     const { recordList, noRecord } = this.state
     return (
       <Block>
-        <CheckboxGroup onChange={this.CheckboxChange}>
-          {
-            noRecord ? <Blank style="margin:14vh 0 32vh 0" tips="暂无预选记录" /> :
-              <ScrollView scrollY>
+        <ScrollView scrollY className="container">
+          <CheckboxGroup onChange={this.CheckboxChange}>
+            {
+              noRecord ? <Blank style="margin:14vh 0 32vh 0" tips="暂无预选记录" /> :
+                <View>
                 {
                   recordList.map((item) => {
                     return (
@@ -86,13 +87,13 @@ export default class Records extends Component {
                     )
                   })
                 }
-              </ScrollView >
+                </View>
+            }
+          </CheckboxGroup>
+          <Statement />
+        </ScrollView >
 
-          }
-        </CheckboxGroup>
-        <Statement />
-
-        {/* <View className="raise-btn">认筹房源</View> */}
+        <View className="raise-box"> <View className="raise-btn">认筹房源</View></View>
 
       </Block>
     )
@@ -235,9 +236,9 @@ export default class Records extends Component {
 
     return (
       <View className="records" >
-        {this.renderBar()}
+        {/* {this.renderBar()} */}
         {/* {this.renderRaiseScreen()} */}
-        {/* {this.renderPreselectScreen()} */}
+        {this.renderPreselectScreen()}
 
 
       </View >

src/onlineSelling/pages/records/index.scss

@@ -44,17 +44,24 @@
     padding-left: 30px;
     margin-bottom: 20px;
   }
-  .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;
-  }  
+  .container {
+    height: calc(100vh - 254px);
+  }
+  .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;
+    }  
+  }
 }
 
 .base-con{