diff --git a/App.js b/App.js index aec4712..752fe41 100644 --- a/App.js +++ b/App.js @@ -737,7 +737,6 @@ getAdView(){ 公众号 {this.state.versionInfo} -<<<<<<< Updated upstream */ @@ -755,28 +754,6 @@ getAdView(){ loop={true} autoplayInterval={5000} /> -======= - - - ); - } else if (this.state.adType == 1) { - return( - - - ->>>>>>> Stashed changes ) } } @@ -1350,22 +1327,11 @@ 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 } });