bug fix

src/actions/house.js

@@ -7,6 +7,7 @@ import {
   ADD_CONSULTANT,
   CHOOSE_CONSULTANT,
   MY_PRESELECT_RECORD,
+  SET_ONLINE_PROTOCOL,
 } from '@/constants/house'
 
 // 加入临时车
@@ -31,3 +32,5 @@ export const dispatchGetMySelection = payload => createAction({
   url: API_PRESELECTION_RECORD,
   payload,
 })
+
+export const dispatchSetOnlineProtocol = payload => createActionNormal({ type: SET_ONLINE_PROTOCOL, payload })

src/constants/house.js

@@ -16,3 +16,6 @@ export const CHOOSE_CONSULTANT = 'CHOOSE_CONSULTANT'
 
 // 获取预选记录
 export const MY_PRESELECT_RECORD = 'MY_PRESELECT_RECORD'
+
+//
+export const SET_ONLINE_PROTOCOL = 'SET_ONLINE_PROTOCOL'

src/onlineSelling/pages/protocol/index.js

@@ -2,9 +2,11 @@ import Taro, { Component } from '@tarojs/taro'
 import { View, RichText } from '@tarojs/components'
 import Statement from '../../components/Statement'
 import ContactConsultant from '../../components/ContactConsultant'
+import { connect } from '@tarojs/redux'
 
 import './index.scss'
 
+@connect(({ house }) => ({ house }))
 export default class Protocol extends Component {
   config = {
     navigationBarTitleText: '线上选房协议',
@@ -15,13 +17,13 @@ export default class Protocol extends Component {
   }
 
   render() {
-
-    const { agreement, buildingId } = this.$router.params
+    const { buildingId } = this.$router.params
+    const { house } = this.props
 
     return (
       <View className="protocal-box">
         <View className="content">
-          <RichText nodes={agreement} />
+          <RichText nodes={house.onlineProtocol} />
         </View>
         <View className="contact">
           <ContactConsultant text="如有问题，请联系置业顾问" buildingId={buildingId} />

src/onlineSelling/pages/raiseProfile/index.js

@@ -11,8 +11,9 @@ import { queryRaiseDetail } from '@/services/project'
 import { connect } from '@tarojs/redux'
 import * as noticeType from '@/constants/common.js'
 import './index.scss'
+import * as houseActions from '@/actions/house'
 
-@connect(({ user }) => ({ user }))
+@connect(({ user, house }) => ({ user, house }), { ...houseActions })
 
 export default class Raise extends Component {
   config = {
@@ -188,9 +189,14 @@ export default class Raise extends Component {
     num = this.toDecimal2(num)
     return num
   }
-  toAgreement(agreement, buildingId) {
+  toAgreement = () => {
+    const { raiseOrder } = this.state;
+    const { payProtocol, buildingId } = raiseOrder || {}
+
+    this.props.dispatchSetOnlineProtocol(payProtocol)
+
     Taro.navigateTo({
-      url: `/onlineSelling/pages/protocol/index?agreement=${agreement}&buildingId=${buildingId}`
+      url: `/onlineSelling/pages/protocol/index?buildingId=${buildingId}`
     })
   }
 
@@ -226,8 +232,8 @@ export default class Raise extends Component {
     const otherInfo = [
       { head: '其他信息', body: '供核对数据使用' },
       { head: '认筹单编号', body: raiseDeatil.raiseRecordId || '', action: true },
-      { head: '缴费单编号', body: raiseDeatil.orderId || '', action: true, hide: (raiseDeatil.payStatus != 'refunded' && raiseDeatil.payStatus != 'paid') || raiseDeatil.payType != 'onLine' },
-      { head: '退费单编号', body: refundOrder.orderId || '', action: true, hide: raiseDeatil.payStatus != 'refunded' },
+      { head: '缴费单编号', body: raiseDeatil.tradeNo || '', action: true, hide: (raiseDeatil.payStatus != 'refunded' && raiseDeatil.payStatus != 'paid') || raiseDeatil.payType != 'onLine' },
+      { head: '退费单编号', body: refundOrder.refundNo || '', action: true, hide: raiseDeatil.payStatus != 'refunded' },
     ]
 
 
@@ -240,7 +246,7 @@ export default class Raise extends Component {
           {raiseDeatil.payStatus == 'unpaid' && raiseDeatil.status == 1 && this.renderUnpayNotice()}
           <View className="raise-flex">
             <View className="date">认筹提交时间  {dayjs(raiseDeatil.createDate).format('YYYY/MM/DD HH:mm:ss')}</View>
-            <View className="agreement" onClick={() => this.toAgreement(raiseOrder.payProtocol, raiseOrder.buildingId)}>线上选房协议<Text className="right-icon"></Text></View>
+            <View className="agreement" onClick={this.toAgreement}>在线选房协议<Text className="right-icon"></Text></View>
           </View>
           <View>
             <CellBlock dataset={raiseInfo} />

src/reducers/house.js

@@ -9,6 +9,7 @@
    ADD_CONSULTANT,
    CHOOSE_CONSULTANT,
    MY_PRESELECT_RECORD,
+   SET_ONLINE_PROTOCOL,
  } from '@/constants/house'
 
 const INITIAL_STATE = {
@@ -23,6 +24,9 @@ const INITIAL_STATE = {
 
   // 预选房源列表
   mySelectHouses: [],
+
+  //
+  onlineProtocol: '',
 }
 
 export default function(state = INITIAL_STATE, action) {
@@ -67,6 +71,13 @@ export default function(state = INITIAL_STATE, action) {
         ...state,
         mySelectHouses: payload.records,
       };
+
+    case SET_ONLINE_PROTOCOL:
+      return {
+        ...state,
+        onlineProtocol: payload,
+      };
+
     default:
       return state;
   }