bug fix

src/onlineSelling/pages/raiseMoney/Certification.js

@@ -4,7 +4,7 @@ import './index.scss'
 import ready from '@/utils/ready'
 import { connect } from '@tarojs/redux'
 import * as noticeType from '@/constants/common.js'
-import { contractUser, contractGet, contractAuto, contractManual } from '@/services/project'
+import { contractUser, contractGet, contractAuto, contractManual, queryRaiseDetail } from '@/services/project'
 import ContactConsultant from '../../components/ContactConsultant'
 
 @connect(({ user, house }) => ({ user, house }))
@@ -17,25 +17,32 @@ export default class Certification extends Component {
     signDetail: null,
     autoErr: null,
     userErr: null,
+    raiseDetail: {}
   }
 
   componentWillMount() {
     ready.queue(() => {
-      const { id: raiseRecordId, raiseId, consultantName, consultantId } = this.$router.params
-      contractUser({ raiseRecordId, }).then(res => {
+      const { id: raiseRecordId, raiseId } = this.$router.params
+      const storageId = Taro.getStorageSync('raiseRecordId')
+      queryRaiseDetail(storageId || raiseRecordId).then(res => {
+        this.setState({
+          raiseDetail: res.taRaiseRecord || {},
+        })
+      })
+      contractUser({ raiseRecordId: storageId || raiseRecordId }).then(res => {
         this.setState({
           signDetail: res || {}
         }, () => {
           const { signDetail } = this.state
           if (signDetail.status == 2 && signDetail.authStatus == 'autoSign') {
             // 自动签署
-            contractAuto({ raiseRecordId, showToast: false }).then(res => {
+            contractAuto({ raiseRecordId: storageId || 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}`
+                    url: `/pages/project/panorama/index?url=${encodeURIComponent(res)}&from=contractManual&raiseId=${raiseId}&id=${storageId || raiseRecordId}`
                   })
                 } else {
                   Taro.showToast({
@@ -46,7 +53,7 @@ export default class Certification extends Component {
               })
               // } else {
               //   Taro.navigateTo({
-              //     url: `/onlineSelling/pages/raiseMoney/signResult?id=${raiseRecordId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}`
+              //     url: `/onlineSelling/pages/raiseMoney/signResult?id=${raiseRecordId}`
               //   })
               // }
             }).catch(err => {
@@ -66,8 +73,7 @@ export default class Certification extends Component {
   }
 
   handleChatClick() {
-
-    const { consultantName, consultantId } = this.$router.params
+    const { raiseDetail: { consultantInfo = {} } } = this.state
     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({
@@ -79,7 +85,7 @@ export default class Certification extends Component {
       },
       complete() {
         Taro.navigateTo({
-          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${consultantId}&receiverName=${encodeURIComponent(consultantName)}`
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${consultantInfo.consultantPersonId}&receiverName=${encodeURIComponent(consultantInfo.nickname || consultantInfo.userName)}`
         })
       }
     })

src/onlineSelling/pages/raiseMoney/index.js

@@ -732,7 +732,7 @@ export default class raiseMoney extends Component {
     })
   }
   toSign() {
-
+    Taro.setStorageSync('raiseRecordId', this.$router.params.id)
     const { signDetail, record = {} } = this.state
     const status = signDetail ? signDetail.status : ''
     const consultant = this.getConsultant()

src/onlineSelling/pages/raiseMoney/signResult.js

@@ -26,14 +26,15 @@ export default class signResult extends Component {
       icon: 'loading'
     })
     ready.queue(() => {
+      const storageId = Taro.getStorageSync('raiseRecordId')
       const { id: raiseRecordId, } = this.$router.params
-      contractCheck(({ raiseRecordId, showToast: false })).then(res => {
+      contractCheck(({ raiseRecordId: storageId || raiseRecordId, showToast: false })).then(res => {
         Taro.hideToast()
         this.setState({
           result: res
         })
       })
-      queryRaiseDetail(raiseRecordId).then(res => {
+      queryRaiseDetail( storageId || raiseRecordId ).then(res => {
         this.setState({
           raiseDetail: res.taRaiseRecord || {},
 
@@ -42,7 +43,6 @@ export default class signResult extends Component {
     })
   }
 
-
   toRaiseProfile(id) {
     const { userInfo: { miniApp: { tpls } } } = this.props
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
@@ -113,6 +113,7 @@ export default class signResult extends Component {
 
   }
   renderBtn() {
+    const storageId = Taro.getStorageSync('raiseRecordId')
     const { result = {}, raiseDetail = {} } = this.state
     const status = result ? result.status : ''
     const { id: raiseRecordId } = this.$router.params
@@ -142,7 +143,7 @@ export default class signResult extends Component {
           </Button>} */}
 
         </View>
-        <Button className="btn" onClick={() => this.toRaiseProfile(result.invoiceTargetId || raiseRecordId)}>
+        <Button className="btn" onClick={() => this.toRaiseProfile(result.invoiceTargetId || storageId || raiseRecordId)}>
           认筹单
         </Button>
       </View>

src/onlineSelling/pages/raiseProfile/index.js

@@ -222,6 +222,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 { id: raiseRecordId } = this.$router.params
     const status = signDetail ? signDetail.status : ''