Commit fd87d6c7 authored by wangqinghua's avatar wangqinghua

文章分类滚动

parent 9fe1bc0a
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.partyCloud.starter.test" version="0.3.16" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="io.ionic.partyCloud.starter.test" version="0.3.17" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>部机关党建云(测试)</name> <name>部机关党建云(测试)</name>
<description>An awesome Ionic/Cordova app.</description> <description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author> <author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"proxies": [ "proxies": [
{ {
"path": "/wisdomgroup", "path": "/wisdomgroup",
"proxyUrl": "http://47.103.35.216:8080/wisdomgroup" "proxyUrl": "http://47.103.33.196:8080/wisdomgroup"
} }
] ]
} }
...@@ -8,6 +8,6 @@ public final class BuildConfig { ...@@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "io.ionic.partyCloud.starter.test"; public static final String APPLICATION_ID = "io.ionic.partyCloud.starter.test";
public static final String BUILD_TYPE = "release"; public static final String BUILD_TYPE = "release";
public static final String FLAVOR = ""; public static final String FLAVOR = "";
public static final int VERSION_CODE = 316; public static final int VERSION_CODE = 317;
public static final String VERSION_NAME = "0.3.16"; public static final String VERSION_NAME = "0.3.17";
} }
#Sun Jun 02 21:30:58 CST 2019 #Mon Jun 03 11:38:00 CST 2019
base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0
renamed.0=classes.dex renamed.0=classes.dex
file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0/classes.dex file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dex/release/0/classes.dex
#Internal package file, do not edit. #Internal package file, do not edit.
#Sun Jun 02 21:30:59 CST 2019 #Mon Jun 03 11:38:00 CST 2019
20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_ 20.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_
143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_ 143.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_
340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/plugins/cordova-plugin-file/www/resolveLocalFileSystemURI.js 340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/plugins/cordova-plugin-file/www/resolveLocalFileSystemURI.js
...@@ -667,7 +667,7 @@ ...@@ -667,7 +667,7 @@
285.set=ANDROID_RESOURCE 285.set=ANDROID_RESOURCE
383.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release 383.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
163.set=ASSET 163.set=ASSET
230.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/build/84.js 230.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/home/edu_banner.png
2.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release 2.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
401.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-mdpi-v4/notification_bg_low_normal.9.png 401.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-mdpi-v4/notification_bg_low_normal.9.png
263.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js 263.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/plugins/cordova-plugin-app-version/www/AppVersionPlugin.js
...@@ -954,7 +954,7 @@ ...@@ -954,7 +954,7 @@
125.set=ASSET 125.set=ASSET
79.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release 79.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
399.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/build/75.js 399.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/build/75.js
229.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/home/edu_banner.png 229.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/build/84.js
230.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release 230.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
401.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_ 401.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_
378.set=ASSET 378.set=ASSET
......
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.ionic.partyCloud.starter.test" package="io.ionic.partyCloud.starter.test"
android:hardwareAccelerated="true" android:hardwareAccelerated="true"
android:versionCode="316" android:versionCode="317"
android:versionName="0.3.16" > android:versionName="0.3.17" >
<uses-sdk <uses-sdk
android:minSdkVersion="16" android:minSdkVersion="16"
......
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":316},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":317},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":316},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":317},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":316},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":317},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":316},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}] [{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":317},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file \ No newline at end of file
...@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none'; ...@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
<span class="mdl-layout-title">Lint Report: 1 error</span> <span class="mdl-layout-title">Lint Report: 1 error</span>
<div class="mdl-layout-spacer"></div> <div class="mdl-layout-spacer"></div>
<nav class="mdl-navigation mdl-layout--large-screen-only"> <nav class="mdl-navigation mdl-layout--large-screen-only">
Check performed at Sun Jun 02 21:31:00 CST 2019 </nav> Check performed at Mon Jun 03 11:38:02 CST 2019 </nav>
</div> </div>
</header> </header>
<div class="mdl-layout__drawer"> <div class="mdl-layout__drawer">
......
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<manifest android:hardwareAccelerated="true" android:versionCode="316" android:versionName="0.3.16" package="io.ionic.partyCloud.starter.test" xmlns:android="http://schemas.android.com/apk/res/android"> <manifest android:hardwareAccelerated="true" android:versionCode="317" android:versionName="0.3.17" package="io.ionic.partyCloud.starter.test" xmlns:android="http://schemas.android.com/apk/res/android">
<supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" /> <supports-screens android:anyDensity="true" android:largeScreens="true" android:normalScreens="true" android:resizeable="true" android:smallScreens="true" android:xlargeScreens="true" />
<application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true"> <application android:hardwareAccelerated="true" android:icon="@mipmap/icon" android:label="@string/app_name" android:supportsRtl="true">
<activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize"> <activity android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale" android:label="@string/activity_name" android:launchMode="singleTop" android:name="MainActivity" android:theme="@android:style/Theme.DeviceDefault.NoActionBar" android:windowSoftInputMode="adjustResize">
......
<?xml version='1.0' encoding='utf-8'?> <?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.partyCloud.starter.test" version="0.3.16" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0"> <widget id="io.ionic.partyCloud.starter.test" version="0.3.17" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<feature name="Keyboard"> <feature name="Keyboard">
<param name="android-package" onload="true" value="io.ionic.keyboard.IonicKeyboard" /> <param name="android-package" onload="true" value="io.ionic.keyboard.IonicKeyboard" />
</feature> </feature>
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<ion-content> <ion-content>
<div class="search-content"> <div class="search-content">
<ng-container *ngFor="let item of new;"> <ng-container *ngFor="let item of new;">
<div *ngIf="obj.childrenName != '你问我答'" class="search-item" (click)="goToDetail(item)" > <div *ngIf="obj.childrenName != '你问我答'" class="search-item" (click)="goToDetail(item)">
<p class="item-info"> <p class="item-info">
<span class="item-source">{{item.source}}</span> <span class="item-source">{{item.source}}</span>
<span>{{item.publishTime | date:'yyyy-MM-dd'}}</span> <span>{{item.publishTime | date:'yyyy-MM-dd'}}</span>
...@@ -155,7 +155,9 @@ ...@@ -155,7 +155,9 @@
class="icon-fire iconfont"></ion-icon> class="icon-fire iconfont"></ion-icon>
</p> </p>
<div style="width: 100%;max-height: 180px;"> <div style="width: 100%;max-height: 180px;">
<video width="100%" height="100%" (canplay)="loadVideo($event)" (play)="clickVideo($event)" <video width="100%" height="100%"
(canplay)="loadVideo($event)"
(play)="clickVideo($event)"
controls="controls" preload="metadata" muted="muted"> controls="controls" preload="metadata" muted="muted">
<source [src]="picture +item.path+ '#t=0.1' "> <source [src]="picture +item.path+ '#t=0.1' ">
您的浏览器不支持 html5。 您的浏览器不支持 html5。
...@@ -197,7 +199,8 @@ ...@@ -197,7 +199,8 @@
</ion-row> </ion-row>
</div> </div>
</div> </div>
<div *ngIf="obj.childrenName =='你问我答' " class="search-item" (click)="goToResponse(item)"> <div *ngIf="obj.childrenName =='你问我答' " class="search-item"
(click)="goToResponse(item)">
<p style="margin: 0;" class="item-info"> <p style="margin: 0;" class="item-info">
<span>{{item.dateTime | date:'yyyy-MM-dd'}}</span> <span>{{item.dateTime | date:'yyyy-MM-dd'}}</span>
</p> </p>
......
...@@ -9,7 +9,6 @@ import {NoticePage} from "../notice/notice"; ...@@ -9,7 +9,6 @@ import {NoticePage} from "../notice/notice";
import {AppGlobal} from "../../../service/http.service"; import {AppGlobal} from "../../../service/http.service";
import {CommonService} from "../../../provide/common.service"; import {CommonService} from "../../../provide/common.service";
import {SwiperComponent} from "../../../components/swiper/swiper"; import {SwiperComponent} from "../../../components/swiper/swiper";
import {interval} from "rxjs/observable/interval";
declare let Swiper: any; declare let Swiper: any;
...@@ -254,6 +253,13 @@ export class DiscoverPage { ...@@ -254,6 +253,13 @@ export class DiscoverPage {
} }
ionViewDidLeave() {
const videoArr = document.querySelectorAll("video");
for (let i = 0; i < videoArr.length; i++) {
videoArr[i].pause();
}
}
public dragTo(e) { public dragTo(e) {
if (e.target.scrollLeft > window.screen.width / 3) { if (e.target.scrollLeft > window.screen.width / 3) {
this.toRight = false; this.toRight = false;
...@@ -262,14 +268,6 @@ export class DiscoverPage { ...@@ -262,14 +268,6 @@ export class DiscoverPage {
} }
} }
ionViewDidLeave() {
const videoArr = document.querySelectorAll("video");
for (let i = 0; i < videoArr.length; i++) {
videoArr[i].pause();
}
}
//文章分类固定 //文章分类固定
scrollHeight() { scrollHeight() {
const height = this.topHeight.nativeElement.offsetHeight; const height = this.topHeight.nativeElement.offsetHeight;
...@@ -349,7 +347,6 @@ export class DiscoverPage { ...@@ -349,7 +347,6 @@ export class DiscoverPage {
}); });
} }
//前往主题教育 //前往主题教育
goEdu() { goEdu() {
this.swiper.slideTo(1, 500); //前往主题教育 this.swiper.slideTo(1, 500); //前往主题教育
...@@ -385,6 +382,7 @@ export class DiscoverPage { ...@@ -385,6 +382,7 @@ export class DiscoverPage {
this.indexParent = item.indexParent; this.indexParent = item.indexParent;
this.obj.parentName = item.name; this.obj.parentName = item.name;
this.obj.childrenName = item.children[0].name;
this.toIndex = item.indexParent; this.toIndex = item.indexParent;
this.childrenList = item.children; this.childrenList = item.children;
......
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