diff --git a/App.js b/App.js index 0a1b163..5e19028 100644 --- a/App.js +++ b/App.js @@ -736,6 +736,7 @@ getAdView(){ 公众号 {this.state.versionInfo} +<<<<<<< Updated upstream */ @@ -753,6 +754,28 @@ getAdView(){ loop={true} autoplayInterval={5000} /> +======= + + + ); + } else if (this.state.adType == 1) { + return( + + + +>>>>>>> Stashed changes ) } } @@ -1326,11 +1349,22 @@ MyPage = CodePush(codePushOptions)(MyPage); height: '100%', }, +<<<<<<< Updated upstream carouselItemWrap: { flex: 1, width: '100%', backgroundColor: 'transparent', alignItems: 'center', +======= + onlyAdSwiperItem:{ + width: '100%', + height: '100%', + }, + + onlyAdTypeItemImg:{ + width: '100%', + height: '100%', +>>>>>>> Stashed changes } });