Skip to content

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

样式修正

parent 2e44d428
Hide whitespace changes
Inline Side-by-side
Showing with 335 additions and 250 deletions
platforms/android/CordovaLib/build/intermediates/incremental/mergeReleaseResources/merger.xml 0 → 100644
View file @ b896e1f1
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main$Generated" generated="true"><source path="/Users/ben/gitLab-project/party-build-cloud/platforms/android/CordovaLib/res"/><source path="/Users/ben/gitLab-project/party-build-cloud/platforms/android/CordovaLib/build/generated/res/rs/release"/><source path="/Users/ben/gitLab-project/party-build-cloud/platforms/android/CordovaLib/build/generated/res/resValues/release"/></dataSet><dataSet config="main" generated-set="main$Generated"><source path="/Users/ben/gitLab-project/party-build-cloud/platforms/android/CordovaLib/res"/><source path="/Users/ben/gitLab-project/party-build-cloud/platforms/android/CordovaLib/build/generated/res/rs/release"/><source path="/Users/ben/gitLab-project/party-build-cloud/platforms/android/CordovaLib/build/generated/res/resValues/release"/></dataSet><dataSet config="release$Generated" generated="true"><source path="/Users/ben/gitLab-project/party-build-cloud/platforms/android/CordovaLib/src/release/res"/></dataSet><dataSet config="release" generated-set="release$Generated"><source path="/Users/ben/gitLab-project/party-build-cloud/platforms/android/CordovaLib/src/release/res"/></dataSet><mergedItems/></merger>
\ No newline at end of file
platforms/android/CordovaLib/build/intermediates/transforms/mergeJavaRes/debug/__content__.json 0 → 100644
View file @ b896e1f1
[{"name":"resources","index":0,"scopes":["PROJECT"],"types":["RESOURCES"],"format":"JAR","present":true}]
\ No newline at end of file
platforms/android/CordovaLib/build/intermediates/transforms/mergeJavaRes/release/__content__.json 0 → 100644
View file @ b896e1f1
[{"name":"resources","index":0,"scopes":["PROJECT"],"types":["RESOURCES"],"format":"JAR","present":true}]
\ No newline at end of file
platforms/android/android.iml 0 → 100644
View file @ b896e1f1
<?xml version="1.0" encoding="UTF-8"?>
<module external.system.id="GRADLE" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
\ No newline at end of file
platforms/android/app/build/intermediates/blame/res/debug/single/debug.json
View file @ b896e1f1
......@@ -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/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/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/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/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/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-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_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_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_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/blame/res/release/multi-v2/release.json
View file @ b896e1f1
......@@ -61,10 +61,10 @@
]
},
{
"outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/values-hr_values-hr.arsc.flat",
"outputFile": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/release/values-fr_values-fr.arsc.flat",
"map": [
{
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-hr/values-hr.xml",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-fr/values-fr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
......@@ -76,10 +76,10 @@
]
},
{
"outputFile": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/release/values-fr_values-fr.arsc.flat",
"outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/values-hr_values-hr.arsc.flat",
"map": [
{
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-fr/values-fr.xml",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-hr/values-hr.xml",
"from": {
"startLines": "2",
"startColumns": "4",
......
platforms/android/app/build/intermediates/blame/res/release/single/release.json
View file @ b896e1f1
......@@ -4,11 +4,11 @@
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout/notification_action.xml"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable_notification_icon_background.xml.flat",
"merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/release/drawable_notification_icon_background.xml.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable/notification_icon_background.xml"
},
{
"merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/release/drawable_notification_icon_background.xml.flat",
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable_notification_icon_background.xml.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/drawable/notification_icon_background.xml"
},
{
......@@ -124,14 +124,14 @@
"source": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xhdpi_screen.png.flat",
"source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png"
},
{
"merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/release/layout-v16_notification_template_custom_big.xml.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v16/notification_template_custom_big.xml"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/release/drawable-land-xhdpi_screen.png.flat",
"source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-land-xhdpi/screen.png"
},
{
"merged": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/release/drawable-port-mdpi_screen.png.flat",
"source": "/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/src/main/res/drawable-port-mdpi/screen.png"
},
......
platforms/android/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
View file @ b896e1f1
This source diff could not be displayed because it is too large. You can view the blob instead.
platforms/android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
View file @ b896e1f1
#Mon May 27 13:41:49 CST 2019
#Tue May 28 16:52:55 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/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/xml/config.xml=/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/debug/xml_config.xml.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 @ b896e1f1
This source diff could not be displayed because it is too large. You can view the blob instead.
platforms/android/app/build/intermediates/incremental/mergeReleaseResources/compile-file-map.properties
View file @ b896e1f1
#Fri May 24 17:08:56 CST 2019
#Tue May 28 16:53:12 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/release/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/release/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/release/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/release/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/release/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/release/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/release/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/release/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/release/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/release/mipmap-mdpi_icon.png.flat
platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt
View file @ b896e1f1
#Mon May 27 13:47:10 CST 2019
#Tue May 28 16:59:53 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/packageRelease/release/dex-renamer-state.txt
View file @ b896e1f1
#Fri May 24 17:09:09 CST 2019
#Tue May 28 16:53:23 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/src/main/res/xml/config.xml
View file @ b896e1f1
......@@ -98,7 +98,7 @@
<preference name="android-minSdkVersion" value="16" />
<preference name="BackupWebStorage" value="none" />
<preference name="FadeSplashScreenDuration" value="300" />
<preference name="SplashScreenDelay" value="3000" />
<preference name="SplashScreenDelay" value="1000" />
<preference name="AutoHideSplashScreen" value="false" />
<preference name="FadeSplashScreen" value="true" />
<preference name="ShowSplashScreen" value="true" />
......
src/pages/home-pages/stuff-detail/stuff-detail.html
View file @ b896e1f1
......@@ -36,7 +36,13 @@
<div *ngFor="let comment of stuffObj?.commentInfos" class="comment-item">
<ion-row>
<ion-col col-2>
<img src="./assets/imgs/man.png" class="contact-img">
<ng-container *ngIf="comment?.picUrl && comment?.picUrl != ''">
<img src="{{picture+comment.picUrl}}" class="contact-img">
</ng-container>
<ng-container *ngIf="!comment?.picUrl || comment?.picUrl == ''">
<img src="./assets/imgs/man.png" class="contact-img" *ngIf="comment.userGender =='1'||comment.userGender==null">
<img src="./assets/imgs/woman.png" class="contact-img" *ngIf="comment.userGender =='0'">
</ng-container>
</ion-col>
<ion-col col-10 style="border-bottom: 1px solid #eee;">
<p class="comment-info">
......@@ -75,24 +81,6 @@
</ion-col>
</ion-row>
</div>
<!--评论-->
<div class="error-text" *ngIf="comment">
<div class="error-flex">
<div class="padding-10">
<textarea [(ngModel)]="content" class="content-textarea"></textarea>
</div>
<div class="error-footer">
<ion-row>
<ion-col col-6>
<button (click)="sure()" class="sure">发布</button>
</ion-col>
<ion-col col-6>
<button (click)="cancel()" class="cancel">取消</button>
</ion-col>
</ion-row>
</div>
</div>
</div>
<div class="error-text" *ngIf="reply">
<div class="error-flex">
......
src/pages/home-pages/stuff-detail/stuff-detail.ts
View file @ b896e1f1
......@@ -17,6 +17,8 @@ export class StuffDetailPage {
@ViewChild('like') like: ElementRef;
@ViewChild('collection') collection: ElementRef;
picture: string = AppGlobal.picture;
stuffId; //文章id
content: string; //评论内容
userId; //用户id
......
src/pages/tabs/home/home.html
View file @ b896e1f1
......@@ -60,17 +60,19 @@
</ion-row>
</div>
<div class="slides-content">
<ion-slides (ionSlideDidChange)="slideChangeSwiper($event)" *ngIf="slidersItems.length>0"
(ionSlideTap)="goToDetailBySlide()" loop="true" autoplay="2000" speed="1500">
<ion-slide *ngFor="let item of slidersItems;">
<img [src]="picture+item.imgUrl" class="slide-image" [alt]="item.title">
</ion-slide>
</ion-slides>
<div id="swiper-container" class="swiper-container">
<div class="swiper-wrapper">
<ng-container *ngIf="slidersItems.length > 0">
<div class="swiper-slide" *ngFor="let item of slidersItems;">
<img [src]="picture+item.imgUrl" class="slide-image" [alt]="item.title">
</div>
</ng-container>
</div>
</div>
</div>
<div class="slides-title" *ngIf="slidersItems.length>0">
<div class="slide-content">
{{slideTitle}}
</div>
{{slideTitle}}</div>
<span class="slide-index">
<span>{{slideIndex}}</span><span>/{{slidersItems.length}}</span>
</span>
......@@ -90,58 +92,64 @@
<div [hidden]="!isScroll" ion-fixed class="news-content ion-fixed parent">
<div class="tabs-parent parent">
<div *ngFor="let item of tabsList;let i = index" (click)="change(item)" class="tabs-children">
<span #tabSpan1 [ngClass]="{'selectTab':index == i}">{{item.name}}</span>
<span [ngClass]="{'selectTab':index == i}">{{item.name}}</span>
</div>
<span #tips1 class="tips"></span>
</div>
</div>
<ion-slides (ionSlideDidChange)="slideChange()" class="stuff" loop="true">
<ion-slide [style.top]="isScroll == true?'50px':''"
*ngFor="let item of slideList;let i = index">
<div class="main-news">
<ng-container *ngFor="let new of item;">
<ng-container *ngIf="new.imgUrl">
<ion-row class="news-item" (click)="goToDetail(new)">
<ion-col col-8 class="news-left">
<p class="news-title">
{{new.title}}
<ion-icon *ngIf="new.topTime" class="icon-fire iconfont"></ion-icon>
</p>
<p class="news-end">
<span>{{new.source}}</span>
<span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>
</p>
</ion-col>
<ion-col col-4 class="news-right">
<img src="{{picture+new.imgUrl}}">
</ion-col>
</ion-row>
</ng-container>
<ng-container *ngIf="!new.imgUrl">
<ion-row class="news-item" (click)="goToDetail(new)">
<ion-col col-12 class="news-left">
<p class="news-title">
{{new.title}}
<ion-icon *ngIf="new.topTime" class="icon-fire iconfont"></ion-icon>
</p>
<p class="news-end">
<span>{{new.source}}</span>
<span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>
</p>
</ion-col>
</ion-row>
</ng-container>
</ng-container>
</div>
</ion-slide>
</ion-slides>
<div id="swiper-article" class="swiper-container">
<div class="swiper-wrapper">
<ng-container *ngIf="slidersItems.length > 0">
<div [style.top]="isScroll == true?'50px':''" class="swiper-slide"
*ngFor="let item of slideList;let i = index;">
<div class="main-news">
<ng-container *ngFor="let new of item;">
<ng-container *ngIf="new.imgUrl">
<ion-row class="news-item" (click)="goToDetail(new)">
<ion-col col-8 class="news-left">
<p class="news-title">
{{new.title}}
<ion-icon *ngIf="new.topTime" class="icon-fire iconfont"></ion-icon>
</p>
<p class="news-end">
<span>{{new.source}}</span>
<span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>
</p>
</ion-col>
<ion-col col-4 class="news-right">
<img src="{{picture+new.imgUrl}}">
</ion-col>
</ion-row>
</ng-container>
<ng-container *ngIf="!new.imgUrl">
<ion-row class="news-item" (click)="goToDetail(new)">
<ion-col col-12 class="news-left">
<p class="news-title">
{{new.title}}
<ion-icon *ngIf="new.topTime" class="icon-fire iconfont"></ion-icon>
</p>
<p class="news-end">
<span>{{new.source}}</span>
<span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>
</p>
</ion-col>
</ion-row>
</ng-container>
</ng-container>
<p class="noData" *ngIf="!loadMore">你已经看到我的底线了</p>
</div>
</div>
</ng-container>
</div>
</div>
<ion-infinite-scroll #infiniteScrollContentEle (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content
loadingSpinner="bubbles"
loadingText="加载中"></ion-infinite-scroll-content>
</ion-infinite-scroll>
<!-- <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 @ b896e1f1
......@@ -33,7 +33,7 @@ page-home {
position: relative;
}
img.toolbar-img{
img.toolbar-img {
width: 2rem;
margin-top: 2px;
margin-right: 1rem;
......@@ -58,24 +58,27 @@ page-home {
}
//头部 积分
.score{
.score {
color: #ffffff;
font-family: SourceHanSans-Bold;
position: relative;
text-align: center;
.score-font{
.score-font {
display: inline-block;
width: 1rem;
line-height: 1rem;
font-size: 1rem;
transform: scale(.8);
}
.score-num{
.score-num {
font-size: 2.5rem;
line-height: 2.3rem;
}
}
.score::after{
.score::after {
content: '';
position: absolute;
right: -14px;
......@@ -84,7 +87,8 @@ page-home {
width: 2px;
background-color: rgba(255, 255, 255, 0.5);
}
ion-buttons.mine-button.bar-buttons-ios[end]{
ion-buttons.mine-button.bar-buttons-ios[end] {
background-color: #fff1f0;
color: #444444;
display: inline-block;
......@@ -112,7 +116,7 @@ page-home {
transition: height 500ms;
ion-row {
padding:0;
padding: 0;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
......@@ -124,6 +128,7 @@ page-home {
align-items: center;
justify-content: center;
padding: 2px;
img {
width: 2.5rem;
}
......@@ -137,7 +142,7 @@ page-home {
}
//滑动固定
.fix-tabs{
.fix-tabs {
position: fixed;
top: 52px;
left: 0px;
......@@ -146,25 +151,31 @@ page-home {
height: 54px;
}
.news-content{
.news-content {
margin-top: .8rem;
}
.news-content.ion-fixed{
.news-content.ion-fixed {
margin: 0;
}
.parent.tabs-parent{
.parent.tabs-parent {
background-color: #fff1f0;
}
.parent.news-content{
.parent.news-content {
background-color: #fff1f0;
}
.ion-fixed + ion-slides{
.ion-fixed + ion-slides {
margin-top: 2rem;
}
//新闻区
.main-news {
padding: 0 1rem;
text-align: left;
.news-item {
padding: .8rem 0;
......@@ -182,7 +193,8 @@ page-home {
font-size: 1.6rem;
font-family: SourceHanSans-Bold;
position: relative;
.icon-fire{
.icon-fire {
position: absolute;
top: 3px;
left: -14px;
......@@ -193,6 +205,7 @@ page-home {
.news-end {
color: #989898;
span {
margin-right: 1rem;
}
......@@ -201,6 +214,7 @@ page-home {
.news-right {
text-align: center;
img {
border-radius: .5rem;
height: 60px;
......@@ -218,6 +232,7 @@ page-home {
text-align: center;
height: 60px;
line-height: 60px;
.submit-btn {
margin-top: 10px;
width: 50%;
......@@ -228,7 +243,8 @@ page-home {
opacity: .4;
}
}
.vertivalLamp{
.vertivalLamp {
position: absolute;
top: 0;
left: 100%;
......@@ -239,129 +255,141 @@ page-home {
white-space: nowrap;
}
.stuff .swiper-slide{
.stuff .swiper-slide {
align-items: baseline;
font-size: 1.4rem;
overflow-y: scroll;
padding-bottom: 5rem;
text-align: left;
}
.slide-zoom{
.slide-zoom {
text-align: left;
}
//下拉刷新
ion-infinite-scroll{
ion-infinite-scroll {
overflow: hidden;
}
$slide-height:220px;
.news-content{
margin-top: 1.2rem;
$slide-height: 220px;
.news-content {
margin-top: 1.2rem;
}
.slides-content {
height: $slide-height;
.swiper-slide {
width: 100%;
height: $slide-height;
background-color: #e42417;
}
.slides-content{
.swiper-wrapper {
width: 100%;
height: $slide-height;
ion-slide{
width: 100%;
height: $slide-height;
background-color: #e42417;
}
ion-slides {
width: 100%;
height: $slide-height;
}
}
.slide-image {
//width: 100%;
//height: $slide-height;
vertical-align: middle;
max-height: 220px;
}
.slide-zoom{
text-align: center;
//line-height: 219px;
max-height: 100%;
}
.swiper-container {
height: $slide-height;
width: 100%;
overflow-y: auto;
}
.slide-image {
vertical-align: middle;
max-height: 220px;
}
.slides-title {
margin-top: 5px;
color: #4c4c4c;
.slide-zoom {
text-align: center;
max-height: 100%;
}
.swiper-container {
height: $slide-height;
width: 100%;
text-align: left;
height: 2rem;
line-height: 2rem;
padding: 0 1rem;
font-size: 1.4rem;
font-weight: 500;
position: relative;
font-family: "Microsoft YaHei";
.slide-content{
white-space:nowrap;
overflow:hidden;
text-overflow:ellipsis;
width: 93%;
overflow-y: auto;
}
}
.slides-title {
margin-top: 5px;
color: #4c4c4c;
width: 100%;
text-align: left;
height: 2rem;
line-height: 2rem;
padding: 0 1rem;
font-size: 1.4rem;
font-weight: 500;
position: relative;
font-family: "Microsoft YaHei";
.slide-content {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
width: 93%;
}
.slide-index {
position: absolute;
top: 2px;
right: 10px;
color: #e42417;
font-weight: 400;
span:first-child {
font-size: 1.8rem;
}
.slide-index{
position: absolute;
top: 2px;
right: 10px;
color: #e42417;
font-weight: 400;
span:first-child{
font-size: 1.8rem;
}
span:last-child{
font-size: 1.5rem;
}
span:last-child {
font-size: 1.5rem;
}
}
//新闻区
.main-news {
padding: 0 1rem;
.news-item {
padding: .8rem 0;
.news-left {
display: flex;
flex-flow: row wrap;
min-height: 100%;
.news-title {
align-self: flex-start;
font-weight: bold;
width: 100%;
margin-bottom: .6rem;
}
}
.news-end {
//align-self: flex-end;
color: #999999;
span {
margin-right: 1rem;
}
}
//新闻区
.main-news {
padding: 0 1rem 5rem 1rem;
//height: inherit;
.news-item {
padding: .8rem 0;
.news-left {
display: flex;
flex-flow: row wrap;
min-height: 100%;
.news-title {
align-self: flex-start;
font-weight: bold;
width: 100%;
margin-bottom: .6rem;
}
.news-right {
text-align: center;
img {
border-radius: .5rem;
height: 60px;
.news-end {
//align-self: flex-end;
color: #999999;
span {
margin-right: 1rem;
}
}
}
.news-item + .news-item {
border-top: 1px solid #eeeeee;
.news-right {
text-align: center;
img {
border-radius: .5rem;
height: 60px;
}
}
}
.news-item + .news-item {
border-top: 1px solid #eeeeee;
}
}
}
src/pages/tabs/home/home.ts
View file @ b896e1f1
......@@ -17,6 +17,8 @@ import {SlideComponent} from "../../../components/slide/slide";
import {interval} from "rxjs/observable/interval";
import {SwiperComponent} from "../../../components/swiper/swiper";
declare let Swiper: any;
@IonicPage()
@Component({
selector: 'page-home',
......@@ -24,7 +26,6 @@ import {SwiperComponent} from "../../../components/swiper/swiper";
})
export class HomePage {
@ViewChildren(Slides) slides: QueryList<Slides>;
@ViewChild(Content) content: Content;
@ViewChild('tips') tips: ElementRef;
@ViewChild('tips1') tips1: ElementRef;
......@@ -34,7 +35,10 @@ export class HomePage {
@ViewChild('headerTag') headerTag: ElementRef;
@ViewChild('homeMiddleTips') homeMiddleTips: ElementRef;
@ViewChild('infiniteScrollContentEle') infiniteScrollContentEle: ElementRef;
// @ViewChild(InfiniteScrollContent) infiniteScrollContent: InfiniteScrollContent;
@ViewChild(InfiniteScrollContent) InfiniteScrollContent: InfiniteScrollContent;
swiperImg;
swiperArticle;
picture: string = AppGlobal.domain + '/wisdomgroup';
slideTitle;
......@@ -93,7 +97,7 @@ export class HomePage {
public commonSer: CommonService, public emitSer: EmitService,
public zone: NgZone, public tabSer: TabsService,
public renderer: Renderer2, public slideCom: SlideComponent,
private swiper:SwiperComponent,
private swiper: SwiperComponent,
public appService: AppService, public http: Http, public storage: Storage,
public badge: Badge, public tabsSer: TabsService) {
// 接收发射过来的数据
......@@ -121,6 +125,7 @@ export class HomePage {
ionViewDidLoad() {
this.initSwiper();
this.itemWidth = window.screen.width / 4;
console.log(this.tabsParent.nativeElement.children[0].children[0].offsetWidth)
this.spanWidth = this.tabsParent.nativeElement.children[0].children[0].offsetWidth; //文字宽度
......@@ -132,6 +137,47 @@ export class HomePage {
this.change(this.tabsList[0]);
}
//初始化swiper
initSwiper() {
console.log('initSwiper')
let that = this;
that.swiperImg = new Swiper('#swiper-container', {
speed: 1000,
autoplay:{
delay: 3000,
disableOnInteraction: false,
},//可选选项，自动滑动
observer: true,
observeParents: true,
observeSlideChildren:true,
loop: true,
on: {
slideChangeTransitionEnd: function () {
console.log(this.activeIndex);
that.slideIndex = this.activeIndex +1;
that.slideTitle = that.slidersItems[this.activeIndex].title;
that.swiperImg.update();
},
}
});
this.swiperArticle = new Swiper('#swiper-article', {
slidesPerView: 1,
speed: 1000,
autoplay: false,//可选选项，自动滑动
observer: true,
observeParents: true,
observeSlideChildren:true,
loop: false,
on: {
slideChangeTransitionEnd: function () {
console.log(this.activeIndex);
that.swiperArticle.update();
that.change(that.tabsList[this.activeIndex]);
},
}
})
}
scrollHeight() {
const height = this.topHeight.nativeElement.offsetHeight + 48;
......@@ -149,16 +195,17 @@ export class HomePage {
change(item) {
this.pageNum = 1;
this.loadMore = true;
// this.infiniteScrollContent.inf.enable(true);
this.index = item.index;
// 自身div的一半 - 滑块的一半
this.tips.nativeElement.style.left = this.itemWidth * (this.index) + (this.itemWidth - this.spanWidth) / 2 + 'px';
this.tips1.nativeElement.style.left = this.itemWidth * (this.index) + (this.itemWidth - this.spanWidth) / 2 + 'px';
this.InfiniteScrollContent.inf.enable(true);
if (item.type == 0) {
this.isRecent = 1;
} else {
this.isRecent = 0;
}
// 自身div的一半 - 滑块的一半
this.tips.nativeElement.style.left = this.itemWidth * (this.index) + (this.itemWidth - this.spanWidth) / 2 + 'px';
this.tips1.nativeElement.style.left = this.itemWidth * (this.index) + (this.itemWidth - this.spanWidth) / 2 + 'px';
this.plateType = item.type;
const data = {
pageNum: this.pageNum,
......@@ -168,7 +215,7 @@ export class HomePage {
'plateType': this.plateType,
'resourceType': 1
}
}
};
this.tabsSer.stuffPage(data).subscribe(
(res) => {
let arr = res.data.list;
......@@ -181,7 +228,7 @@ export class HomePage {
});
this.slideList[this.index] = arr;
}
if (this.slides.toArray()[1]) this.slides.toArray()[1].slideTo(this.index, 500);
if (this.swiperArticle) this.swiperArticle.slideTo(this.index, 500);
}
)
}
......@@ -192,10 +239,10 @@ export class HomePage {
this.initSlide = 1;
return false;
}
let index = this.slides.toArray()[1].getActiveIndex();
if (index == this.tabsList.length) index = 0;
if (index == this.tabsList.length + 1) index = 1;
this.change(this.tabsList[index])
// let index = this.slides.toArray()[1].getActiveIndex();
// if (index == this.tabsList.length) index = 0;
// if (index == this.tabsList.length + 1) index = 1;
// this.change(this.tabsList[index])
}
......@@ -241,18 +288,10 @@ export class HomePage {
})
}
this.slidersItems = res.data.list;
this.slides.toArray()[0].resize();
this.slides.toArray()[0].update();
}
)
}
//轮播图变动
slideChangeSwiper(e) {
this.slideIndex = this.slides.toArray()[0].realIndex + 1;
this.slideTitle = this.slidersItems[this.slideIndex - 1].title;
}
//关闭弹窗 开启跑马灯
start() {
const nowDay = this.datePipe.transform(new Date(), 'yyyy-MM-dd');
......@@ -317,11 +356,11 @@ export class HomePage {
//查看文章详情 轮播图
goToDetailBySlide() {
const index = this.slides.toArray()[0].realIndex;
if (this.slidersItems[index].plateType == 20) return false;
this.navCtrl.push(StuffDetailPage, {
id: this.slidersItems[index].id
})
// const index = this.slides.toArray()[0].realIndex;
// if (this.slidersItems[index].plateType == 20) return false;
// this.navCtrl.push(StuffDetailPage, {
// id: this.slidersItems[index].id
// })
}
//前往搜索页面
......@@ -336,6 +375,7 @@ export class HomePage {
//上拉加载
doInfinite(e) {
console.log('doInfinite');
if (this.totalNum < this.slideList[this.index].length + 1) {
console.log('没有数据了');
this.loadMore = false;
......
src/pages/tabs/mine/mine.html
View file @ b896e1f1
......@@ -16,8 +16,8 @@
<ion-content class="bgc-e7e8ed">
<div class="bgc-fff" style="padding: 1rem;">
<div class="mine-box" (click)="goTo('PersonInfoPage')">
<div class="mine-item">
<div class="mine-box" >
<div class="mine-item" (click)="goTo('PersonInfoPage')">
<ion-grid>
<ion-row>
<ion-col col-3>
......@@ -105,15 +105,6 @@
<ion-icon name="ios-arrow-forward"></ion-icon>
</ion-col>
</ion-row>
<ion-row (click)="goTo('OperationListPage')">
<ion-col class="group-left" col-2>
<img src="./assets/imgs/mine/czjl.png" alt="">
</ion-col>
<ion-col class="group-right" col-10>
<span>操作记录</span>
<ion-icon name="ios-arrow-forward"></ion-icon>
</ion-col>
</ion-row>
</ion-grid>
<div class="space"></div>
<ion-grid class="padding-0-10">
......
src/service/http.service.ts
View file @ b896e1f1
......@@ -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/"; //正式地址
......@@ -34,7 +34,7 @@ export class AppGlobal {
getDetails: '/api/ionic3/details'
};
static pageCount = 1000;
static pageCount = 10;
}
@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