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://192.168.2.52:8080"',
-    // WSS_HOST: '"ws://192.168.2.52: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'

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.13'
+    Version: 'V3.5.12'
   },
   weapp: {},
   h5: {}

src/onlineSelling/components/HouseCard/index.js

@@ -20,11 +20,13 @@ export default function HouseCard(props) {
     saleBatchStatus,
     houseId,
     createDate,
+    apartmentImgList = [],
     buildingImgList = [],
   } = props.summary || {}
 
   const title = `${buildingName || ''} ${termname || termName || ''} ${blockName || ''} ${unitName || ''} ${floorName || ''} ${roomName || ''}`
   const thumb = (buildingImgList || []).length
+  const thumb2 = (apartmentImgList || []).length
   const showDT = dayjs(createDate).format('YYYY/MM/DD')
   const wanY = Number(price)
 
@@ -45,9 +47,13 @@ export default function HouseCard(props) {
   return (
     <View className="housecard">
       <View className="head" onClick={toHouseDetail}>
-        {thumb ? <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" /> :
+        {thumb && <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" />
+        }
+        {!thumb && !thumb2 &&
           <Text style="font-size:26rpx;color:#666">暂无户型图</Text>
         }
+        {thumb2 && <Image className="thumb" src={transferImage((apartmentImgList)[0].url)} mode="aspectFit" />
+        }
       </View>
       <View className="body" onClick={toHouseDetail}>
         <View className="badge">已预选</View>

src/onlineSelling/components/RaiseHouse/index.js

@@ -1,46 +0,0 @@
-import { View, Image, Text } from "@tarojs/components";
-import { transferImage } from '@/utils/tools'
-import dayjs from 'dayjs'
-
-import './index.scss'
-
-export default function RaiseHouse(props) {
-  const {
-    buildingName,
-    termname,
-    blockName,
-    unitName,
-    roomName,
-    price,
-    createDate,
-    buildingImgList = [],
-  } = props.summary || {}
-
-  const title = `${buildingName} ${termname||''} ${blockName} ${unitName} ${roomName}`
-  const thumb = (buildingImgList || []).length
-  const showDT = dayjs(createDate).format('YYYY/MM/DD')
-  const wanY = Number(price)
-
-  return (
-    <View className="raisehouse">
-      <View className="head">
-        {thumb ? <Image className="thumb" src={transferImage((buildingImgList)[0].url)} mode="aspectFit" /> :
-          <Text style="font-size:26rpx;color:#666">暂无户型图</Text>
-        }
-      </View>
-      <View className="body">
-        <View className="apartment">A户型</View>
-        <View className="price">现价234万</View>
-        <View className="title">XX嘉苑 1号楼 2单元 3楼 303号</View>
-        <View className="subtitle">
-          <Text>建筑面积约</Text>
-          <Text className="red">{wanY + 'm²' || '待定'}</Text>
-        </View>
-        <View className="subtitle">
-          <Text>使用面积约</Text>
-          <Text className="red">{wanY + 'm²' || '待定'}</Text>
-        </View>
-      </View>
-    </View>
-  )
-}

src/onlineSelling/components/RaiseHouse/index.scss

@@ -1,65 +0,0 @@
-.raisehouse {
-  width: 690px;
-  height: 250px;
-  background:#fff;
-  border-radius: 8px;
-  display: flex;
-  margin: 16px 30px;
-  box-shadow: 0 4px 15px 1px rgba(0, 0, 0, 0.12);
-  font-weight: 400;
-
-  .head {
-    width: 250px;
-    flex: none;
-    border-right: 2px solid rgba(0, 0, 0, 0.04);
-    padding: 20px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .thumb {
-      width: 100%;
-      height: 100%;
-    }
-  }
-
-  .body {
-    width: 438px;
-    flex: none;
-    position: relative;
-    line-height: 40px;
-    padding: 20px 16px;
-
-    .apartment {
-      font-size: 26px;
-      color: #FE1C1C;
-      font-weight: 700;
-    }
-
-    .price {
-      font-size: 24px;
-      font-weight: 700;
-      color: #FE1C1C;
-      line-height: 1.8;
-    }
-    .title {
-      font-size: 26px;
-      font-weight: bold;
-      color: #333;
-      line-height: 1.8;
-    }
-
-    .subtitle {
-      font-size: 28px;
-      color:#333;
-      line-height: 1.6;
-
-    }
-  }
-
-  .red {
-    color: #FF3C3C;
-    margin: 0 6px;
-  }
-
-}

src/onlineSelling/pages/addHouse/index.js

@@ -41,7 +41,12 @@ export default class extends Component {
   handleCheckboxChange = (e) => {
     const { house } = this.props
     const houseIdList = e.detail.value.map(x => x - 0)
-    const chooseList = (house.mySelectHouses || []).filter(x => houseIdList.indexOf(x.houseId) > -1).map(x => x.housingInfo)
+    const chooseList = (house.mySelectHouses || []).filter(x => houseIdList.indexOf(x.houseId) > -1).map(x => ({
+      ...x.housingInfo,
+      buildingImgList: x.buildingImgList,
+      displayHousePrice:x.displayHousePrice,
+      displayHousePrice: x.displayHousePrice
+    }))
 
     this.setState({ chooseList })
   }
@@ -82,7 +87,12 @@ export default class extends Component {
     const { house } = this.props
 
     // 从预选记录中过滤出来, 状态正常且未锁定的房源
-    const houseList = (house.mySelectHouses || []).map(x => x.housingInfo).filter(x => x.status == 1)
+    const houseList = (house.mySelectHouses || []).map(x => ({
+      ...x.housingInfo,
+      buildingImgList: x.buildingImgList,
+      displayHousePrice:x.displayHousePrice,
+      displayHousePrice: x.displayHousePrice
+    })).filter(x => x.status == 1)
 
     return houseList.length && (
       <Block>

src/onlineSelling/pages/records/index.js

@@ -53,6 +53,7 @@ export default class Records extends Component {
     customerLocked: '',
 
     chooseList: [], // 选中的房源ID列表
+    clickDisable: true,
   }
   componentDidShow() {
     ready.queue(() => {
@@ -202,9 +203,13 @@ export default class Records extends Component {
     )
   }
   toRaiseProfile(id) {
+    this.setState({
+      clickDisable: false
+    })
+
     const { userInfo: { miniApp: { tpls } } } = this.props
     const tplId = (tpls.filter(x => x.tplType == noticeType.TPL_HOUSE && x.isSubscribe == true)[0] || {}).tplId
-
+    const that = this
     wx.requestSubscribeMessage({
       tmplIds: [tplId],
       success(res) {
@@ -213,14 +218,18 @@ export default class Records extends Component {
 
       },
       complete() {
+        that.setState({
+          clickDisable: true
+        })
         Taro.navigateTo({
           url: `/onlineSelling/pages/raiseProfile/index?id=${id}`
         })
       }
     })
+
   }
   renderRaise() {
-    const { raiseList, noRaiseRecord } = this.state
+    const { raiseList, noRaiseRecord, clickDisable } = this.state
     return (
       <Block>
         <ScrollView scrollY className="container">
@@ -230,7 +239,7 @@ export default class Records extends Component {
                 {
                   raiseList.map(item => (
                     <View key={item.raiseRecordId} >
-                      <RaiseCard handleCard={() => this.toRaiseProfile(item.raiseRecordId)} summary={item} statusType="raise" />
+                      <RaiseCard handleCard={clickDisable ? () => this.toRaiseProfile(item.raiseRecordId) : ''} summary={item} statusType="raise" />
                     </View>
                   )
                   )