Commit 4dbd236f authored by wangqinghua's avatar wangqinghua

权限划分

parent 3ad121ac
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.partyCloud.starter.test" version="0.5.1" 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.5.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<name>部机关党建云(测试)</name>
<description>An awesome Ionic/Cordova app.</description>
<author email="hi@ionicframework" href="http://ionicframework.com/">Ionic Framework Team</author>
......
......@@ -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 = 501;
public static final String VERSION_NAME = "0.5.1";
public static final int VERSION_CODE = 502;
public static final String VERSION_NAME = "0.5.2";
}
......@@ -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 = "release";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 501;
public static final String VERSION_NAME = "0.5.1";
public static final int VERSION_CODE = 505;
public static final String VERSION_NAME = "0.5.5";
}
{
"logs": [
{
"outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-in_values-in.arsc.flat",
"outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-iw_values-iw.arsc.flat",
"map": [
{
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-in/values-in.xml",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-iw/values-iw.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
"endColumns": "102",
"endOffsets": "153"
}
}
]
},
{
"outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-iw_values-iw.arsc.flat",
"outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-in_values-in.arsc.flat",
"map": [
{
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-iw/values-iw.xml",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-in/values-in.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "102",
"endOffsets": "153"
"endColumns": "100",
"endOffsets": "151"
}
}
]
......@@ -46,31 +46,31 @@
]
},
{
"outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-v16_values-v16.arsc.flat",
"outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-bs_values-bs.arsc.flat",
"map": [
{
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-v16/values-v16.xml",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-bs/values-bs.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "65",
"endOffsets": "116"
"endColumns": "100",
"endOffsets": "151"
}
}
]
},
{
"outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-bs_values-bs.arsc.flat",
"outputFile": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/values-v16_values-v16.arsc.flat",
"map": [
{
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-bs/values-bs.xml",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/values-v16/values-v16.xml",
"from": {
"startLines": "2",
"startColumns": "4",
"startOffsets": "55",
"endColumns": "100",
"endOffsets": "151"
"endColumns": "65",
"endOffsets": "116"
}
}
]
......
......@@ -40,16 +40,16 @@
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-compat-27.1.0.aar/45a22bc138864dd211a4392ad5c08606/res/layout-v21/notification_action_tombstone.xml"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-mdpi_screen.png.flat",
"source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-mdpi/screen.png"
"merged": "/Users/ben/gitLab-project/party-build-cloud/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"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/layout_notification_media_action.xml.flat",
"source": "/Users/ben/.gradle/caches/transforms-1/files-1.1/support-media-compat-27.1.0.aar/9e0e60c653d210b584d1ee2c4867f4b8/res/layout/notification_media_action.xml"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/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"
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable-port-mdpi_screen.png.flat",
"source": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/res/drawable-port-mdpi/screen.png"
},
{
"merged": "/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/merged/debug/drawable_notification_bg.xml.flat",
......
#Sun Jun 09 12:01:30 CST 2019
#Sun Jun 09 17:12:27 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
#Internal package file, do not edit.
#Sun Jun 09 12:01:31 CST 2019
#Sun Jun 09 17:12:28 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=ANDROID_RESOURCE
......@@ -392,7 +392,7 @@
139.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/wdzb.png
489.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/19.js
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/mipmap-hdpi-v4/icon.png
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
409.set=ASSET
392.set=ASSET
36.set=ASSET
......@@ -585,7 +585,7 @@
412.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/fonts/noto-sans-bold.woff
151.set=ANDROID_RESOURCE
248.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
274.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png
274.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-xxhdpi-v4/icon.png
5.set=ASSET
445.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/learn/rank_title.png
196.set=ASSET
......@@ -1006,7 +1006,7 @@
174.set=ASSET
138.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/signBgc.png
488.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/notice/notice-srzf.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
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
382.set=ASSET
26.set=ANDROID_RESOURCE
82.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug
......@@ -1430,7 +1430,7 @@ count=490
413.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/imgs/home/edu_banner.png
161.set=ASSET
249.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_
275.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/mipmap-xxhdpi-v4/icon.png
275.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/debug/resources-debug.ap_/res/drawable-hdpi-v4/notification_bg_normal_pressed.9.png
446.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/assets/jwplayer/jwplayer.html5.js
479.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/plugins/cordova.plugins.diagnostic/www/android/diagnostic.notifications.js
309.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/debug/www/build/9.js.map
......
#Sun Jun 09 13:35:17 CST 2019
#Mon Jun 10 16:49:34 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
#Internal package file, do not edit.
#Sun Jun 09 13:35:17 CST 2019
#Mon Jun 10 16:49:34 CST 2019
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_
340.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/plugins/cordova-plugin-file/www/resolveLocalFileSystemURI.js
......@@ -236,7 +236,7 @@
295.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
214.set=ASSET
125.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
142.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-hdpi-v4/screen.png
142.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
169.set=ASSET
158.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
52.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/layout-v17/notification_template_lines_media.xml
......@@ -966,7 +966,7 @@
224.set=ASSET
126.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
20.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-xhdpi-v4/notification_bg_normal.9.png
143.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-xhdpi-v4/notify_panel_notification_icon_bg.png
143.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/res/release/resources-release.ap_/res/drawable-land-hdpi-v4/screen.png
102.set=ASSET
159.base=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release
53.file=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/assets/release/www/assets/imgs/home/icon-tips.png
......
......@@ -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="501"
android:versionName="0.5.1" >
android:versionCode="502"
android:versionName="0.5.2" >
<uses-sdk
android:minSdkVersion="16"
......
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":501},"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":502},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
......@@ -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="501"
android:versionName="0.5.1" >
android:versionCode="505"
android:versionName="0.5.5" >
<uses-sdk
android:minSdkVersion="16"
......
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":501},"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":505},"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":501},"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":502},"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":501},"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":505},"path":"AndroidManifest.xml","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":501},"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":502},"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":501},"path":"resources-release.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":505},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ 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
[{"name":"main","index":0,"scopes":["EXTERNAL_LIBRARIES","PROJECT","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
[{"name":"main","index":0,"scopes":["PROJECT","SUB_PROJECTS","EXTERNAL_LIBRARIES"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
[{"name":"main","index":0,"scopes":["SUB_PROJECTS","EXTERNAL_LIBRARIES","PROJECT"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":501},"path":"app-debug.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":502},"path":"app-debug.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":501},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":505},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.partyCloud.starter.test","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
......@@ -176,7 +176,7 @@ document.getElementById(id).style.display = 'none';
<span class="mdl-layout-title">Lint Report: 1 error</span>
<div class="mdl-layout-spacer"></div>
<nav class="mdl-navigation mdl-layout--large-screen-only">
Check performed at Sun Jun 09 13:35:25 CST 2019 </nav>
Check performed at Mon Jun 10 16:49:36 CST 2019 </nav>
</div>
</header>
<div class="mdl-layout__drawer">
......
<?xml version='1.0' encoding='utf-8'?>
<manifest android:hardwareAccelerated="true" android:versionCode="501" android:versionName="0.5.1" package="io.ionic.partyCloud.starter.test" xmlns:android="http://schemas.android.com/apk/res/android">
<manifest android:hardwareAccelerated="true" android:versionCode="505" android:versionName="0.5.5" 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" />
<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">
......
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.partyCloud.starter.test" version="0.5.1" 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.5.5" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<feature name="Keyboard">
<param name="android-package" onload="true" value="io.ionic.keyboard.IonicKeyboard" />
</feature>
......
......@@ -23,7 +23,6 @@ export class SwiperComponent implements OnChanges {
initSwiper() {
let that = this;
console.log(that);
that.swiper = new Swiper('#swiper-component', {
speed: 1000,
autoplay:{
......
......@@ -28,12 +28,15 @@ export class PublishPage {
// {name: '纪检提示', id: '10'},
// {name: '风险排查', id: '11'},
// {name: '警示教育', id: '12'},
{name: '支部风采', id: '13'},
{name: '支部活动', id: '13'},
{name: '党建联建', id: '14'},
{name: '结对帮扶', id: '15'},
{name: '学思践悟', id: '21'},
// {name: '党建联建', id: '14'},
// {name: '结对帮扶', id: '15'},
];
obj = {
type: '1',
type: '13',
title: '',
content: '',
publishRange: '',
......@@ -48,15 +51,18 @@ export class PublishPage {
type; //视频文章or图片文章
caroul; //轮播图
role; //权限级别
constructor(public navCtrl: NavController, public navParams: NavParams, public storage: Storage,
public camera: Camera, public actionSheetCtrl: ActionSheetController,
public loadingCtrl: LoadingController, public transfer: FileTransfer,
private tabsSer: TabsService,
public commonSer: CommonService, public tabSer: TabsService) {
}
ionViewDidLoad() {
this.type = this.navParams.get('type');
this.getRole();
this.storage.get("userLoginInfo").then((value) => {
this.userid = value.userid;
})
......@@ -68,6 +74,16 @@ export class PublishPage {
)
}
//获取权限
//返回值int :3-管理员,2-处室领导,1-内勤人员,0-普通用户
getRole() {
this.tabsSer.getRoles().subscribe(
(res) => {
this.role = res;
}
)
}
tackePic(resourceType) {
const actionSheet = this.actionSheetCtrl.create({
......@@ -276,12 +292,9 @@ export class PublishPage {
//选择发布或者预览
handle() {
const actionSheet = this.actionSheetCtrl.create({
title: '',
cssClass: 'stuffAction',
buttons: [
{
const preview = {
text: '预览',
role: 'preview',
handler: () => {
let content = this.obj.content;
if (this.fileList.length > 0) {
......@@ -308,26 +321,40 @@ export class PublishPage {
stuff: obj
});
}
}, {
};
const cancel = {
text: '取消',
role: 'cancel',
handler: () => {
console.log('Cancel clicked');
}
};
const publish = {
text: '直接发布',
role: 'fromPhoto',
role: 'publish',
handler: () => {
this.publish(3);
}
}, {
};
const submit = {
text: '提交审核',
role: 'fromPhoto',
role: 'submit',
handler: () => {
this.publish(2);
}
}, {
text: '取消',
role: 'cancel',
handler: () => {
console.log('Cancel clicked');
}
}
]
};
let buttonArr = [];
buttonArr.push(preview);
if (this.role == 3) {
buttonArr.push(publish);
} else {
buttonArr.push(submit);
}
buttonArr.push(cancel);
const actionSheet = this.actionSheetCtrl.create({
title: '',
cssClass: 'stuffAction',
buttons: buttonArr
});
actionSheet.present();
}
......
......@@ -159,7 +159,8 @@ page-stuff-detail {
.comment-item {
.contact-img{
border-radius: 50%;
width: 75%;
width: 50px;
height: 50px;
text-align: center;
margin-top: 8px;
}
......
......@@ -73,6 +73,7 @@ export class MoreAppPage {
}
//获取权限
// 返回值int 。3-管理员,2-处室领导,1-内勤人员,0-普通用户
getRole() {
this.appService.ObserverHttpGet("/wisdomgroup/app/getRoles", null).subscribe((res: Response) => {
this.role = res.json();
......
<ion-header>
<ion-navbar>
<ion-title>我的审核</ion-title>
</ion-navbar>
</ion-header>
<ion-content class="bgc-e7e8ed">
<ion-refresher (ionRefresh)="doRefresh($event)">
<ion-refresher-content pullingText="下拉刷新"
refreshingSpinner="bubbles">
</ion-refresher-content>
</ion-refresher>
<div class="duty">
<div class="dutyItem" (click)="change(1)">
<span class="{{changeType == 1?'duty-title':''}}">待审核</span>
</div>
<div class="dutyItem" (click)="change(2)">
<span class="{{changeType == 2?'duty-title':''}}">已审核</span>
</div>
</div>
<ng-container *ngIf="changeType == 1">
<div class="main-news">
<ng-container *ngFor="let new of collectionList;">
<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}}
</p>
<p class="news-end">
<!-- <span>收藏时间:</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}}
</p>
<p class="news-end">
<!-- <span>收藏时间:</span><span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>-->
</p>
</ion-col>
</ion-row>
</ng-container>
</ng-container>
<ion-list text-center style="margin-top: 10rem" *ngIf="!isLoad && collectionList.length == 0">
<img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
<p text-center>
暂无收藏
</p>
</ion-list>
</div>
</ng-container>
<ng-container *ngIf="changeType == 2">
<div class="duty-content">
<ion-list *ngIf="historyDuty.length > 0">
<ion-item class="dutyItem" class="margin-top-10" *ngFor="let item of nowDuty">
<div class="margin-bottom-15">
<span>{{item.dutyDate | date:'yyyy-MM-dd'}}</span>
<span *ngIf="item.type == 0">白班</span>
<span *ngIf="item.type == 1">夜班</span>
<span float-right class="duty-state">待值班</span>
</div>
<div>
<span class="color-666" style="font-size: 1.5rem">
<span *ngIf="item.type == 1">工作日</span>
<span *ngIf="item.type == 2">节假日</span>
<span *ngIf="item.type == 3">调休</span>
<span *ngIf="item.type == 4">调班</span>
</span>
<span class="span-btn" float-right (click)="dutyDetail(item)" *ngIf="item.applyId">查看详情</span>
<span class="span-btn" float-right (click)="dutyApply(item)" *ngIf="!item.applyId">申请换班</span>
</div>
</ion-item>
</ion-list>
<ion-list text-center style="margin-top: 10rem" *ngIf="historyDuty.length == 0">
<img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
<p text-center>
暂无值班
</p>
</ion-list>
</div>
</ng-container>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content
loadingSpinner="bubbles"
loadingText="加载中"></ion-infinite-scroll-content>
</ion-infinite-scroll>
</ion-content>
import { NgModule } from '@angular/core';
import { IonicPageModule } from 'ionic-angular';
import { VerifyPage } from './verify';
@NgModule({
declarations: [
VerifyPage,
],
imports: [
IonicPageModule.forChild(VerifyPage),
],
})
export class VerifyPageModule {}
page-verify {
//新闻区
.main-news {
padding: 0 1rem;
text-align: left;
.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;
color: #333333;
font-size: 1.6rem;
font-family: SourceHanSans-Bold;
position: relative;
.icon-fire {
position: absolute;
top: 3px;
left: -14px;
font-size: 1.5rem;
color: #e42417;
}
}
.news-end {
color: #989898;
}
}
.news-right {
text-align: center;
img {
border-radius: .5rem;
height: 60px;
}
}
}
.news-item + .news-item {
border-top: 1px solid #eeeeee;
}
}
}
import {Component, ViewChild} from '@angular/core';
import {InfiniteScrollContent, IonicPage, NavController, NavParams} from 'ionic-angular';
import {AppGlobal, AppService} from "../../../service/http.service";
import {MineService} from "../mine.service";
import {CommonService} from "../../../provide/common.service";
import {StuffDetailPage} from "../../home-pages/stuff-detail/stuff-detail";
@IonicPage()
@Component({
selector: 'page-verify',
templateUrl: 'verify.html',
})
export class VerifyPage {
@ViewChild(InfiniteScrollContent) infiniteScrollContent:InfiniteScrollContent;
changeType = 1;
pageNum = 1;
pageCount = 10;
collectionList = [];
picture: string = AppGlobal.domain + '/wisdomgroup';
isLoad = true;
loadMore = true;
totalNum; //总条数
constructor(public navCtrl: NavController, public navParams: NavParams,
public mineSer: MineService, public commonSer: CommonService) {
}
ionViewDidEnter() {
this.getList();
}
change(type){
}
getList() {
const data = {
pageNum: this.pageNum,
pageCount: this.pageCount
};
this.mineSer.myCollection(data).subscribe(
(res) => {
this.collectionList = res.data.list;
this.isLoad = false;
this.totalNum = res.data.total;
}
)
}
//下拉刷新
doRefresh(e) {
this.loadMore = true;
this.infiniteScrollContent.inf.enable(true);
const data = {
pageNum: 1,
pageCount: this.pageCount
};
this.mineSer.myCollection(data).subscribe(
(res) => {
this.collectionList = res.data.list;
this.totalNum = res.data.total;
setTimeout(() => {
this.commonSer.toast('刷新成功');
e.complete()
}, 800);
}
)
}
//加载更多
doInfinite(e) {
if (this.totalNum == this.collectionList.length) {
this.loadMore = false;
e.enable(false);
return false;
}
this.pageNum++;
const data = {
pageNum: this.pageNum,
pageCount: this.pageCount
};
this.mineSer.myCollection(data).subscribe(
(res) => {
this.totalNum = res.data.total;
res.data.list.forEach(e => {
this.collectionList.push(e);
});
setTimeout(() => {
e.complete()
}, 800);
}
)
}
//查看文章详情
goToDetail(item) {
this.navCtrl.push(StuffDetailPage, {
id: item.id
})
}
}
import { Component } from '@angular/core';
import { IonicPage, NavController, NavParams } from 'ionic-angular';
import {Component} from '@angular/core';
import {IonicPage, NavController, NavParams} from 'ionic-angular';
import {AppService} from "../../../service/http.service";
......@@ -13,6 +13,7 @@ export class MyDutyPage {
changeType = 1;
nowDuty = [];
historyDuty = [];
constructor(public navCtrl: NavController, public navParams: NavParams,
public appService: AppService) {
}
......@@ -21,47 +22,47 @@ export class MyDutyPage {
this.getDuty();
}
change(type){
change(type) {
this.changeType = type;
}
getDuty(){
getDuty() {
const data = {
type:0
type: 0
};
this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/app/getMySchedule',data)
.subscribe((res)=>{
this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/app/getMySchedule', data)
.subscribe((res) => {
this.nowDuty = res.json();
});
const data1 = {
type:1
type: 1
};
this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/app/getMySchedule',data1)
.subscribe((res)=>{
this.appService.ObserverHttpGetOption('/wisdomgroup/schedule/app/getMySchedule', data1)
.subscribe((res) => {
this.historyDuty = res.json();
});
}
//提交申请
dutyApply(item){
dutyApply(item) {
let nowTime = new Date().getTime();
if(nowTime > item.dutyDate){
this.appService.popToastView('该条值班已过期','middle',1500);
if (nowTime > item.dutyDate) {
this.appService.popToastView('该条值班已过期', 'middle', 1500);
return false;
}
this.navCtrl.push('DutyApplyPage',{
id:item.id,
date:item.dutyDate
this.navCtrl.push('DutyApplyPage', {
id: item.id,
date: item.dutyDate
})
}
//申请详情
dutyDetail(item){
this.navCtrl.push('DutyDetailPage',{
"id":item.applyId,
'time':item.dutyDate
dutyDetail(item) {
this.navCtrl.push('DutyDetailPage', {
"id": item.applyId,
'time': item.dutyDate
})
}
......
......@@ -21,6 +21,7 @@ page-personInfo {
.img {
width: 50px;
height: 50px;
border-radius: 50%;
}
......
......@@ -238,9 +238,9 @@
<div class="image" (click)="goToPublish('image')">
<ion-icon class="icon iconfont icon-shipin-tianchong"></ion-icon>
<span>发图文</span></div>
<div class="video" (click)="goToPublish('video')">
<ion-icon class="icon-tupian iconfont"></ion-icon>
<span>发视频</span></div>
<!-- <div class="video" (click)="goToPublish('video')">-->
<!-- <ion-icon class="icon-tupian iconfont"></ion-icon>-->
<!-- <span>发视频</span></div>-->
</div>
</div>
......
......@@ -202,7 +202,7 @@ page-discover {
background-color: #ffffff;
transition: all 500ms;
.tabs-children{
width: 90px;
//width: 90px;
}
}
......
......@@ -245,13 +245,15 @@ export class DiscoverPage {
}
ionViewDidLoad() {
this.itemWidth = window.screen.width / 4;
this.spanWidth = this.tabSpan.nativeElement.offsetWidth; //文字宽度
this.initSwiper();
this.getBanner();
this.slideList.length = 7;
this.scrollHeight();
timer(20).subscribe(()=>this.changeParent(this.tabsList[0]));
timer(20).subscribe(()=>{
this.itemWidth = window.screen.width / 4;
this.spanWidth = this.tabSpan.nativeElement.offsetWidth; //文字宽度
this.changeParent(this.tabsList[0])
});
}
......
......@@ -87,6 +87,15 @@
<ion-icon name="ios-arrow-forward"></ion-icon>
</ion-col>
</ion-row>
<ion-row (click)="goTo('VerifyPage')">
<ion-col class="group-left" col-2>
<img src="./assets/imgs/mine/wdfb.png" >
</ion-col>
<ion-col class="group-right" col-10>
<span>我的审核</span>
<ion-icon name="ios-arrow-forward"></ion-icon>
</ion-col>
</ion-row>
<ion-row (click)="goTo('MyCollectionPage')">
<ion-col class="group-left" col-2>
<img src="./assets/imgs/mine/wdsc.png" >
......
......@@ -11,6 +11,7 @@ page-mine {
img{
border-radius: 50%;
width: 70px;
height: 70px;
}
}
......
......@@ -139,19 +139,6 @@ export class ServePage {
}
}
//获取权限
getRole() {
this.tabsSer.getRoles().subscribe(
(res) => {
this.role = res
},
error => {
this.appService.alert('系统错误!');
}
)
}
go(item) {
if (item.type == 1) {
this.getActivity(item.id);
......
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