Commit c917de7f authored by wangqinghua's avatar wangqinghua

样式修改

parent 1bce2fea
...@@ -90,9 +90,9 @@ ...@@ -90,9 +90,9 @@
<plugin name="phonegap-plugin-mobile-accessibility" spec="~1.0.5-dev" /> <plugin name="phonegap-plugin-mobile-accessibility" spec="~1.0.5-dev" />
<plugin name="cordova-plugin-camera" spec="~4.0.3" /> <plugin name="cordova-plugin-camera" spec="~4.0.3" />
<plugin name="cordova-plugin-file-transfer" spec="~1.7.1" /> <plugin name="cordova-plugin-file-transfer" spec="~1.7.1" />
<plugin name="cordova-plugin-splashscreen" spec="~5.0.2" />
<plugin name="com.moust.cordova.videoplayer" spec="https://github.com/moust/cordova-plugin-videoplayer.git" />
<engine name="ios" spec="4.5.5" /> <engine name="ios" spec="4.5.5" />
<engine name="browser" spec="5.0.4" /> <engine name="browser" spec="5.0.4" />
<engine name="android" spec="7.0.0" /> <engine name="android" spec="7.0.0" />
<plugin name="cordova-plugin-splashscreen" spec="~5.0.2" />
<plugin name="com.moust.cordova.videoplayer" spec="https://github.com/moust/cordova-plugin-videoplayer.git" />
</widget> </widget>
...@@ -51,7 +51,7 @@ export class MyApp { ...@@ -51,7 +51,7 @@ export class MyApp {
this.statusBar.backgroundColorByHexString('#e12724'); this.statusBar.backgroundColorByHexString('#e12724');
this.statusBar.styleLightContent(); this.statusBar.styleLightContent();
timer(500).subscribe((res) =>{ timer(4500).subscribe((res) =>{
this.showSplash = false this.showSplash = false
this.checkVersion(); this.checkVersion();
this.loadLogin(); this.loadLogin();
......
...@@ -424,7 +424,7 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios { ...@@ -424,7 +424,7 @@ ion-navbar .header-ios .toolbar-ios:last-child .toolbar-background-ios {
height: 300px; height: 300px;
border-radius: 5px; border-radius: 5px;
background: url(../assets/imgs/home/edu_mask.png) repeat; background: url(../assets/imgs/home/edu_mask.png) repeat;
background-size: cover; background-size: contain;
.close { .close {
position: absolute; position: absolute;
......
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
</div> </div>
</div> </div>
<ion-fab *ngIf="indexChildren == '45'" right bottom> <ion-fab *ngIf="indexChildren == '55'" right bottom>
<button ion-fab color="light" (click)="issue()"> <button ion-fab color="light" (click)="issue()">
<span class="issue">我要<br>出题</span> <span class="issue">我要<br>出题</span>
</button> </button>
......
...@@ -269,15 +269,15 @@ export class DiscoverPage { ...@@ -269,15 +269,15 @@ export class DiscoverPage {
}); });
that.swiperImg = new Swiper('#swiper-slide', { that.swiperImg = new Swiper('#swiper-slide', {
speed: 1000, speed: 1000,
autoplay: { autoplay: true,//可选选项,自动滑动
delay: 3000,
disableOnInteraction: false,
},//可选选项,自动滑动
observer: true, observer: true,
observeParents: true, observeParents: true,
observeSlideChildren: true, observeSlideChildren: true,
loop: true, loop: true,
on: { on: {
init: function () {
},
slideChangeTransitionEnd: function () { slideChangeTransitionEnd: function () {
that.slideIndex = this.activeIndex; that.slideIndex = this.activeIndex;
that.slideTitle = that.slidersItems[this.activeIndex].title; that.slideTitle = that.slidersItems[this.activeIndex].title;
...@@ -286,14 +286,14 @@ export class DiscoverPage { ...@@ -286,14 +286,14 @@ export class DiscoverPage {
click: function () { click: function () {
const item = that.slidersItems[this.activeIndex]; const item = that.slidersItems[this.activeIndex];
if (item.static == "true") { if (item.static == "true") {
that.swiperImg.slideTo(0, 500); that.swiper.slideTo(0, 500);
return false; return false;
} }
if (item.plateType == 20) return false; if (item.plateType == 20) return false;
that.navCtrl.push(StuffDetailPage, { that.navCtrl.push(StuffDetailPage, {
id: item.id id: item.id
}) })
}, }
} }
}); });
} }
...@@ -318,6 +318,7 @@ export class DiscoverPage { ...@@ -318,6 +318,7 @@ export class DiscoverPage {
} }
this.slidersItems = res.data.list; this.slidersItems = res.data.list;
this.slidersItems.push(this.eduObj); this.slidersItems.push(this.eduObj);
this.slideTitle = this.slidersItems[this.slidersItems.length -2].title;
} }
) )
} }
......
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
</button> </button>
</ion-buttons> </ion-buttons>
<ion-buttons end class="mine-button" > <ion-buttons end class="mine-button" >
<button (click)="goTo('PersonInfoPage')" style="background-color: transparent;padding: 0;"> <button (click)="goTo('PersonInfoPage')" class="mine-home">
<span >{{username}}</span> <span >{{username}}</span>
</button> </button>
</ion-buttons> </ion-buttons>
......
...@@ -207,6 +207,7 @@ page-home { ...@@ -207,6 +207,7 @@ page-home {
.news-end { .news-end {
color: #989898; color: #989898;
font-size: 1.5rem; font-size: 1.5rem;
span { span {
margin-right: 1rem; margin-right: 1rem;
} }
...@@ -359,5 +360,12 @@ page-home { ...@@ -359,5 +360,12 @@ page-home {
} }
} }
.mine-home {
background-color: transparent;
padding: 0;
font-size: 1rem;
transform: scale(0.8);
}
} }
...@@ -280,6 +280,8 @@ export class HomePage { ...@@ -280,6 +280,8 @@ export class HomePage {
}) })
} }
this.slidersItems = res.data.list; this.slidersItems = res.data.list;
console.log(this.slidersItems);
this.slideTitle = this.slidersItems[this.slidersItems.length -1].title;
} }
) )
} }
......
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