From 05305fefa0295ad20249841da78e05294e76f9d1 Mon Sep 17 00:00:00 2001 From: caserKing Date: Fri, 30 Aug 2019 18:36:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E5=88=B0=E6=94=B9=E5=8A=A8?= =?UTF-8?q?=E5=90=8E=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.js | 34 ---------------------------------- 1 file changed, 34 deletions(-) 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 } });