Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/miniapp-v3 into dev

src/constants/api.js

@@ -62,6 +62,8 @@ export const API_PRESELECTION_RECORD = resolvePath('listPreselectionRecord')
 export const API_RAISE_PROFILE = resolvePath('taRaise')
 export const API_SAVE_RAISE_RECORD = resolvePath('taRaiseRecord')
 export const API_RATSE_RECORD = resolvePath('taRaiseRecord/list')
+export const API_RATSE_DETAIL = resolvePath('taRaiseRecord')
+export const API_RATSE_ORDER = resolvePath('unifiedOrder')
 export const API_HOUSE_DETAIL = resolvePath('getHousingDetailById')
 export const API_ADD_PRESELECTION = resolvePath('taPreselectionRecord')
 export const API_CANCEL_PRESELECTION = resolvePath('taPreselectionRecordCancel')

src/onlineSelling/components/RaiseCard/index.js

@@ -23,6 +23,7 @@ export default function HouseCard(props) {
     status = 1,
     area1,
     area2,
+    payStatus,
     code,
     buildingImgList = [],
   } = props.summary || {}
@@ -32,15 +33,7 @@ export default function HouseCard(props) {
   const showDT = dayjs(createDate).format('YYYY/MM/DD')
   const wanY = Number(price)
 
-  const toHouseDetail = () => {
-    if (housingStatus == '0' || saleBatchStatus == '0') {
-      Taro.showToast({ title: '当前销售批次或该房源已被取消发布', icon: 'none', duration: 2000 })
-    } else {
-      Taro.navigateTo({
-        url: `/onlineSelling/pages/detail/index?id=${houseId}`
-      })
-    }
-  }
+
   const copyData = (e) => {
     e.stopPropagation()
     Taro.setClipboardData({
@@ -55,8 +48,8 @@ export default function HouseCard(props) {
     }
   }
   return (
-    <View className="housecard" style={props.style}>
-      <View className="head" onClick={toHouseDetail}>
+    <View className="housecard" style={props.style} onClick={props.handleCard}>
+      <View className="head">
         {thumb ? <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" /> :
           <Text style="font-size:26rpx;color:#666">暂无户型图</Text>
         }
@@ -64,7 +57,7 @@ export default function HouseCard(props) {
       <View className="body">
         {props.type == 'raiseMoney' && <Image src={closeImg} onClick={handleCancel} className="close-img"></Image>}
         <View onClick={toHouseDetail}>
-          {!props.type && <View className={status == '1' ? 'raised badge' : status == '2' ? 'unraise badge' : 'badge'}>{status == '1' ? '已缴费' : '未缴费'}</View>}
+          {!props.type && <View 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={status == '1' ? 'raised badge' : status == '2' ? 'unraise badge' : 'badge'}>{status == '1' ? '已锁给我' : '未缴费'}</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' && <View className="red-price">现价{Number(price) + 0}万</View>}

src/onlineSelling/pages/raiseMoney/index.js

@@ -10,6 +10,7 @@ import * as houseActions from '@/actions/house'
 import NextStep from './NextStep'
 import { fetch, apis } from '@/utils/request'
 import Captcha from './Captcha'
+import { raiseOrder } from '@/services/project'
 
 const getRaiseProfile = ({raiseId, salesBatchId, personId}) => {
   const queryString = [
@@ -70,6 +71,10 @@ export default class raiseMoney extends Component {
         })
         return;
       }
+      
+      if (this.$router.params.type == 'pay') {
+        this.setState({ current: 3 })
+      }
     })
   }
 
@@ -133,7 +138,7 @@ export default class raiseMoney extends Component {
       <ScrollView scrollY className="container">
         {
           raiseCart.map(item => (
-              <View key={item.preselectionRecordId} >
+              <View key={item.houseId} >
                 <RaiseCard type="raiseMoney" summary={item} onCancel={this.handleCancel}/>
               </View>
             )
@@ -188,7 +193,7 @@ export default class raiseMoney extends Component {
 
   tochooseConsultant() {
     Taro.navigateTo({
-      url: 'onlineSelling/pages/chooseConsultant/index'
+      url: '/onlineSelling/pages/chooseConsultant/index'
     })
   }
   renderProfile() {
@@ -248,7 +253,7 @@ export default class raiseMoney extends Component {
       <ScrollView scrollY className="container2" style="padding:0 30rpx">
         <View className="profile-flex">
           <View className="title">认筹金额</View>
-          <View className="price">30000 元</View>
+          <View className="price">1 元</View>
         </View>
         <View className="center-title">线上选房协议</View>
       </ScrollView >
@@ -266,20 +271,65 @@ export default class raiseMoney extends Component {
       })
     })
   }
+
+  makePay = () => {
+    const params = {
+      targetId: this.$router.params.id,
+      targetType: 'house'
+    }
+    
+    return new Promise((resolve, reject) => {
+      raiseOrder(params).then(res => {
+        Taro.requestPayment({
+          timeStamp: res.timeStamp,
+          nonceStr: res.noncestr,
+          package: `prepay_id=${res.prepayid}`,
+          signType: 'MD5',
+          paySign: res.sign,
   
+          success(res) {
+            // TODO 缴费成功
+
+            // 调用远程接口
+
+
+            // 最后
+            resolve()
+          },
+          fail(res) {
+            // TODO 缴费失败
+
+            // 然后
+            reject()
+          }
+        })
+      })
+    })
+
+  }
+
   nextStep(current) {
+    switch (current) {
+      // 认筹确认
+      case 2:
+        this.makeRaiseRecord().then(() => {
+          this.setState({
+            current: current + 1
+          })
+        })
+        return;
 
-    // 确定认筹
-    if (current === 2) {
-      this.makeRaiseRecord().then(() => {
+      // 缴费
+      case 3:
+        this.makePay()
+        return;
+
+      //
+      default:
         this.setState({
           current: current + 1
         })
-      })
-    } else {
-      this.setState({
-        current: current + 1
-      })
+
     }
   }
 

src/onlineSelling/pages/raiseProfile/Cell.js

@@ -1,4 +1,4 @@
-import { View } from '@tarojs/components'
+import { View, Block } from '@tarojs/components'
 import './index.scss'
 import NamedIcon from '../../components/NamedIcon'
 
@@ -7,24 +7,28 @@ export default function (props) {
   console.log('------->', props)
 
   return (
-    <View className={`raiseCell ${disable}`}>
-      <View className="row">
-        <View className="head">{props.head}</View>
-        <View className="body">{props.body}</View>
-        <View className="action" onClick={props.onActionClick}>
+    <Block>
+      {
+        !props.hide && <View className={`raiseCell ${disable}`}>
+          <View className="row">
+            <View className="head">{props.head}</View>
+            <View className="body">{props.body}</View>
+            <View className="action" onClick={props.onActionClick}>
+              {
+                props.action && (<NamedIcon name="copy" size={34} />)
+              }
+            </View>
+          </View>
           {
-            props.action && (<NamedIcon name="copy" size={34} />)
+            props.desc &&
+            (
+              <View className="row desc">
+                <View className="desc">{props.desc}</View>
+              </View>
+            )
           }
         </View>
-      </View>
-      {
-        props.desc &&
-        (
-          <View className="row desc">
-            <View className="desc">{props.desc}</View>
-          </View>
-        )
       }
-    </View>
+    </Block>
   )
 }

src/onlineSelling/pages/raiseProfile/CellBlock.js

@@ -22,6 +22,7 @@ export default function(props) {
               head={item.head}
               body={item.body}
               action={item.action}
+              hide={item.hide}
               desc={item.desc}
               onActionClick={handleActionClick.bind(this, item)}
               />

src/onlineSelling/pages/raiseProfile/houseResource.js

@@ -55,7 +55,7 @@ export default class HouseResource extends Component {
       <View style="padding-top:30rpx">
         {
           list.map(item => (
-            <View key={item.preselectionRecordId} >
+            <View key={item.raiseRecordId} >
               <RaiseCard type="houseResource" summary={item} />
             </View>
           )

src/onlineSelling/pages/raiseProfile/index.js

@@ -7,6 +7,8 @@ import ContactConsultant from '../../components/ContactConsultant'
 import ConsultantItem from '../../components/ConsultantItem/index'
 import NamedIcon from '../../components/NamedIcon'
 import RaiseCard from '../../components/RaiseCard'
+import { queryRaiseDetail } from '@/services/project'
+
 
 import './index.scss'
 import consultant from 'dist/components/consultant'
@@ -17,10 +19,23 @@ export default class extends Component {
   }
 
   state = {
-    buildingId: '9f021a59b2a714822894c23ccca8c2db', // must change this
+    buildingId: '',
+    raiseDeatil: {},
+    houseList: [],
+    raiseOrder: {}
   }
 
-  componentWillMount() { }
+  componentWillMount() {
+    const { raiseRecordId } = this.$router.params
+    queryRaiseDetail(raiseRecordId).then(res => {
+      this.setState({
+        buildingId: res.taRaiseRecord.buildingId,
+        raiseDeatil: res.taRaiseRecord || {},
+        houseList: res.houseList || [],
+        raiseOrder: res.taRaise || {},
+      })
+    })
+  }
 
   // 复制数据
   copyData(data) {
@@ -30,10 +45,7 @@ export default class extends Component {
     })
   }
 
-  // 跳转去交费
-  toPay = () => {
 
-  }
 
   // 查看所有认筹房源
   viewAllHouses = () => {
@@ -43,34 +55,7 @@ export default class extends Component {
   }
 
   renderHead() {
-    const item = {
-      apartmentId: null,
-      apartmentName: 'A户型',
-      avatarurl: null,
-      blockName: "1栋",
-      buildingId: "9f021a59b2a714822894c23ccca8c2db",
-      buildingImgList: null,
-      buildingName: "万科安平园舍",
-      createDate: "2020-02-27T16:31:56",
-      floorName: "1楼",
-      houseId: "820",
-      housingStatus: "1",
-      name: null,
-      nameOrnick: null,
-      orgId: 84,
-      personId: "899b8930e85125471f0981eec4a0de3c",
-      phone: null,
-      preselectionRecordId: 205,
-      price: "111.00000000",
-      roomName: "1户",
-      saleBatchStatus: "1",
-      status: 1,
-      termname: "1期",
-      unitName: "2单元",
-      area1: '290',
-      area2: '270',
-
-    }
+    const { houseList } = this.state
     return (
       <Block>
         <View className="head flexSpace">
@@ -78,13 +63,14 @@ export default class extends Component {
             <View className="title">认筹房源</View>
           </View>
           <View className="flexSpace-fixed">
-            <View className="gray" onClick={this.viewAllHouses}>
-              <Text>查看全部（4）</Text>
+            {houseList.length > 1 && <View className="gray" onClick={this.viewAllHouses}>
+              <Text>查看全部（{houseList.length}）</Text>
               <Text className='at-icon at-icon-chevron-right'></Text>
-            </View>
+            </View>}
+
           </View>
         </View>
-        <RaiseCard summary={item} type="raiseProfile" style="height:280rpx" />
+        <RaiseCard summary={houseList[0]} type="raiseProfile" style="height:280rpx" />
       </Block>
     )
   }
@@ -107,9 +93,16 @@ export default class extends Component {
       </Block>
     )
   }
-
+  // 跳转去交费
+  toPay = () => {
+    const { raiseDeatil: { raiseRecordId } } = this.state
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/raiseMoney/index?type=pay&id=${raiseRecordId}`
+    })
+  }
   // 未交费提示
   renderUnpayNotice() {
+    const { raiseOrder } = this.state
     return (
       <Block>
         <View className="unpayNotice flexSpace" onClick={this.toPay}>
@@ -119,7 +112,7 @@ export default class extends Component {
           </View>
           <View className="flexSpace-fixed">
             <Text className="a-line">认筹金额</Text>
-            <Text className="a-line price">30000元</Text>
+            <Text className="a-line price">{raiseOrder.raisePrice}元</Text>
           </View>
         </View>
         <View className="hr"></View>
@@ -128,18 +121,18 @@ export default class extends Component {
   }
 
   render() {
-    const { buildingId } = this.state;
+    const { buildingId, raiseDeatil } = this.state;
 
     // 认筹信息
     const raiseInfo = [
-      { head: '认筹人', body: '姓名' },
-      { head: '身份证号', body: '412702199709215528' },
-      { head: '手机号', body: '17716241245' },
+      { head: '认筹人', body: `${raiseDeatil.name || ''}`, },
+      { head: '身份证号', body: `${raiseDeatil.idcard || ''}` },
+      { head: '手机号', body: `${raiseDeatil.tel || ''}` },
     ]
 
     // 缴费信息
     const payInfo = [
-      { head: '缴费方式', body: '线上缴费/线下缴费' },
+      { head: '缴费方式', body: `${raiseDeatil.payType == 'onLine' ? '线上缴费' : '线下缴费'}` },
       { head: '实际支付费用', body: '234元' },
       { head: '缴费成功时间', body: dayjs('2020-2-28 17:12:48').format('YYYY/MM/DD HH:mm:ss') },
     ]
@@ -157,9 +150,9 @@ export default class extends Component {
     // 其他信息
     const otherInfo = [
       { head: '其他信息', body: '供核对数据使用' },
-      { head: '认筹单编号', body: '234567890-09876545678', action: true },
-      { head: '缴费单编号', body: '234567890-09876543456', action: true },
-      { head: '退费单编号', body: '234567890-09876543423', action: true },
+      { head: '认筹单编号', body: `${raiseDeatil.raiseRecordId}`, action: true },
+      { head: '缴费单编号', body: '234567890-09876543456', action: true, hide: `${raiseDeatil.payStatus == 'paid' ? false : true}` },
+      { head: '退费单编号', body: '234567890-09876543423', action: true, hide: `${raiseDeatil.payStatus == 'refunded' ? false : true}` },
     ]
     const consultantInfo = {
       name: '哈哈哈1',
@@ -171,9 +164,9 @@ export default class extends Component {
       <View className="raiseProfilePage">
         <View className="main">
           {this.renderHead()}
-          <View className="tip">注意：请在一个工作日内，到售楼处或项目现场办理认购手续。逾期未办理视为放弃购买。</View>
-          {this.renderCancelReason()}
-          {this.renderUnpayNotice()}
+          <View className="tip">{raiseDeatil.payDescription || ''}</View>
+          {raiseDeatil.status == '0' && this.renderCancelReason()}
+          {raiseDeatil.payStatus == 'unpaid' && this.renderUnpayNotice()}
           <View>
             <CellBlock dataset={raiseInfo} />
             <ConsultantItem
@@ -183,10 +176,18 @@ export default class extends Component {
               onClick={this.handleItemClick}>
             </ConsultantItem>
             <View className="hr" />
-            <CellBlock dataset={payInfo} />
-            <View className="hr" />
-            <CellBlock dataset={refundInfo} />
-            <View className="hr" />
+            {raiseDeatil.payStatus == 'paid' &&
+              <Block>
+                <CellBlock dataset={payInfo} />
+                <View className="hr" />
+              </Block>}
+
+            {/* unpaid未缴费paid已缴费refunded已退费 */}
+            {raiseDeatil.payStatus == 'refunded' &&
+              <Block>
+                <CellBlock dataset={refundInfo} />
+                <View className="hr" />
+              </Block>}
             <CellBlock dataset={otherInfo} disable onActionClick={dt => this.copyData(dt.body)} />
           </View>
           <View></View>

src/onlineSelling/pages/records/index.js

@@ -3,7 +3,7 @@ import { View, ScrollView, Block } from '@tarojs/components'
 import HouseCard from '../../components/HouseCard'
 import RaiseCard from '../../components/RaiseCard'
 import { getItemList } from '@/services/item'
-import { queryPreselectionRecord, queryRaiseRecord, querySalesList } from '@/services/project'
+import { queryPreselectionRecord, queryRaiseRecord, querySalesList, queryApartmentType } from '@/services/project'
 import { connect } from '@tarojs/redux'
 import ready from '@/utils/ready'
 import Blank from '../../components/Blank'
@@ -37,6 +37,10 @@ export default class Records extends Component {
     saleBatch: '',
     salesBatchId: '',
 
+    apartmentList: [],
+    apartmentValue: '',
+    apartmentId: '',
+
     lockStatus: [{ value: '不限', code: '' }, { value: '未锁定', code: 'unlocked' }, { value: '已锁定', code: 'locked' }],
     lockStatusValue: '',
     houseLockingStatus: '',
@@ -145,6 +149,11 @@ export default class Records extends Component {
       </Block>
     )
   }
+  toRaiseProfile(id) {
+    Taro.navigateTo({
+      url: `/onlineSelling/pages/raiseProfile/index?raiseRecordId=${id}`
+    })
+  }
   renderRaise() {
     const { raiseList, noRaiseRecord } = this.state
     return (
@@ -155,15 +164,15 @@ export default class Records extends Component {
             <ScrollView scrollY>
               {
                 raiseList.map(item => (
-                  <View key={item.preselectionRecordId} >
-                    <RaiseCard summary={item} />
+                  <View key={item.raiseRecordId} >
+                    <RaiseCard handleCard={this.toRaiseProfile(item.raiseRecordId)} summary={item} />
                   </View>
                 )
                 )
               }
             </ScrollView >
         }
-        <Statement />
+        <Statement styel="margin-top:80rpx" />
 
 
       </Block>
@@ -184,13 +193,35 @@ export default class Records extends Component {
       saleBatch: salesList[e.detail.value].salesBatchName,
       salesBatchId: salesList[e.detail.value].salesBatchId,
 
+    }, () => {
+      if (this.state.salesBatchId) {
+        console.log('hhhhhhhhhhhhhh')
+        this.loadAparamentType(this.state.salesBatchId)
+      } else {
+        console.log('hjjjjjjjjjjjhhhh')
+        this.setState({
+          apartmentList: [{ apartmentName: '请选择', apartmentId: '' }]
+        })
+      }
+    })
+  }
+  loadAparamentType(salesBatchId) {
+    queryApartmentType({ salesBatchId: salesBatchId }).then(res => {
+      res.unshift({ apartmentName: '请选择', apartmentId: '' })
+      this.setState({
+        apartmentList: res || []
+      })
     })
   }
   handleApartmentChange = e => {
 
+    const { apartmentList } = this.state
+
     this.setState({
-      status: selector[e.detail.value].buildingTypeName
+      apartmentValue: apartmentList[e.detail.value].apartmentName,
+      apartmentId: apartmentList[e.detail.value].apartmentId,
     })
+
   }
   handleLockStatusChange = e => {
     const { lockStatus } = this.state
@@ -216,6 +247,8 @@ export default class Records extends Component {
       buildingId: '',
       saleBatch: '',
       salesBatchId: '',
+      apartmentValue: '',
+      apartmentId: '',
       lockStatusValue: '',
       houseLockingStatus: '',
       lockCustomerValue: '',
@@ -235,7 +268,7 @@ export default class Records extends Component {
       screenVisible: false
     })
     const { userInfo: { person: { personId } } } = this.props
-    const { buildingId, salesBatchId, houseLockingStatus, customerLocked } = this.state
+    const { buildingId, salesBatchId, houseLockingStatus, apartmentId, customerLocked } = this.state
 
     if (this.state.current == '0') {
 
@@ -245,6 +278,7 @@ export default class Records extends Component {
         pageSize: 999,
         buildingId,
         salesBatchId,
+        apartmentId,
         houseLockingStatus,
         customerLocked
       }
@@ -267,7 +301,7 @@ export default class Records extends Component {
   }
 
   renderPreselectScreen() {
-    const { current, buildingValue, buildingList, saleBatch, salesList, lockCustomerValue, lockCustomer, lockStatusValue, lockStatus } = this.state
+    const { current, buildingValue, buildingList, saleBatch, salesList, apartmentList, apartmentValue, lockCustomerValue, lockCustomer, lockStatusValue, lockStatus } = this.state
 
     const selector = [{ buildingTypeName: '楼盘1' }, { buildingTypeName: '楼盘2' }, { buildingTypeName: '楼盘3' }, { buildingTypeName: '楼盘4' }]
 
@@ -276,6 +310,7 @@ export default class Records extends Component {
       <View className="base-con">
         <PickerComponent title="选择楼盘" selector={buildingList} keyValue={"buildingName"} currentValue={buildingValue || ''} handleChange={this.handleBuildingChange} />
         <PickerComponent title="选择销售批次" selector={salesList} keyValue={"salesBatchName"} currentValue={saleBatch || ''} handleChange={this.handleSaleBatchChange} />
+        {current == '0' && <PickerComponent title="选择户型" selector={apartmentList} keyValue={"apartmentName"} currentValue={apartmentValue || ''} handleChange={this.handleApartmentChange} />}
         <PickerComponent title="锁定状态" selector={lockStatus} keyValue={"value"} currentValue={lockStatusValue || ''} handleChange={this.handleLockStatusChange} />
         {current == '0' && <PickerComponent title="锁定客户" keyValue={"value"} selector={lockCustomer} currentValue={lockCustomerValue || ''} handleChange={this.handleCustomerChange} />}
 
@@ -307,6 +342,8 @@ export default class Records extends Component {
       buildingId: '',
       saleBatch: '',
       salesBatchId: '',
+      apartmentValue: '',
+      apartmentId: '',
       lockStatusValue: '',
       houseLockingStatus: '',
       lockCustomerValue: '',

src/services/project.js

@@ -9,7 +9,10 @@ import {
   API_CANCEL_PRESELECTION,
   API_APARTMENT_TYPE,
   API_NOTICE_INFO,
-  API_SALES_BATCH
+  API_SALES_BATCH,
+  API_RATSE_DETAIL,
+  API_RATSE_ORDER
+
 } from '@/constants/api'
 
 
@@ -23,12 +26,17 @@ export const queryHouseList = payload => fetch({ url: API_HOUSE_LIST, payload })
  * 获取房源分享信息
  * @param {*} id
  */
-export const querySalesInfo = id => fetch({ url: `${API_SALES_BATCH}/${id}`})
+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 queryNoticeInfo = id => fetch({ url: `${API_NOTICE_INFO}/${id}`})
+export const queryNoticeInfo = id => fetch({ url: `${API_NOTICE_INFO}/${id}` })
 
 /**
  * 预选房源
@@ -39,7 +47,7 @@ export const addPreselection = payload => fetch({ url: API_ADD_PRESELECTION, pay
  * 取消预选房源
  * @param {*} payload
  */
-export const cancelPreselection = payload => fetch({ url: `${API_CANCEL_PRESELECTION}?${'houseId='+payload.houseId}&${'personId='+payload.personId}`, method: 'DELETE' })
+export const cancelPreselection = payload => fetch({ url: `${API_CANCEL_PRESELECTION}?${'houseId=' + payload.houseId}&${'personId=' + payload.personId}`, method: 'DELETE' })
 /**
  * 获取房源详情
  * @param {*} payload
@@ -65,7 +73,12 @@ export const querySalesList = payload => fetch({ url: API_SALESBATCH_LIST, paylo
  * 获取某销售批次下所有房源户型
  * @param {*} payload
  */
-export const queryApartmentType= payload => fetch({ url: API_APARTMENT_TYPE, payload })
+export const queryApartmentType = payload => fetch({ url: API_APARTMENT_TYPE, payload })
+/**
+ *认筹下单接口
+ * @param {*} payload
+ */
+export const raiseOrder = payload => fetch({ url: API_RATSE_ORDER, payload, method: 'POST' })