record

config/dev.js

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

src/constants/api.js

@@ -59,10 +59,12 @@ export const API_INDEX_ICONS = resolvePath('taMiniappOrgIcon')
 
 export const API_HOUSE_LIST = resolvePath('listHousingResources')
 export const API_PRESELECTION_RECORD = resolvePath('listPreselectionRecord')
+export const API_RATSE_RECORD = resolvePath('taRaiseRecord/list')
 export const API_HOUSE_DETAIL = resolvePath('getHousingDetailById')
 export const API_ADD_PRESELECTION = resolvePath('taPreselectionRecord')
 export const API_CANCEL_PRESELECTION = resolvePath('taPreselectionRecordCancel')
 export const API_APARTMENT_TYPE = resolvePath('listBuildApartmentBySalesBatchId')
+export const API_SALESBATCH_LIST = resolvePath('taSalesBatch/choice')
 export const API_NOTICE_INFO = resolvePath('getNoticeInfo')
 export const API_SALES_BATCH = resolvePath('taSalesBatch')
 export const API_ADDLIVE_NUM = resolvePath('addVisitNum')

src/onlineSelling/components/HouseGrid/Room.js

@@ -6,9 +6,11 @@ import preselectionImg from '../../assets/preselection.png'
 import chipsImg from '../../assets/chips.png'
 
 export default function Room(props) {
-  const { roomName, heat, realHeat, price, apartmentName, status, showAction, ownerd } = props.dataset || {}
+  const { roomName, heat, realHeat, status, raiseHeat, raiseRealHeat, showAction, ownerd, houseLockingStatus, mineLocked, minePreselection, mineRaise } = props.dataset || {}
   // const personNum = `(${realHeat + heat + 0}人)`
+  const { currentHot = 0 } = props
   const personNum = realHeat + heat + 0
+  const raisePersonNum = raiseHeat + raiseRealHeat + 0
 
   const handleClick = () => {
     if (props.onClick) {
@@ -25,26 +27,26 @@ export default function Room(props) {
   }
 
   return (
-    <HotBlock number={heat + realHeat + 0}>
+    <HotBlock number={currentHot == '0' ? personNum : raisePersonNum}>
       {
         status == '1' &&
-          (<View className="room">
-            <View onClick={handleClick}>
-              <View className="roomname">{roomName || ''}</View>
-              <View className="yuxuan">{personNum}预选</View>
-              <View className="yuxuan">{personNum}认筹</View>
-              <Image src={preselectionImg} className="preselection-img"></Image>
-              <Image src={chipsImg} className="chips-img"></Image>
-              <Image src={lockImg} className="lock-img"></Image>
-            </View>
-            {
-              !showAction && (
-                <View className="action" onClick="handleActionClick">
-                  <View className={`at-icon at-icon-${actionIcon}`}></View>
-                </View>
-              )
-            }
-          </View>)
+        (<View className="room">
+          <View onClick={handleClick}>
+            <View className="roomname">{roomName || ''}</View>
+            <View className="yuxuan">{personNum}预选</View>
+            <View className="yuxuan">{raisePersonNum}认筹</View>
+            {minePreselection && <Image src={preselectionImg} className="preselection-img"></Image>}
+            {mineRaise && <Image src={chipsImg} className="chips-img"></Image>}
+            {houseLockingStatus == 'locked' && <Image src={lockImg} style={mineLocked ? 'position: absolute; right: 2px;bottom: 3px;' : ''} className="lock-img"></Image>}
+          </View>
+          {
+            !showAction && (
+              <View className="action" onClick="handleActionClick">
+                <View className={`at-icon at-icon-${actionIcon}`}></View>
+              </View>
+            )
+          }
+        </View>)
       }
 
     </HotBlock>

src/onlineSelling/components/HouseGrid/room.scss

@@ -19,6 +19,7 @@
 
   .yuxuan {
    color: #333;
+   white-space: nowrap;
   }
 
   .tip {

src/onlineSelling/components/Picker/index.js

@@ -6,7 +6,7 @@ import emptyImg from '@/assets/empty.png'
 import './index.scss'
 
 export default function HouseCard(props) {
-  const { selector, title, currentValue,key } = props || {}
+  const { selector, title, currentValue, keyValue } = props || {}
 
 
 
@@ -16,13 +16,11 @@ export default function HouseCard(props) {
         {title}
       </View>
       <View className="con-picker" >
-        <View>
-          <Picker mode='selector' range={selector} range-key={key} onChange={props.handleChange}>
-            <View className='picker'>
-              {currentValue}
-            </View>
-          </Picker>
-        </View>
+        <Picker mode='selector' range={selector} range-key={keyValue} onChange={props.handleChange}>
+          <View className='picker'>
+            {currentValue}
+          </View>
+        </Picker>
         <View className="choose">请选择</View>
       </View>
     </View>

src/onlineSelling/components/Picker/index.scss

@@ -4,6 +4,7 @@
   border-bottom: 1px solid #dcdcdc;
   line-height: 98px;
   align-items: center;
+  position: relative;
   .title{
     font-size: 33px;
     color: #333;
@@ -18,13 +19,21 @@
     padding: 0 16px;
     border-radius: 4px;
     .picker{
-      width: 300px;
-      height:48px ;
+      width: 450px;
+      line-height:98px ;
+      height: 98px;
+      z-index: 1;
+      position: absolute;
+      top: 0;
+      font-size: 32px;
     }
   }
   .choose{
    font-size: 24px;
    color: #E4A938;
+   float: right;
+   position: absolute;
+   right: 40px;
 
   }
 }

src/onlineSelling/pages/detail/index.js

@@ -10,6 +10,7 @@ import { transferImage } from '@/utils/tools'
 import Blank from '../../components/Blank'
 import * as noticeType from '@/constants/common.js'
 import Statement from '../../components/Statement'
+import { View } from '@tarojs/components';
 
 @connect(
   ({ user }) => ({ ...user })
@@ -208,16 +209,21 @@ export default class Index extends Component {
               </View>
               <Statement style="margin: 104rpx 0 30rpx 0" />
               <View style="padding: 0 30rpx;">
-                {!houseDetail.isPreselect ?
-                  <View className="choose-btn" onClick={() => this.open()}>
-                    预选此房源
+                {
+                  houseDetail.raiseBtn && <View>
+                    {!houseDetail.isPreselect ?
+                      <View className="choose-btn" onClick={() => this.open()}>
+                        预选此房源
                   </View> : <View className="choose-btn" onClick={() => this.open()}>
-                    取消预选
+                        取消预选
+                  </View>
+                    }
                   </View>
                 }
-                <View className="raise-btn" onClick={() => this.toRaiseMoney()}>
+
+                {houseDetail.preselectionBtn && <View className="raise-btn" onClick={() => this.toRaiseMoney()}>
                   认筹此房源
-              </View>
+              </View>}
               </View>
             </View>
           </ScrollView>

src/onlineSelling/pages/houseList/index.js

@@ -394,13 +394,13 @@ export default class HouseList extends Component {
   }
 
   renderHouses() {
-    const { houseList } = this.state
+    const { houseList,currentHot } = this.state
 
     return (
       <ScrollView className="container" scrollY scrollWithAnimation>
         {
           houseList.map((item) => {
-            return <HouseGrid key={item.unitId} dataset={item} onRoomClick={this.handleRoomClick} />
+            return <HouseGrid key={item.unitId} currentHot={currentHot} dataset={item} onRoomClick={this.handleRoomClick} />
           })
         }
       </ScrollView>
@@ -594,7 +594,7 @@ export default class HouseList extends Component {
     this.goto(`/pages/project/detail/index?id=${buildingId}`)
   }
   handleScreen(value) {
-  
+    console.log(value,"valueffffffffffffffffffffffffffff")
     this.setState({
       currentHot: value,
     })
@@ -624,6 +624,7 @@ export default class HouseList extends Component {
 
     const showCircleBtn = posterData && posterData.qrcode
     console.log('==============>', posterData, showPoster, posterConfig)
+
     const screenList = [{ title: '预选热度图', value: 0 }, { title: '认筹热度图', value: 1 }]
     return (
       <Block>
@@ -663,7 +664,6 @@ export default class HouseList extends Component {
                   circleBtn={showCircleBtn}
                   onShareFrineds={this.handleShareFrineds}
                   onSharingCircleOfFriends={() => this.togglePosterStatus(true)}
-                // onSharingCircleOfFriends={this.handleSharingCircleOfFriends}
                 />
               </ActSheet>
             </Block>

src/onlineSelling/pages/records/index.js

@@ -2,7 +2,8 @@ import Taro, { Component } from '@tarojs/taro'
 import { View, ScrollView, Block } from '@tarojs/components'
 import HouseCard from '../../components/HouseCard'
 import RaiseCard from '../../components/RaiseCard'
-import { queryPreselectionRecord } from '@/services/project'
+import { getItemList } from '@/services/item'
+import { queryPreselectionRecord, queryRaiseRecord, querySalesList } from '@/services/project'
 import { connect } from '@tarojs/redux'
 import ready from '@/utils/ready'
 import Blank from '../../components/Blank'
@@ -12,7 +13,7 @@ import PickerComponent from '../../components/Picker'
 import './index.scss'
 
 @connect(
-  ({ user }) => ({ ...user })
+  ({ user, city }) => ({ ...user, ...city })
 )
 
 export default class Records extends Component {
@@ -21,12 +22,28 @@ export default class Records extends Component {
   }
 
   state = {
-    recordList: [],
+
     current: 0,
+    recordList: [],
     noRecord: false,
-    building: '',
+    raiseList: [],
+    noRaiseRecord: false,
+    screenVisible: false,
+    buildingList: [],
+    buildingValue: '',
+    buildingId: '',
+
+    salesList: [],
     saleBatch: '',
-    status: '',
+    salesBatchId: '',
+
+    lockStatus: [{ value: '不限', code: '' }, { value: '未锁定', code: 'unlocked' }, { value: '已锁定', code: 'locked' }],
+    lockStatusValue: '',
+    houseLockingStatus: '',
+
+    lockCustomer: [{ value: '不限', code: '' }, { value: '我自己', code: 'mine' }, { value: '其他人', code: 'other' }],
+    lockCustomerValue: '',
+    customerLocked: '',
   }
   componentDidShow() {
     ready.queue(() => {
@@ -34,31 +51,61 @@ export default class Records extends Component {
       const { userInfo: { person: { personId } } } = this.props
       const params = {
         personId,
-        pageNum: 1,
+        pageNumber: 1,
         pageSize: 999,
       }
-      queryPreselectionRecord(params).then(res => {
-        const list = res.records
+      this.getPreselection(params)
+      this.getRaise(params)
+      querySalesList().then(res => {
+        res.unshift({ salesBatchName: '请选择', salesBatchId: '' })
+        this.setState({
+          salesList: res || [],
+
+        })
+      })
+      this.loadBuildingList()
+    })
+  }
+  getPreselection(params) {
+    queryPreselectionRecord(params).then(res => {
+      const list = res.records
+      this.setState({
+        recordList: list.filter(item => item.status == '1') || [],
+
+      }, () => {
         this.setState({
-          recordList: list.filter(item => item.status == '1') || [],
+          noRecord: this.state.recordList.length > 0 ? false : true
+        })
+      })
+    })
+  }
+  getRaise(params) {
+    queryRaiseRecord(params).then(res => {
+      this.setState({
+        raiseList: res.records || [],
 
-        }, () => {
-          this.setState({
-            noRecord: this.state.recordList.length > 0 ? false : true
-          })
+      }, () => {
+        this.setState({
+          noRaiseRecord: this.state.raiseList.length > 0 ? false : true
         })
       })
     })
   }
-  // toHouseDetail(item) {
-  //   if (item.housingStatus == '0' || item.saleBatchStatus == '0') {
-  //     Taro.showToast({ title: '当前销售批次或该房源已被取消发布', icon: 'none', duration: 2000 })
-  //   } else {
-  //     Taro.navigateTo({
-  //       url: `/onlineSelling/pages/detail/index?id=${item.houseId}`
-  //     })
-  //   }
-  // }
+  loadBuildingList() {
+    const params = {
+      pageNumber: 1,
+      pageSize: 50,
+      cityId: this.props.curCity.id || ''
+    }
+    getItemList(params).then(res => {
+      res.records.unshift({ buildingName: '请选择', buildingId: '' })
+      this.setState({
+        buildingList: res.records,
+      })
+    })
+
+  }
+
   CheckboxChange = (e) => {
     e.stopPropagation()
     console.log('checkbox发生change事件，携带value值为：', e)
@@ -73,20 +120,20 @@ export default class Records extends Component {
             {
               noRecord ? <Blank style="margin:14vh 0 32vh 0" tips="暂无预选记录" /> :
                 <View>
-                {
-                  recordList.map((item) => {
-                    return (
-                      <Label class="checkbox" >
-                        <Checkbox value={item.houseId} checked={item.checked} >
-                          <View className="carditem" key={item.preselectionRecordId} >
-
-                            <HouseCard summary={item} />
-                          </View>
-                        </Checkbox>
-                      </Label>
-                    )
-                  })
-                }
+                  {
+                    recordList.map((item) => {
+                      return (
+                        <Label class="checkbox" >
+                          <Checkbox value={item.houseId} checked={item.checked} >
+                            <View className="carditem" key={item.preselectionRecordId} >
+
+                              <HouseCard summary={item} />
+                            </View>
+                          </Checkbox>
+                        </Label>
+                      )
+                    })
+                  }
                 </View>
             }
           </CheckboxGroup>
@@ -99,15 +146,15 @@ export default class Records extends Component {
     )
   }
   renderRaise() {
-    const { recordList, noRecord } = this.state
+    const { raiseList, noRaiseRecord } = this.state
     return (
       <Block>
 
         {
-          noRecord ? <Blank style="margin:14vh 0 32vh 0" tips="暂无认筹记录" /> :
+          noRaiseRecord ? <Blank style="margin:14vh 0 32vh 0" tips="暂无认筹记录" /> :
             <ScrollView scrollY>
               {
-                recordList.map(item => (
+                raiseList.map(item => (
                   <View key={item.preselectionRecordId} >
                     <RaiseCard summary={item} />
                   </View>
@@ -122,76 +169,121 @@ export default class Records extends Component {
       </Block>
     )
   }
-  onSexChange = e => {
-    let building = e.detail.value == '0' ? '1' : e.detail.value == '1' ? '2' : ''
+
+
+  handleBuildingChange = e => {
+    const { buildingList } = this.state
     this.setState({
-      building,
+      buildingValue: buildingList[e.detail.value].buildingName,
+      buildingId: buildingList[e.detail.value].buildingId,
     })
   }
   handleSaleBatchChange = e => {
-    const selector = [{ buildingTypeName: '楼盘1' }, { buildingTypeName: '楼盘2' }, { buildingTypeName: '楼盘3' }, { buildingTypeName: '楼盘4' }]
+    const { salesList } = this.state
     this.setState({
-      saleBatch: selector[e.detail.value].buildingTypeName
+      saleBatch: salesList[e.detail.value].salesBatchName,
+      salesBatchId: salesList[e.detail.value].salesBatchId,
+
     })
   }
-  handleStatusChange = e => {
+  handleApartmentChange = e => {
 
-    let status = e.detail.value == '0' ? '1' : e.detail.value == '1' ? '2' : ''
     this.setState({
-      status,
+      status: selector[e.detail.value].buildingTypeName
     })
   }
-  renderRaiseScreen() {
-    const { building, saleBatch, status } = this.state
-    const sexSelector = ['男', '女']
-    const selector = [{ buildingTypeName: '楼盘1' }, { buildingTypeName: '楼盘2' }, { buildingTypeName: '楼盘3' }, { buildingTypeName: '楼盘4' }]
-    return (
-
-      <View className="base-con">
-        <PickerComponent title="选择楼盘" selector={sexSelector} currentValue={building == '1' ? '男' : building == '2' ? '女' : '　'} handleChange={this.onSexChange} />
-        <PickerComponent title="选择销售批次" selector={selector} key={"buildingTypeName"} currentValue={saleBatch || '　'} handleChange={this.handleSaleBatchChange} />
-        <PickerComponent title="锁定状态" selector={selector} key={"buildingTypeName"} currentValue={status || '　'} handleChange={this.handleStatusChange} />
-        <View className="bottom-btn">
-          <View className="save" onClick={this.baseSaveBtn}>
-            筛选
-            </View>
-          <View className="cancel" onClick={this.baseCancelBtn}>
-            不限
-          </View>
-        </View>
-      </View>
-    )
+  handleLockStatusChange = e => {
+    const { lockStatus } = this.state
+    this.setState({
+      lockStatusValue: lockStatus[e.detail.value].value,
+      houseLockingStatus: lockStatus[e.detail.value].code,
+    })
+  }
+  handleCustomerChange = e => {
+    const { lockCustomer } = this.state
+    this.setState({
+      lockCustomerValue: lockCustomer[e.detail.value].value,
+      customerLocked: lockCustomer[e.detail.value].code,
+    })
   }
 
-  handleSaleBatchChange = e => {
-    const selector = [{ buildingTypeName: '楼盘1' }, { buildingTypeName: '楼盘2' }, { buildingTypeName: '楼盘3' }, { buildingTypeName: '楼盘4' }]
+
+  unlimitedBtn() {
+
     this.setState({
-      saleBatch: selector[e.detail.value].buildingTypeName
+      screenVisible: false,
+      buildingValue: '',
+      buildingId: '',
+      saleBatch: '',
+      salesBatchId: '',
+      lockStatusValue: '',
+      houseLockingStatus: '',
+      lockCustomerValue: '',
+      customerLocked: '',
     })
+    const { userInfo: { person: { personId } } } = this.props
+    const params = {
+      personId,
+      pageNumber: 1,
+      pageSize: 999,
+    }
+    this.getPreselection(params)
+    this.getRaise(params)
   }
-  handleApartmentChange = e => {
-    const selector = [{ buildingTypeName: '楼盘1' }, { buildingTypeName: '楼盘2' }, { buildingTypeName: '楼盘3' }, { buildingTypeName: '楼盘4' }]
+  ScreenBtn() {
     this.setState({
-      status: selector[e.detail.value].buildingTypeName
+      screenVisible: false
     })
+    const { userInfo: { person: { personId } } } = this.props
+    const { buildingId, salesBatchId, houseLockingStatus, customerLocked } = this.state
+
+    if (this.state.current == '0') {
+
+      const params = {
+        personId,
+        pageNumber: 1,
+        pageSize: 999,
+        buildingId,
+        salesBatchId,
+        houseLockingStatus,
+        customerLocked
+      }
+      this.getPreselection(params)
+    } else {
+
+      const params = {
+        personId,
+        pageNumber: 1,
+        pageSize: 999,
+        buildingId,
+        salesBatchId,
+        houseLockingStatus,
+
+      }
+      this.getRaise(params)
+    }
+
+
   }
 
   renderPreselectScreen() {
-    const { building, saleBatch, status } = this.state
+    const { current, buildingValue, buildingList, saleBatch, salesList, lockCustomerValue, lockCustomer, lockStatusValue, lockStatus } = this.state
 
     const selector = [{ buildingTypeName: '楼盘1' }, { buildingTypeName: '楼盘2' }, { buildingTypeName: '楼盘3' }, { buildingTypeName: '楼盘4' }]
+
     return (
 
       <View className="base-con">
-        <PickerComponent title="选择楼盘" selector={selector} currentValue={status || ''} handleChange={this.handleApartmentChange} />
-        <PickerComponent title="选择销售批次" selector={selector} currentValue={status || ''} handleChange={this.handleApartmentChange} />
-        <PickerComponent title="选择户型" selector={selector} currentValue={status || ''} handleChange={this.handleApartmentChange} />
+        <PickerComponent title="选择楼盘" selector={buildingList} keyValue={"buildingName"} currentValue={buildingValue || ''} handleChange={this.handleBuildingChange} />
+        <PickerComponent title="选择销售批次" selector={salesList} keyValue={"salesBatchName"} currentValue={saleBatch || ''} handleChange={this.handleSaleBatchChange} />
+        <PickerComponent title="锁定状态" selector={lockStatus} keyValue={"value"} currentValue={lockStatusValue || ''} handleChange={this.handleLockStatusChange} />
+        {current == '0' && <PickerComponent title="锁定客户" keyValue={"value"} selector={lockCustomer} currentValue={lockCustomerValue || ''} handleChange={this.handleCustomerChange} />}
 
         <View className="bottom-btn">
-          <View className="save" onClick={this.baseSaveBtn}>
+          <View className="save" onClick={this.ScreenBtn}>
             筛选
             </View>
-          <View className="cancel" onClick={this.baseCancelBtn}>
+          <View className="cancel" onClick={this.unlimitedBtn}>
             不限
           </View>
         </View>
@@ -202,10 +294,25 @@ export default class Records extends Component {
 
   handleScreenClick() {
 
+
+    this.setState({
+      screenVisible: true
+    })
+
   }
   handleCondition(value) {
     this.setState({
-      current: value
+      current: value,
+      buildingValue: '',
+      buildingId: '',
+      saleBatch: '',
+      salesBatchId: '',
+      lockStatusValue: '',
+      houseLockingStatus: '',
+      lockCustomerValue: '',
+      customerLocked: '',
+
+
     })
   }
   renderBar() {
@@ -233,13 +340,11 @@ export default class Records extends Component {
   }
   render() {
 
-
+    const { screenVisible } = this.state
     return (
       <View className="records" >
-        {this.renderBar()}
-        {/* {this.renderRaiseScreen()} */}
-        {/* {this.renderPreselectScreen()} */}
-
+        {!screenVisible && this.renderBar()}
+        {screenVisible && this.renderPreselectScreen()}
 
       </View >
     )

src/services/project.js

@@ -2,6 +2,8 @@ import { fetch } from '@/utils/request'
 import {
   API_HOUSE_LIST,
   API_PRESELECTION_RECORD,
+  API_SALESBATCH_LIST,
+  API_RATSE_RECORD,
   API_HOUSE_DETAIL,
   API_ADD_PRESELECTION,
   API_CANCEL_PRESELECTION,
@@ -49,6 +51,16 @@ export const queryHouseDetail = payload => fetch({ url: API_HOUSE_DETAIL, payloa
  * @param {*} payload
  */
 export const queryPreselectionRecord = payload => fetch({ url: API_PRESELECTION_RECORD, payload })
+/**
+ * 获取认筹记录
+ * @param {*} payload
+ */
+export const queryRaiseRecord = payload => fetch({ url: API_RATSE_RECORD, payload })
+/**
+ * 获取销售批次列表
+ * @param {*} payload
+ */
+export const querySalesList = payload => fetch({ url: API_SALESBATCH_LIST, payload })
 /**
  * 获取某销售批次下所有房源户型
  * @param {*} payload