Browse Source

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

xujing 5 years ago
parent
commit
b58438676f
2 changed files with 5 additions and 2 deletions
  1. 1
    1
      src/pages/project/activity/index.js
  2. 4
    1
      src/pages/project/index.js

+ 1
- 1
src/pages/project/activity/index.js View File

39
     }
39
     }
40
     render() {
40
     render() {
41
         const { helpGroupList } = this.props
41
         const { helpGroupList } = this.props
42
-        if (!helpGroupList.length) return null;
42
+        // if (!helpGroupList.length) return null;
43
 
43
 
44
         return (
44
         return (
45
             <View className="activity-box" style={`background: url(${transferImage(bgImg)}) no-repeat center;background-size: 100% 100%;`}>
45
             <View className="activity-box" style={`background: url(${transferImage(bgImg)}) no-repeat center;background-size: 100% 100%;`}>

+ 4
- 1
src/pages/project/index.js View File

685
                 <Newsbanner showNesBox={this.handleNewsbannerShow} cityId={curCity.id} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} />
685
                 <Newsbanner showNesBox={this.handleNewsbannerShow} cityId={curCity.id} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} />
686
               </View >
686
               </View >
687
               {/* 热门活动*/}
687
               {/* 热门活动*/}
688
-              <Activity helpGroupList={helpGroupList} cityId={curCity.id} />
688
+              {
689
+                helpGroupList && helpGroupList.length &&
690
+                (<Activity helpGroupList={helpGroupList} cityId={curCity.id} />)
691
+              }              
689
               {/* 推荐楼盘 */}
692
               {/* 推荐楼盘 */}
690
               {this.renderProjectList()}
693
               {this.renderProjectList()}
691
             </ScrollView>}
694
             </ScrollView>}