1007395918@qq.com 5 years ago
parent
commit
f04c4b2b78

+ 1
- 1
src/components/Poster/index.js View File

@@ -75,7 +75,7 @@ export default class Poster extends Component {
75 75
 
76 76
   onCreateSuccess = (inx) => {
77 77
     return (result) => {
78
-      debugger
78
+      // debugger
79 79
       const { tempFilePath, errMsg } = result;
80 80
       if (errMsg === 'canvasToTempFilePath:ok') {
81 81
         this.tmpImgs[inx] = tempFilePath

+ 3
- 3
src/onlineSelling/components/HouseGrid/Room.js View File

@@ -17,10 +17,10 @@ export default function Room(props) {
17 17
   return (
18 18
     <HotBlock number={heat + realHeat + 0}>
19 19
       <View className="room" onClick={handleClick}>
20
-        <View className="warn">{roomName}</View>
21
-        <View className="warn">{personNum}</View>
20
+        <View className="warn">{roomName || ''}</View>
21
+        <View className="warn">{personNum || ''}</View>
22 22
         <View className="info">{wanY}万</View>
23
-        <View className="info">{apartmentName || 'A户型'}</View>
23
+        <View className="info">{apartmentName || ''}</View>
24 24
       </View>
25 25
     </HotBlock>
26 26
   )

+ 2
- 1
src/onlineSelling/components/HouseGrid/Unit.js View File

@@ -3,11 +3,12 @@ import Floor from "./Floor";
3 3
 import './unit.scss'
4 4
 
5 5
 export default function Unit(props) {
6
-  const { blockName, unitName, floorList = [] } = props.dataset || {}
6
+  const {termName, blockName, unitName, floorList = [] } = props.dataset || {}
7 7
 
8 8
   return (
9 9
     <View className="unit">
10 10
       <View className="head">
11
+        <Text className="item">{termName}</Text>
11 12
         <Text className="item">{blockName}</Text>
12 13
         <Text className="item">{unitName}</Text>
13 14
       </View>

+ 2
- 0
src/onlineSelling/components/NamedIcon/index.js View File

@@ -2,9 +2,11 @@ import { Text } from "@tarojs/components";
2 2
 import './index.scss'
3 3
 
4 4
 export default function NamedIcon(props) {
5
+  // const bg = `require('../../assets/${props.name}.png')`
5 6
   const bg = `background: url(../../assets/${props.name}.png); background-size:cover;`
6 7
   const size = props.size || 48
7 8
   const bound = `width: ${size}rpx; height: ${size}rpx;`
8 9
 
10
+  // return <Text><Image src={bg}></Image><Text className="namedicon" style={`${bg} ${bound}`}></Text></Text> 
9 11
   return <Text className="namedicon" style={`${bg} ${bound}`}></Text>
10 12
 }

+ 2
- 1
src/onlineSelling/components/ScrollMessage/index.js View File

@@ -51,7 +51,8 @@ export default class ScrollMessage extends Component {
51 51
     return (
52 52
       <View className="scrollmessage">
53 53
         <View className="head">
54
-          <NamedIcon name="notice" size={44} />
54
+          <Image style="width:44rpx;height:44rpx;margin-top: 10rpx;" src={require('../../assets/notice.png')}></Image>
55
+          {/* <NamedIcon name="notice" size={44} /> */}
55 56
         </View>
56 57
         <View className="body">
57 58
           <Swiper vertical autoplay>

+ 1
- 1
src/onlineSelling/components/ScrollMessage/index.scss View File

@@ -3,7 +3,7 @@
3 3
 
4 4
   .head {
5 5
     flex: none;
6
-    width: 60rpx;
6
+    width: 60px;
7 7
   }
8 8
 
9 9
   .body {

+ 3
- 1
src/onlineSelling/components/ShareButtons/ShareBtn.js View File

@@ -9,7 +9,9 @@ export default function ShareBtn(props) {
9 9
   return (
10 10
     <Button className="sharebtn" onClick={handleClick} openType={props.openType}>
11 11
       <View>
12
-        <NamedIcon name={props.name} size={props.size || 56} />
12
+        {/* <NamedIcon name={props.name} size={props.size || 56} /> */}
13
+        {props.name=='share-friends'&&<Image style="width:56rpx;height:56rpx" src={require('../../assets/share-friends.png')}></Image>}
14
+        {props.name=='sharing-circleoffriends'&&<Image style="width:56rpx;height:56rpx" src={require('../../assets/sharing-circleoffriends.png')}></Image>}
13 15
       </View>
14 16
       <View>
15 17
         <Text>{props.tips}</Text>

+ 12
- 5
src/onlineSelling/pages/houseList/index.js View File

@@ -82,6 +82,7 @@ export default class HouseList extends Component {
82 82
     }
83 83
   }
84 84
   initPageData() {
85
+    Taro.showLoading()
85 86
     const id = this.$router.params.id
86 87
 
87 88
     if (this.$router.params.scene) {
@@ -112,7 +113,9 @@ export default class HouseList extends Component {
112 113
       this.setState({
113 114
         houseList: this.groupHouseList(res) || []
114 115
       })
116
+      Taro.hideLoading()
115 117
     }).catch(err => {
118
+      Taro.hideLoading()
116 119
       Taro.showToast({ title: '未找到房源批次', icon: 'none', duration: 2000 })
117 120
     })
118 121
   }
@@ -130,7 +133,7 @@ export default class HouseList extends Component {
130 133
         posterData: { poster: posterImg },
131 134
         shareContents: res.shareContents || [],
132 135
       }, () => {
133
-        debugger
136
+        // debugger
134 137
         this.getPosterData().then(posterData => {
135 138
           const posterConfig = this.transTPLs2Configs(templates, posterData)
136 139
           this.setState({ posterConfig, posterData })
@@ -336,10 +339,12 @@ export default class HouseList extends Component {
336 339
         </View>
337 340
         <View className="action">
338 341
           <View onClick={this.handleExplainClick}>
339
-            <NamedIcon name="explain" size={50} />
342
+            {/* <NamedIcon name="explain" size={50} /> */}
343
+            <Image style="width:50rpx;height:50rpx" src={require('../../assets/explain.png')}></Image>
340 344
           </View>
341 345
           <View onClick={this.handleSearchClick}>
342
-            <NamedIcon name="screen" size={50} />
346
+          <Image style="width:50rpx;height:50rpx" src={require('../../assets/screen.png')}></Image>
347
+            {/* <NamedIcon name="screen" size={50} /> */}
343 348
           </View>
344 349
         </View>
345 350
       </View>
@@ -370,11 +375,13 @@ export default class HouseList extends Component {
370 375
     return (
371 376
       <View className="bottombar">
372 377
         <Button className="btn record" onClick={this.handleRecordBtn}>
373
-          <NamedIcon name="record" size="42" />
378
+          {/* <NamedIcon name="record" size="42" /> */}
379
+          <Image style="width:42rpx;height:42rpx" src={require('../../assets/record.png')}></Image>
374 380
           <Text className="txt">选房记录</Text>
375 381
         </Button>
376 382
         <Button className="btn share" onClick={this.handleShareBtn}>
377
-          <NamedIcon name="share" size="42" />
383
+          {/* <NamedIcon name="share" size="42" /> */}
384
+          <Image style="width:42rpx;height:42rpx" src={require('../../assets/share.png')}></Image>
378 385
           <Text className="txt">分享</Text>
379 386
         </Button>
380 387
       </View>

+ 3
- 0
src/onlineSelling/pages/houseList/index.scss View File

@@ -40,6 +40,9 @@
40 40
       flex: none;
41 41
       border-radius: 10px;
42 42
       line-height: 88px;
43
+      display: flex;
44
+      align-items: center;
45
+      justify-content: center;
43 46
 
44 47
       .txt {
45 48
         display: inline-block;