dev

config/dev.js

@@ -15,7 +15,7 @@ module.exports = {
     // WSS_HOST: '"ws://192.168.2.52:8080"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
-    Version: 'V3.5.12'
+    Version: 'V3.5.13'
   },
   weapp: {},
   h5: {}

config/prod.js

@@ -5,13 +5,13 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://192.168.2.52:8080"',
     // WSS_HOST: '"ws://192.168.2.52:8080"',
-    HOST: '"https://dev.pawoma.cn"',// 新测试
-    WSS_HOST: '"wss://dev.pawoma.cn"',
-    // HOST: '"https://lt.pawoma.cn"',
-    // WSS_HOST: '"wss://lt.pawoma.cn"',
+    // HOST: '"https://dev.pawoma.cn"',// 新测试
+    // WSS_HOST: '"wss://dev.pawoma.cn"',
+    HOST: '"https://lt.pawoma.cn"',
+    WSS_HOST: '"wss://lt.pawoma.cn"',
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
-    Version: 'V3.5.12'
+    Version: 'V3.5.13'
   },
   weapp: {},
   h5: {}

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/houseList/index.js

@@ -53,7 +53,6 @@ export default class HouseList extends Component {
     endPrice: '',
     apartmentId: '',
     reportedCustomer: false,
-    posterShow: false,
     posterData: {},
     buildingId: null,
     salesBatchDetail: {},
@@ -623,7 +622,8 @@ export default class HouseList extends Component {
 
     const { userInfo: { person } } = this.props
 
-    const showCircleBtn = posterData && posterData.qrcode
+    // 必须正确生成二维码, 且维护了海报图
+    const showCircleBtn = posterData && posterData.qrcode && posterData.poster
     console.log('==============>', posterData, showPoster, posterConfig)
 
     const screenList = [{ title: '预选热度图', value: 1 }, { title: '认筹热度图', value: 2 }]

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/raiseMoney/index.js

@@ -60,10 +60,10 @@ export default class raiseMoney extends Component {
       { label: '线上缴费', value: 'onLine' },
       { label: '线下缴费', value: 'offLine' },
     ],
-    payClick: true,
   }
 
   captchaLock = false
+  paying = false
 
   // 此页面不支持分享，以及二维码
   componentWillMount() {
@@ -598,9 +598,6 @@ export default class raiseMoney extends Component {
   }
 
   makePay = () => {
-    this.setState({
-      payClick: false
-    })
     const { payType, record = {} } = this.state
     if (!payType) {
       Taro.showToast({
@@ -708,6 +705,8 @@ export default class raiseMoney extends Component {
   }
 
   nextStep(current) {
+    if (this.paying) return;
+
     // 缴费的下一步
     if (current > 3) {
       this.setState({
@@ -744,13 +743,18 @@ export default class raiseMoney extends Component {
 
         // 缴费
         case 3:
-          this.makePay().then(() => {
+          this.paying = true
 
+          this.makePay().then(() => {
             this.setState({
-              payClick: true,
               current: current + 1
             })
+
+            this.paying = false
+          }).catch(() => {            
+            this.paying = false
           })
+
           return;
 
         //
@@ -771,7 +775,7 @@ export default class raiseMoney extends Component {
   }
 
   renderBottomBtn() {
-    const { current, protocolCountdown, payClick } = this.state
+    const { current, protocolCountdown } = this.state
     const { payType } = this.state
     return (
       <View className="bottom-btn">
@@ -779,7 +783,7 @@ export default class raiseMoney extends Component {
         {current != 4 &&
           <NextStep
             countdown={current == 1 ? protocolCountdown : 0}
-            onClick={() => payClick ? this.nextStep(current) : ''}
+            onClick={() => this.nextStep(current)}
             text={current == 3 && payType === 'onLine' ? '现在缴费' : '下一步'}
           />
         }

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,10 +232,12 @@ 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: orderDetail.tradeNo || '', action: true, hide: !(raiseDeatil.payType == 'onLine' && (raiseDeatil.payStatus == 'refunded' || raiseDeatil.payStatus == 'paid')) },
+      { head: '微信退费单', body: refundOrder.refundNo || '', action: true, hide: refundOrder.payStatus != 'refunded' },
     ]
 
+    console.log('------------------>', raiseOrder.payType == 'onLine' && (raiseDeatil.payStatus == 'refunded' || raiseDeatil.payStatus == 'paid'))
+
 
     return (
       <View className="raiseProfilePage">
@@ -240,7 +248,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/pages/project/NavIcons/icons.js

@@ -12,9 +12,9 @@ export default [
     iconCode: 'refercustomers',
     iconName: '推荐客户',
     page: ({ city, personType }) => {
-      if (personType !== ROLE_CODE['CONSULTANT']) return false;
+      if (personType === ROLE_CODE['CONSULTANT']) return false;
 
-      return `/useless/pages/agent/recommend/index?type=index&cityId=${city}`
+      return `/useless/pages/agent/recommend/index?type=index&cityId=${(city || {}).id}`
     },
     iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811691300-recommend-icon.png',
     default: true,

src/pages/project/h5Page.js

@@ -383,7 +383,7 @@ export default class Index extends Component {
 
     const originURL = parseURL(pageInfo.h5Address) || {}
     const queryString = [webUrlParams, originURL.query].join('&')
-    const webURL = [`${originURL.origin}${originURL.host}?${queryString}`, originURL.hash].join('#')
+    const webURL = [`${originURL.origin}${originURL.path}?${queryString}`, originURL.hash].join('#')
 
     return (
       <Block>

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;
   }