Skip to content

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

我的发布

我的收藏
parent ef92e810
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 132 deletions
platforms/android/app/build/intermediates/blame/res/release/multi-v2/release.json
View file @ e58cc90a
......@@ -61,10 +61,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",
......@@ -76,10 +76,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",
......
platforms/android/app/build/intermediates/blame/res/release/single/release.json
View file @ e58cc90a
......@@ -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/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"
},
{
"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"
},
{
......@@ -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/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/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/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/mergeReleaseAssets/merger.xml
View file @ e58cc90a
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 @ e58cc90a
#Mon May 13 15:26:06 CST 2019
#Tue May 14 17:15:04 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/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/xml/config.xml=/Users/ben/gitLab-project/wisdom-ces/platforms/android/app/build/intermediates/res/merged/release/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/release/mipmap-mdpi_icon.png.flat
platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt
View file @ e58cc90a
#Tue May 14 16:17:30 CST 2019
#Tue May 14 17:13:00 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 @ e58cc90a
#Internal package file, do not edit.
#Tue May 14 16:17:31 CST 2019
#Tue May 14 17:13:01 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
......
platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt
View file @ e58cc90a
#Fri May 10 13:07:55 CST 2019
#Tue May 14 17:15:21 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/release/AndroidManifest.xml
View file @ e58cc90a
......@@ -29,18 +29,6 @@
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.CAMERA" />
<provider
android:name="android.support.v4.content.FileProvider"
android:authorities="nl.x-services.plugins.videocaptureplus.provider"
android:exported="false"
android:grantUriPermissions="true" >
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>
<!-- for android -->
<!-- <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS"/> -->
<!-- <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS"/> -->
......
platforms/android/app/build/intermediates/res/symbol-table-with-package/release/package-aware-r.txt
View file @ e58cc90a
......@@ -168,3 +168,4 @@ int styleable FontFamilyFont_fontWeight 5
int xml camera_provider_paths 0x7f0d0000
int xml config 0x7f0d0001
int xml opener_paths 0x7f0d0002
int xml provider_paths 0x7f0d0003
platforms/android/app/build/intermediates/symbols/release/R.txt
View file @ e58cc90a
......@@ -167,3 +167,4 @@ int styleable FontFamilyFont_fontWeight 5
int xml camera_provider_paths 0x7f0d0000
int xml config 0x7f0d0001
int xml opener_paths 0x7f0d0002
int xml provider_paths 0x7f0d0003
platforms/android/app/build/intermediates/transforms/dex/release/__content__.json
View file @ e58cc90a
[{"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":["PROJECT","EXTERNAL_LIBRARIES","SUB_PROJECTS"],"types":["DEX"],"format":"DIRECTORY","present":true}]
\ No newline at end of file
platforms/android/app/build/outputs/logs/manifest-merger-release-report.txt
View file @ e58cc90a
......@@ -22,10 +22,10 @@ INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/
android:name
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:14:127-180
manifest
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-34:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-34:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-34:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-34:12
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
MERGED from [me.leolin:ShortcutBadger:1.1.21] /Users/ben/.gradle/caches/transforms-1/files-1.1/ShortcutBadger-1.1.21.aar/d9e66a40bdbdd0ac562039721fd48b4a/AndroidManifest.xml:2:1-52:12
MERGED from [com.android.support:support-v4:27.1.0] /Users/ben/.gradle/caches/transforms-1/files-1.1/support-v4-27.1.0.aar/2e7787ee4aa5277e591774453a6f2139/AndroidManifest.xml:17:1-22:12
MERGED from [:CordovaLib] /Users/ben/gitLab-project/party-build-cloud/platforms/android/CordovaLib/build/intermediates/manifests/full/release/AndroidManifest.xml:20:1-27:12
......@@ -38,9 +38,9 @@ MERGED from [android.arch.lifecycle:runtime:1.1.0] /Users/ben/.gradle/caches/tra
MERGED from [android.arch.lifecycle:livedata-core:1.1.0] /Users/ben/.gradle/caches/transforms-1/files-1.1/livedata-core-1.1.0.aar/b202af8a773e22d7a62a3ef6eb93a86e/AndroidManifest.xml:17:1-22:12
MERGED from [android.arch.lifecycle:viewmodel:1.1.0] /Users/ben/.gradle/caches/transforms-1/files-1.1/viewmodel-1.1.0.aar/1edfaaf4fc3eb7166424068e24c0e7ad/AndroidManifest.xml:17:1-22:12
MERGED from [android.arch.core:runtime:1.1.0] /Users/ben/.gradle/caches/transforms-1/files-1.1/runtime-1.1.0.aar/fcf3d41d76daa1e08b0ab9c51d31565d/AndroidManifest.xml:17:1-22:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-34:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-34:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-34:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:1-29:12
package
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:2:100-142
INJECTED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml
......@@ -177,30 +177,12 @@ uses-permission#android.permission.BLUETOOTH
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:28:5-68
android:name
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:28:22-65
uses-permission#android.permission.RECORD_AUDIO
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:29:5-71
android:name
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:29:22-68
uses-permission#android.permission.CAMERA
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:30:5-65
android:name
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:30:22-62
provider#android.support.v4.content.FileProvider
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:31:5-33:16
android:grantUriPermissions
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:31:110-144
android:authorities
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:31:15-84
android:exported
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:31:85-109
android:name
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:31:145-199
meta-data#android.support.FILE_PROVIDER_PATHS
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:32:9-112
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:12:13-114
android:resource
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:32:71-109
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:12:75-111
android:name
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:32:20-70
ADDED from /Users/ben/gitLab-project/party-build-cloud/platforms/android/app/src/main/AndroidManifest.xml:12:24-74
uses-permission#com.sec.android.provider.badge.permission.READ
ADDED from [me.leolin:ShortcutBadger:1.1.21] /Users/ben/.gradle/caches/transforms-1/files-1.1/ShortcutBadger-1.1.21.aar/d9e66a40bdbdd0ac562039721fd48b4a/AndroidManifest.xml:19:5-86
android:name
......
platforms/android/app/build/reports/lint-results-release-fatal.html
View file @ e58cc90a
......@@ -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 Fri May 10 13:07:57 CST 2019 </nav>
Check performed at Tue May 14 17:15:33 CST 2019 </nav>
</div>
</header>
<div class="mdl-layout__drawer">
......
src/app/app.module.ts
View file @ e58cc90a
......@@ -42,6 +42,7 @@ import {PublishPageModule} from "../pages/discover-pages/publish/publish.module"
import {MobileAccessibility} from "@ionic-native/mobile-accessibility";
import {Camera} from "@ionic-native/camera";
import {ProposalPageModule} from "../pages/mine-pages/proposal/proposal.module";
import {MineService} from "../pages/mine-pages/mine.service";
@NgModule({
declarations: [
......@@ -106,9 +107,10 @@ import {ProposalPageModule} from "../pages/mine-pages/proposal/proposal.module";
LearnManageService,
LoginService,
CommonService,
TabsService,
BackButtonService,
HomeService,
TabsService,
MineService,
EmitService,
{provide: ErrorHandler, useClass: IonicErrorHandler}
]
......
src/components/slide/slide.html
View file @ e58cc90a
<div class="slides-content">
<ion-slides (ionSlideDidChange)="slideChange($event)" *ngIf="slidersItems.length>0" (ionSlideTap)="goToDetail()" loop="true" autoplay="2000" speed="1500">
<ion-slide *ngFor="let item of slidersItems;">
<img src="{{picture+item.imgUrl}}" class="slide-image" >
<img [src]="picture+item.imgUrl" class="slide-image" [alt]="item.title">
</ion-slide>
</ion-slides>
</div>
......
src/components/slide/slide.scss
View file @ e58cc90a
......@@ -43,7 +43,6 @@ slide {
padding: 0 1rem;
font-size: 1.4rem;
font-weight: 500;
font-family: 'SourceHanSans-Bold';
.slide-index{
color: #e42417;
font-weight: 400;
......
src/components/slide/slide.ts
View file @ e58cc90a
......@@ -40,7 +40,7 @@ export class SlideComponent implements AfterViewInit{
if(this.slidersItems.length > 0){
this.slidersItems.forEach(e => {
if (e.title.length > 16) {
e.title = e.title.substr(0, 14) + '...';
e.title = e.title.substr(0, 20) + '...';
}
if (e.attachments.length > 0) {
e.imgUrl = e.attachments[0].path;
......
src/pages/discover-pages/discover.service.ts 0 → 100644
View file @ e58cc90a
import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service"; @Injectable()export class DiscoverService { constructor( private http: HttpClient, //该请求 将结果转为json private commonSer: CommonService, private https: Http, //该请求不转json ) { } //登录 loginpost(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/app/loginpost?' + this.commonSer.toQuery(data), null) } }
\ No newline at end of file
src/pages/discover-pages/publish/publish.ts
View file @ e58cc90a
......@@ -66,7 +66,6 @@ export class PublishPage {
tackePic() {
const actionSheet = this.actionSheetCtrl.create({
title: '上传图片',
buttons: [
{
text: '拍照',
......@@ -202,7 +201,11 @@ export class PublishPage {
//发布
publish() {
if(!this.check()){
return false;
}
let attachmentsArr = [];
let content = this.obj.content;
if(this.fileList.length > 0){
if(this.type == 'image'){ //将第一张图片作为标题图片 ,后面的图片 作为文章里面的图片
const obj = {
......@@ -212,12 +215,11 @@ export class PublishPage {
};
attachmentsArr = this.fileList.splice(1,this.fileList.length -1);
attachmentsArr.forEach(e=>{
this.obj.content += `<br><img src="/wisdomgroup/${e.path} " alt="图片">`;
content += `<br><img src="/wisdomgroup/${e.path} " alt="图片">`;
});
this.fileList = [obj];
}
}
if(this.type == 'video'){
this.fileList.forEach(e=>{
e.resourceType = 3;
......@@ -227,11 +229,11 @@ export class PublishPage {
title: this.obj.title,
plateType: this.obj.type,
source: '上海市委组织部',
publishStatus: '2',
content: this.obj.content,
publishStatus: '2', //已提交
content: content,
publishRange: this.obj.publishRange,
submitter: this.userid,
stuffType: this.type === 'image'?1:2, //视频 2 图片 1
stuffType: this.type === 'image'?1:2, //图片 1 视频 2
attachments: this.fileList,
};
this.commonSer.alert('确定提交审核当前内容?', () => {
......@@ -246,6 +248,19 @@ export class PublishPage {
})
}
check(){
if(!this.obj.title){
this.commonSer.toast('请输入文章标题！');
return false;
}
if(!this.obj.content){
this.commonSer.toast('请输入内容！');
return false;
}
return true;
}
//选择发布或者预览
handle(){
const actionSheet = this.actionSheetCtrl.create({
......
src/pages/home/home.service.ts
View file @ e58cc90a
......@@ -17,7 +17,4 @@ export class HomeService{
myScheduleOfToday(): Observable<any>{
return this.http.get(AppGlobal.domain+'/wisdomgroup/schedule/myScheduleOfToday',{responseType: 'text' });
}
}
\ No newline at end of file
src/pages/mine-pages/mine.service.ts 0 → 100644
View file @ e58cc90a
import {Injectable} from "@angular/core";import {HttpClient} from "@angular/common/http";import {Http} from "@angular/http";import {Observable} from "rxjs/Observable";import {AppGlobal} from "../../service/http.service";import {CommonService} from "../../provide/common.service"; @Injectable()export class MineService { constructor( private http: HttpClient, //该请求 将结果转为json private commonSer: CommonService, private https: Http, //该请求不转json ) { } //我的发布 myPublish(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/myPublish', data); } //我的收藏 myCollection(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/myCollection', data); } }
\ No newline at end of file
src/pages/mine/person/personInfo/personInfo.html
View file @ e58cc90a
......@@ -12,7 +12,7 @@
<ion-item>
<div class="info-item">
<span class="info-span">头像</span>
<div class="photo-box">
<div class="photo-box" (click)="tackePic()">
<img *ngIf="user?.userDetail?.user?.picUrl == ''" src="./assets/imgs/head.png" class="img">
<img *ngIf="user?.userDetail?.user?.picUrl != ''" src="{{picture+user?.userDetail?.user?.picUrl}}" class="img">
</div>
......
src/pages/mine/person/personInfo/personInfo.ts
View file @ e58cc90a
import {Component} from '@angular/core';
import {IonicPage, NavController, ToastController} from 'ionic-angular';
import {ActionSheetController, IonicPage, LoadingController, NavController, ToastController} from 'ionic-angular';
import {Camera, CameraOptions} from "@ionic-native/camera";
import {ModifyPasswordPage} from "../modifyPassword/modifyPassword";
import {Storage} from '@ionic/storage';
import {AppGlobal, AppService} from "../../../../service/http.service";
import {EditPersonInfoPage} from '../editPersonInfo/editPersonInfo';
import {FileTransferObject, FileUploadOptions, FileTransfer} from "@ionic-native/file-transfer";
import {CommonService} from "../../../../provide/common.service";
@IonicPage()
@Component({
......@@ -20,10 +23,10 @@ export class PersonInfoPage {
userid: '';
picture: string = AppGlobal.picture;
constructor(public navCtrl: NavController,
public storage: Storage,
public appService: AppService,
public toast: ToastController) {
constructor(public navCtrl: NavController,public camera:Camera,public commonSer:CommonService,
public storage: Storage,public actionSheetCtrl:ActionSheetController,
public appService: AppService,public loadingCtrl:LoadingController,
public toast: ToastController,public transfer: FileTransfer,) {
}
......@@ -59,6 +62,83 @@ export class PersonInfoPage {
this.navCtrl.push("EditPersonInfoPage", {code: code});
}
//选择头像
tackePic() {
const actionSheet = this.actionSheetCtrl.create({
buttons: [
{
text: '拍照',
role: 'fromCamera',
handler: () => {
this.selectPicture(1);
}
}, {
text: '从相册中选',
role: 'fromPhoto',
handler: () => {
console.log('fromPhoto');
this.selectPicture(0);
}
}, {
text: '取消',
role: 'cancel',
handler: () => {
console.log('Cancel clicked');
}
}
]
});
actionSheet.present();
}
//选择图片
selectPicture(srcType) {
const options: CameraOptions = {
quality: 100,
destinationType: this.camera.DestinationType.FILE_URI,
encodingType: this.camera.EncodingType.PNG,
mediaType: this.camera.MediaType.PICTURE,
sourceType: srcType,
saveToPhotoAlbum: false
};
const option: FileUploadOptions = {
httpMethod: 'POST',
headers: {
'Accept': 'application/json', //不加入 发生错误！！
},
fileName:'image.png'
};
this.camera.getPicture(options).then((imagedata) => {
let filePath = imagedata;
if(filePath.indexOf('?') !== -1){ //获取文件名
filePath = filePath.split('?')[0];
}
let arr = filePath.split('/');
option.fileName = arr[arr.length -1];
this.upload(imagedata, option);
})
}
upload(file, options) {
const uploadLoading = this.loadingCtrl.create({
content: '上传中...',
dismissOnPageChange:true,
enableBackdropDismiss:true,
});
uploadLoading.present();
const fileTransfer: FileTransferObject = this.transfer.create();
fileTransfer.upload(file, AppGlobal.domain + '/wisdomgroup/modules/common/file/upload1', options).then(
(res) => {
uploadLoading.dismiss();
this.commonSer.toast('上传成功');
const data = JSON.parse(res.response);
this.commonSer.log(data);
}, err => {
uploadLoading.dismiss();
this.commonSer.toast('上传错误');
});
}
goBack() {
this.navCtrl.popToRoot();
}
......
src/pages/tabs/mine/mine.html
View file @ e58cc90a
......@@ -6,7 +6,7 @@
</button>
</ion-buttons>
<ion-buttons end>
<button ion-button icon-only (click)="goToNotice()" class="toolbar-icon">
<button ion-button icon-only (click)="goTo('NoticePage')" class="toolbar-icon">
<ion-icon class="icon-youjian iconfont"></ion-icon>
<span *ngIf="noReadNum > 0" class="num">{{noReadNum}}</span>
</button>
......@@ -16,7 +16,7 @@
<ion-content class="bgc-e7e8ed">
<div class="bgc-fff" style="padding: 1rem;">
<div class="mine-box" (click)="personInfo()">
<div class="mine-box" (click)="goTo('PersonInfoPage')">
<div class="mine-item">
<ion-grid>
<ion-row>
......@@ -42,7 +42,7 @@
</div>
<div class="group-box">
<ion-grid class="padding-0-10">
<ion-row (click)="myActivityList()">
<ion-row (click)="goTo('MyActivityListPage')">
<ion-col class="group-left" col-2>
<img src="./assets/imgs/mine/wdhd.png" alt="">
</ion-col>
......@@ -51,7 +51,7 @@
<ion-icon name="ios-arrow-forward"></ion-icon>
</ion-col>
</ion-row>
<ion-row (click)="myReport()">
<ion-row (click)="goTo('MyReportPage')">
<ion-col class="group-left" col-2>
<img src="./assets/imgs/mine/wdbb.png" alt="">
</ion-col>
......@@ -60,7 +60,7 @@
<ion-icon name="ios-arrow-forward"></ion-icon>
</ion-col>
</ion-row>
<ion-row (click)="mySurvey()">
<ion-row (click)="goTo('MySurveyPage')">
<ion-col class="group-left" col-2>
<img src="./assets/imgs/mine/wdwj.png" alt="">
</ion-col>
......@@ -69,7 +69,7 @@
<ion-icon name="ios-arrow-forward"></ion-icon>
</ion-col>
</ion-row>
<ion-row (click)="goDuty()">
<ion-row (click)="goTo('MyDutyPage')">
<ion-col class="group-left" col-2>
<img src="./assets/imgs/mine/wdzb.png" alt="">
</ion-col>
......@@ -78,7 +78,25 @@
<ion-icon name="ios-arrow-forward"></ion-icon>
</ion-col>
</ion-row>
<ion-row (click)="myOperationList()">
<ion-row (click)="goTo('MyPublishPage')">
<ion-col class="group-left" col-2>
<img src="./assets/imgs/mine/wdzb.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-row (click)="goTo('MyCollectionPage')">
<ion-col class="group-left" col-2>
<img src="./assets/imgs/mine/wdzb.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-row (click)="goTo('OperationListPage')">
<ion-col class="group-left" col-2>
<img src="./assets/imgs/mine/czjl.png" alt="">
</ion-col>
......@@ -90,7 +108,7 @@
</ion-grid>
<div class="space"></div>
<ion-grid class="padding-0-10">
<ion-row (click)="goSet()">
<ion-row (click)="goTo('VersionPage')">
<ion-col class="group-left" col-2>
<img src="./assets/imgs/mine/xtsz.png" alt="">
</ion-col>
......
src/pages/tabs/mine/mine.ts
View file @ e58cc90a
......@@ -34,19 +34,20 @@ export class MinePage {
mineInfo;
noReadNum;
constructor(public navCtrl: NavController,
private appCtrl: App,
private alertCtrl: AlertController,
public navParams: NavParams,
public tabSer:TabsService,
public tabSer: TabsService,
public appService: AppService,
public emitSer:EmitService,
public storage: Storage,public app:App,
public emitSer: EmitService,
public storage: Storage, public app: App,
private appUpdateService: AppUpdateService,
private appVersion: AppVersion) {
// 接收发射过来的数据
this.emitSer.eventEmit.subscribe((value: any) => {
if(!isNaN(value)){
if (!isNaN(value)) {
this.noReadNum = value;
}
});
......@@ -60,7 +61,7 @@ export class MinePage {
});
this.getversion();
this.tabSer.getUserIntegral().subscribe(
(res)=>{
(res) => {
this.mineInfo = res.data;
}
)
......@@ -78,28 +79,9 @@ export class MinePage {
});
}
personInfo() {
this.navCtrl.push("PersonInfoPage");
}
//我的活动
myActivityList() {
this.navCtrl.push("MyActivityListPage");
}
//我的报备
myReport() {
this.navCtrl.push("MyReportPage");
}
//操作记录
myOperationList() {
this.navCtrl.push("OperationListPage");
}
//我的问卷
mySurvey() {
this.navCtrl.push('MySurveyPage');
//前往
goTo(page) {
this.navCtrl.push(page);
}
//后台退出
......@@ -127,18 +109,4 @@ export class MinePage {
}).catch(err => {
});
}
goSet() {
// this.app.getRootNav().push('VersionPage');
this.navCtrl.push('VersionPage');
}
goDuty() {
this.navCtrl.push("MyDutyPage");
}
//消息提醒页面
goToNotice(){
this.navCtrl.push(NoticePage);
}
}
src/provide/common.service.ts
View file @ e58cc90a
......@@ -3,9 +3,8 @@ import {AlertController, LoadingController, ToastController} from "ionic-angular
import {AppGlobal} from "../service/http.service";
import {File} from "@ionic-native/file";
import {FileOpener} from "@ionic-native/file-opener";
import VConsole from 'vconsole';
var vconsole = new VConsole();
@Injectable()
......
src/service/http.service.ts
View file @ e58cc90a
......@@ -15,8 +15,8 @@ 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 = ""; //本地环境
// static domain = "http://47.103.33.196:8080"; //阿里云地址
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