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

config/dev.js

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

src/app.js

@@ -120,6 +120,8 @@ class App extends Component {
           'pages/houseList/index',
           'pages/help/index',
           'pages/records/index',
+          'pages/detail/index',
+          'pages/detail/resultPage',
         ],
       }
     ],

src/onlineSelling/pages/detail/index.js

@@ -0,0 +1,143 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+import AchievePhone from '@/components/achievePhone'
+import AchieveAvatar from '@/components/achieveAvatar'
+import { connect } from '@tarojs/redux'
+import ready from '@/utils/ready'
+
+@connect(
+  ({ user }) => ({ ...user })
+)
+
+export default class Index extends Component {
+  config = {
+    navigationBarTitleText: '房源详情',
+  }
+
+  state = {
+    grantPhoneVisible: false, // 授权电话
+    grantAvatarVisible: false, // 授权头像
+  }
+
+
+
+  componentWillMount() {
+
+    ready.queue(() => {
+      // 分享场景需要先授权手机, 再授权头像
+      if (this.toggleGrantPhone()) {
+        this.toggleGrantAvatar()
+      }
+
+
+    })
+  }
+
+
+
+  // 调起授权电话
+  toggleGrantPhone = () => {
+    const { userInfo: { person: { phone, tel } } } = this.props
+    if (!phone && !tel) {
+      this.setState({ grantPhoneVisible: true })
+      return false
+    }
+    console.log('phone:', phone, 'tel:', tel, '!!!!!')
+    console.log(this.props, 'this.propsphone!!!!!')
+
+    return true
+  }
+
+  // 调起授权头像
+  toggleGrantAvatar = () => {
+    const { userInfo: { person: { avatarurl } } } = this.props
+
+    if (!avatarurl || avatarurl.indexOf('wx.qlogo.cn') === -1) {
+      this.setState({ grantAvatarVisible: true })
+      return false
+    }
+
+    console.log(avatarurl, "avatarurl")
+    console.log(this.props.userInfo, "this.props")
+    return true
+  }
+  chooseBtn() {
+    Taro.navigateTo({
+      url: '/onlineSelling/pages/detail/resultPage'
+    })
+  }
+
+
+  render() {
+    const { grantPhoneVisible, grantAvatarVisible } = this.state
+    const { userInfo = { person: {} } } = this.props
+
+    return (
+      <Block>
+        {
+          grantPhoneVisible &&
+          <AchievePhone user={userInfo.person} onSuccess={this.toggleGrantAvatar}></AchievePhone>
+        }
+        {
+          grantAvatarVisible &&
+          <AchieveAvatar user={userInfo.person} onSuccess={() => { this.setState({ grantAvatarVisible: false }) }} ></AchieveAvatar>
+        }
+
+        <View className='detail'>
+          <View className='detail-top'>
+            <Image className="norecord-img" mode="aspectFill" src={require('../../assets/norecord.png')}></Image>
+            <View className="norecord-text">暂无户型信息</View>
+            {/* <Image className="cover-img" mode="aspectFill" src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1581369637322&di=6065c2aee90f790b00d0c815f465ebc5&imgtype=0&src=http%3A%2F%2Fcyzs97.com%2FUploads%2FEditor%2FPicture%2F2018-10-18%2F5bc8330f2d06f.jpg"></Image> */}
+          </View>
+          <ScrollView
+            enableBackToTop
+            className="wrap"
+            scrollY>
+            <View className='detail__main'>
+              <View style="padding: 0 30rpx;">
+
+                <View className="title">
+                  <View className="name">A户型</View>
+                  <View className="btn">询问优惠</View>
+                </View>
+                <View className="price">
+                  现价：234万
+              </View>
+                <View className="area">
+                  <Text> 建面<Text style="color:#FE1C1C">270</Text>m²</Text>
+                  <Text style="margin-left:20rpx"> 套内<Text style="color:#FE1C1C">270</Text>m²</Text>
+                </View>
+                <View className="address">
+                  <Image className="location-icon" src={require('../../assets/location.png')}></Image> XX嘉园1号楼2单元3楼303号
+              </View>
+                <View className="date">
+                  预选时间：2/12 12:23:33--2/13 12:23:34
+              </View>
+                <View className="date">
+                  认筹时间：2/12 12:23:33--2/13 12:23:34
+              </View>
+              </View>
+              <View className="num">
+                已有12人预选此房源，快快预选认筹~
+              </View>
+              <View style="padding: 0 30rpx;">
+                <View className="choose-btn" onClick={()=>this.chooseBtn()}>
+                  预选此房源
+              </View>
+                <View className="close-btn">
+                  认筹功能未开放
+              </View>
+              </View>
+
+
+            </View>
+          </ScrollView>
+
+
+
+        </View>
+
+      </Block>
+    );
+  }
+}

src/onlineSelling/pages/detail/index.scss

@@ -0,0 +1,149 @@
+@import "@/styles/mixins.scss";
+@import "@/styles/theme.scss";
+.detail {
+  position: relative;
+  width: 100%;
+  font-weight: 300;
+  background-color: #F8F8F8;
+  .detail-top{
+    width:100%;
+    height:600px;
+    position: fixed;
+    top: 0;
+    text-align: center;
+    .cover-img{
+      width:100%;
+      height:100%;
+    }
+    .norecord-img{
+      width:280px;
+      height:220px;
+      margin: 140px auto 4px auto;
+    }
+    .norecord-text{
+     font-size: 28px;
+     color: #999;
+    }
+  }
+ 
+  .wrap {
+    padding-top: 570px;
+    background: transparent;
+  }
+
+  &__main {
+    background: #fff;
+    border-radius: 40px 40px 0 0;
+    padding: 60px 0;
+    .title{
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      .name{
+        font-size: 44px;
+        color: #333333;
+        font-weight: 600;
+      }
+      .btn{
+        background-color: #F3B82E;
+        font-size: 30px;
+        color: #fff;
+        padding: 14px 28px;
+        font-weight: 300;
+        border-radius: 36px;
+      }
+    }
+    .price{
+      color: #FE1C1C;
+      font-size: 38px;
+      font-weight: 600;
+    }
+    .area{
+      font-size: 34px;
+      color: #666;
+      font-weight: 300;
+      line-height: 50px;
+    }
+    .address{
+      font-size: 30px;
+      color: #666;
+      font-weight: 300;
+      margin-bottom: 10px;
+      display: flex;
+      align-items: center;
+      margin: 0;
+      line-height: 60px;
+      .location-icon{
+        width:40px;
+        height:40px;
+        margin-left: -6px;
+        margin-right: 6px;
+      }
+    }
+    .date{
+      font-size: 22px;
+      color: #999;
+      line-height: 1.7;
+    }
+    .num{
+      font-size: 26px;
+      color: #999;
+      background-color: #F8F8F8;
+      line-height: 54px;
+      padding: 0 30px;
+      margin-top: 10px;
+      font-weight: 300;
+      margin-bottom: 78px;
+   
+    }
+    .choose-btn{
+      color: #fff;
+      font-size: 36px;
+      background-color: $primary-color;
+      line-height: 94px;
+      border-radius:10px;
+      text-align: center; 
+    }
+    .close-btn{
+      color: $primary-color;
+      font-size: 36px;
+      background-color: #F8F8F8;
+      line-height: 94px;
+      border-radius:10px;
+      text-align: center;
+      margin: 40px 0;
+    }
+  }
+}
+
+
+.result{
+  background-color: #fff;
+  height: 100vh;
+  width: 100vw;
+  position: relative;
+  text-align: center;
+  padding-top: 20vh;
+  font-weight: 300;
+  .result-img{
+    width:168px;
+    height:168px;
+  }
+  .status{
+    font-size: 36px;
+    color: #333;
+    line-height: 1.8;
+  }
+  .tip{
+    font-size: 34px;
+    color: #999;
+  }
+  .contact{
+    position: absolute;
+    bottom: 8vh;
+    font-size: 36px;
+    color: #3DE344;
+    left: 50%;
+    margin-left: -108px;
+  }
+}

src/onlineSelling/pages/detail/resultPage.js

@@ -0,0 +1,43 @@
+import Taro, { Component } from '@tarojs/taro';
+import './index.scss'
+import { connect } from '@tarojs/redux'
+import ready from '@/utils/ready'
+
+@connect(
+  ({ user }) => ({ ...user })
+)
+
+export default class Index extends Component {
+  config = {
+    navigationBarTitleText: '预选结果',
+  }
+
+  state = {
+    status: 2,
+  }
+
+  componentWillMount() {
+
+    ready.queue(() => {
+
+
+    })
+  }
+
+
+  render() {
+    const { status } = this.state
+    return (
+      <View className="result">
+        {status == 1 && <Image className="result-img" src={require('../../assets/success.png')}></Image>}
+        {status == 2 && <Image className="result-img" src={require('../../assets/going.png')}></Image>}
+        {status == 3 && <Image className="result-img" src={require('../../assets/fail2.png')}></Image>}
+        <View className="status">{status == 1 ? '预选成功' : status == 2 ? '正在处理' : '预选失败'}</View>
+        <View className="tip">已提交申请，等待系统处理</View>
+
+        <View className="contact">联系置业顾问</View>
+      </View>
+
+    );
+  }
+}

src/pages/project/detail/index.js

@@ -1069,6 +1069,19 @@ export default class Index extends Component {
       </Block>
     )
   }
+  renderChooseHouse() {
+
+    return (
+      <Block>
+        <View className="activity">
+          <View className="title">在线选房</View>
+          <View style={{ position: 'relative', padding: '0 30rpx' }} >
+            <Image style="height:388rpx;width:100%;border-radius: 24rpx;" src={transferImage(require('@/assets/empty.png'))} mode="aspectFill"></Image>
+          </View>
+        </View>
+      </Block>
+    )
+  }
 
   handleHelpClick(item) {
     Taro.navigateTo({
@@ -1524,6 +1537,8 @@ export default class Index extends Component {
                   </View>
                   {/* 项目亮点 */}
                   {projectDetail.highlightsCover && this.renderPoints()}
+                  {/* 在线选房 */}
+                  {/* {this.renderChooseHouse()} */}
                   {/* 项目顾问 */}
                   {this.renderConsuler()}
                   {/* 周边 */}