Commit 78df88dd authored by wangqinghua's avatar wangqinghua

样式调试

parent c9e652dc
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
<preference name="android-minSdkVersion" value="16" /> <preference name="android-minSdkVersion" value="16" />
<preference name="BackupWebStorage" value="none" /> <preference name="BackupWebStorage" value="none" />
<preference name="SplashMaintainAspectRatio" value="true" /> <preference name="SplashMaintainAspectRatio" value="true" />
<preference name="FadeSplashScreenDuration" value="300" /> <preference name="FadeSplashScreenDuration" value="500" />
<preference name="SplashShowOnlyFirstTime" value="false" /> <preference name="SplashShowOnlyFirstTime" value="false" />
<preference name="SplashScreen" value="screen" /> <preference name="SplashScreen" value="screen" />
<preference name="SplashScreenDelay" value="20000" /> <preference name="SplashScreenDelay" value="5000" />
<preference name="ShowSplashScreenSpinner" value="false" /> <preference name="ShowSplashScreenSpinner" value="false" />
<platform name="android"> <platform name="android">
<allow-intent href="market:*" /> <allow-intent href="market:*" />
......
...@@ -23,7 +23,7 @@ slide { ...@@ -23,7 +23,7 @@ slide {
} }
.slide-zoom{ .slide-zoom{
text-align: center; text-align: center;
line-height: 219px; //line-height: 219px;
max-height: 100%; max-height: 100%;
} }
.swiper-container { .swiper-container {
......
...@@ -70,7 +70,7 @@ export class PublishPage { ...@@ -70,7 +70,7 @@ export class PublishPage {
title:this.obj.title, title:this.obj.title,
plateType:this.obj.type, plateType:this.obj.type,
source:'上海市委组织部', source:'上海市委组织部',
publishStatus:'1', publishStatus:'2',
content:this.obj.content, content:this.obj.content,
publishRange:this.obj.publishRange, publishRange:this.obj.publishRange,
submitter:this.userid, submitter:this.userid,
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
<span #tips1 class="tips"></span> <span #tips1 class="tips"></span>
</div> </div>
</div> </div>
<ion-slides (ionSlideDidChange)="slideChange()" loop="true"> <ion-slides (ionSlideDidChange)="slideChange()" class="stuff" loop="true">
<ion-slide [style.top]="isScroll == true?'50px':''" *ngFor="let item of slideList;let i = index"> <ion-slide [style.top]="isScroll == true?'50px':''" *ngFor="let item of slideList;let i = index">
<div class="main-news"> <div class="main-news">
<ng-container *ngFor="let new of item;"> <ng-container *ngFor="let new of item;">
...@@ -105,15 +105,15 @@ ...@@ -105,15 +105,15 @@
</ion-slide> </ion-slide>
</ion-slides> </ion-slides>
<ion-infinite-scroll #infiniteScrollContentEle (ionInfinite)="doInfinite($event)"> <!-- <ion-infinite-scroll #infiniteScrollContentEle (ionInfinite)="doInfinite($event)">-->
<ion-infinite-scroll-content <!-- <ion-infinite-scroll-content-->
loadingSpinner="bubbles" <!-- loadingSpinner="bubbles"-->
loadingText="加载中"></ion-infinite-scroll-content> <!-- loadingText="加载中"></ion-infinite-scroll-content>-->
</ion-infinite-scroll> <!-- </ion-infinite-scroll>-->
<p class="noData" *ngIf="!loadMore">你已经看到我的底线了</p> <!-- <p class="noData" *ngIf="!loadMore">你已经看到我的底线了</p>-->
</ion-content> </ion-content>
<!--政治生日--> <!--政治生日-->
<div *ngIf="isBir" class="signMask" (click)="close($event)"> <div *ngIf="isBir" class="signMask" (click)="closeBir()">
<div class="mask-content-bir" (click)="stop($event)"> <div class="mask-content-bir" (click)="stop($event)">
<p class="title">政治生日</p> <p class="title">政治生日</p>
<div class="record-content"> <div class="record-content">
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
</div> </div>
<!--签到--> <!--签到-->
<div *ngIf="isSign" (click)="close($event)" class="signMask"> <div *ngIf="isSign" (click)="closeSign()" class="signMask">
<div class="mask-content" (click)="stop($event)"> <div class="mask-content" (click)="stop($event)">
<ion-icon class="close" (click)="isSign = false" name="close"></ion-icon> <ion-icon class="close" (click)="isSign = false" name="close"></ion-icon>
<div class="record-conten"> <div class="record-conten">
......
...@@ -191,7 +191,7 @@ page-home { ...@@ -191,7 +191,7 @@ page-home {
white-space: nowrap; white-space: nowrap;
} }
.swiper-slide{ .stuff .swiper-slide{
align-items: baseline; align-items: baseline;
font-size: 1.4rem; font-size: 1.4rem;
overflow-y: scroll; overflow-y: scroll;
......
...@@ -33,7 +33,7 @@ export class HomePage { ...@@ -33,7 +33,7 @@ export class HomePage {
@ViewChild('headerTag') headerTag: ElementRef; @ViewChild('headerTag') headerTag: ElementRef;
@ViewChild('homeMiddleTips') homeMiddleTips: ElementRef; @ViewChild('homeMiddleTips') homeMiddleTips: ElementRef;
@ViewChild('infiniteScrollContentEle') infiniteScrollContentEle: ElementRef; @ViewChild('infiniteScrollContentEle') infiniteScrollContentEle: ElementRef;
@ViewChild(InfiniteScrollContent) infiniteScrollContent: InfiniteScrollContent; // @ViewChild(InfiniteScrollContent) infiniteScrollContent: InfiniteScrollContent;
picture: string = AppGlobal.domain + '/wisdomgroup'; picture: string = AppGlobal.domain + '/wisdomgroup';
//所属板块类型: //所属板块类型:
...@@ -131,7 +131,7 @@ export class HomePage { ...@@ -131,7 +131,7 @@ export class HomePage {
change(item) { change(item) {
this.pageNum = 1; this.pageNum = 1;
this.loadMore = true; this.loadMore = true;
this.infiniteScrollContent.inf.enable(true); // this.infiniteScrollContent.inf.enable(true);
this.index = item.index; this.index = item.index;
// 自身div的一半 - 滑块的一半 // 自身div的一半 - 滑块的一半
this.tips.nativeElement.style.left = this.itemWidth * (this.index) + (this.itemWidth - this.spanWidth) / 2 + 'px'; this.tips.nativeElement.style.left = this.itemWidth * (this.index) + (this.itemWidth - this.spanWidth) / 2 + 'px';
...@@ -282,7 +282,7 @@ export class HomePage { ...@@ -282,7 +282,7 @@ export class HomePage {
'resourceType': 1 'resourceType': 1
} }
}; };
this.renderer.setStyle(this.infiniteScrollContentEle.nativeElement, 'height', '60px'); // this.renderer.setStyle(this.infiniteScrollContentEle.nativeElement, 'height', '60px');
this.tabsSer.stuffPage(data).subscribe( this.tabsSer.stuffPage(data).subscribe(
(res) => { (res) => {
let arr = res.data.list; let arr = res.data.list;
...@@ -296,7 +296,7 @@ export class HomePage { ...@@ -296,7 +296,7 @@ export class HomePage {
} }
setTimeout(() => { setTimeout(() => {
e.complete(); e.complete();
this.renderer.setStyle(this.infiniteScrollContentEle.nativeElement, 'height', '0px'); // this.renderer.setStyle(this.infiniteScrollContentEle.nativeElement, 'height', '0px');
}, 1000) }, 1000)
} }
) )
...@@ -304,6 +304,7 @@ export class HomePage { ...@@ -304,6 +304,7 @@ export class HomePage {
//下拉刷新 //下拉刷新
doRefresh(e) { doRefresh(e) {
this.slideCom.getBanner();
const data = { const data = {
pageNum: 1, pageNum: 1,
pageCount: this.pageCount, pageCount: this.pageCount,
...@@ -332,8 +333,12 @@ export class HomePage { ...@@ -332,8 +333,12 @@ export class HomePage {
} }
//关闭弹窗 //关闭弹窗
close(e) { closeBir() {
this.isBir = false; this.isBir = false;
this.start();
}
closeSign(){
this.isSign = false; this.isSign = false;
} }
......
...@@ -15,8 +15,8 @@ export class AppGlobal { ...@@ -15,8 +15,8 @@ export class AppGlobal {
//接口基地址 //接口基地址
// static domain = "http://101.89.112.92:80"; //正式环境 // static domain = "http://101.89.112.92:80"; //正式环境
// static domain = "http://180.168.156.212:2931"; //测试环境 // static domain = "http://180.168.156.212:2931"; //测试环境
static domain = "http://47.103.35.216:8080"; //阿里云地址 // static domain = "http://47.103.35.216:8080"; //阿里云地址
// static domain = ""; //本地环境 static domain = ""; //本地环境
//图片地址 //图片地址
// static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/"; //正式地址 // static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/"; //正式地址
...@@ -33,7 +33,7 @@ export class AppGlobal { ...@@ -33,7 +33,7 @@ export class AppGlobal {
getDetails: '/api/ionic3/details' getDetails: '/api/ionic3/details'
}; };
static pageCount = 10; static pageCount = 1000;
} }
@Injectable() @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