Commit aff0710f authored by wangqinghua's avatar wangqinghua

样式调整

parent aaa64f3e
...@@ -175,20 +175,28 @@ p { ...@@ -175,20 +175,28 @@ p {
width: 100%; width: 100%;
.tabs-parent { .tabs-parent {
position: relative; position: relative;
background-color: #fff;
margin-bottom: .5rem; margin-bottom: .5rem;
font-size: 1.7rem; font-size: 1.7rem;
white-space: nowrap; white-space: nowrap;
background-color: #fff1f0;
} }
.tabs-parent::-webkit-scrollbar { .tabs-parent::-webkit-scrollbar {
display: none; display: none;
} }
.selectTab{
color: #e42417;
padding: 6px 2px;
-webkit-transition: background-color 500ms;
-moz-transition: background-color 500ms;
-ms-transition: background-color 500ms;
-o-transition: background-color 500ms;
transition: background-color 500ms;
}
.tabs-children { .tabs-children {
text-align: center; text-align: center;
cursor: pointer; cursor: pointer;
height: 4rem; height: 3rem;
line-height: 4rem; line-height: 3rem;
width: calc(100% / 4); width: calc(100% / 4);
display: inline-block; display: inline-block;
color: #747378; color: #747378;
...@@ -201,7 +209,7 @@ p { ...@@ -201,7 +209,7 @@ p {
#tips,.tips { #tips,.tips {
position: absolute; position: absolute;
bottom: 5px; bottom: 0px;
height: 2px; height: 2px;
width: 3rem; width: 3rem;
background-color: #e12724; background-color: #e12724;
......
...@@ -27,6 +27,7 @@ slide { ...@@ -27,6 +27,7 @@ slide {
} }
.slides-title { .slides-title {
margin-top: 5px;
color: #4c4c4c; color: #4c4c4c;
width: 100%; width: 100%;
text-align: left; text-align: left;
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
</div> </div>
</div> </div>
</ion-header> </ion-header>
<ion-content> <ion-content>
<ion-refresher (ionRefresh)="doRefresh($event)"> <ion-refresher (ionRefresh)="doRefresh($event)">
<ion-refresher-content pullingText="下拉刷新" <ion-refresher-content pullingText="下拉刷新"
...@@ -101,6 +102,8 @@ ...@@ -101,6 +102,8 @@
</ion-slides> </ion-slides>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)"> <ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content></ion-infinite-scroll-content> <ion-infinite-scroll-content
loadingSpinner="bubbles" threshold="10%"
loadingText="加载更多..."></ion-infinite-scroll-content>
</ion-infinite-scroll> </ion-infinite-scroll>
</ion-content> </ion-content>
...@@ -147,6 +147,7 @@ page-discover { ...@@ -147,6 +147,7 @@ page-discover {
align-items: baseline; align-items: baseline;
font-size: 1.4rem; font-size: 1.4rem;
overflow-y: auto; overflow-y: auto;
padding-bottom: 1rem;
} }
.slide-zoom{ .slide-zoom{
text-align: left; text-align: left;
......
...@@ -274,7 +274,10 @@ export class DiscoverPage { ...@@ -274,7 +274,10 @@ export class DiscoverPage {
} }
doInfinite(e) { doInfinite(e) {
e.complete(); console.log('infinite')
setTimeout(()=>{
e.complete();
},1000)
} }
slideChange(e) { slideChange(e) {
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<div [hidden]="isScroll" class="news-content"> <div [hidden]="isScroll" class="news-content">
<div class="tabs-parent"> <div class="tabs-parent">
<div *ngFor="let item of tabsList;let i = index" (click)="change(item)" class="tabs-children"> <div *ngFor="let item of tabsList;let i = index" (click)="change(item)" class="tabs-children">
<span #tabSpan [style.color]="index == i ? '#e12724':''">{{item.name}}</span> <span #tabSpan [ngClass]="{'selectTab':index == i}">{{item.name}}</span>
</div> </div>
<span #tips class="tips"></span> <span #tips class="tips"></span>
</div> </div>
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<div [hidden]="!isScroll" ion-fixed class="news-content ion-fixed"> <div [hidden]="!isScroll" ion-fixed class="news-content ion-fixed">
<div class="tabs-parent"> <div class="tabs-parent">
<div *ngFor="let item of tabsList;let i = index" (click)="change(item)" class="tabs-children"> <div *ngFor="let item of tabsList;let i = index" (click)="change(item)" class="tabs-children">
<span #tabSpan1 [style.color]="index == i ? '#e12724':''">{{item.name}}</span> <span #tabSpan1 [ngClass]="{'selectTab':index == i}">{{item.name}}</span>
</div> </div>
<span #tips1 class="tips"></span> <span #tips1 class="tips"></span>
</div> </div>
...@@ -100,6 +100,8 @@ ...@@ -100,6 +100,8 @@
</div> </div>
</ion-slide> </ion-slide>
</ion-slides> </ion-slides>
<ion-infinite-scroll #infiniteScrollContent (ionInfinite)="doInfinite($event)"> <ion-infinite-scroll #infiniteScrollContent (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content <ion-infinite-scroll-content
loadingSpinner="bubbles" threshold="10%" loadingSpinner="bubbles" threshold="10%"
......
page-home { page-home {
//头部搜索 //头部搜索
.toolbar .searchbar-ios .searchbar-input { .toolbar .searchbar-ios .searchbar-input {
background-color: #e12724; background-color: #e12724;
...@@ -109,7 +106,7 @@ page-home { ...@@ -109,7 +106,7 @@ page-home {
} }
.news-content{ .news-content{
margin-top: 1.2rem; margin-top: .8rem;
} }
.news-content.ion-fixed{ .news-content.ion-fixed{
margin: 0; margin: 0;
...@@ -189,7 +186,8 @@ page-home { ...@@ -189,7 +186,8 @@ page-home {
.swiper-slide{ .swiper-slide{
align-items: baseline; align-items: baseline;
font-size: 1.4rem; font-size: 1.4rem;
overflow-y: auto; overflow-y: scroll;
padding-bottom: 1rem;
} }
.slide-zoom{ .slide-zoom{
text-align: left; text-align: left;
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
//tabs-icon //tabs-icon
ion-icon { ion-icon {
&[class*="custom-"] { &[class*="custom-"] {
margin: 0 5px 0 0; margin: 0 2px 0 0;
vertical-align: middle; vertical-align: middle;
$sz: 20px; $sz: 20px;
width: $sz; width: $sz;
......
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