swiper

src/app/app.scss

@@ -384,9 +384,10 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios {
       color: #ffffff;
       text-align: center;
       font-size: 1.8rem;
-      padding: .4rem 0;
       border-top-right-radius: 5px;
       border-top-left-radius: 5px;
+      height: 35px;
+      line-height: 35px;
     }
 
     .record-content {

src/pages/discover-pages/publish/publish.ts

@@ -106,7 +106,7 @@ export class PublishPage {
             return false;
         }
         const options: CameraOptions = {
-            quality: 100,
+            quality: 70,
             destinationType: this.camera.DestinationType.FILE_URI,
             encodingType: this.camera.EncodingType.PNG,
             mediaType: this.camera.MediaType.PICTURE,

src/pages/mine/person/personInfo/personInfo.ts

@@ -91,7 +91,7 @@ export class PersonInfoPage {
     //选择图片
     selectPicture(srcType) {
         const options: CameraOptions = {
-            quality: 100,
+            quality: 50,
             destinationType: this.camera.DestinationType.FILE_URI,
             encodingType: this.camera.EncodingType.PNG,
             mediaType: this.camera.MediaType.PICTURE,

src/pages/tabs/discover/discover.html

@@ -111,11 +111,11 @@
     </ion-slides>
 
 
-<!--  <ion-infinite-scroll #infiniteScrollContentEle (ionInfinite)="doInfinite($event)">-->
-<!--    <ion-infinite-scroll-content-->
-<!--            loadingSpinner="bubbles"-->
-<!--            loadingText="加载中"></ion-infinite-scroll-content>-->
-<!--  </ion-infinite-scroll>-->
+  <ion-infinite-scroll #infiniteScrollContentEle (ionInfinite)="doInfinite($event)">
+    <ion-infinite-scroll-content
+            loadingSpinner="bubbles"
+            loadingText="加载中"></ion-infinite-scroll-content>
+  </ion-infinite-scroll>
 
   <p class="noData" *ngIf="!loadMore">你已经看到我的底线了</p>
 

src/pages/tabs/discover/discover.scss

@@ -68,6 +68,7 @@ page-discover {
     padding: 0 1rem;
     .search-item{
       padding: .8rem 0;
+      overflow-y: scroll;
       .item-info{
         margin: .8rem 0;
         color: #989898;

src/pages/tabs/discover/discover.ts

@@ -158,7 +158,7 @@ export class DiscoverPage {
     toIndex;
 
     //分页
-    pageCount = 100;
+    pageCount = 10;
 
     loadMore = true;
     totalNum;
@@ -186,7 +186,7 @@ export class DiscoverPage {
     //父级选择
     changeParent(item) {
         this.newsContent.nativeElement.scrollLeft = 0;   //二级菜单滑动重置
-        // this.infiniteScrollContent.inf.enable(true);
+        this.infiniteScrollContent.inf.enable(true);
         this.loadMore = true;
 
         const index = item.indexParent;
@@ -227,7 +227,7 @@ export class DiscoverPage {
     //子级选择
     changeChildren(item) {
         this.indexChildren = item.indexChildren;
-        // this.infiniteScrollContent.inf.enable(true);
+        this.infiniteScrollContent.inf.enable(true);
 
         this.loadMore = true;
 
@@ -255,6 +255,7 @@ export class DiscoverPage {
 
     //下拉刷新
     doRefresh(e) {
+        this.infiniteScrollContent.inf.enable(true);
         const data = {
             pageNum: 1,
             pageCount: this.pageCount,
@@ -272,9 +273,9 @@ export class DiscoverPage {
                         e.imgUrl = e.attachments[0].path;
                     }
                 })
-                this.slideList[this.toIndex] = this.newList;
                 setTimeout(() => {
-                    this.commonSer.toastTime('刷新成功!', 800)
+                    this.slideList[this.toIndex] = this.newList;
+                    this.commonSer.toastTime('刷新成功!', 800);
                     e.complete();
                 }, 1000);
             }
@@ -300,7 +301,7 @@ export class DiscoverPage {
                 'resourceType': 1
             }
         };
-        this.renderer.setStyle(this.infiniteScrollContentEle.nativeElement.children[0], 'minHeight', '60px');
+        // this.renderer.setStyle(this.infiniteScrollContentEle.nativeElement.children[0], 'minHeight', '60px');
         this.tabsSer.stuffPage(data).subscribe(
             (res) => {
                 let arr = res.data.list;
@@ -314,7 +315,7 @@ export class DiscoverPage {
                 }
                 setTimeout(() => {
                     infiniteScroll.complete();
-                    this.renderer.setStyle(this.infiniteScrollContentEle.nativeElement.children[0], 'minHeight', '0px');
+                    // this.renderer.setStyle(this.infiniteScrollContentEle.nativeElement.children[0], 'minHeight', '0px');
                 }, 1000)
             }
         )

src/pages/tabs/home/home.html

@@ -139,7 +139,6 @@
                         <p class="noData" *ngIf="!loadMore">你已经看到我的底线了</p>
                     </div>
                 </div>
-
             </ng-container>
         </div>
     </div>

src/pages/tabs/home/home.scss

@@ -346,49 +346,16 @@ page-home {
     }
   }
 
-  //新闻区
-  .main-news {
-    padding: 0 1rem 5rem 1rem;
-    //height: inherit;
-
-    .news-item {
-      padding: .8rem 0;
-
-      .news-left {
-        display: flex;
-        flex-flow: row wrap;
-        min-height: 100%;
-
-        .news-title {
-          align-self: flex-start;
-          font-weight: bold;
-          width: 100%;
-          margin-bottom: .6rem;
-        }
-
-        .news-end {
-          //align-self: flex-end;
-          color: #999999;
+  #swiper-article.swiper-container {
+    height: fit-content;
 
-          span {
-            margin-right: 1rem;
-          }
-        }
-      }
-
-      .news-right {
-        text-align: center;
+    .swiper-wrapper {
+      height: fit-content;
 
-        img {
-          border-radius: .5rem;
-          height: 60px;
-        }
+      .swiper-slide {
+        height: fit-content;
       }
     }
-
-    .news-item + .news-item {
-      border-top: 1px solid #eeeeee;
-    }
   }
 
 }

src/pages/tabs/home/home.ts

@@ -170,7 +170,6 @@ export class HomePage {
             loop: false,
             on: {
                 slideChangeTransitionEnd: function () {
-                    console.log(this.activeIndex);
                     that.swiperArticle.update();
                     that.change(that.tabsList[this.activeIndex]);
                 },
@@ -229,6 +228,7 @@ export class HomePage {
                     this.slideList[this.index] = arr;
                 }
                 if (this.swiperArticle) this.swiperArticle.slideTo(this.index, 500);
+                this.content.resize();
             }
         )
     }
@@ -254,7 +254,7 @@ export class HomePage {
                 (res) => {
                     this.partyObj = res.apiResult.data;
                     //获取是否展示过政治生日
-                    const nowDay = this.datePipe.transform(new Date(), 'yyyy-MM-dd');
+                    const nowDay = this.datePipe.transform(new Date(), 'yyyy-MM-dd HH');
                     const partyBir = localStorage.getItem('partyBir');
                     if (nowDay == partyBir) {
                         setTimeout(() => {