check

config/dev.js

@@ -15,7 +15,7 @@ module.exports = {
     // WSS_HOST: '"ws://192.168.2.52:8080"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
-    Version: 'V3.5.17'
+    Version: 'V3.5.19'
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -11,7 +11,7 @@ module.exports = {
     // WSS_HOST: '"wss://lt.pawoma.cn"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
-    Version: 'V3.5.17'
+    Version: 'V3.5.19'
   },
   weapp: {},
   h5: {}

src/constants/api.js

@@ -79,9 +79,10 @@ export const API_LIVE_DEATIL = resolvePath('taLiveActivity')
 
 //sign
 export const API_CONTRACT_USER = resolvePath('contract/user/add')
-export const API_CONTRACT_GET = resolvePath('contract/user/get ')
-export const API_CONTRACT_AUTO = resolvePath('contract/auto ')
+export const API_CONTRACT_GET = resolvePath('contract/user/get')
+export const API_CONTRACT_AUTO = resolvePath('contract/auto')
 export const API_CONTRACT_MANUAL = resolvePath('contract/manual')
+export const API_CONTRACT_CHECK = resolvePath('contract/check')
 
 // shop
 export const API_GOODS_LIST = resolvePath('goods')

src/onlineSelling/pages/raiseMoney/Certification.js

@@ -4,33 +4,53 @@ import './index.scss'
 import ready from '@/utils/ready'
 import { connect } from '@tarojs/redux'
 import * as noticeType from '@/constants/common.js'
-import { contractUser, contractGet, contractAuto } from '@/services/project'
+import { contractUser, contractGet, contractAuto, contractManual } from '@/services/project'
 import ContactConsultant from '../../components/ContactConsultant'
 
-@connect(({ user, house }) => ({ ...user, house }))
+@connect(({ user, house }) => ({ user, house }))
 
 export default class Certification extends Component {
   config = {
     navigationBarTitleText: '正在实名认证'
   }
   state = {
-    signDetail: {},
+    signDetail: null,
     autoErr: null,
   }
 
   componentWillMount() {
     ready.queue(() => {
-      const { id: raiseRecordId, consultantInfo = {} } = this.$router.params
+      const { id: raiseRecordId, raiseId, consultantName, consultantId } = this.$router.params
       contractUser({ raiseRecordId, }).then(res => {
         this.setState({
           signDetail: res || {}
         }, () => {
           const { signDetail } = this.state
           if (signDetail.status == 2 && signDetail.authStatus == 'autoSign') {
-            contractAuto({ raiseRecordId, }).then(res => {
-              Taro.navigateTo({
-                url: `//onlineSelling/pages/raiseMoney/signResult?id=${raiseRecordId}&consultantInfo=${consultantInfo}`
-              })
+            // 自动签署
+            contractAuto({ raiseRecordId, showToast: false }).then(res => {
+              if (res.status == 0) {
+                // 自动签署成功后调手动签署
+                contractManual({ ...res, showToast: false }).then(res => {
+                  if (res) {
+                    Taro.navigateTo({
+                      url: `/pages/project/panorama/index?url=${encodeURIComponent(res)}&from=contractManual&raiseId=${raiseId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}&id=${raiseRecordId}`
+                    })
+                  } else {
+                    Taro.showToast({
+                      title: '无可跳转的认证地址',
+                      icon: 'none'
+                    })
+                  }
+                })
+              } else {
+                Taro.navigateTo({
+                  url: `/onlineSelling/pages/raiseMoney/signResult?status=${res.status}&id=${raiseRecordId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}`
+                })
+              }
+
+
+
             }).catch(err => {
               this.setState({
                 autoErr: err.message || ''
@@ -45,7 +65,7 @@ export default class Certification extends Component {
 
   handleChatClick() {
 
-    const { consultantInfo = {} } = this.$router.params
+    const { consultantName, consultantId } = 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({
@@ -57,13 +77,12 @@ export default class Certification extends Component {
       },
       complete() {
         Taro.navigateTo({
-          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${consultantInfo.consultantPersonId}&receiverName=${encodeURIComponent(consultantInfo.name || consultantInfo.nickname || consultantInfo.userName)}`
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${consultantId}&receiverName=${encodeURIComponent(consultantName)}`
         })
       }
     })
   }
   handleBtnClick() {
-    console.log('eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee')
     contractGet().then(res => {
     })
   }

src/onlineSelling/pages/raiseMoney/signResult.js

@@ -6,7 +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 { contractCheck } from '@/services/project'
 import { transferImage } from '@/utils/tools'
 
 @connect(({ user, house }) => ({ ...user, house }), { ...houseActions })
@@ -15,13 +15,18 @@ export default class signResult extends Component {
     navigationBarTitleText: '签署结果'
   }
   state = {
-
+    result: {}
   }
 
 
   componentWillMount() {
     ready.queue(() => {
-
+      const { id: raiseRecordId, } = this.$router.params
+      contractCheck(({ raiseRecordId, showToast: false })).then(res => {
+        this.setState({
+          result: res
+        })
+      })
 
     })
   }
@@ -73,35 +78,58 @@ export default class signResult extends Component {
       url: `/onlineSelling/pages/houseList/index?id=${id}`
     })
   }
+  toSeeContract(url) {
+    Taro.navigateTo({
+      url: `/pages/project/panorama/index?url=${encodeURIComponent(url)}`
+    })
+  }
+  toDownloadContract(url) {
+    Taro.downloadFile({
+      url,
+      success: function (param) {
+        if (param.statusCode === 200) {
+          Taro.showToast({
+            title: '下载合同成功',
+            icon: 'none'
+          })
+        }
+      },
+      fail: function (res) {
+        console.log('下载合同失败');
+      }
+    })
+
+  }
   renderBtn() {
-    const { raiseProfile = {}, record = {} } = this.state
-    const isOk = false
+    const { result = {} } = this.state
+    const { status } = this.$router.params
+
     return (
       <View className="bottombar">
         <View className="bt-nav__left">
-          <Button class='bt-nav__item' onClick={() => this.toBuilding(raiseProfile.buildingId)}>
+          <Button class='bt-nav__item' onClick={() => this.toBuilding(result.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)}>
+          <Button className='bt-nav__item' onClick={() => this.toHouseList(result.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()}>
+          {status != 1 && <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' >
+          {status == 1 && <Button className='bt-nav__item' onClick={() => this.toSeeContract(result.contractViewUrl)} >
             <Image src={transferImage(require('../../assets/see.png'))} style="width:42rpx;height:40rpx"></Image>
-            <Text className="text" style="color:#E4A938">查看合同</Text>
+            <Text className="text" style="color:#E4A938" >查看合同</Text>
           </Button>}
-          {isOk && <Button className='bt-nav__item' >
+          {status == 1 && <Button className='bt-nav__item' onClick={() => this.toDownloadContract(result.contractDownloadUrl)} >
             <Image src={transferImage(require('../../assets/download.png'))} style="width:42rpx;height:40rpx"></Image>
-            <Text className="text" style="color:#E4A938">下载合同</Text>
+            <Text className="text" style="color:#E4A938" >下载合同</Text>
           </Button>}
 
         </View>
-        <Button className="btn" onClick={() => this.toRaiseProfile(record.raiseRecordId)}>
+        <Button className="btn" onClick={() => this.toRaiseProfile(result.invoiceTargetId)}>
           认筹单
         </Button>
       </View>
@@ -109,18 +137,18 @@ export default class signResult extends Component {
   }
 
   render() {
-    const isOk = false
+    const { status } = this.$router.params
     const failInfo = { title: '合同签署失败', desc: '签署失败描述' }
-    const showIcon = isOk ? require('../../assets/success2.png') : require('../../assets/fail2.png')
-    const showTitle = isOk ? '恭喜已成功签署合同' : failInfo.title
+    const showIcon = status == 1 ? require('../../assets/success2.png') : require('../../assets/fail2.png')
+    const showTitle = status == 1 ? '恭喜已成功签署合同' : failInfo.title
 
     return (
       <View className="result">
         <Image className="result-img" src={showIcon}></Image>
 
-        <View className="status" style={!isOk ? 'color:#F4333B' : 'color:#118EE9'}>{showTitle}</View>
+        <View className="status" style={status != 1 ? 'color:#F4333B' : 'color:#118EE9'}>{showTitle}</View>
         {
-          !isOk && (
+          status != 1 && (
             <Block>
               <View className="tip" style="margin-top:10rpx">{(failInfo || {}).desc}</View>
               <View className="tip" style="margin-top:10rpx">请到认筹单中尝试重新签署合同</View>

src/onlineSelling/pages/raiseProfile/index.js

@@ -6,7 +6,7 @@ import Statement from '../../components/Statement'
 import ContactConsultant from '../../components/ContactConsultant'
 import ConsultantItem from '../../components/ConsultantItem/index'
 import RaiseCard from '../../components/RaiseCard'
-import { queryRaiseDetail, contractUser } from '@/services/project'
+import { queryRaiseDetail, contractUser, contractCheck } from '@/services/project'
 import { connect } from '@tarojs/redux'
 import * as noticeType from '@/constants/common.js'
 import './index.scss'
@@ -28,6 +28,7 @@ export default class Raise extends Component {
     refundOrder: {},
     payDisable: true,
     signDetail: {},
+    contractDetail: null,
   }
 
   componentWillMount() {
@@ -40,15 +41,16 @@ export default class Raise extends Component {
         raiseOrder: res.taRaise || {},
         orderDetail: res.taOrder || {},
         refundOrder: res.refundOrder || {},
+        contractDetail: res.taContract || null,
       }, () => {
         const { raiseDeatil: { showContract } } = this.state
-        // if (showContract == 1) {
-        contractUser({ raiseRecordId, }).then(res => {
-          this.setState({
-            signDetail: res || {}
+        if (showContract == 1) {
+          contractUser({ raiseRecordId, }).then(res => {
+            this.setState({
+              signDetail: res || {}
+            })
           })
-        })
-        // }
+        }
       })
     })
   }
@@ -210,12 +212,13 @@ export default class Raise extends Component {
     })
   }
   toSign = () => {
-    const { signDetail, raiseDeatil: { consultantInfo } } = this.state
+    const { signDetail, raiseOrder: { raiseId }, raiseDeatil: { consultantInfo: { name, userName, personId, consultantPersonId } } } = this.state
+    const { id: raiseRecordId } = this.$router.params
     const status = signDetail ? signDetail.status : ''
     if (status == 0 || status == 1) {
       if (signDetail.certifiedAddress) {
         Taro.navigateTo({
-          url: `/pages/project/panorama/index?url=${encodeURIComponent(signDetail.certifiedAddress)}&from=raiseProfile&consultantInfo=${consultantInfo}`
+          url: `/pages/project/panorama/index?url=${encodeURIComponent(signDetail.certifiedAddress)}&raiseId=${raiseId}&from=raiseProfile&consultantName=${encodeURIComponent(name || userName || '')}&consultantId=${consultantPersonId || personId || ''}&id=${raiseRecordId}`
         })
       } else {
         Taro.showToast({
@@ -226,13 +229,35 @@ export default class Raise extends Component {
     } else {
       const { id: raiseRecordId } = this.$router.params
       Taro.navigateTo({
-        url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId}&consultantInfo=${consultantInfo}`
+        url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId}&raiseId=${raiseId}&consultantName=${encodeURIComponent(name || userName || '')}&consultantId=${consultantPersonId || personId || ''}`
       })
     }
   }
+  toSeeContract(url) {
+    Taro.navigateTo({
+      url: `/pages/project/panorama/index?url=${encodeURIComponent(url)}`
+    })
+  }
+  toDownloadContract(url) {
+    Taro.downloadFile({
+      url,
+      success: function (param) {
+        if (param.statusCode === 200) {
+          Taro.showToast({
+            title: '下载合同成功',
+            icon: 'none'
+          })
+        }
+      },
+      fail: function (res) {
+        console.log('下载合同失败');
+      }
+    })
+
+  }
 
   render() {
-    const { buildingId, raiseDeatil, orderDetail, refundOrder, raiseOrder, signDetail } = this.state;
+    const { buildingId, raiseDeatil, orderDetail, refundOrder, raiseOrder, signDetail, contractDetail } = this.state;
 
 
     // 认筹信息
@@ -281,13 +306,15 @@ export default class Raise extends Component {
             <View className="date">认筹提交时间  {dayjs(raiseDeatil.createDate).format('YYYY/MM/DD HH:mm:ss')}</View>
             <View className="agreement" onClick={this.toAgreement}>在线选房协议<Text className="right-icon"></Text></View>
           </View>
-          <View className="raise-flex">
-            <View className="date">合同签署时间  {dayjs(raiseDeatil.createDate).format('YYYY/MM/DD HH:mm:ss')}
-              <Image className="download" src={require('../../assets/download.png')} /></View>
-            <View className="agreement" onClick={this.toAgreement}>查看合同<Text className="right-icon"></Text></View>
-          </View>
+          {contractDetail &&
+            <View className="raise-flex">
+              <View className="date">合同签署时间  {dayjs(raiseDeatil.createDate).format('YYYY/MM/DD HH:mm:ss')}
+                <Image className="download" onClick={() => this.toDownloadContract(contractDetail.contractDownloadUrl)} src={require('../../assets/download.png')} /></View>
+              <View className="agreement" onClick={() => this.toSeeContract(contractDetail.contractViewUrl)}>查看合同<Text className="right-icon"></Text></View>
+            </View>}
+
           {
-            raiseDeatil.showContract == 0 && signDetail &&
+            raiseDeatil.showContract == 1 && 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>

src/pages/project/panorama/index.js

@@ -1,25 +1,59 @@
 import Taro, { Component } from '@tarojs/taro'
 import { WebView } from '@tarojs/components'
-import { contractUser } from '@/services/project'
+import { contractUser, contractCheck } from '@/services/project'
 
 export default class Panorama extends Component {
   state = {}
-
+  tk = undefined
+  tk2 = undefined
   componentWillMount() {
-    const { from = '', consultantInfo = {} } = this.$router.params
+    const { from = '', id: raiseRecordId, consultantName, consultantId } = this.$router.params
     if (from == 'raiseProfile') {
       console.log('！！！！')
-      const tk = setInterval(() => {
+      this.tk = setInterval(() => {
         contractUser().then(res => {
-          console.log(res, res.status, '每30秒请求一次！！！！')
+          console.log(res, res.status, '每5秒请求一次！！！！')
           if (res.status != 0 && res.status != 1) {
-            clearInterval(tk)
+            const { id } = this.$router.params
+            clearInterval(this.tk)
+            Taro.navigateTo({
+              url: `/onlineSelling/pages/raiseMoney/Certification?id=${res.raiseRecordId || id}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}`
+            })
+          }
+        })
+      }, 5000)
+    }
+    if (from == 'contractManual') {
+      console.log('contractManual！！！！')
+      this.tk2 = setInterval(() => {
+        contractCheck({ raiseRecordId, showToast: false }).then(res => {
+          console.log(res, res.status, 'contractManual每5秒请求一次！！！')
+          if (res.status != 0) {
+            clearInterval(this.tk2)
             Taro.navigateTo({
-              url: `/onlineSelling/pages/raiseMoney/Certification?id=${res.raiseRecordId}&consultantInfo=${consultantInfo}`
+              url: `/onlineSelling/pages/raiseMoney/signResult?status=${res.status}&id=${raiseRecordId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}`
             })
           }
         })
-      }, 30000)
+      }, 5000)
+    } else {
+      console.log(this.$router.params, "this.$router.paramsthis.$router.paramsthis.$router.paramsthis.$router.params")
+    }
+  }
+  componentDidHide() {
+    if (this.tk) {
+      clearInterval(this.tk)
+    }
+    if (this.tk2) {
+      clearInterval(this.tk2)
+    }
+  }
+  componentWillUnmount() {
+    if (this.tk) {
+      clearInterval(this.tk)
+    }
+    if (this.tk2) {
+      clearInterval(this.tk2)
     }
   }
 

src/services/project.js

@@ -16,7 +16,8 @@ import {
   API_CONTRACT_USER,
   API_CONTRACT_GET,
   API_CONTRACT_AUTO,
-  API_CONTRACT_MANUAL
+  API_CONTRACT_MANUAL,
+  API_CONTRACT_CHECK
 
 } from '@/constants/api'
 
@@ -113,7 +114,12 @@ export const contractAuto = payload => fetch({ url: API_CONTRACT_AUTO, payload,
  *手动签署
  * @param {*} payload
  */
-export const contractManual = payload => fetch({ url: API_CONTRACT_MANUAL, payload })
+export const contractManual = payload => fetch({ url: API_CONTRACT_MANUAL, payload, method: 'POST' })
+/**
+ *手动签署结果
+ * @param {*} payload
+ */
+export const contractCheck = payload => fetch({ url: API_CONTRACT_CHECK, payload, method: 'POST' })