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

src/pages/project/index.js

@@ -645,21 +645,21 @@ export default class Index extends Component {
               </View>
               {/* 菜单栏 */}
               <Menus menusList={menusList}></Menus>
-              <View style={propagandaBanner.length > 0 ? "border-bottom:20rpx solid #f5f5f5" : ''}>
-                {/* <View style={(newsShow || propagandaBanner.length > 0) ? "border-bottom:20rpx solid #f5f5f5" : ''}> */}
+              {/* <View style={propagandaBanner.length > 0 ? "border-bottom:20rpx solid #f5f5f5" : ''}> */}
+              <View style={(newsShow || propagandaBanner.length > 0) ? "border-bottom:20rpx solid #f5f5f5" : ''}>
                 {/* 展示位轮播图 */}
                 {
                   this.state.visPropagandaBanner && propagandaBanner.length > 0 &&
                   <View
                     style={{
-                      position: 'relative', padding: '20px 15px'
+                      position: 'relative', padding: '20px 15px 0 15px'
                     }}>
                     <BannerTwo
                       style={{
                         borderRadius: '6px',
                         height: '172rpx'
                       }}
-                      forwardShow={true}
+                      // forwardShow={true}
                       indicatorDots={false}
                       list={propagandaBanner}
                       onClick={this.handlePropagandaClick}>
@@ -667,7 +667,7 @@ export default class Index extends Component {
                   </View>
                 }
                 {/* 资讯 */}
-                {/* <Newsbanner showNesBox={this.handleNewsbannerShow} cityId={curCity.id} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} /> */}
+                <Newsbanner showNesBox={this.handleNewsbannerShow} cityId={curCity.id} onClick={this.handleNoticeClick} onClickMore={this.toNewsList} />
               </View >
               {/* 热门活动*/}
               {

src/pages/project/swiper/index.js

@@ -24,7 +24,8 @@ export default class SwiperBanner extends Component {
     this.props.onClick(item)
   }
   render() {
-    const { list, style, indicatorDots, current, activityStyle, type,forwardShow } = this.props
+    // const { list, style, indicatorDots, current, activityStyle, type,forwardShow } = this.props
+    const { list, style, indicatorDots, current, activityStyle, type } = this.props
 
     const styles = activityStyle ? activityStyle : style
     return (
@@ -45,13 +46,13 @@ export default class SwiperBanner extends Component {
               className='home-banner__swiper-item'
             >
               <View style={{ display: 'block',width:'100%' }}>
-                {
+                {/* {
                   forwardShow &&
                   <View>
                     <Image className='forward' src={forwardImg}></Image>
                     <Text className="text">详情</Text>
                   </View>
-                }
+                } */}
                 <Image
                   mode="aspectFill"
                   style={style}