Skip to content

P
party-build-cloud
Commit eeede9c7 authored by wangqinghua's avatar wangqinghua
Browse files
Options

头部栏增加数据

parent c5a3660a
Hide whitespace changes
Inline Side-by-side
Showing with 181 additions and 131 deletions
platforms/android/app/build/generated/source/buildConfig/debug/io/ionic/partyCloud/starter/test/BuildConfig.java
View file @ eeede9c7
......@@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "io.ionic.partyCloud.starter.test";
public static final String BUILD_TYPE = "debug";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 303;
public static final String VERSION_NAME = "0.3.3";
public static final int VERSION_CODE = 305;
public static final String VERSION_NAME = "0.3.5";
}
platforms/android/app/build/intermediates/blame/res/debug/single/debug.json
View file @ eeede9c7
......@@ -16,14 +16,14 @@
"source": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/src/main/res/drawable-land-hdpi/screen.png"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/mipmap-mdpi_icon.png.flat",
"source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-mdpi/icon.png"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/xml_provider_paths.xml.flat",
"source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/xml/provider_paths.xml"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/mipmap-mdpi_icon.png.flat",
"source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-mdpi/icon.png"
},
{
"merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_normal_pressed.9.png.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notification_bg_normal_pressed.9.png"
},
......@@ -56,14 +56,14 @@
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media_narrow.xml"
},
{
"merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png"
},
{
"merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action.xml.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml"
},
{
"merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notify_panel_notification_icon_bg.png.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notify_panel_notification_icon_bg.png"
},
{
"merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/drawable-mdpi-v4_notification_bg_low_normal.9.png.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-mdpi-v4/notification_bg_low_normal.9.png"
},
......@@ -140,14 +140,14 @@
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable/notification_tile_bg.xml"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_media_custom.xml.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_media_custom.xml"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_big_media.xml.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_big_media.xml"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_media_custom.xml.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_media_custom.xml"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_lines_media.xml.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_lines_media.xml"
},
......
platforms/android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
View file @ eeede9c7
#Mon May 13 17:40:59 CST 2019
#Mon May 20 10:43:25 CST 2019
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout-v21_notification_action.xml.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xxhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-xxhdpi_screen.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_template_lines_media.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_template_lines_media.xml.flat
......@@ -77,6 +77,6 @@
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action.xml=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_action.xml.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/mipmap-ldpi/icon.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/mipmap-ldpi_icon.png.flat
/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-xhdpi/screen.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-xhdpi_screen.png.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notification_bg_low_pressed.9.png.flat
/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/src/main/res/xml/config.xml=/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/xml_config.xml.flat
/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-hdpi-v4_notification_bg_low_pressed.9.png.flat
/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/src/main/res/mipmap-mdpi/icon.png=/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/mipmap-mdpi_icon.png.flat
platforms/android/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml
View file @ eeede9c7
This source diff could not be displayed because it is too large. You can view the blob instead.
platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt
View file @ eeede9c7
#Wed May 15 17:06:14 CST 2019
#Mon May 20 13:52:57 CST 2019
base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0
renamed.0=classes.dex
file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex
platforms/android/app/build/intermediates/incremental/packageDebug/debug/file-input-save-data.txt
View file @ eeede9c7
#Internal package file, do not edit.
#Wed May 15 17:06:15 CST 2019
#Mon May 20 13:52:58 CST 2019
20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
439.set=ASSET
......@@ -93,7 +93,7 @@
202.set=ASSET
37.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
157.set=ANDROID_RESOURCE
63.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/72.js
63.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/33.js.map
186.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-hdpi-v4/notification_bg_low_pressed.9.png
96.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/74.js
455.set=ANDROID_RESOURCE
......@@ -388,7 +388,7 @@
184.set=ASSET
139.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout/notification_template_big_media_narrow.xml
140.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
49.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v17/notification_template_big_media_narrow.xml
49.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-hdpi-v4/icon.png
409.set=ASSET
392.set=ASSET
36.set=ASSET
......@@ -400,7 +400,7 @@
5.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
233.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/48.js
404.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/tabs/icon-discover-off.png
266.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-ldpi-v4/icon.png
266.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
299.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/phonegap-plugin-mobile-accessibility/www/mobile-accessibility.js
129.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-port-xhdpi-v4/screen.png
13.set=ASSET
......@@ -566,7 +566,7 @@
455.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v17/notification_template_custom_big.xml
438.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
296.set=ASSET
15.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/73.js
15.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/back.png
147.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/12.js.map
318.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/nl.x-services.plugins.videocaptureplus/www/VideoCapturePlus.js
472.set=ANDROID_RESOURCE
......@@ -688,7 +688,7 @@
323.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova.plugins.diagnostic/www/android/diagnostic.wifi.js
36.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
147.set=ASSET
62.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/33.js.map
62.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/72.js
185.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/30.js.map
339.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
95.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex
......@@ -996,7 +996,7 @@
105.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/17.js
174.set=JAVA_RESOURCE
138.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/wdzb.png
48.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-hdpi-v4/icon.png
48.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/layout-v17/notification_template_big_media_narrow.xml
382.set=ASSET
26.set=ANDROID_RESOURCE
82.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
......@@ -1184,7 +1184,7 @@
437.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/mergeJavaRes/debug/0.jar
286.set=ASSET
164.set=ASSET
14.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/back.png
14.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/73.js
317.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/69.js.map
179.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/64.js.map
462.set=ASSET
......@@ -1245,7 +1245,7 @@
6.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
405.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/wdxx.png
171.set=ASSET
267.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
267.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-ldpi-v4/icon.png
23.set=ASSET
131.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
481.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
......
platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt
View file @ eeede9c7
#Wed May 15 17:47:21 CST 2019
#Mon May 20 10:39:08 CST 2019
base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0
renamed.0=classes.dex
file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0/classes.dex
platforms/android/app/build/intermediates/manifests/full/debug/AndroidManifest.xml
View file @ eeede9c7
......@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.ionic.partyCloud.starter.test"
android:hardwareAccelerated="true"
android:versionCode="303"
android:versionName="0.3.3" >
android:versionCode="305"
android:versionName="0.3.5" >
<uses-sdk
android:minSdkVersion="16"
......
platforms/android/app/build/intermediates/manifests/full/debug/output.json
View file @ eeede9c7
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":303},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":305},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/intermediates/manifests/instant-run/debug/output.json
View file @ eeede9c7
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":303},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":305},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/intermediates/res/debug/output.json
View file @ eeede9c7
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":303},"path":"resources-debug.ap_","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":305},"path":"resources-debug.ap_","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/intermediates/transforms/dexMerger/debug/__content__.json
View file @ eeede9c7
[{"name":"main","index":0,"scopes":["SUB_PROJECTS","EXTERNAL_LIBRARIES","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
[{"name":"main","index":0,"scopes":["SUB_PROJECTS","PROJECT","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
src/components/slide/slide.ts
View file @ eeede9c7
......@@ -5,59 +5,60 @@ import {App, NavController, Slides} from "ionic-angular";
import {StuffDetailPage} from "../../pages/home-pages/stuff-detail/stuff-detail";
@Component({
selector: 'slide',
templateUrl: 'slide.html'
selector: 'slide',
templateUrl: 'slide.html'
})
export class SlideComponent implements AfterViewInit{
@ViewChild(Slides) slides:Slides;
@Output() done = new EventEmitter<any>();
export class SlideComponent implements AfterViewInit {
@ViewChild(Slides) slides: Slides;
@Output() done = new EventEmitter<any>();
picture: string = AppGlobal.domain + '/wisdomgroup';
slideTitle;
slideIndex;
slidersItems = [];
picture: string = AppGlobal.domain + '/wisdomgroup';
slideTitle;
slideIndex;
slidersItems = [];
constructor(private tabsSer:TabsService,
private app:App
) {
}
constructor(private tabsSer: TabsService,
private app: App
) {
}
ngAfterViewInit(){
this.getBanner();
}
ngAfterViewInit() {
this.getBanner();
}
//获取轮播图
getBanner() {
const data = {
obj: {
resourceType: 2,
isRecommend: 1,
}
};
this.tabsSer.stuffPage(data).subscribe(
(res) => {
this.slidersItems = res.data.list;
if(this.slidersItems.length > 0){
this.slidersItems.forEach(e => {
if (e.attachments.length > 0) {
e.imgUrl = e.attachments[0].path;
}
})
}
}
)
}
//获取轮播图
getBanner() {
const data = {
isRecent: 0,
obj: {
resourceType: 2,
isRecommend: 1,
}
};
this.tabsSer.stuffPage(data).subscribe(
(res) => {
this.slidersItems = res.data.list;
if (this.slidersItems.length > 0) {
this.slidersItems.forEach(e => {
if (e.attachments.length > 0) {
e.imgUrl = e.attachments[0].path;
}
})
}
}
)
}
//轮播图变动
slideChange(e) {
this.slideIndex = this.slides.realIndex +1;
this.slideTitle = this.slidersItems[this.slideIndex -1].title;
}
//轮播图变动
slideChange(e) {
this.slideIndex = this.slides.realIndex + 1;
this.slideTitle = this.slidersItems[this.slideIndex - 1].title;
}
//查看文章详情
goToDetail() {
const index = this.slides.realIndex;
if(this.slidersItems[index].plateType == 20) return false;
this.done.emit(this.slidersItems[index]);
}
//查看文章详情
goToDetail() {
const index = this.slides.realIndex;
if (this.slidersItems[index].plateType == 20) return false;
this.done.emit(this.slidersItems[index]);
}
}
src/pages/tabs/home/home.html
View file @ eeede9c7
<ion-header>
<ion-navbar>
<ion-buttons start>
<button ion-button icon-only (click)="goToSearch()" class="search-button">
<button ion-button icon-only>
<img class="toolbar-img" src="./assets/imgs/logo.png">
<ion-icon class="search-icon" name="search"></ion-icon>
</button>
</ion-buttons>
<ion-buttons>
积分
</ion-buttons>
<ion-buttons>
庆华
</ion-buttons>
<ion-buttons end>
<ion-buttons start>
<button ion-button icon-only (click)="signNow()" class="toolbar-signUp">
<span class="signUp-span">
<img *ngIf="signObj.isSign == 'no'" class="toolbar-img" src="./assets/imgs/home/no-sign.png">
......@@ -20,12 +13,25 @@
</span>
</button>
</ion-buttons>
<ion-buttons end>
<ion-buttons end class="score margin-right-10">
<span class="score-font">积分</span><span class="score-num">
<ng-container *ngIf="mineInfo?.total">{{mineInfo?.total}}</ng-container>
<ng-container *ngIf="!mineInfo?.total">0</ng-container>
</span>
</ion-buttons>
<ion-buttons class="search-button margin-0-5" end (click)="goToSearch()">
<ion-icon class="search-icon" name="search"></ion-icon>
</ion-buttons>
<ion-buttons end class="margin-0-5">
<button ion-button icon-only (click)="goToNotice()" class="toolbar-icon">
<ion-icon class="icon-youjian iconfont"></ion-icon>
<span *ngIf="noReadNum > 0" class="num">{{noReadNum}}</span>
</button>
</ion-buttons>
<ion-buttons end class="mine-button">
<span>{{username}}</span>
</ion-buttons>
</ion-navbar>
</ion-header>
......@@ -112,12 +118,12 @@
</ion-slide>
</ion-slides>
<!-- <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>-->
<!-- <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>-->
</ion-content>
<!--政治生日-->
<div *ngIf="isBir" class="signMask" (click)="closeBir()">
......
src/pages/tabs/home/home.scss
View file @ eeede9c7
......@@ -40,13 +40,13 @@ page-home {
}
.signUp-span::after {
content: '';
position: absolute;
right: 2px;
top: 6px;
height: 15px;
width: 1px;
background-color: #fff;
//content: '';
//position: absolute;
//right: -8px;
//top: 6px;
//height: 18px;
//width: 2px;
//background-color: rgba(255,255,255,.5);
}
ion-icon.iconfont {
......@@ -57,6 +57,47 @@ page-home {
}
}
//头部 积分
.score{
color: #ffffff;
font-family: SourceHanSans-Bold;
position: relative;
text-align: center;
.score-font{
display: inline-block;
width: 1rem;
line-height: 1rem;
font-size: 1rem;
transform: scale(.8);
}
.score-num{
font-size: 2.5rem;
line-height: 2.3rem;
}
}
.score::after{
content: '';
position: absolute;
right: -14px;
top: 6px;
height: 18px;
width: 2px;
background-color: rgba(255, 255, 255, 0.5);
}
ion-buttons.mine-button.bar-buttons-ios[end]{
background-color: #fff1f0;
color: #444444;
display: inline-block;
border: 1px solid #fff;
border-radius: 50%;
width: 2.5rem;
line-height: 2.5rem;
font-size: 1rem;
transform: scale(.9);
height: 2.5rem;
text-align: center;
}
//中间
.home-middle-tips {
font-size: 1.5rem;
......@@ -213,5 +254,6 @@ page-home {
ion-infinite-scroll{
overflow: hidden;
}
}
src/pages/tabs/home/home.ts
View file @ eeede9c7
......@@ -82,9 +82,12 @@ export class HomePage {
totalNum;
loadMore = true;
mineInfo;
username;
constructor(public navCtrl: NavController, public tts: TextToSpeech, public datePipe: DatePipe,
public commonSer: CommonService, public emitSer: EmitService,
public zone: NgZone, public slideListCom: SlideListComponent,
public zone: NgZone, public tabSer: TabsService,
public renderer: Renderer2, public slideCom: SlideComponent,
public appService: AppService, public http: Http, public storage: Storage,
public badge: Badge, public tabsSer: TabsService) {
......@@ -98,12 +101,18 @@ export class HomePage {
}
ionViewDidEnter() {
this.slideCom.getBanner();
this.tabsSer.signNow().subscribe(
(res) => {
this.signObj = res.data;
}
);
this.tabSer.getUserIntegral().subscribe(
(res) => {
this.mineInfo = res.data;
this.username = this.mineInfo.username.slice(-2);
}
)
}
......@@ -136,9 +145,9 @@ export class HomePage {
this.loadMore = true;
// this.infiniteScrollContent.inf.enable(true);
this.index = item.index;
if(item.type == 0){
if (item.type == 0) {
this.isRecent = 1;
}else{
} else {
this.isRecent = 0;
}
// 自身div的一半 - 滑块的一半
......@@ -148,7 +157,7 @@ export class HomePage {
const data = {
pageNum: this.pageNum,
pageCount: this.pageCount,
isRecent:this.isRecent,
isRecent: this.isRecent,
obj: {
'plateType': this.plateType,
'resourceType': 1
......@@ -194,10 +203,10 @@ export class HomePage {
const nowDay = this.datePipe.transform(new Date(), 'yyyy-MM-dd');
const partyBir = localStorage.getItem('partyBir');
if (nowDay == partyBir) {
setTimeout(()=>{
setTimeout(() => {
this.start();
this.isBir = false;
},500)
}, 500)
} else {
this.isBir = true;
}
......@@ -246,7 +255,7 @@ export class HomePage {
//签到倒计时
signNow() {
if(this.signObj.isSign == 'no') this.disabledClick = true;
if (this.signObj.isSign == 'no') this.disabledClick = true;
this.isSign = true;
let totalTime = 5;
this.signText = '(倒计时' + totalTime + 's)';
......@@ -290,7 +299,7 @@ export class HomePage {
const data = {
pageNum: this.pageNum,
pageCount: this.pageCount,
isRecent:this.isRecent,
isRecent: this.isRecent,
obj: {
'plateType': this.plateType,
'resourceType': 1
......@@ -322,7 +331,7 @@ export class HomePage {
const data = {
pageNum: 1,
pageCount: this.pageCount,
isRecent:this.isRecent,
isRecent: this.isRecent,
obj: {
'plateType': this.plateType,
'resourceType': 1
......@@ -353,7 +362,7 @@ export class HomePage {
this.start();
}
closeSign(){
closeSign() {
this.isSign = false;
}
......
src/pages/tabs/mine/mine.ts
View file @ eeede9c7
......@@ -73,16 +73,6 @@ export class MinePage {
this.navCtrl.push(page);
}
//后台退出
logoutApp() {
this.appService.ObserverHttpGet("/wisdomgroup/app/logout", null)
.subscribe((res: Response) => {
let data = res.json();
}, error => {
}
);
}
//获取最新版本信息
getversion() {
//检测是否需要更新
......
src/provide/http.common.service.ts 0 → 100644
View file @ eeede9c7
import {Injectable} from "@angular/core";import {TabsService} from "../pages/tabs/tabs.service"; @Injectable() export class HttpCommonService { constructor(private tabSer:TabsService){} }
\ No newline at end of file
src/service/http.service.ts
View file @ eeede9c7
......@@ -15,9 +15,9 @@ export class AppGlobal {
//接口基地址
// static domain = "http://101.89.112.92:80"; //正式环境
// static domain = "http://192.168.2.235:8080"; //测试环境
static domain = "http://47.103.33.196:8080"; //阿里云测试地址
// static domain = "http://47.103.33.196:8080"; //阿里云测试地址
// static domain = "http://47.103.35.216:8080"; //阿里云正式地址
// static domain = ""; //本地环境
static domain = ""; //本地环境
//图片地址
// static picture = AppGlobal.domain + "/wisdomgroup/manager/getIcon/"; //正式地址
......
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