xujing 5 years ago
parent
commit
e7956db027

+ 15
- 9
src/onlineSelling/pages/raiseMoney/Certification.js View File

4
 import ready from '@/utils/ready'
4
 import ready from '@/utils/ready'
5
 import { connect } from '@tarojs/redux'
5
 import { connect } from '@tarojs/redux'
6
 import * as noticeType from '@/constants/common.js'
6
 import * as noticeType from '@/constants/common.js'
7
-import { contractUser, contractGet, contractAuto, contractManual } from '@/services/project'
7
+import { contractUser, contractGet, contractAuto, contractManual, queryRaiseDetail } from '@/services/project'
8
 import ContactConsultant from '../../components/ContactConsultant'
8
 import ContactConsultant from '../../components/ContactConsultant'
9
 
9
 
10
 @connect(({ user, house }) => ({ user, house }))
10
 @connect(({ user, house }) => ({ user, house }))
17
     signDetail: null,
17
     signDetail: null,
18
     autoErr: null,
18
     autoErr: null,
19
     userErr: null,
19
     userErr: null,
20
+    raiseDetail: {}
20
   }
21
   }
21
 
22
 
22
   componentWillMount() {
23
   componentWillMount() {
23
     ready.queue(() => {
24
     ready.queue(() => {
24
-      const { id: raiseRecordId, raiseId, consultantName, consultantId } = this.$router.params
25
-      contractUser({ raiseRecordId, }).then(res => {
25
+      const { id: raiseRecordId, raiseId } = this.$router.params
26
+      const storageId = Taro.getStorageSync('raiseRecordId')
27
+      queryRaiseDetail(storageId || raiseRecordId).then(res => {
28
+        this.setState({
29
+          raiseDetail: res.taRaiseRecord || {},
30
+        })
31
+      })
32
+      contractUser({ raiseRecordId: storageId || raiseRecordId }).then(res => {
26
         this.setState({
33
         this.setState({
27
           signDetail: res || {}
34
           signDetail: res || {}
28
         }, () => {
35
         }, () => {
29
           const { signDetail } = this.state
36
           const { signDetail } = this.state
30
           if (signDetail.status == 2 && signDetail.authStatus == 'autoSign') {
37
           if (signDetail.status == 2 && signDetail.authStatus == 'autoSign') {
31
             // 自动签署
38
             // 自动签署
32
-            contractAuto({ raiseRecordId, showToast: false }).then(res => {
39
+            contractAuto({ raiseRecordId: storageId || raiseRecordId, showToast: false }).then(res => {
33
               // if (res.status == 0) {
40
               // if (res.status == 0) {
34
               // 自动签署成功后调手动签署
41
               // 自动签署成功后调手动签署
35
               contractManual({ ...res, showToast: false }).then(res => {
42
               contractManual({ ...res, showToast: false }).then(res => {
36
                 if (res) {
43
                 if (res) {
37
                   Taro.navigateTo({
44
                   Taro.navigateTo({
38
-                    url: `/pages/project/panorama/index?url=${encodeURIComponent(res)}&from=contractManual&raiseId=${raiseId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}&id=${raiseRecordId}`
45
+                    url: `/pages/project/panorama/index?url=${encodeURIComponent(res)}&from=contractManual&raiseId=${raiseId}&id=${storageId || raiseRecordId}`
39
                   })
46
                   })
40
                 } else {
47
                 } else {
41
                   Taro.showToast({
48
                   Taro.showToast({
46
               })
53
               })
47
               // } else {
54
               // } else {
48
               //   Taro.navigateTo({
55
               //   Taro.navigateTo({
49
-              //     url: `/onlineSelling/pages/raiseMoney/signResult?id=${raiseRecordId}&consultantName=${encodeURIComponent(consultantName)}&consultantId=${consultantId}`
56
+              //     url: `/onlineSelling/pages/raiseMoney/signResult?id=${raiseRecordId}`
50
               //   })
57
               //   })
51
               // }
58
               // }
52
             }).catch(err => {
59
             }).catch(err => {
66
   }
73
   }
67
 
74
 
68
   handleChatClick() {
75
   handleChatClick() {
69
-
70
-    const { consultantName, consultantId } = this.$router.params
76
+    const { raiseDetail: { consultantInfo = {} } } = this.state
71
     const { user: { userInfo: { miniApp: { tpls }, person: { personId, nickname, name } } } } = this.props
77
     const { user: { userInfo: { miniApp: { tpls }, person: { personId, nickname, name } } } } = this.props
72
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true)[0] || {}).tplId
78
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_NOTICE && x.isSubscribe == true)[0] || {}).tplId
73
     wx.requestSubscribeMessage({
79
     wx.requestSubscribeMessage({
79
       },
85
       },
80
       complete() {
86
       complete() {
81
         Taro.navigateTo({
87
         Taro.navigateTo({
82
-          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${consultantId}&receiverName=${encodeURIComponent(consultantName)}`
88
+          url: `/pages/im/index?sendId=${personId}&sendName=${encodeURIComponent(name || nickname)}&receiverId=${consultantInfo.consultantPersonId}&receiverName=${encodeURIComponent(consultantInfo.nickname || consultantInfo.userName)}`
83
         })
89
         })
84
       }
90
       }
85
     })
91
     })

+ 1
- 1
src/onlineSelling/pages/raiseMoney/index.js View File

732
     })
732
     })
733
   }
733
   }
734
   toSign() {
734
   toSign() {
735
-
735
+    Taro.setStorageSync('raiseRecordId', this.$router.params.id)
736
     const { signDetail, record = {} } = this.state
736
     const { signDetail, record = {} } = this.state
737
     const status = signDetail ? signDetail.status : ''
737
     const status = signDetail ? signDetail.status : ''
738
     const consultant = this.getConsultant()
738
     const consultant = this.getConsultant()

+ 5
- 4
src/onlineSelling/pages/raiseMoney/signResult.js View File

26
       icon: 'loading'
26
       icon: 'loading'
27
     })
27
     })
28
     ready.queue(() => {
28
     ready.queue(() => {
29
+      const storageId = Taro.getStorageSync('raiseRecordId')
29
       const { id: raiseRecordId, } = this.$router.params
30
       const { id: raiseRecordId, } = this.$router.params
30
-      contractCheck(({ raiseRecordId, showToast: false })).then(res => {
31
+      contractCheck(({ raiseRecordId: storageId || raiseRecordId, showToast: false })).then(res => {
31
         Taro.hideToast()
32
         Taro.hideToast()
32
         this.setState({
33
         this.setState({
33
           result: res
34
           result: res
34
         })
35
         })
35
       })
36
       })
36
-      queryRaiseDetail(raiseRecordId).then(res => {
37
+      queryRaiseDetail( storageId || raiseRecordId ).then(res => {
37
         this.setState({
38
         this.setState({
38
           raiseDetail: res.taRaiseRecord || {},
39
           raiseDetail: res.taRaiseRecord || {},
39
 
40
 
42
     })
43
     })
43
   }
44
   }
44
 
45
 
45
-
46
   toRaiseProfile(id) {
46
   toRaiseProfile(id) {
47
     const { userInfo: { miniApp: { tpls } } } = this.props
47
     const { userInfo: { miniApp: { tpls } } } = this.props
48
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
48
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
113
 
113
 
114
   }
114
   }
115
   renderBtn() {
115
   renderBtn() {
116
+    const storageId = Taro.getStorageSync('raiseRecordId')
116
     const { result = {}, raiseDetail = {} } = this.state
117
     const { result = {}, raiseDetail = {} } = this.state
117
     const status = result ? result.status : ''
118
     const status = result ? result.status : ''
118
     const { id: raiseRecordId } = this.$router.params
119
     const { id: raiseRecordId } = this.$router.params
142
           </Button>} */}
143
           </Button>} */}
143
 
144
 
144
         </View>
145
         </View>
145
-        <Button className="btn" onClick={() => this.toRaiseProfile(result.invoiceTargetId || raiseRecordId)}>
146
+        <Button className="btn" onClick={() => this.toRaiseProfile(result.invoiceTargetId || storageId || raiseRecordId)}>
146
           认筹单
147
           认筹单
147
         </Button>
148
         </Button>
148
       </View>
149
       </View>

+ 1
- 0
src/onlineSelling/pages/raiseProfile/index.js View File

222
     })
222
     })
223
   }
223
   }
224
   toSign = () => {
224
   toSign = () => {
225
+    Taro.setStorageSync('raiseRecordId', this.$router.params.id)
225
     const { signDetail, raiseOrder: { raiseId }, raiseDeatil: { consultantInfo: { name, userName, personId, consultantPersonId } } } = this.state
226
     const { signDetail, raiseOrder: { raiseId }, raiseDeatil: { consultantInfo: { name, userName, personId, consultantPersonId } } } = this.state
226
     const { id: raiseRecordId } = this.$router.params
227
     const { id: raiseRecordId } = this.$router.params
227
     const status = signDetail ? signDetail.status : ''
228
     const status = signDetail ? signDetail.status : ''