Commit 66a63236 authored by wangqinghua's avatar wangqinghua

搜索框高度修正

parent 9bcf5a2d
......@@ -61,6 +61,7 @@ export class SlideComponent implements AfterViewInit{
//查看文章详情
goToDetail() {
const index = this.slides.realIndex;
if(this.slidersItems[index].plateType == 20) return false;
this.nav.push(StuffDetailPage, {
id: this.slidersItems[index].id
})
......
......@@ -18,7 +18,6 @@
<p [innerHTML]="stuffObj?.content"></p>
</div>
<div class="stuff-attachments">
<ng-container *ngFor="let item of attachments">
<div style="height: 160px;" *ngIf="item.resourceType == 1">
<img style="height: 160px;" [src]="url + item.path" alt="">
......
......@@ -110,7 +110,7 @@
<ion-infinite-scroll #infiniteScrollContentEle (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content
loadingSpinner="bubbles"
loadingText="加载更多..."></ion-infinite-scroll-content>
loadingText="加载"></ion-infinite-scroll-content>
</ion-infinite-scroll>
<p class="noData" *ngIf="!loadMore">你已经看到我的底线了</p>
......
......@@ -91,6 +91,13 @@ page-discover {
color: #333333;
font-size: 1.6rem;
font-family: SourceHanSans-Bold;
.icon-fire{
position: absolute;
top: 3px;
left: -14px;
font-size: 1.5rem;
color: #e42417;
}
}
.news-end{
align-self: flex-end;
......
......@@ -156,6 +156,7 @@ export class DiscoverPage {
totalNum;
pageNum = 1;
constructor(public navCtrl: NavController, public navParams: NavParams,
public commonSer: CommonService,public renderer:Renderer2,
public tabsSer: TabsService, public emitSer: EmitService) {
......@@ -267,11 +268,11 @@ export class DiscoverPage {
}
//上拉加载
doInfinite(e) {
doInfinite(infiniteScroll) {
if (this.totalNum < this.slideList[this.toIndex].length + 1) {
console.log('没有数据了');
this.loadMore = false;
e.enable(false);
infiniteScroll.enable(false);
return false;
}
this.pageNum++;
......@@ -292,11 +293,11 @@ export class DiscoverPage {
if (e.attachments.length > 0) {
e.imgUrl = e.attachments[0].path;
}
this.slideList[this.toIndex].push(e);
this.slideList[this.indexParent].push(e);
});
}
setTimeout(() => {
e.complete();
infiniteScroll.complete();
this.renderer.setStyle(this.infiniteScrollContentEle.nativeElement, 'height', '0px');
}, 1000)
}
......
......@@ -33,7 +33,7 @@ export class AppGlobal {
getDetails: '/api/ionic3/details'
};
static pageCount = 2;
static pageCount = 4;
}
@Injectable()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment