commit

src/onlineSelling/pages/raiseMoney/Certification.js

@@ -184,7 +184,7 @@ export default class Certification extends Component {
               </Block>}
               {manualErr && <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:14rpx;color:#333">原因：{manualErr}</View>
               </Block>}
             </Block>
             }

src/onlineSelling/pages/raiseMoney/index.js

@@ -749,12 +749,12 @@ export default class raiseMoney extends Component {
       },
       complete() {
         if (status == 2) {
-          Taro.navigateTo({
+          Taro.reLaunch({
             url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId || record.raiseRecordId}&consultantInfo=${encodeURIComponent(consultant)}`
           })
         } else {
           if (signDetail.certifiedAddress) {
-            Taro.navigateTo({
+            Taro.reLaunch({
               url: `/pages/project/panorama/index?url=${encodeURIComponent(signDetail.certifiedAddress)}&from=raiseProfile&consultantInfo=${encodeURIComponent(consultant)}`
             })
           } else {

src/onlineSelling/pages/raiseMoney/signResult.js

@@ -31,10 +31,10 @@ export default class signResult extends Component {
       contractCheck(({ raiseRecordId: storageId || raiseRecordId, showToast: false })).then(res => {
         Taro.hideToast()
         this.setState({
-          result: res
+          result: res || {}
         })
       })
-      queryRaiseDetail( storageId || raiseRecordId ).then(res => {
+      queryRaiseDetail(storageId || raiseRecordId).then(res => {
         this.setState({
           raiseDetail: res.taRaiseRecord || {},
 
@@ -115,13 +115,14 @@ export default class signResult extends Component {
   renderBtn() {
     const storageId = Taro.getStorageSync('raiseRecordId')
     const { result = {}, raiseDetail = {} } = this.state
-    const status = result ? result.status : ''
+    const status = this.$router.params.result_code == 3000 ? '1' : '2'
     const { id: raiseRecordId } = this.$router.params
-
+    const viewUrl = this.$router.params.viewpdf_url ? decodeURIComponent(decodeURIComponent(this.$router.params.viewpdf_url)) : ''
+    console.log(viewUrl, "viewUrlviewUrlviewUrlviewUrlviewUrlviewUrlviewUrl")
     return (
       <View className="bottombar">
         <View className="bt-nav__left">
-          <Button class='bt-nav__item' onClick={() => this.toBuilding(result.buildingId || raiseDetail.buildingId)}>
+          <Button class='bt-nav__item' onClick={() => this.toBuilding(raiseDetail.buildingId || result.buildingId)}>
             <Image src={transferImage(require('@/assets/news/property.png'))} style="width:42rpx;height:42rpx"></Image>
             <Text className="text">查看项目</Text>
           </Button>
@@ -133,7 +134,7 @@ export default class signResult extends Component {
             <Image src={transferImage(require('../../assets/consult.png'))} style="width:36rpx;height:40rpx"></Image>
             <Text className="text">置业顾问</Text>
           </Button>}
-          {status == 1 && <Button className='bt-nav__item' onClick={() => this.toSeeContract(result.contractViewUrl)} >
+          {status == 1 && viewUrl && <Button className='bt-nav__item' onClick={() => this.toSeeContract(viewUrl)} >
             <Image src={transferImage(require('../../assets/see.png'))} style="width:42rpx;height:40rpx"></Image>
             <Text className="text" style="color:#E4A938" >查看合同</Text>
           </Button>}
@@ -143,7 +144,7 @@ export default class signResult extends Component {
           </Button>} */}
 
         </View>
-        <Button className="btn" onClick={() => this.toRaiseProfile(result.invoiceTargetId || storageId || raiseRecordId)}>
+        <Button className="btn" onClick={() => this.toRaiseProfile(storageId || result.invoiceTargetId || raiseRecordId)}>
           认筹单
         </Button>
       </View>
@@ -151,11 +152,13 @@ export default class signResult extends Component {
   }
 
   render() {
-    const { result = {} } = this.state
-    const status = result ? result.status : ''
+    // const { result = {} } = this.state
+    const status = this.$router.params.result_code == 3000 ? '1' : '2'
     const failInfo = { title: '合同签署失败', desc: '签署失败描述' }
     const showIcon = status == 1 ? require('../../assets/success2.png') : status == 2 ? require('../../assets/fail2.png') : ''
     const showTitle = status == 1 ? '恭喜已成功签署合同' : status == 2 ? failInfo.title : ''
+    const reason = this.$router.params.result_desc ? decodeURIComponent(decodeURIComponent(this.$router.params.result_desc)) : ''
+    console.log(reason, "reasonreasonreasonreasonreason")
 
     return (
       <View className="result">
@@ -165,7 +168,7 @@ export default class signResult extends Component {
         {
           status == 2 && (
             <Block>
-              <View className="tip" style="margin-top:10rpx">{result.reason || ''}</View>
+              <View className="tip" style="margin-top:10rpx">{reason || ''}</View>
               <View className="tip" style="margin-top:10rpx">请到认筹单中尝试重新签署合同</View>
               <View className="tip" style="margin-top:10rpx">或联系您的专属置业顾问</View>
             </Block>

src/onlineSelling/pages/raiseProfile/index.js

@@ -237,12 +237,12 @@ export default class Raise extends Component {
       },
       complete() {
         if (status == 2) {
-          Taro.navigateTo({
+          Taro.reLaunch({
             url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId}&consultantName=${encodeURIComponent(name || userName || '')}&consultantId=${consultantPersonId || personId || ''}`
           })
         } else {
           if (signDetail.certifiedAddress) {
-            Taro.navigateTo({
+            Taro.reLaunch({
               url: `/pages/project/panorama/index?url=${encodeURIComponent(signDetail.certifiedAddress)}&from=raiseProfile&consultantName=${encodeURIComponent(name || userName || '')}&consultantId=${consultantPersonId || personId || ''}&id=${raiseRecordId}`
             })
           } else {

src/pages/project/panorama/index.js

@@ -1,13 +1,13 @@
 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
+  // tk2 = undefined
   componentWillMount() {
-    const { from = '', id: raiseRecordId, consultantName, consultantId } = this.$router.params
+    // const { from = '', id: raiseRecordId, consultantName, consultantId } = this.$router.params
     // if (from == 'raiseProfile') {
     //   console.log('！！！！')
     //   this.tk = setInterval(() => {
@@ -23,37 +23,37 @@ export default class Panorama extends Component {
     //     })
     //   }, 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 (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)
     // }
-    if (this.tk2) {
-      clearInterval(this.tk2)
-    }
   }
+  // 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)