张延森 5 年前
父节点
当前提交
6719f34dc0

+ 4
- 4
config/dev.js 查看文件

5
   defineConstants: {
5
   defineConstants: {
6
     // HOST: '"http://47.101.36.130:8085"',//测试
6
     // HOST: '"http://47.101.36.130:8085"',//测试
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
7
     // WSS_HOST: '"wss://47.101.36.130:8085"',
8
-    HOST: '"https://dev.pawoma.cn"',//测试
9
-    WSS_HOST: '"wss://dev.pawoma.cn"',
8
+    // HOST: '"https://dev.pawoma.cn"',//测试
9
+    // WSS_HOST: '"wss://dev.pawoma.cn"',
10
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
10
     // HOST: '"https://dev.jinchengjiaye.com"',//测试
11
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
11
     // WSS_HOST: '"wss://dev.jinchengjiaye.com"',
12
     // HOST: '"https://lt.pawoma.cn"',
12
     // HOST: '"https://lt.pawoma.cn"',
13
     // WSS_HOST: '"wss://lt.pawoma.cn"',
13
     // WSS_HOST: '"wss://lt.pawoma.cn"',
14
-    // HOST: '"http://127.0.0.1:8080"',
15
-    // WSS_HOST: '"ws://127.0.0.1:8080"',
14
+    HOST: '"http://127.0.0.1:8080"',
15
+    WSS_HOST: '"ws://127.0.0.1:8080"',
16
     Version: 'V3.5.10'
16
     Version: 'V3.5.10'
17
   },
17
   },
18
   weapp: {},
18
   weapp: {},

+ 16
- 0
src/onlineSelling/components/HouseGrid/index.js 查看文件

1
+import { Block } from "@tarojs/components"
2
+import Unit from './Unit'
3
+
4
+export default (props) => {
5
+  const unitList = (props.dataset || {}).unitList || []
6
+  const onRoomClick = props.onRoomClick || (() => {})
7
+
8
+  return (
9
+    <Block>
10
+      {
11
+        unitList.map((unit) => (<Unit key={unit.unitId} dataset={unit} onRoomClick={onRoomClick} />))
12
+      }
13
+    </Block>
14
+  )
15
+
16
+}

+ 2
- 2
src/onlineSelling/components/TimeTicker/index.js 查看文件

31
     }
31
     }
32
 
32
 
33
     componentWillUnmount() {
33
     componentWillUnmount() {
34
-      if (tk) {
35
-        clearInterval(tk)
34
+      if (this.tk) {
35
+        clearInterval(this.tk)
36
       }
36
       }
37
     }
37
     }
38
 
38
 

+ 2
- 2
src/onlineSelling/pages/houseList/index.js 查看文件

1
 import Taro, { Component } from '@tarojs/taro'
1
 import Taro, { Component } from '@tarojs/taro'
2
 import { View, ScrollView, Button, Swiper, Block } from '@tarojs/components'
2
 import { View, ScrollView, Button, Swiper, Block } from '@tarojs/components'
3
-import Unit from '../../components/HouseGrid/Unit'
3
+import HouseGrid from '../../components/HouseGrid'
4
 import NamedIcon from '../../components/NamedIcon'
4
 import NamedIcon from '../../components/NamedIcon'
5
 import ScrollMessage from '../../components/ScrollMessage'
5
 import ScrollMessage from '../../components/ScrollMessage'
6
 import Blank from '../../components/Blank'
6
 import Blank from '../../components/Blank'
362
       <ScrollView className="container" scrollY scrollWithAnimation>
362
       <ScrollView className="container" scrollY scrollWithAnimation>
363
         {
363
         {
364
           houseList.map((item) => {
364
           houseList.map((item) => {
365
-            return <Unit key={item.unitId} dataset={item} onRoomClick={this.handleRoomClick} />
365
+            return <HouseGrid key={item.unitId} dataset={item} onRoomClick={this.handleRoomClick} />
366
           })
366
           })
367
         }
367
         }
368
       </ScrollView>
368
       </ScrollView>

+ 1
- 1
src/pages/project/detail/index.js 查看文件

1076
     })
1076
     })
1077
   }
1077
   }
1078
   renderChooseHouse() {
1078
   renderChooseHouse() {
1079
-    const { projectDetail: { salesBatch } } = this.props
1079
+    const { projectDetail: { salesBatch = [] } } = this.props
1080
     return (
1080
     return (
1081
       <Block>
1081
       <Block>
1082
         {salesBatch.length && <View className="activity" style="padding:40rpx 0 20rpx 0 ">
1082
         {salesBatch.length && <View className="activity" style="padding:40rpx 0 20rpx 0 ">