commit

src/onlineSelling/pages/raiseMoney/Certification.js

@@ -16,6 +16,7 @@ export default class Certification extends Component {
   state = {
     signDetail: null,
     autoErr: null,
+    manualErr: null,
     userErr: null,
     raiseDetail: {}
   }
@@ -50,6 +51,10 @@ export default class Certification extends Component {
                     icon: 'none'
                   })
                 }
+              }).catch(err => {
+                this.setState({
+                  manualErr: err.message || ''
+                })
               })
               // } else {
               //   Taro.navigateTo({
@@ -118,6 +123,10 @@ export default class Certification extends Component {
                       icon: 'none'
                     })
                   }
+                }).catch(err => {
+                  this.setState({
+                    manualErr: err.message || ''
+                  })
                 })
                 // } else {
                 //   Taro.navigateTo({
@@ -150,7 +159,7 @@ export default class Certification extends Component {
 
 
   render() {
-    const { signDetail, autoErr, userErr } = this.state
+    const { signDetail, autoErr, userErr, manualErr } = this.state
     const status = signDetail ? signDetail.status : ''
     const showIcon = status == 2 ? require('../../assets/success2.png') : (status == 0 || status == 1 || status == 4) ? require('../../assets/fail2.png') : require('../../assets/going.png')
 
@@ -168,11 +177,14 @@ export default class Certification extends Component {
             {status == 4 && <View className="tip" style="margin-top:14rpx">不通过原因：{signDetail.reason || 'XXXXXX'}</View>}
 
             {status == 2 && <Block>
-              {!autoErr && <View className="tip" style="margin-top:14rpx">正在准备合同，请不要退出···</View>}
+              {!autoErr && !manualErr && < 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>
-                {/* <ContactConsultant contactClick={() => this.handleChatClick()} text="请联系专属置业顾问" style=" position: absolute;bottom: 9vh;" /> */}
+              </Block>}
+              {manualErr && <Block>
+                <View className="tip" style="margin-top:14rpx;color:#F4333B">手动签署失败</View>
+                <View className="tip" style="margin-top:14rpx;color:#333">原因：{autoErr}</View>
               </Block>}
             </Block>
             }

src/onlineSelling/pages/raiseProfile/index.js

@@ -223,7 +223,7 @@ export default class Raise extends Component {
   }
   toSign = () => {
     Taro.setStorageSync('raiseRecordId', this.$router.params.id)
-    const { signDetail, raiseOrder: { raiseId }, raiseDeatil: { consultantInfo: { name, userName, personId, consultantPersonId } } } = this.state
+    const { signDetail, raiseDeatil: { consultantInfo: { name, userName, personId, consultantPersonId } } } = this.state
     const { id: raiseRecordId } = this.$router.params
     const status = signDetail ? signDetail.status : ''
     const { user: { userInfo: { miniApp: { tpls } } } } = this.props
@@ -238,12 +238,12 @@ export default class Raise extends Component {
       complete() {
         if (status == 2) {
           Taro.navigateTo({
-            url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId}&raiseId=${raiseId}&consultantName=${encodeURIComponent(name || userName || '')}&consultantId=${consultantPersonId || personId || ''}`
+            url: `/onlineSelling/pages/raiseMoney/Certification?id=${raiseRecordId}&consultantName=${encodeURIComponent(name || userName || '')}&consultantId=${consultantPersonId || personId || ''}`
           })
         } else {
           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}`
+              url: `/pages/project/panorama/index?url=${encodeURIComponent(signDetail.certifiedAddress)}&from=raiseProfile&consultantName=${encodeURIComponent(name || userName || '')}&consultantId=${consultantPersonId || personId || ''}&id=${raiseRecordId}`
             })
           } else {
             Taro.showToast({