Skip to content

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

出题采纳

parent b2abf2ea
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 335 additions and 271 deletions
config.xml
View file @ 88480c9a
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.2.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.ionic.smart19.starter" version="4.2.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>
......
platforms/android/app/build/generated/source/buildConfig/release/io/ionic/smart19/starter/BuildConfig.java
View file @ 88480c9a
......@@ -8,6 +8,6 @@ public final class BuildConfig {
public static final String APPLICATION_ID = "io.ionic.smart19.starter";
public static final String BUILD_TYPE = "release";
public static final String FLAVOR = "";
public static final int VERSION_CODE = 40203;
public static final String VERSION_NAME = "4.2.3";
public static final int VERSION_CODE = 40205;
public static final String VERSION_NAME = "4.2.5";
}
platforms/android/app/build/intermediates/incremental/mergeReleaseAssets/merger.xml
View file @ 88480c9a
This source diff could not be displayed because it is too large. You can view the blob instead.
platforms/android/app/build/intermediates/incremental/packageRelease/release/dex-renamer-state.txt
View file @ 88480c9a
#Sat Jun 15 14:27:22 CST 2019
#Sun Jun 16 00:51:51 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 @ 88480c9a
......@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.ionic.smart19.starter"
android:hardwareAccelerated="true"
android:versionCode="40203"
android:versionName="4.2.3" >
android:versionCode="40205"
android:versionName="4.2.5" >
<uses-sdk
android:minSdkVersion="16"
......
platforms/android/app/build/intermediates/manifests/full/release/output.json
View file @ 88480c9a
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40203},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40205},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/intermediates/manifests/instant-run/release/output.json
View file @ 88480c9a
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40203},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"INSTANT_RUN_MERGED_MANIFESTS"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40205},"path":"AndroidManifest.xml","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/intermediates/res/release/output.json
View file @ 88480c9a
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40203},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"PROCESSED_RES"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40205},"path":"resources-release.ap_","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/outputs/apk/release/output.json
View file @ 88480c9a
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40203},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":40205},"path":"app-release-unsigned.apk","properties":{"packageId":"io.ionic.smart19.starter","split":"","minSdkVersion":"16"}}]
\ No newline at end of file
platforms/android/app/build/reports/lint-results-release-fatal.html
View file @ 88480c9a
......@@ -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 Sat Jun 15 14:27:28 CST 2019 </nav>
Check performed at Sun Jun 16 00:51:54 CST 2019 </nav>
</div>
</header>
<div class="mdl-layout__drawer">
......
platforms/android/app/src/main/AndroidManifest.xml
View file @ 88480c9a
<?xml version='1.0' encoding='utf-8'?>
<manifest android:hardwareAccelerated="true" android:versionCode="40203" android:versionName="4.2.3" package="io.ionic.smart19.starter" xmlns:android="http://schemas.android.com/apk/res/android">
<manifest android:hardwareAccelerated="true" android:versionCode="40205" android:versionName="4.2.5" package="io.ionic.smart19.starter" 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">
......
platforms/android/app/src/main/res/xml/config.xml
View file @ 88480c9a
<?xml version='1.0' encoding='utf-8'?>
<widget id="io.ionic.smart19.starter" version="4.2.3" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<widget id="io.ionic.smart19.starter" version="4.2.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>
......
src/pages/discover-pages/accept/accept.html
View file @ 88480c9a
......@@ -78,7 +78,8 @@
{{answer.userName}}
</p>
<p class="commnet-content">
<span class="margin-right-5 margin-left-20">回答：</span>{{answer.answer}} <span
<span class="margin-right-5 margin-left-20">回答：</span>{{answer.answer}}
<span *ngIf="!acceptBol"
style="color: #003388" class="margin-left-10" (click)="accept(answer.id)">采纳</span>
</p>
<span *ngIf="answer.isAccept == 1" class="accept">已采纳</span>
......
src/pages/discover-pages/accept/accept.ts
View file @ 88480c9a
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 {TabsService} from "../../tabs/tabs.service";
import {CommonService} from "../../../provide/common.service";
@IonicPage()
@Component({
selector: 'page-accept',
templateUrl: 'accept.html',
selector: 'page-accept',
templateUrl: 'accept.html',
})
export class AcceptPage {
id;
answer = "";
item;
id;
answer = "";
item;
acceptBol = false;
constructor(public navCtrl: NavController, public navParams: NavParams,
private tabSer: TabsService, private commonSer: CommonService) {
}
ionViewDidLoad() {
this.id = this.navParams.get('id');
this.getDetail();
}
getDetail(){
this.tabSer.personDetail(this.id).subscribe(
(res)=>{
this.item = res.data;
}
)
}
constructor(public navCtrl: NavController, public navParams: NavParams,
private tabSer: TabsService, private commonSer: CommonService) {
}
//采纳回答
accept(answerId){
const data = {
answerId:answerId
ionViewDidLoad() {
this.id = this.navParams.get('id');
this.getDetail();
}
this.tabSer.accept(data).subscribe(
(res)=>{
if(res.errcode == '1000'){
this.commonSer.toast('采纳成功');
this.getDetail();
}else{
this.commonSer.toast(res.errmsg);
getDetail() {
this.tabSer.personDetail(this.id).subscribe(
(res) => {
this.item = res.data;
if(this.item.answers && this.item.answers.length > 0){
this.item.answers.forEach(e => {
if (e.isAccept == 1) {
this.acceptBol = true;
}
})
}
}
)
}
//采纳回答
accept(answerId) {
const data = {
answerId: answerId
}
)
}
this.tabSer.accept(data).subscribe(
(res) => {
if (res.errcode == '1000') {
this.commonSer.toast('采纳成功');
this.getDetail();
} else {
this.commonSer.toast(res.errmsg);
}
}
)
}
}
src/pages/discover-pages/publish/publish.ts
View file @ 88480c9a
......@@ -230,6 +230,7 @@ export class PublishPage {
//发布
publish(status) {
let message;
if (status == 1) message = '确定当前内容保存为草稿?';
if (status == 2) message = '确定提交审核当前内容?';
if (status == 3) message = '确定直接发布当前内容?';
if (!this.check()) {
......@@ -343,6 +344,13 @@ export class PublishPage {
this.publish(2);
}
};
const draft = {
text: '保存草稿',
role: 'draft',
handler: () => {
this.publish(1);
}
};
let buttonArr = [];
buttonArr.push(preview);
if (this.role == 3 || this.role == 5) {
......@@ -350,6 +358,7 @@ export class PublishPage {
} else {
buttonArr.push(submit);
}
buttonArr.push(draft);
buttonArr.push(cancel);
const actionSheet = this.actionSheetCtrl.create({
title: '',
......
src/pages/mine-pages/mine.service.ts
View file @ 88480c9a
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); } //我的审核 appCheckList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/appCheckList', data); } //上传头像 imageUpload(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/common/file/image/upload', data); } //获取个人头像 showImgByFileid(data): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/common/file/showImgByFileid/' + data); } //支部积分 orgPointList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/twissignhistory/orgPointList', this.commonSer.toFormData(data)); } //个人排行榜 personPointList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/twissignhistory/personPointList', this.commonSer.toFormData(data) ); } //个人积分信息 personPointDetail(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/twissignhistory/personPointDetail', this.commonSer.toFormData(data) ); } }
\ No newline at end of file
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); } //我的审核 appCheckList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/appCheckList', data); } //上传头像 imageUpload(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/common/file/image/upload', data); } //获取个人头像 showImgByFileid(data): Observable<any> { return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/common/file/showImgByFileid/' + data); } //支部积分 orgPointList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/twissignhistory/orgPointList', this.commonSer.toFormData(data)); } //个人排行榜 personPointList(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/twissignhistory/personPointList', this.commonSer.toFormData(data) ); } //个人积分信息 personPointDetail(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/twissignhistory/personPointDetail', this.commonSer.toFormData(data) ); } //查询待审核数量 waitCheckNum(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/waitCheckNum' , data); } //查询我的草稿 myDraft(data): Observable<any> { return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/myDraft',data); } }
\ No newline at end of file
......
src/pages/mine-pages/my-publish/my-publish.html
View file @ 88480c9a
<ion-header>
<ion-navbar>
<ion-title>我的发布</ion-title>
<ion-title>我的文章</ion-title>
</ion-navbar>
</ion-header>
......@@ -13,48 +13,94 @@
refreshingSpinner="bubbles">
</ion-refresher-content>
</ion-refresher>
<div class="main-news">
<ng-container *ngFor="let new of publicList;">
<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>发布时间：</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>
<div class="duty">
<div class="dutyItem" (click)="getPublishList()">
<span class="{{changeType == 1?'duty-title':''}}">已发布</span>
</div>
<div class="dutyItem" (click)="getDraftList()">
<span class="{{changeType == 2?'duty-title':''}}">草稿箱</span>
</div>
</div>
<ng-container *ngIf="changeType == 1">
<div class="main-news">
<ng-container *ngFor="let new of publicList;">
<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>发布时间：</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>发布时间：</span><span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>
</p>
</ion-col>
</ion-row>
</ng-container>
</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>发布时间：</span><span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>
</p>
</ion-col>
</ion-row>
<ion-list text-center style="margin-top: 10rem" *ngIf=" !isLoad && publicList.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="main-news">
<ng-container *ngFor="let new of draftList;">
<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>发布时间：</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>发布时间：</span><span>{{new.publishTime | date:'yyyy-MM-dd'}}</span>
</p>
</ion-col>
</ion-row>
</ng-container>
</ng-container>
</ng-container>
<ion-list text-center style="margin-top: 10rem" *ngIf=" !isLoad && publicList.length == 0">
<img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
<p text-center>
暂无发布
</p>
</ion-list>
</div>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content
loadingSpinner="bubbles"
loadingText="加载中"></ion-infinite-scroll-content>
</ion-infinite-scroll>
<ion-list text-center style="margin-top: 10rem" *ngIf=" !isLoad && publicList.length == 0">
<img style="width: 20%;" src="./assets/imgs/no-info.png" alt="">
<p text-center>
暂无发布
</p>
</ion-list>
</div>
</ng-container>
</ion-content>
src/pages/mine-pages/my-publish/my-publish.scss
View file @ 88480c9a
......@@ -47,4 +47,31 @@ page-my-publish {
border-top: 1px solid #eeeeee;
}
}
.duty{
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
height: 36px;
background-color: #fff;
}
.duty div{
width: 50%;
text-align: center;
position: relative;
}
.duty-title{
position: relative;
color: #e42417;
}
.duty-title::after{
content: '';
position: absolute;
width: 100%;
height: 2px;
background-color: #e42417;
bottom: -10px;
left: 0px;
}
}
src/pages/mine-pages/my-publish/my-publish.ts
View file @ 88480c9a
......@@ -7,91 +7,78 @@ import {CommonService} from "../../../provide/common.service";
@IonicPage()
@Component({
selector: 'page-my-publish',
templateUrl: 'my-publish.html',
selector: 'page-my-publish',
templateUrl: 'my-publish.html',
})
export class MyPublishPage {
@ViewChild(InfiniteScrollContent) infiniteScrollContent:InfiniteScrollContent;
@ViewChild(InfiniteScrollContent) infiniteScrollContent: InfiniteScrollContent;
pageNum = 1;
pageCount = 10;
publicList = [];
picture: string = AppGlobal.domain + '/wisdomgroup';
pageNum = 1;
pageCount = 100;
publicList = [];
draftList = [];
changeType = 1;
picture: string = AppGlobal.domain + '/wisdomgroup';
isLoad = true;
totalNum;
loadMore = true;
constructor(public navCtrl: NavController, public navParams: NavParams,
public mineSer:MineService,public commonSer:CommonService) {
}
isLoad = true;
totalNum;
ionViewDidLoad() {
this.getList();
}
constructor(public navCtrl: NavController, public navParams: NavParams,
public mineSer: MineService, public commonSer: CommonService) {
}
ionViewDidLoad() {
this.getPublishList();
this.getDraftList();
}
change(type) {
this.changeType = type;
this.getPublishList();
}
getList(){
const data = {
pageNum:this.pageNum,
pageCount:this.pageCount
};
this.mineSer.myPublish(data).subscribe(
(res)=>{
this.publicList = res.data.list;
this.isLoad = false;
this.totalNum = res.data.total;
}
)
}
//已发布
getPublishList() {
this.changeType = 1;
const data = {
pageNum: this.pageNum,
pageCount: this.pageCount
};
this.mineSer.myPublish(data).subscribe(
(res) => {
this.publicList = 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.myPublish(data).subscribe(
(res) => {
this.publicList = res.data.list;
this.totalNum = res.data.total;
setTimeout(()=>{
this.commonSer.toast('刷新成功')
e.complete()
},800);
}
)
}
//草稿箱
getDraftList() {
this.changeType = 2;
const data = {
pageNum: this.pageNum,
pageCount: this.pageCount
};
this.mineSer.myDraft(data).subscribe(
(res) => {
if (res.data) {
this.draftList = res.data.list;
}
}
)
}
//加载更多
doInfinite(e){
if(this.totalNum == this.publicList.length ){
this.loadMore = false;
e.enable(false);
return false;
//下拉刷新
doRefresh(e) {
this.getDraftList();
this.getPublishList();
}
this.pageNum ++;
const data = {
pageNum: this.pageNum,
pageCount: this.pageCount
};
this.mineSer.myPublish(data).subscribe(
(res) => {
this.totalNum = res.data.total;
res.data.list.forEach(e=>{
this.publicList.push(e);
});
setTimeout(()=>{
e.complete()
},800);
}
)
}
//查看文章详情
goToDetail(item) {
this.navCtrl.push(StuffDetailPage, {
id: item.id
})
}
//查看文章详情
goToDetail(item) {
this.navCtrl.push(StuffDetailPage, {
id: item.id
})
}
}
src/pages/mine-pages/proposal/proposal.html
View file @ 88480c9a
<ion-header>
<ion-navbar>
<ion-title>对于系统的建议</ion-title>
<ion-title>意见反馈</ion-title>
</ion-navbar>
</ion-header>
......
src/pages/mine/person/editPersonInfo/editPersonInfo.html
View file @ 88480c9a
......@@ -9,91 +9,37 @@
</div>
<div class="content-box">
<div class="info-item content-box-group">
<!-- <div class="info-item">
<span class="info-span">房间号</span>
<span class="info" *ngIf="edit11">{{user?.userDetail?.user?.abbreviation}}</span>
<div class="info-item-box" *ngIf="edit12">
<div class="info-input">
<input type="text" maxlength="20" [(ngModel)] = "userinfo.abbreviation">
</div>
<img src="./assets/imgs/confirm.png" class="confirm" (click)="updateUserInfo()">
</div>
</div> -->
<!-- <ion-label class="info-span">房间号</ion-label> -->
<label class="info-span">房间号</label>
<ion-label class="content-label info" *ngIf="edit11">{{user?.userDetail?.user?.abbreviation}}</ion-label>
<ion-datetime cancelText="取消" doneText="确认" displayFormat="YYYY-MM-DD" [(ngModel)]="timeStarts"></ion-datetime>
<p item-end *ngIf="edit12">
<img src="./assets/imgs/confirm.png" class="confirm" (click)="updateUserInfo()">
</p>
</div>
<div class="info-item content-box-group">
<label class="info-span">房间号</label>
<ion-label class="content-label info" *ngIf="edit11">{{user?.userDetail?.user?.abbreviation}}</ion-label>
<ion-input class="info-input" *ngIf="edit12" type="text" maxlength="20" [(ngModel)]="userinfo.abbreviation"></ion-input>
<!-- <div class="button button-icon icon ion-settings"></div> -->
<!-- <ion-label *ngIf="edit12" class="button button-positive button-small" ng-click="updateUserInfo()">保存</ion-label> -->
<!-- <ion-label class="title-label">房间号</ion-label>
<ion-label class="content-label" *ngIf="edit11">{{user?.userDetail?.user.abbreviation}}</ion-label>
<ion-input *ngIf="edit12" type="text" maxlength="20" [(ngModel)]="userinfo.abbreviation"></ion-input>
<p item-end *ngIf="edit12" tappable (click)="updateUserInfo()">
<img src="./assets/imgs/confirm.png" class="confirm" >
</p> -->
<p item-end *ngIf="edit12">
<img src="./assets/imgs/confirm.png" class="confirm" (click)="updateUserInfo()">
</p>
</div>
<div class="info-item content-box-group">
<!-- <div class="info-item">
<span class="info-span">座机</span>
<span class="info" *ngIf="edit21">{{user?.userDetail?.user.telephone}}</span>
<div class="info-item-box" *ngIf="edit22">
<div class="info-input">
<input type="text" maxlength="20" [(ngModel)] = "userinfo.telephone">
</div>
<img src="./assets/imgs/confirm.png" class="confirm" (click)="updateUserInfo()">
</div>
</div> -->
<label class="info-span">座机</label>
<ion-label class="content-label info" *ngIf="edit21">{{user?.userDetail?.user.telephone}}</ion-label>
<ion-input class="info-input" *ngIf="edit22" type="text" maxlength="20" [(ngModel)]="userinfo.telephone"></ion-input>
<p item-end *ngIf="edit22">
<img src="./assets/imgs/confirm.png" class="confirm" (click)="updateUserInfo()">
</p>
<!-- <ion-label class="title-label">座机</ion-label>
<ion-label class="content-label" *ngIf="edit21">{{user?.userDetail?.user.telephone}}</ion-label>
<ion-input *ngIf="edit22" type="text" maxlength="20" [(ngModel)]="userinfo.telephone"></ion-input>
<p item-end *ngIf="edit22" tappable (click)="updateUserInfo()">
<img src="./assets/imgs/confirm.png" class="confirm" >
</p> -->
</div>
<div class="info-item content-box-group">
<!-- <div class="info-item">
<span class="info-span">邮箱</span>
<span class="info" *ngIf="edit31">{{user?.userDetail?.user.email}}</span>
<div class="info-item-box" *ngIf="edit32">
<div class="info-input">
<input type="text" maxlength="20" [(ngModel)] = "userinfo.email" (ionFocus)="focusFun()">
<input type="text" maxlength="20" [(ngModel)] = "userinfo.email">
</div>
<img src="./assets/imgs/confirm.png" class="confirm" (click)="updateUserInfo()">
</div>
</div> -->
<label class="info-span">邮箱</label>
<ion-label class="content-label info" *ngIf="edit31">{{user?.userDetail?.user.email}}</ion-label>
<ion-input class="info-input" *ngIf="edit32" type="text" maxlength="20" [(ngModel)]="userinfo.email"></ion-input>
<p item-end *ngIf="edit32">
<img src="./assets/imgs/confirm.png" class="confirm" (click)="updateUserInfo()">
</p>
<!-- <ion-label class="title-label">邮箱</ion-label>
<ion-label class="content-label" *ngIf="edit31">{{user?.userDetail?.user.email}}</ion-label>
<ion-input *ngIf="edit32" type="text" maxlength="20" [(ngModel)]="userinfo.email"></ion-input>
<p item-end *ngIf="edit32" tappable (click)="updateUserInfo()">
<img src="./assets/imgs/confirm.png" class="confirm" >
</p> -->
</div>
</div>
</ion-content>
src/pages/mine/person/editPersonInfo/editPersonInfo.ts
View file @ 88480c9a
......@@ -13,6 +13,7 @@ import { AppService } from "../../../../service/http.service";
export class EditPersonInfoPage {
// @ViewChild(Content) content: Content;
timeStarts;
orgName = '';
user: any;
......
src/pages/mine/person/personInfo/personInfo.html
View file @ 88480c9a
......@@ -51,6 +51,25 @@
补充信息（可编辑）
</div>
<ion-list>
<ion-item>
<div class="info-item">
<span class="info-span">出生日期</span>
<div class="info-item-content">
<span class="info">{{user?.userDetail?.user.telephone}}</span>
<img src="./assets/imgs/edit.png" class="edit" (click)="edit(2)">
</div>
</div>
</ion-item>
<ion-item>
<div class="info-item">
<span class="info-span">职务</span>
<div class="info-item-content">
<span class="info">{{user?.userDetail?.user.telephone}}</span>
<img src="./assets/imgs/edit.png" class="edit" (click)="edit(2)">
</div>
</div>
</ion-item>
<ion-item>
<div class="info-item">
<span class="info-span">房间号</span>
......@@ -81,7 +100,7 @@
</ion-item>
</ion-list>
<!-- <button ion-button block class="save">保存信息</button> -->
<button ion-button block class="save">修改个人信息</button>
<!--<button ion-button block class="save" (click)="modifyPwd()">修改密码</button>-->
<button class="submit-btn submit" (click)="modifyPwd()">修改密码</button>
</ion-content>
\ No newline at end of file
</ion-content>
src/pages/mine/person/personInfo/personInfo.ts
View file @ 88480c9a
......@@ -22,6 +22,7 @@ export class PersonInfoPage {
user: any;
gender: object;
userid: '';
myDate;
picUrl = AppGlobal.domain + '/wisdomgroup/modules/common/file/showImgByFileid/';
mineInfo;
......
src/pages/tabs/home/home.html
View file @ 88480c9a
......@@ -13,14 +13,7 @@
</span>
</button>
</ion-buttons>
<ion-buttons start>
<button ion-button icon-only (click)="goTo('ProposalPage')" class="toolbar-signUp">
<span class="signUp-span">
<img style="margin-left: 0" class="toolbar-img" src="./assets/imgs/home/icon-proposal.jpg">
</span>
</button>
</ion-buttons>
<ion-buttons end class="score margin-right-10">
<ion-buttons start class="score">
<span class="score-font">积分</span>
<button (click)="goTo('IntegralPage')" style="background-color: transparent;position: relative;">
<span class="score-num">
......@@ -28,8 +21,14 @@
</span>
</button>
</ion-buttons>
<ion-buttons class="search-button margin-0-5" end>
<ion-buttons end class=" margin-right-10">
<button ion-button icon-only (click)="goTo('ProposalPage')" class="toolbar-signUp">
<span class="signUp-span">
<img class="toolbar-img" src="./assets/imgs/home/icon-proposal.jpg">
</span>
</button>
</ion-buttons>
<ion-buttons class="search-button margin-right-5" end>
<button ion-button icon-only (click)="goTo('SearchNewPage')">
<ion-icon class="search-icon" name="search"></ion-icon>
</button>
......@@ -71,9 +70,9 @@
</ion-row>
</div>
<div class="slides-content">
<div id="swiper-container" class="swiper-container" >
<div id="swiper-container" class="swiper-container">
<div class="swiper-wrapper">
<ng-container *ngIf="slidersItems.length > 0" >
<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>
......
src/pages/tabs/home/home.scss
View file @ 88480c9a
......@@ -36,7 +36,6 @@ page-home {
img.toolbar-img {
width: 2rem;
margin-top: 2px;
margin-right: 1rem;
}
.signUp-span::after {
......@@ -63,6 +62,7 @@ page-home {
font-family: SourceHanSans-Bold;
position: relative;
text-align: center;
margin-left: 1rem;
.score-font {
display: inline-block;
......@@ -84,8 +84,8 @@ page-home {
.score::after {
content: '';
position: absolute;
right: -24px;
top: 5px;
left: -10px;
top: 3px;
height: 18px;
width: 2px;
background-color: rgba(255, 255, 255, 0.5);
......
src/pages/tabs/mine/mine.html
View file @ 88480c9a
......@@ -92,7 +92,7 @@
<img src="./assets/imgs/mine/wdsh.png">
</ion-col>
<ion-col class="group-right" col-10>
<span>我的审核 <span class="main-color" *ngIf="checkList.length > 0">{{checkList.length}}</span></span>
<span>我的审核 <span class="main-color mysh" *ngIf="checkList.length > 0">{{checkList.length}}</span></span>
<ion-icon name="ios-arrow-forward"></ion-icon>
</ion-col>
</ion-row>
......
src/pages/tabs/mine/mine.scss
View file @ 88480c9a
......@@ -6,9 +6,11 @@ page-mine {
border-radius: 5px;
box-shadow: -5px 0px 5px 1px #f2f2f2, 0px -5px 5px 1px #f2f2f2, 5px 0px 5px 1px #f2f2f2, 0px 5px 5px 1px #f2f2f2;
background-color: #fff;
.mine-item {
padding: 1rem 0;
img{
img {
border-radius: 50%;
width: 70px;
height: 70px;
......@@ -43,26 +45,31 @@ page-mine {
.group-box {
background-color: #fff;
font-size: 1.6rem;
.group-left{
.group-left {
display: flex;
align-items: center;
justify-content: center;
padding-bottom: 1rem;
}
.group-right {
display: flex;
flex-flow: row;
align-items: center;
border-bottom: 1px solid #eee;
padding-bottom: 1rem;
ion-icon {
margin-left: auto;
}
}
ion-row{
ion-row {
padding-top: .6rem;
}
img{
img {
width: 2.5rem;
}
}
......@@ -79,7 +86,7 @@ page-mine {
}
}
.red-span-round{
.red-span-round {
background-color: #fee7e7;
border: 1px solid #e12724;
color: #e12724;
......@@ -88,4 +95,15 @@ page-mine {
-moz-border-radius: 100px;
border-radius: 100px;
}
.mysh {
display: inline-block;
color: #e42417;
padding: 2px 5px;
border: 1px solid #e42417;
border-radius: 50%;
font-size: 1rem;
transform: scale(0.8);
background-color: #fff6f6;
}
}
src/pages/tabs/mine/mine.ts
View file @ 88480c9a
......@@ -72,14 +72,10 @@ export class MinePage {
}
getCheckList() {
const data = {
pageNum: 1,
pageCount: 1000
};
this.mineSer.appCheckList(data).subscribe(
this.mineSer.waitCheckNum(null).subscribe(
(res) => {
if(res.data){
this.checkList = res.data.list;
this.checkList = res.data;
}
}
)
......
src/pages/tabs/tabs.service.ts
View file @ 88480c9a
......@@ -144,6 +144,11 @@ export class TabsService {
return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/save', data);
}
//查询我的草稿
myDraft(data): Observable<any> {
return this.http.post(AppGlobal.domain + '/wisdomgroup/modules/stuff/myDraft',data);
}
//审核通过
stuffPublish(params): Observable<any> {
return this.http.get(AppGlobal.domain + '/wisdomgroup/modules/stuff/publish/' + params);
......
src/pages/tabs/tabs.ts
View file @ 88480c9a
......@@ -52,13 +52,15 @@ export class TabsPage {
tabIconOn: 'custom-discover-on',
tabIconOff: 'custom-discover-off',
index: 1
}, {
},
{
root: ServePage,
tabTitle: '服务',
tabIconOn: 'custom-serve-on',
tabIconOff: 'custom-serve-off',
index: 2
}, {
},
{
root: MinePage,
tabTitle: '我的',
tabIconOn: 'custom-mine-on',
......
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