bug fix

config/dev.js

@@ -5,14 +5,14 @@ module.exports = {
   defineConstants: {
     // HOST: '"http://47.101.36.130:8085"',//测试
     // WSS_HOST: '"wss://47.101.36.130:8085"',
-    HOST: '"https://dev.pawoma.cn"',//测试
-    WSS_HOST: '"wss://dev.pawoma.cn"',
+    // HOST: '"https://dev.pawoma.cn"',//测试
+    // WSS_HOST: '"wss://dev.pawoma.cn"',
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
-    // HOST: '"http://127.0.0.1:8080"',
-    // WSS_HOST: '"ws://127.0.0.1:8080"',
+    HOST: '"http://192.168.2.52:8080"',
+    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'

src/onlineSelling/components/ConsultantItem/index.js

@@ -26,7 +26,7 @@ export default function ConsultantItem(props) {
               }
               <View className="phone">{data.phone}</View>
             </View>
-            {!type && <View className="home">主页</View>}
+            {!type && <View className="home" onClick={props.onHomepage}>主页</View>}
             {type == 'raiseProfile' && <View className="contact" onClick={props.contactClick}>联系我<Text className="right-icon"></Text></View>}
           </View >
         )

src/onlineSelling/components/HouseCard/index.js

@@ -9,7 +9,9 @@ export default function HouseCard(props) {
   const {
     buildingName,
     termname,
+    termName,
     blockName,
+    displayHousePrice,
     unitName,
     floorName,
     roomName,
@@ -21,7 +23,7 @@ export default function HouseCard(props) {
     buildingImgList = [],
   } = props.summary || {}
 
-  const title = `${buildingName || ''} ${termname || ''} ${blockName || ''} ${unitName || ''} ${floorName || ''} ${roomName || ''}`
+  const title = `${buildingName || ''} ${termname || termName || ''} ${blockName || ''} ${unitName || ''} ${floorName || ''} ${roomName || ''}`
   const thumb = (buildingImgList || []).length
   const showDT = dayjs(createDate).format('YYYY/MM/DD')
   const wanY = Number(price)
@@ -50,10 +52,11 @@ export default function HouseCard(props) {
       <View className="body" onClick={toHouseDetail}>
         <View className="badge">已预选</View>
         <View className="title">{title}</View>
-        <View className="subtitle">
+        {displayHousePrice && <View className="subtitle">
           <Text>现价</Text>
           <Text className="red">{wanY + '万元' || '待定'}</Text>
-        </View>
+        </View>}
+
         <View className="meta">{showDT}预选</View>
       </View>
 

src/onlineSelling/components/RaiseCard/index.js

@@ -16,6 +16,7 @@ export default function RaiseCard(props) {
     roomName,
     price,
     houseLockingStatus,
+    displayHousePrice,
     apartmentName,
     mineLocked,
     createDate,
@@ -23,6 +24,7 @@ export default function RaiseCard(props) {
     insideArea,
     payStatus,
     houseId,
+    statusType = '',
     status,
     taHousingResourcesList = [],
     apartmentImgList = [],
@@ -57,8 +59,9 @@ export default function RaiseCard(props) {
     }
   }
   return (
+
     <Block>
-      {status != -1 &&
+      {status == -1 && statusType == "raise" ? '' :
         <View className="housecard" style={props.style} >
           <View className="head" onClick={() => (props.handleCard && props.handleCard())}>
             {thumb && <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" />
@@ -75,11 +78,11 @@ export default function RaiseCard(props) {
               {!props.type && <View style={status == '0' ? 'color:#999' : ''} className={payStatus == 'paid' ? 'raised badge' : payStatus == 'unpaid' ? 'unraise badge' : 'badge'}>{payStatus == 'paid' ? '已缴费' : payStatus == 'unpaid' ? '未缴费' : '已退费'}</View>}
               {(props.type == 'raiseProfile' || props.type == 'houseResource') && <View style="color:#FF3C3C" className='badge'>{mineLocked ? '已锁给我' : '　'}</View>}
               {(props.type == 'raiseProfile' || props.type == 'raiseMoney') && <View style={props.type == 'raiseMoney' ? 'color:#BB9C79;font-size:30rpx' : 'color:#BB9C79;font-size:30rpx;margin-top:-20rpx'}>{apartmentName || '　'}</View>}
-              {props.type == 'raiseMoney' && taRaise.displayHousePrice && <View className="red-price">现价{Number(price) + 0}万</View>}
+              {props.type == 'raiseMoney' && (taRaise.displayHousePrice || displayHousePrice) && <View className="red-price">现价{wanY}万</View>}
               {props.type == 'houseResource' && <View style="color:#BB9C79;font-size:28rpx;margin:-40rpx 0 12rpx 0">{houseLockingStatus == 'locked' ? '已锁定' : '未锁定'}</View>}
               <View className={props.type == 'raiseMoney' && !props.disableCancel ? 'title max' : 'title'} style={status == '0' ? 'color:#999' : ''}>{title}</View>
               {!props.type && <View className="meta">{showDT}</View>}
-              {props.type == 'raiseProfile' && taRaise.displayHousePrice && <View className="price">现价<Text className="red">{Number(price) + 0}</Text>万</View>}
+              {props.type == 'raiseProfile' && (taRaise.displayHousePrice || displayHousePrice) && <View className="price">现价<Text className="red">{wanY}</Text>万</View>}
               {status == '0' && <View style="color:#999;font-size:30rpx">已作废</View>}
               {(props.type == 'raiseProfile' || props.type == 'raiseMoney') &&
                 <Block>

src/onlineSelling/pages/addHouse/index.js

@@ -7,11 +7,11 @@ import ready from '@/utils/ready'
 import { connect } from '@tarojs/redux'
 import * as houseActions from '@/actions/house'
 
-function noop(){}
+function noop() { }
 
 @connect(
   ({ user, house }) => ({ ...user, house }),
-  {...houseActions}
+  { ...houseActions }
 )
 export default class extends Component {
   config = {
@@ -73,7 +73,7 @@ export default class extends Component {
   renderHouses() {
     const { chooseList } = this.state
     const { house } = this.props
-    
+
     // 从预选记录中过滤出来, 状态正常且未锁定的房源
     const houseList = (house.mySelectHouses || []).map(x => x.housingInfo).filter(x => x.status == 1 && x.houseLockingStatus != 'locked')
 

src/onlineSelling/pages/chooseConsultant/index.js

@@ -7,22 +7,22 @@ import { connect } from '@tarojs/redux'
 import * as houseActions from '@/actions/house'
 import Blank from '../../components/Blank'
 
-@connect(({ house }) => ({ house }), {...houseActions})
+@connect(({ house }) => ({ house }), { ...houseActions })
 export default class ConsultantList extends Component {
   config = {
     navigationBarTitleText: '选择置业顾问'
   }
 
-  componentDidMount () {
+  componentDidMount() {
     const { buildingId } = this.$router.params
     const { house } = this.props
 
     // if (!house.consultantList || !house.consultantList.length) {
-      this.props.dispatchGetConsultants({
-        buildingId,
-        pageSize: 999,
-        pageNumber: 1,
-      })
+    this.props.dispatchGetConsultants({
+      buildingId,
+      pageSize: 999,
+      pageNumber: 1,
+    })
     // }
   }
 
@@ -32,7 +32,11 @@ export default class ConsultantList extends Component {
 
     Taro.navigateBack({ delta: 1 })
   }
- 
+  toConsultantDetail(item) {
+    Taro.navigateTo({
+      url: `/pages/card/index?id=${item.id}`
+    })
+  }
   render() {
     const { house } = this.props
 
@@ -40,15 +44,17 @@ export default class ConsultantList extends Component {
       <View className="consultantList">
         {
           (!house.consultantList || !house.consultantList.length) &&
-          (<Blank tips="暂无数据"/>)
+          (<Blank tips="暂无数据" />)
         }
 
         {
-          house.consultantList.map((item,index) => (
+          house.consultantList.map((item, index) => (
             <ConsultantItem
               data={item}
-              key={index+'card'}
-              onClick={this.handleItemClick}>
+              key={index + 'card'}
+              onClick={this.handleItemClick}
+              onHomepage={() => this.toConsultantDetail(item)}
+            >
             </ConsultantItem>
           ))
         }

src/onlineSelling/pages/detail/index.js

@@ -155,12 +155,12 @@ export default class Index extends Component {
 
   // 查看大图
   onPreview = (item, e) => {
-  
+
     var previewArr = [];
     for (var i = 0; i < item.length; i++) {
       previewArr.push(item[i].url);
     }
-   
+
     Taro.previewImage({
       current: previewArr,
       urls: previewArr
@@ -214,7 +214,7 @@ export default class Index extends Component {
                 <View className="name">{houseDetail.apartmentName || '　'}</View>
                 <View className="btn" onClick={() => this.handleChat(houseDetail.buildingId)}>询问优惠</View>
                 {
-                  taRaise.displayHousePrice && <View className="price"> 现价：{houseDetail.price}万</View>
+                  (taRaise.displayHousePrice || houseDetail.displayHousePrice) && <View className="price"> 现价：{houseDetail.price}万</View>
                 }
 
                 {houseDetail.apartmentName &&

src/onlineSelling/pages/raiseMoney/index.js

@@ -11,7 +11,7 @@ import * as houseActions from '@/actions/house'
 import NextStep from './NextStep'
 import { fetch, apis } from '@/utils/request'
 import Captcha from './Captcha'
-import { raiseOrder, cancelOrder, queryPreselectionRecord } from '@/services/project'
+import { raiseOrder, cancelOrder, queryPreselectionRecord, raiseOffline } from '@/services/project'
 import { getCodeMessage, checkCaptcha } from '@/services/getCode'
 import { checkIDCard, isEmpty } from '@/utils/tools'
 import ContactConsultant from '../../components/ContactConsultant'
@@ -223,7 +223,6 @@ export default class raiseMoney extends Component {
     const { house: { raiseCart } } = this.props
     const { raiseProfile = {} } = this.state
     const disabled = raiseProfile.houseLockingType === 'auto'
-
     return (
       <ScrollView scrollY className="container">
         {
@@ -597,7 +596,14 @@ export default class raiseMoney extends Component {
     }
 
     if (payType === 'offLine') {
-      return Promise.resolve()
+      const paramsId = this.$router.params.raiseRecordId || record.raiseRecordId
+      return new Promise((resolve, reject) => {
+        raiseOffline(paramsId).then(res => {
+          resolve()
+        }).catch(err => {
+          reject()
+        })
+      })
     }
 
     const params = {
@@ -620,7 +626,6 @@ export default class raiseMoney extends Component {
             resolve()
           },
           fail(err) {
-            console.log(err, "errrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr")
 
             cancelOrder(params).then(res => { })
 

src/onlineSelling/pages/raiseProfile/index.js

@@ -52,7 +52,7 @@ export default class Raise extends Component {
 
   // 查看所有认筹房源
   viewAllHouses = () => {
-    const { id} = this.$router.params
+    const { id } = this.$router.params
     Taro.navigateTo({
       url: `/onlineSelling/pages/raiseProfile/houseResource?raiseRecordId=${id}`
     })
@@ -60,6 +60,7 @@ export default class Raise extends Component {
 
   renderHead() {
     const { houseList } = this.state
+    console.log(houseList,"houseListhouseListhouseListhouseListhouseList")
     return (
       <Block>
         <View className="head flexSpace">
@@ -202,7 +203,7 @@ export default class Raise extends Component {
     // 缴费信息
     const payInfo = [
       { head: '缴费方式', body: `${raiseDeatil.payType == 'onLine' ? '线上缴费' : '线下缴费'}` },
-      { head: '实际支付费用', body: this.regFenToYuan(orderDetail.totalFee) + '元' },
+      { head: '实际支付费用', body: raiseDeatil.payType == 'onLine' ? this.regFenToYuan(orderDetail.totalFee) + '元' : this.regFenToYuan(raiseOrder.raisePrice) },
       { head: '缴费成功时间', body: dayjs(orderDetail.payTime).format('YYYY/MM/DD HH:mm:ss') },
     ]
 
@@ -220,8 +221,8 @@ export default class Raise extends Component {
     const otherInfo = [
       { head: '其他信息', body: '供核对数据使用' },
       { head: '认筹单编号', body: raiseDeatil.raiseRecordId || '', action: true },
-      { head: '缴费单编号', body: orderDetail.tradeNo || '', action: true, hide: (raiseDeatil.payStatus != 'refunded' && raiseDeatil.payStatus != 'paid') },
-      { head: '退费单编号', body: refundOrder.refundNo || '', action: true, hide: raiseDeatil.payStatus != 'refunded' },
+      { 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' },
     ]
 
 

src/onlineSelling/pages/records/index.js

@@ -230,7 +230,7 @@ export default class Records extends Component {
                 {
                   raiseList.map(item => (
                     <View key={item.raiseRecordId} >
-                      <RaiseCard handleCard={() => this.toRaiseProfile(item.raiseRecordId)} summary={item} />
+                      <RaiseCard handleCard={() => this.toRaiseProfile(item.raiseRecordId)} summary={item} statusType="raise" />
                     </View>
                   )
                   )
@@ -261,10 +261,8 @@ export default class Records extends Component {
 
     }, () => {
       if (this.state.salesBatchId) {
-        console.log('hhhhhhhhhhhhhh')
         this.loadAparamentType(this.state.salesBatchId)
       } else {
-        console.log('hjjjjjjjjjjjhhhh')
         this.setState({
           apartmentList: [{ apartmentName: '请选择', apartmentId: '' }]
         })

src/services/project.js

@@ -33,6 +33,11 @@ export const querySalesInfo = id => fetch({ url: `${API_SALES_BATCH}/${id}` })
  * @param {*} id
  */
 export const queryRaiseDetail = id => fetch({ url: `${API_RATSE_DETAIL}/${id}` })
+/**
+ * 认筹单线下缴费
+ * @param {*} id
+ */
+export const raiseOffline = id => fetch({ url: `${API_RATSE_DETAIL}/${id}`, method: 'PUT' })
 /**
  * 获取房源列表滚动提示
  * @param {*} id

src/useless/pages/agent/recommend/index.js

@@ -102,7 +102,6 @@ export default class Index extends Component {
       this.setState({
         recordId: res.recordId
       })
-      console.log('新增客户')
     })
   }
   componentWillUnmount() {
@@ -499,7 +498,7 @@ export default class Index extends Component {
     const visable = (!phone && !tel)
 
     return (
-      <View style="width:100%;height:100%">
+      <View style="width:100%;height:100vh">
         {visable ? this.renderLogin() : this.renderDetail()}
       </View>
     );