commit

src/onlineSelling/pages/raiseMoney/index.js

@@ -732,27 +732,40 @@ export default class raiseMoney extends Component {
     })
   }
   toSign = () => {
-    const { signDetail } = this.state
+    const { signDetail, record = {} } = 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'
-        })
+    const { id: raiseRecordId } = this.$router.params
+    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() {
+        if (status == 0 || status == 1) {
+          if (signDetail.certifiedAddress) {
+            Taro.navigateTo({
+              url: `/pages/project/panorama/index?url=${encodeURIComponent(signDetail.certifiedAddress)}&from=raiseProfile&consultantInfo=${encodeURIComponent(consultant)}`
+            })
+          } else {
+            Taro.showToast({
+              title: '无可跳转的认证地址',
+              icon: 'none'
+            })
+          }
+        } else {
+          Taro.navigateTo({
+            url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId || record.raiseRecordId}&consultantInfo=${encodeURIComponent(consultant)}`
+          })
+        }
       }
-    } else {
-      const { record = {} } = this.state
-      const { id: raiseRecordId } = this.$router.params
-      Taro.navigateTo({
-        url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId || record.raiseRecordId}&consultantInfo=${consultant}`
-      })
-    }
+    })
+
   }
   renderBtn() {
     const { raiseProfile = {}, record = {}, signDetail, raiseDeatil = {} } = this.state

src/onlineSelling/pages/raiseMoney/signResult.js

@@ -102,7 +102,7 @@ export default class signResult extends Component {
   }
   renderBtn() {
     const { result = {} } = this.state
-    const { status } = this.$router.params
+    const status = result ? result.status : ''
 
     return (
       <View className="bottombar">
@@ -137,8 +137,8 @@ export default class signResult extends Component {
   }
 
   render() {
-    const { status } = this.$router.params
     const { result = {} } = this.state
+    const status = result ? result.status : ''
     const failInfo = { title: '合同签署失败', desc: '签署失败描述' }
     const showIcon = status == 1 ? require('../../assets/success2.png') : require('../../assets/fail2.png')
     const showTitle = status == 1 ? '恭喜已成功签署合同' : failInfo.title

src/onlineSelling/pages/raiseProfile/index.js

@@ -215,23 +215,34 @@ export default class Raise extends Component {
     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)}&raiseId=${raiseId}&from=raiseProfile&consultantName=${encodeURIComponent(name || userName || '')}&consultantId=${consultantPersonId || personId || ''}&id=${raiseRecordId}`
-        })
-      } else {
-        Taro.showToast({
-          title: '无可跳转的认证地址',
-          icon: 'none'
-        })
+    const { user: { 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() {
+        if (status == 0 || status == 1) {
+          if (signDetail.certifiedAddress) {
+            Taro.navigateTo({
+              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({
+              title: '无可跳转的认证地址',
+              icon: 'none'
+            })
+          }
+        } else {
+          Taro.navigateTo({
+            url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId}&raiseId=${raiseId}&consultantName=${encodeURIComponent(name || userName || '')}&consultantId=${consultantPersonId || personId || ''}`
+          })
+        }
       }
-    } else {
-      const { id: raiseRecordId } = this.$router.params
-      Taro.navigateTo({
-        url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId}&raiseId=${raiseId}&consultantName=${encodeURIComponent(name || userName || '')}&consultantId=${consultantPersonId || personId || ''}`
-      })
-    }
+    })
   }
   toSeeContract(url) {
     Taro.navigateTo({

src/pages/project/panorama/index.js

@@ -1,61 +1,59 @@
 import Taro, { Component } from '@tarojs/taro'
 import { WebView } from '@tarojs/components'
-import { contractUser, contractCheck } from '@/services/project'
+// import { contractUser, contractCheck } from '@/services/project'
 
 export default class Panorama extends Component {
   state = {}
-  tk = undefined
-  tk2 = undefined
+  // tk = undefined
+  // tk2 = undefined
   componentWillMount() {
-    const { from = '', id: raiseRecordId, consultantName, consultantId } = this.$router.params
-    if (from == 'raiseProfile') {
-      console.log('！！！！')
-      this.tk = setInterval(() => {
-        contractUser({ raiseRecordId, showToast: false }).then(res => {
-          console.log(res, res.status, '每5秒请求一次！！！！')
-          if (res.status != 0 && res.status != 1) {
-            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/signResult?status=${res.status}&id=${raiseRecordId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}`
-            })
-          }
-        })
-      }, 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)
-    }
+    // const { from = '', id: raiseRecordId, consultantName, consultantId } = this.$router.params
+    // if (from == 'raiseProfile') {
+    //   console.log('！！！！')
+    //   this.tk = setInterval(() => {
+    //     contractUser({ raiseRecordId, showToast: false }).then(res => {
+    //       console.log(res, res.status, '每5秒请求一次！！！！')
+    //       if (res.status != 0 && res.status != 1) {
+    //         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/signResult?status=${res.status}&id=${raiseRecordId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}`
+    //         })
+    //       }
+    //     })
+    //   }, 5000)
+    // }
   }
+  // 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)
+  //   }
+  // }
 
   render() {
     const url = decodeURIComponent(this.$router.params.url)