jiekou

src/onlineSelling/pages/raiseMoney/Certification.js

@@ -15,19 +15,26 @@ export default class Certification extends Component {
   }
   state = {
     signDetail: {},
+    autoErr: null,
   }
 
   componentWillMount() {
     ready.queue(() => {
-      const { id: raiseRecordId } = this.$router.params
+      const { id: raiseRecordId, consultantInfo = {} } = this.$router.params
       contractUser({ raiseRecordId, }).then(res => {
         this.setState({
           signDetail: res || {}
         }, () => {
           const { signDetail } = this.state
           if (signDetail.status == 2 && signDetail.authStatus == 'autoSign') {
-            contractAuto().then(res => {
-              console.log(res, "自动签署合同自动签署合同自动签署合同自动签署合同自动签署合同自动签署合同")
+            contractAuto({ raiseRecordId, }).then(res => {
+              Taro.navigateTo({
+                url: `//onlineSelling/pages/raiseMoney/signResult?id=${raiseRecordId}&consultantInfo=${consultantInfo}`
+              })
+            }).catch(err => {
+              this.setState({
+                autoErr: err.message || ''
+              })
             })
           }
         })
@@ -37,7 +44,9 @@ export default class Certification extends Component {
   }
 
   handleChatClick() {
-    const { userInfo: { miniApp: { tpls }, person: { personId, nickname, name } } } = this.props
+
+    const { consultantInfo = {} } = this.$router.params
+    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],
@@ -48,7 +57,7 @@ export default class Certification extends Component {
       },
       complete() {
         Taro.navigateTo({
-          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${consultant.id}&receiverName=${encodeURIComponent(consultant.name || consultant.nickname || consultant.userName)}`
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${consultantInfo.consultantPersonId}&receiverName=${encodeURIComponent(consultantInfo.name || consultantInfo.nickname || consultantInfo.userName)}`
         })
       }
     })
@@ -69,7 +78,7 @@ export default class Certification extends Component {
 
 
   render() {
-    const { signDetail } = this.state
+    const { signDetail, autoErr } = this.state
     const status = signDetail ? signDetail.status : ''
     const showIcon = status == 2 ? require('../../assets/success2.png') : (status == 0 || status == 1) ? require('../../assets/fail2.png') : status == 2 ? require('../../assets/fail2.png') : require('../../assets/going.png')
 
@@ -84,13 +93,22 @@ export default class Certification extends Component {
             <Image className="result-img" src={showIcon}></Image>
             <View className="status" >实名认证<Text style={status == 3 ? 'color:#2CD7AA' : status == 2 ? 'color:#118EE9' : 'color:#F4333B'}>{showTitle}</Text></View>
 
-            {status == 4 && <View className="tip" style="margin-top:10rpx">不通过原因：XXXXXX</View>}
+            {status == 4 && <View className="tip" style="margin-top:14rpx">不通过原因：XXXXXX</View>}
 
-            {status == 2 && <View className="tip" style="margin-top:10rpx">正在准备合同，请不要退出···</View>}
+            {status == 2 && <Block>
+              {!autoErr && <View className="tip" style="margin-top:14rpx">正在准备合同，请不要退出···</View>}
+              {autoErr && <Block>
+                <View className="tip" style="margin-top:14rpx;color:#F4333B">自动签署失败</View>
+                <View className="tip" style="margin-top:14rpx;color:#333">原因：{autoErr}</View>
+                <View className="tip" style="margin-top:24rpx">请联系专属置业顾问解决</View>
+                <ContactConsultant contactClick={() => this.handleChatClick()} text="请联系专属置业顾问" style=" position: absolute;bottom: 9vh;" />
+              </Block>}
+            </Block>
+            }
 
-            {(status == 0 || status == 1 || status == 4) && <View className="tip" style="margin-top:10rpx">请返回重新发起认证</View>}
+            {(status == 0 || status == 1 || status == 4) && <View className="tip" style="margin-top:14rpx">请返回重新发起认证</View>}
 
-            {status == 3 && <View className="tip" style="margin-top:10rpx; display: flex;align-items: center;" onClick={() => this.handleBtnClick()}>实名信息需要法大大审核，请刷新状态
+            {status == 3 && <View className="tip" style="margin-top:14rpx; display: flex;align-items: center;" onClick={() => this.handleBtnClick()}>实名信息需要法大大审核，请刷新状态
             <Image style="width:18px;height:18px;margin-left:8rpx" src={require('../../assets/refresh.png')} />
             </View>}
 
@@ -99,10 +117,6 @@ export default class Certification extends Component {
             {status == 3 && <View class="certification-btn" onClick={() => this.handleBtnClick()}>更新我的实名认证信息</View>}
           </Block>
         }
-        {/* 
-            <ContactConsultant contactClick={() => this.handleChatClick()} text="请联系专属置业顾问" style=" position: absolute;bottom: 9vh;" />
-      */}
-
       </View>
     )
   }

src/onlineSelling/pages/raiseMoney/index.js

@@ -11,7 +11,7 @@ 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 { raiseOrder, cancelOrder, queryPreselectionRecord, raiseOffline, contractUser } from '@/services/project'
 import { getCodeMessage, checkCaptcha } from '@/services/getCode'
 import { checkRaise } from '@/services/house'
 import { checkIDCard, isEmpty, transferImage } from '@/utils/tools'
@@ -62,6 +62,7 @@ export default class raiseMoney extends Component {
       { label: '线上缴费', value: 'onLine' },
       { label: '线下缴费', value: 'offLine' },
     ],
+    signDetail: {},
   }
 
   captchaLock = false
@@ -105,7 +106,19 @@ export default class raiseMoney extends Component {
         payType = payTypeSettings[0]
       }
 
-      this.setState({ raiseProfile: res, payType, record: res.record || defaultRecord })
+      this.setState({
+        raiseProfile: res, payType,
+        record: res.record || defaultRecord
+      }, () => {
+        const { record: { showContract } } = this.state
+        if (showContract == 1) {
+          contractUser({ raiseRecordId, }).then(res => {
+            this.setState({
+              signDetail: res || {}
+            })
+          })
+        }
+      })
 
       // 销售批次已被取消发布
       if (res.status != 1) {
@@ -707,8 +720,30 @@ export default class raiseMoney extends Component {
       url: `/onlineSelling/pages/houseList/index?id=${id}`
     })
   }
+  toSign = () => {
+    const { signDetail } = this.state
+    const status = signDetail ? signDetail.status : ''
+    const consultant = this.getConsultant()
+    if (status == 0 || status == 1) {
+      if (signDetail.certifiedAddress) {
+        Taro.navigateTo({
+          url: `/pages/project/panorama/index?url=${encodeURIComponent(signDetail.certifiedAddress)}&from=raiseProfile&consultantInfo=${consultant}`
+        })
+      } else {
+        Taro.showToast({
+          title: '无可跳转的认证地址',
+          icon: 'none'
+        })
+      }
+    } else {
+      const { id: raiseRecordId } = this.$router.params
+      Taro.navigateTo({
+        url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId}&consultantInfo=${consultant}`
+      })
+    }
+  }
   renderBtn() {
-    const { raiseProfile = {}, record = {} } = this.state
+    const { raiseProfile = {}, record = {}, signDetail } = this.state
     return (
       <View className="bottombar">
         <View className="bt-nav__left">
@@ -724,10 +759,14 @@ export default class raiseMoney extends Component {
             <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>
+          {
+            record.showContract == 1 && signDetail &&
+            <Button className='bt-nav__item' >
+              <Image src={transferImage(require('../../assets/sign.png'))} style="width:42rpx;height:40rpx"></Image>
+              <Text className="text" style="color:#E4A938" onClick={this.toSign}>签署合同</Text>
+            </Button>
+          }
+
         </View>
         <Button className="btn" onClick={() => this.toRaiseProfile(record.raiseRecordId)}>
           认筹单

src/onlineSelling/pages/raiseMoney/signResult.js

@@ -6,6 +6,7 @@ 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 { contractManual } from '@/services/project'
 import { transferImage } from '@/utils/tools'
 
 @connect(({ user, house }) => ({ ...user, house }), { ...houseActions })

src/onlineSelling/pages/raiseProfile/index.js

@@ -210,11 +210,12 @@ export default class Raise extends Component {
     })
   }
   toSign = () => {
-    const { signDetail } = this.state
-    if (signDetail.status == 0 || signDetail.status == 1) {
+    const { signDetail, raiseDeatil: { consultantInfo } } = this.state
+    const status = signDetail ? signDetail.status : ''
+    if (status == 0 || status == 1) {
       if (signDetail.certifiedAddress) {
         Taro.navigateTo({
-          url: `/pages/project/panorama/index?url=${encodeURIComponent(res.certifiedAddress)}`
+          url: `/pages/project/panorama/index?url=${encodeURIComponent(signDetail.certifiedAddress)}&from=raiseProfile&consultantInfo=${consultantInfo}`
         })
       } else {
         Taro.showToast({
@@ -225,13 +226,13 @@ export default class Raise extends Component {
     } else {
       const { id: raiseRecordId } = this.$router.params
       Taro.navigateTo({
-        url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId}`
+        url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId}&consultantInfo=${consultantInfo}`
       })
     }
   }
 
   render() {
-    const { buildingId, raiseDeatil, orderDetail, refundOrder, raiseOrder } = this.state;
+    const { buildingId, raiseDeatil, orderDetail, refundOrder, raiseOrder, signDetail } = this.state;
 
 
     // 认筹信息
@@ -286,7 +287,7 @@ export default class Raise extends Component {
             <View className="agreement" onClick={this.toAgreement}>查看合同<Text className="right-icon"></Text></View>
           </View>
           {
-            raiseDeatil.showContract == 0 &&
+            raiseDeatil.showContract == 0 && signDetail &&
             <View className="sign" onClick={this.toSign}>
               为保障您的权益，请签署认筹合同<Text className="right-icon" style="opacity:0.3"></Text><Text className="right-icon" style="opacity:0.6"></Text><Text className="right-icon"></Text>
             </View>
@@ -296,7 +297,7 @@ export default class Raise extends Component {
             {raiseDeatil.consultantInfo && <ConsultantItem
               data={raiseDeatil.consultantInfo}
               type="raiseProfile"
-              style="height:140rpx;margin-bottom:0rpx;width:690rpx;padding:0"
+              style="height:140rpx;margin-bottom:0rpx;width:690rpx;padding:1px 0"
               contactClick={() => this.handleChatClick(raiseDeatil.consultantInfo)}
             />}
             <View className="hr" />

src/pages/project/panorama/index.js

@@ -1,12 +1,27 @@
 import Taro, { Component } from '@tarojs/taro'
 import { WebView } from '@tarojs/components'
+import { contractUser } from '@/services/project'
 
 export default class Panorama extends Component {
   state = {}
 
-  componentWillMount() {}
+  componentWillMount() {
+    const { from = '', consultantInfo = {} } = this.$router.params
+    if (from == raiseProfile) {
+      const tk = setInterval(() => {
+        contractUser().then(res => {
+          if (res.status != 0 || res.status != 1) {
+            clearInterval(tk)
+            Taro.navigateTo({
+              url: `/onlineSelling/pages/raiseMoney/Certification?id=${res.raiseRecordId}&consultantInfo=${consultantInfo}`
+            })
+          }
+        })
+      }, 30000)
+    }
+  }
 
-  render () {
+  render() {
     const url = decodeURIComponent(this.$router.params.url)
 
     return (