3.5.17

src/app.js

@@ -130,6 +130,8 @@ class App extends Component {
         pages: [
           'pages/houseList/index',
           'pages/raiseMoney/index',
+          'pages/raiseMoney/signResult',
+          'pages/raiseMoney/Certification',
           'pages/live/index',
           'pages/help/index',
           'pages/records/index',

src/onlineSelling/pages/raiseMoney/Certification.js

@@ -0,0 +1,88 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Block } from '@tarojs/components'
+import './index.scss'
+import ready from '@/utils/ready'
+import { connect, getStore } from '@tarojs/redux'
+import * as houseActions from '@/actions/house'
+import * as noticeType from '@/constants/common.js'
+import ContactConsultant from '../../components/ContactConsultant'
+
+@connect(({ user, house }) => ({ ...user, house }), { ...houseActions })
+export default class signResult extends Component {
+  config = {
+    navigationBarTitleText: '正在实名认证'
+  }
+  state = {
+
+  }
+
+  componentWillMount() {
+    ready.queue(() => {
+
+    })
+  }
+
+  handleChatClick() {
+    const { 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=${consultant.id}&receiverName=${encodeURIComponent(consultant.name || consultant.nickname || consultant.userName)}`
+        })
+      }
+    })
+  }
+
+
+
+  render() {
+    const isOk = true
+    const failInfo = { title: '未通过', desc: '实名认证失败描述' }
+    const showIcon = isOk ? require('../../assets/success2.png') : require('../../assets/fail2.png')
+    const showTitle = isOk ? '审核通过' : failInfo.title
+    const loading = true
+
+    return (
+      <View className="result" style="height:100vh">
+
+        {loading &&
+          <Block>
+            <Image style=" width:60px;height:60px;margin-bottom:10px" src={require('../../assets/loading.gif')}></Image>
+            <View className="status" >请稍等，正在准备实名认证</View>
+          </Block>
+        }
+
+        {/* {
+          !isOk && (
+            <Block>
+              <Image className="result-img" src={showIcon}></Image>
+              <View className="status" >实名认证<Text style={!isOk ? 'color:#F4333B' : 'color:#118EE9'}>{showTitle}</Text></View>
+              <View className="tip" style="margin-top:10rpx">{(failInfo || {}).desc}</View>
+              <View className="tip" style="margin-top:10rpx">请返回重新发起认证</View>
+              <View class="certification-btn">查询不通过原因</View>
+            </Block>
+          )
+
+        }
+
+        {isOk &&
+          <Block>
+            <Image className="result-img" src={showIcon}></Image>
+            <View className="status" >实名认证<Text style={!isOk ? 'color:#F4333B' : 'color:#118EE9'}>{showTitle}</Text></View>
+            <ContactConsultant contactClick={() => this.handleChatClick()} text="请联系专属置业顾问" style=" position: absolute;bottom: 9vh;" />
+          </Block>
+        } */}
+        {/* <View class="certification-btn">更新我的实名认证信息</View> */}
+
+      </View>
+    )
+  }
+
+}

src/onlineSelling/pages/raiseMoney/index.js

@@ -14,11 +14,12 @@ 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 { checkIDCard, isEmpty, transferImage } from '@/utils/tools'
 import ContactConsultant from '../../components/ContactConsultant'
 import RadioList from './RadioList'
 import * as noticeType from '@/constants/common.js'
 import { UPDATE_USER_INFO } from '@/constants/user'
+import BackHomeBtn from '@/components/BackHomeBtn'
 
 const getRaiseProfile = ({ salesBatchId, raiseRecordId }) => {
   const queryString = [
@@ -47,7 +48,7 @@ export default class raiseMoney extends Component {
     navigationBarTitleText: '认筹确认'
   }
   state = {
-    current: 0,
+    current: 4,
     inputName: '',
     raiseProfile: undefined,  // 认筹主记录
     record: {},               // 认筹单
@@ -454,7 +455,7 @@ export default class raiseMoney extends Component {
           )
         }
         <View className="center-title">{payTip}</View>
-        <RichText  nodes={showProtocal || ''} />
+        <RichText nodes={showProtocal || ''} />
       </ScrollView >
     )
   }
@@ -696,8 +697,46 @@ export default class raiseMoney extends Component {
       }
     })
   }
+  toBuilding(buildingId) {
+    Taro.navigateTo({
+      url: `/pages/project/detail/index?id=${buildingId}`
+    })
+  }
+  toHouseList(id) {
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/houseList/index?id=${id}`
+    })
+  }
+  renderBtn() {
+    const { raiseProfile = {}, record = {} } = this.state
+    return (
+      <View className="bottombar">
+        <View className="bt-nav__left">
+          <Button class='bt-nav__item' onClick={() => this.toBuilding(raiseProfile.buildingId)}>
+            <Image src={transferImage(require('@/assets/news/property.png'))} style="width:42rpx;height:42rpx"></Image>
+            <Text className="text">查看项目</Text>
+          </Button>
+          <Button className='bt-nav__item' onClick={() => this.toHouseList(raiseProfile.salesBatchId)}>
+            <Image src={transferImage(require('../../assets/list.png'))} style="width:40rpx;height:40rpx" ></Image>
+            <Text className="text">房源列表</Text>
+          </Button>
+          <Button className='bt-nav__item' onClick={() => this.handleChatClick()}>
+            <Image src={transferImage(require('../../assets/consult.png'))} style="width:36rpx;height:40rpx"></Image>
+            <Text className="text">置业顾问</Text>
+          </Button>
+          <Button className='bt-nav__item' >
+            <Image src={transferImage(require('../../assets/sign.png'))} style="width:42rpx;height:40rpx"></Image>
+            <Text className="text" style="color:#E4A938">签署合同</Text>
+          </Button>
+        </View>
+        <Button className="btn" onClick={() => this.toRaiseProfile(record.raiseRecordId)}>
+          认筹单
+        </Button>
+      </View>
+    )
+  }
   renderResult() {
-    const { raiseProfile = {}, record = {}, failInfo, payType } = this.state
+    const { failInfo, payType } = this.state
     const isOk = !failInfo
     const showIcon = isOk ? require('../../assets/success2.png') : require('../../assets/fail2.png')
     const showTitle = isOk ? '提交成功' : failInfo.title
@@ -706,16 +745,18 @@ export default class raiseMoney extends Component {
       <View className="result">
         <Image className="result-img" src={showIcon}></Image>
 
-        <View className="status">{showTitle}</View>
+        <View className="status" style={failInfo ? 'color:#F4333B' : 'color:#118EE9'}>{showTitle}</View>
 
         {
           isOk &&
           (
             <Block>
-              <View className="tip" style="margin-bottom:10rpx">详情请查看认筹单</View>
+              <View className="tip" style="margin:16rpx 0">详情请查看认筹单</View>
               {payType === 'onLine' && <Block>
                 <View className="tip">支付结果请留意微信支付通知</View>
-              </Block>}
+                <View style="font-size: 30rpx;color: #E4A938;line-height:2">为保障您的权益，请签署认筹合同！</View>
+              </Block>
+              }
               {payType === 'offLine' && <Block>
                 <View className="tip" style="margin-bottom:10rpx">后台已收到认筹申请，您尚未付款！</View>
                 <View className="tip">请尽快联系您的专属置业顾问缴纳定金</View>
@@ -727,12 +768,13 @@ export default class raiseMoney extends Component {
         {
           !isOk && (<View className="tip">{(failInfo || {}).desc}</View>)
         }
-
-        <ContactConsultant buildingId={raiseProfile.buildingId} contactClick={() => this.handleChatClick()} text="联系专属置业顾问" style=" position: absolute;bottom: 11vh;" />
-        {
+        {/* <ContactConsultant buildingId={raiseProfile.buildingId} contactClick={() => this.handleChatClick()} text="联系专属置业顾问" style=" position: absolute;bottom: 11vh;" /> */}
+        {/* {
           record.raiseRecordId &&
           (<View className="look-btn" onClick={() => this.toRaiseProfile(record.raiseRecordId)}>查看认筹单</View>)
-        }
+        } */}
+        {this.renderBtn()}
+        <BackHomeBtn style={{ right: '3%', bottom: '190rpx' }}></BackHomeBtn>
       </View>
 
     );

src/onlineSelling/pages/raiseMoney/index.scss

@@ -162,45 +162,118 @@
         margin-top: 36px;
     }
   }
-  .result{
-    background-color: #fff;
-    height: 88vh;
-    width: 100vw;
-    position: relative;
-    text-align: center;
-    padding-top: 19vh;
-    font-weight: 300;
-    .result-img{
-      width:168px;
-      height:168px;
-    }
-    .status{
-      font-size: 34px;
-      color: #333;
-      line-height: 1.8;
-    }
-    .tip{
-      font-size: 30px;
-      color: #999;
-      padding: 0 100px;
+}
+.result{
+  background-color: #fff;
+  height: 88vh;
+  width: 100vw;
+  position: relative;
+  text-align: center;
+  padding-top: 19vh;
+  font-weight: 300;
+  .result-img{
+    width:168px;
+    height:168px;
+  }
+  .status{
+    font-size: 34px;
+    color: #333;
+    line-height: 1.8;
+  }
+  .tip{
+    font-size: 30px;
+    color: #999;
+    padding: 0 100px;
+  }
+  .last-tip{
+    color: #BB9C79;
+    font-size: 32px;
+    margin-top: 50px;
+    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;
+ }
+}
+.bottombar {
+  height: 164px;
+  box-shadow:0px 16px 48px 0px rgba(0, 0, 0, 0.12);
+  width: 100%;
+  padding: 0 35px;
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  position: fixed;
+  bottom: 0;
+  background-color: #fff;
+
+  .btn {
+    height: 88px;
+    flex: none;
+    border-radius: 10px;
+    line-height: 88px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    background: #BB9C79;
+    color: #fff;
+    width: 24%;
+    margin-left: 4%;
+    font-size: 26px;
+  }
+  .bt-nav {
+  
+    &__item {
+      margin: 0;
+      padding: 0;
+      line-height: 1;
+      width: 25%;
+      box-sizing: border-box;
+      background: transparent;
+      border-radius: none;
+      height: 80px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      .text {
+        margin-top: 12px;
+        text-align: center;
+        font-size: 24px;
+        color: #a1a1a1;
+      }
     }
-    .last-tip{
-      color: #BB9C79;
-      font-size: 32px;
-      margin-top: 50px;
-      padding: 0 100px;
+  
+    &__left {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      // justify-content: space-between;
+      padding: 20px 0;
     }
-   .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;
-   }
+    
   }
+
+}
+.certification-btn{
+  width: 690px;
+  line-height:90px;
+  background:rgba(187,156,121,1);
+  border-radius:10px;
+  font-size: 32px;
+  color: #fff;
+  text-align: center;
+  position: absolute;
+  bottom: 7vh;
+  left: 30px;
+
 }

src/onlineSelling/pages/raiseMoney/signResult.js

@@ -0,0 +1,137 @@
+import Taro, { Component } from '@tarojs/taro'
+import { View, Block } from '@tarojs/components'
+import './index.scss'
+import ready from '@/utils/ready'
+import { connect, getStore } from '@tarojs/redux'
+import * as houseActions from '@/actions/house'
+import * as noticeType from '@/constants/common.js'
+import BackHomeBtn from '@/components/BackHomeBtn'
+import { transferImage } from '@/utils/tools'
+
+@connect(({ user, house }) => ({ ...user, house }), { ...houseActions })
+export default class signResult extends Component {
+  config = {
+    navigationBarTitleText: '签署结果'
+  }
+  state = {
+
+  }
+
+
+  componentWillMount() {
+    ready.queue(() => {
+
+
+    })
+  }
+
+
+  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}`
+        })
+      }
+    })
+  }
+
+  handleChatClick() {
+    const { 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=${consultant.id}&receiverName=${encodeURIComponent(consultant.name || consultant.nickname || consultant.userName)}`
+        })
+      }
+    })
+  }
+  toBuilding(buildingId) {
+    Taro.navigateTo({
+      url: `/pages/project/detail/index?id=${buildingId}`
+    })
+  }
+  toHouseList(id) {
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/houseList/index?id=${id}`
+    })
+  }
+  renderBtn() {
+    const { raiseProfile = {}, record = {} } = this.state
+    const isOk = false
+    return (
+      <View className="bottombar">
+        <View className="bt-nav__left">
+          <Button class='bt-nav__item' onClick={() => this.toBuilding(raiseProfile.buildingId)}>
+            <Image src={transferImage(require('@/assets/news/property.png'))} style="width:42rpx;height:42rpx"></Image>
+            <Text className="text">查看项目</Text>
+          </Button>
+          <Button className='bt-nav__item' onClick={() => this.toHouseList(raiseProfile.salesBatchId)}>
+            <Image src={transferImage(require('../../assets/list.png'))} style="width:40rpx;height:40rpx" ></Image>
+            <Text className="text">房源列表</Text>
+          </Button>
+          {!isOk && <Button className='bt-nav__item' onClick={() => this.handleChatClick()}>
+            <Image src={transferImage(require('../../assets/consult.png'))} style="width:36rpx;height:40rpx"></Image>
+            <Text className="text">置业顾问</Text>
+          </Button>}
+          {isOk && <Button className='bt-nav__item' >
+            <Image src={transferImage(require('../../assets/see.png'))} style="width:42rpx;height:40rpx"></Image>
+            <Text className="text" style="color:#E4A938">查看合同</Text>
+          </Button>}
+          {isOk && <Button className='bt-nav__item' >
+            <Image src={transferImage(require('../../assets/download.png'))} style="width:42rpx;height:40rpx"></Image>
+            <Text className="text" style="color:#E4A938">下载合同</Text>
+          </Button>}
+
+        </View>
+        <Button className="btn" onClick={() => this.toRaiseProfile(record.raiseRecordId)}>
+          认筹单
+        </Button>
+      </View>
+    )
+  }
+
+  render() {
+    const isOk = false
+    const failInfo = { title: '合同签署失败', desc: '签署失败描述' }
+    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" style={!isOk ? 'color:#F4333B' : 'color:#118EE9'}>{showTitle}</View>
+        {
+          !isOk && (
+            <Block>
+              <View className="tip" style="margin-top:10rpx">{(failInfo || {}).desc}</View>
+              <View className="tip" style="margin-top:10rpx">请到认筹单中尝试重新签署合同</View>
+              <View className="tip" style="margin-top:10rpx">或联系您的专属置业顾问</View>
+            </Block>
+          )
+        }
+        {this.renderBtn()}
+        <BackHomeBtn style={{ right: '3%', bottom: '190rpx' }}></BackHomeBtn>
+      </View>
+
+    )
+  }
+
+}