Browse Source

回滚到改动后版本

tags/jenkins-front-end-screenad-275-
caserKing 6 years ago
parent
commit
05305fefa0
1 changed files with 0 additions and 34 deletions
  1. +0
    -34
      App.js

+ 0
- 34
App.js View File

@@ -737,7 +737,6 @@ getAdView(){
<Text style={styles.bottomQrcode1Str}>公众号</Text> <Text style={styles.bottomQrcode1Str}>公众号</Text>
</View> </View>
<Text style={styles.bottomPlacehold}>{this.state.versionInfo}</Text> <Text style={styles.bottomPlacehold}>{this.state.versionInfo}</Text>
<<<<<<< Updated upstream
</View> */ </View> */
@@ -755,28 +754,6 @@ getAdView(){
loop={true} loop={true}
autoplayInterval={5000} autoplayInterval={5000}
/> />
=======
</View>
</ImageBackground>
);
} else if (this.state.adType == 1) {
return(
<View style={styles.adTypeSwiper02}>
<Carousel
ref={'carousel01'}
data={adDataList}
renderItem={this.setAdSwiperItemDom}
sliderWidth={1080}
itemWidth={1080}
itemHeight={1920}
sliderHeight={1920}
activeSlideOffset={0}
autoplay={true}
loop={true}
autoplayInterval={2500}
/>
</View>
>>>>>>> Stashed changes
) )
} }
} }
@@ -1350,22 +1327,11 @@ MyPage = CodePush(codePushOptions)(MyPage);
height: '100%', height: '100%',
}, },


<<<<<<< Updated upstream
carouselItemWrap: { carouselItemWrap: {
flex: 1, flex: 1,
width: '100%', width: '100%',
backgroundColor: 'transparent', backgroundColor: 'transparent',
alignItems: 'center', alignItems: 'center',
=======
onlyAdSwiperItem:{
width: '100%',
height: '100%',
},

onlyAdTypeItemImg:{
width: '100%',
height: '100%',
>>>>>>> Stashed changes
} }


}); });

Loading…
Cancel
Save