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

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://127.0.0.1:8080"',
+    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.12'

config/prod.js

@@ -11,7 +11,7 @@ module.exports = {
     // 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/onlineSelling/components/RaiseCard/index.js

@@ -7,7 +7,7 @@ import closeImg from '../../assets/close.png'
 import './index.scss'
 
 export default function RaiseCard(props) {
-  const {
+  let {
     buildingName,
     termName,
     blockName,
@@ -27,8 +27,12 @@ export default function RaiseCard(props) {
     taRaise = {},
     buildingImgList = [],
   } = props.summary || {}
-  const defHouse = taHousingResourcesList[0] || {}
 
+  if (!taRaise) {
+    taRaise = {}
+  }
+
+  const defHouse = taHousingResourcesList[0] || {}
   const title = `${buildingName || defHouse.buildingName || ''} ${termName || defHouse.termName || ''} ${blockName || defHouse.blockName || ''} ${unitName || defHouse.unitName || ''} ${roomName || defHouse.roomName || '　'}`
   const thumb = (buildingImgList || []).length
   const thumb2 = (apartmentImgList || []).length
@@ -39,7 +43,7 @@ export default function RaiseCard(props) {
   const copyData = (e) => {
     e.stopPropagation()
     Taro.setClipboardData({
-      data: houseId,
+      data: `${houseId}`,
       onSuccess: (() => { }),
     })
   }

src/onlineSelling/pages/detail/index.js

@@ -216,7 +216,7 @@ export default class Index extends Component {
               <Statement style="margin: 104rpx 0 30rpx 0" />
               <View style="padding: 0 30rpx;">
                 {
-                  houseDetail.raiseBtn && <View>
+                  houseDetail.preselectionBtn && <View>
                     {!houseDetail.isPreselect ?
                       <View className="choose-btn" onClick={() => this.open()}>
                         预选此房源
@@ -227,7 +227,7 @@ export default class Index extends Component {
                   </View>
                 }
 
-                {houseDetail.preselectionBtn && <View className="raise-btn" onClick={() => this.toRaiseMoney()}>
+                {houseDetail.raiseBtn && <View className="raise-btn" onClick={() => this.toRaiseMoney()}>
                   认筹此房源
               </View>}
               </View>

src/onlineSelling/pages/houseCart/index.js

@@ -9,6 +9,17 @@ import { queryHouseList } from '@/services/project'
 import ready from '@/utils/ready'
 import { connect } from '@tarojs/redux'
 import * as houseActions from '@/actions/house'
+import { fetch, apis } from '@/utils/request'
+
+const getRaiseProfile = ({ salesBatchId, raiseRecordId, personId }) => {
+  const queryString = [
+    `${raiseRecordId ? 'raiseRecordId=' + raiseRecordId : ''}`,
+    `${salesBatchId ? 'salesBatchId=' + salesBatchId : ''}`,
+    `${personId ? 'personId=' + personId : ''}`,
+  ].filter(Boolean).join('&')
+
+  return fetch({ url: `${apis.API_RAISE_PROFILE}?${queryString}` })
+}
 
 @connect(
   ({ user, house }) => ({ ...user, house }),
@@ -24,19 +35,21 @@ export default class extends Component {
     dataType: 1, // maybe need change  1 预选, 2 认筹
     houseList: [],
     chooseList: [], // 已经选择的房源列表
-    collapsed: true, // 已选列表默认关闭, true 关闭, false 开启 
+    collapsed: true,      // 已选列表默认关闭, true 关闭, false 开启
+    multiSelect: true,  // 是否多选, 自动锁房是单选
   }
 
   componentWillMount () {
     ready.queue(() => {
       const { userInfo, house } = this.props
-      const { id: salesBatchId } = this.$router.params
+      const { id: salesBatchId, multi } = this.$router.params
 
       const params = {
         salesBatchId,
         pageNum: 1,
         pageSize: 9999,
       }
+
       queryHouseList(params).then(res => {
         this.setState({
           houseList: this.groupHouseList(res) || [],
@@ -44,9 +57,14 @@ export default class extends Component {
         })
       })
 
+      // 获取认筹信息
+      // getRaiseProfile(salesBatchId, undefined, userInfo.person.personId)
+
       if (house.raiseCart && house.raiseCart.length) {
         this.setState({ chooseList: house.raiseCart })
       }
+
+      this.setState({ multiSelect: multi !== 'false' })
     })
   }
   
@@ -119,14 +137,18 @@ export default class extends Component {
       return;
     }
 
-    const { chooseList } = this.state
+    const { chooseList, multiSelect } = this.state
     const checked = (chooseList || []).filter(x => x.houseId == room.houseId)[0]
 
     if (checked) {
       this.setState({ chooseList: chooseList.filter(x => x.houseId != room.houseId) })
     } else {
-      this.setState({ chooseList: chooseList.concat(room) })
-    }    
+      if (multiSelect) {
+        this.setState({ chooseList: chooseList.concat(room) })
+      } else {
+        this.setState({ chooseList: [room] })
+      }
+    }
   }
 
   // 确认选择
@@ -150,12 +172,15 @@ export default class extends Component {
 
   // 取消选择
   subChooseList = (house) => {
+    const name = [house.termName, house.blockName, house.unitName, house.floorName, house.roomName].join('')
+    const { chooseList } = this.state
+
     Taro.showModal({
       title: '取消选择',
-      content: `确认取消 ${house.name} ?`,
+      content: `确认取消 ${name} ?`,
       success: (res) => {
         if (res.confirm) {
-          // TODO: 取消房源选择
+          this.setState({ chooseList: chooseList.filter(x => x.houseId != house.houseId) })
         }
       }
     })

src/onlineSelling/pages/raiseMoney/index.js

@@ -159,9 +159,10 @@ export default class raiseMoney extends Component {
 
   gotoHouseSelect = (pageType) => {
     const { raiseProfile } = this.state
+    const isMulti = raiseProfile.houseLockingType != 'auto'
 
     const url = pageType == 'all' ?
-      `/onlineSelling/pages/houseCart/index?id=${raiseProfile.salesBatchId}` :
+      `/onlineSelling/pages/houseCart/index?id=${raiseProfile.salesBatchId}&multi={isMulti}` :
       `/onlineSelling/pages/addHouse/index?id=${raiseProfile.salesBatchId}`
 
     Taro.navigateTo({ url })
@@ -214,7 +215,10 @@ export default class raiseMoney extends Component {
           !disabled &&
           (
             <Block>
-              <View className="addhouse">从 <Text style="color:#F3B82E" onClick={this.gotoHouseSelect.bind(this, 'all')}>房源列表</Text> 中添加其他房源</View>
+              {
+                !raiseProfile.needPreselection &&
+                (<View className="addhouse">从 <Text style="color:#F3B82E" onClick={this.gotoHouseSelect.bind(this, 'all')}>房源列表</Text> 中添加其他房源</View>)
+              }              
               <View className="addhouse">从 <Text style="color:#BB9C79" onClick={this.gotoHouseSelect.bind(this, 'select')}>预选记录</Text> 中添加其他房源</View>
             </Block>
           )
@@ -522,6 +526,7 @@ export default class raiseMoney extends Component {
         userId: consultant.userId,
         userName: consultant.name,
       }, raiseProfile).then((res) => {
+        this.setState({ record: res })
         resolve(res)
       })
     })
@@ -576,11 +581,11 @@ export default class raiseMoney extends Component {
   toRaiseProfile(id) {
 
     Taro.navigateTo({
-      url: `/onlineSelling/pages/raiseProfile/index?raiseRecordId=${id}`
+      url: `/onlineSelling/pages/raiseProfile/index?id=${id}`
     })
   }
   renderResult() {
-    const { raiseProfile = {}, failInfo } = this.state
+    const { raiseProfile = {}, record = {}, failInfo } = this.state
     const isOk = !failInfo
     const showIcon = isOk ? require('../../assets/success2.png') : require('../../assets/fail2.png')
     const showTitle = isOk ? '提交成功' : failInfo.title
@@ -607,7 +612,7 @@ export default class raiseMoney extends Component {
 
         <ContactConsultant buildingId={raiseProfile.buildingId} style=" position: absolute;bottom: 11vh;" />
 
-        <View className="look-btn" onClick={() => this.toRaiseProfile(raiseProfile.raiseId)}>查看认筹单</View>
+        <View className="look-btn" onClick={() => this.toRaiseProfile(record.raiseRecordId)}>查看认筹单</View>
       </View>
 
     );

src/onlineSelling/pages/raiseProfile/index.js

@@ -29,7 +29,7 @@ export default class Raise extends Component {
   }
 
   componentWillMount() {
-    const { raiseRecordId } = this.$router.params
+    const { id: raiseRecordId } = this.$router.params
     queryRaiseDetail(raiseRecordId).then(res => {
       this.setState({
         buildingId: res.taRaiseRecord.buildingId,
@@ -45,13 +45,11 @@ export default class Raise extends Component {
   // 复制数据
   copyData(data) {
     Taro.setClipboardData({
-      data,
+      data: `${data}`,
       onSuccess: (() => { }),
     })
   }
 
-
-
   // 查看所有认筹房源
   viewAllHouses = () => {
     const { raiseRecordId } = this.$router.params
@@ -235,7 +233,7 @@ export default class Raise extends Component {
           {raiseDeatil.status == '0' && this.renderCancelReason()}
           {raiseDeatil.payStatus == 'unpaid' && this.renderUnpayNotice()}
           <View className="raise-flex">
-            <View className="date">认筹提交时间  {dayjs(raiseOrder.createDate).format('YYYY/MM/DD HH:mm:ss')}</View>
+            <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>
           <View>

src/onlineSelling/pages/records/index.js

@@ -198,7 +198,7 @@ export default class Records extends Component {
       },
       complete() {
         Taro.navigateTo({
-          url: `/onlineSelling/pages/raiseProfile/index?raiseRecordId=${id}`
+          url: `/onlineSelling/pages/raiseProfile/index?id=${id}`
         })
       }
     })