Skip to content

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

api update

parent ee745a49
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 72 additions and 44 deletions
platforms/android/app/build/intermediates/incremental/packageDebug/debug/dex-renamer-state.txt
View file @ 31b5b5cb
#Mon Aug 12 11:33:40 CST 2019 #Mon Aug 12 15:22:05 CST 2019
base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0 base.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0
renamed.0=classes.dex renamed.0=classes.dex
file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex file.0=/Users/ben/gitLab-project/party-build-cloud/platforms/android/app/build/intermediates/transforms/dexMerger/debug/0/classes.dex
src/components/party-person/party-person.html
View file @ 31b5b5cb
<ng-container *ngIf="list.length > 0"> <ng-container *ngIf="list.length > 0">
<div style="margin-bottom: 10px" *ngFor="let contactPerson of list"> <div class="padding-10">
<div class="contact-box"> <div style="margin-bottom: 10px" *ngFor="let contactPerson of list">
<ng-container *ngIf="contactPerson?.picUrl && contactPerson?.picUrl != ''"> <div class="contact-box">
<img src="{{picture+contactPerson.picUrl}}" class="contact-img"> <ng-container *ngIf="contactPerson?.picUrl && contactPerson?.picUrl != ''">
</ng-container> <img src="{{picture+contactPerson.picUrl}}" class="contact-img">
<ng-container *ngIf="!contactPerson?.picUrl || contactPerson?.picUrl == ''"> </ng-container>
<img src="./assets/imgs/man.png" class="contact-img" <ng-container *ngIf="!contactPerson?.picUrl || contactPerson?.picUrl == ''">
*ngIf="contactPerson.gender =='1'||contactPerson.gender==null"> <img src="./assets/imgs/man.png" class="contact-img"
<img src="./assets/imgs/woman.png" class="contact-img" *ngIf="contactPerson.gender =='0'"> *ngIf="contactPerson.gender =='1'||contactPerson.gender==null">
</ng-container> <img src="./assets/imgs/woman.png" class="contact-img" *ngIf="contactPerson.gender =='0'">
<div class="contact-box-right"> </ng-container>
<div> <div class="contact-box-right">
<span class="contact-name">{{contactPerson.username}}</span> <div>
</div> <span class="contact-name">{{contactPerson.username}}</span>
</div>
<div> <div>
<span class="contact-handphone">党内职务：{{contactPerson.job}}</span> <span class="contact-handphone">党内职务：{{contactPerson.job}}</span>
<span class="contact-telphone">入党时间：{{contactPerson.partytime | date:'yyyy-MM-dd'}}</span> <span class="contact-telphone">入党时间：{{contactPerson.partytime | date:'yyyy-MM-dd'}}</span>
</div>
</div> </div>
</div> </div>
</div> </div>
......
src/pages/serve-pages/goods-collect/evaluation/evaluation.html
View file @ 31b5b5cb
<ion-header> <ion-navbar> <ion-title>申领评价</ion-title> </ion-navbar> </ion-header> <ion-content> <div class="order"><!-- <div class="orderTips">--><!-- <p>--><!-- <span *ngIf="item.status == 2">已申请</span>--><!-- <span *ngIf="item.status == 3">已领取</span>--><!-- <span *ngIf="item.status == 4">已驳回</span>--><!-- <span float-right>时间：{{item.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>--><!-- </p>--><!-- <p>--><!-- <span>申请人：{{item.applicantName}}</span>--><!-- <span float-right>申请部门：{{item.orgName}}</span>--><!-- </p>--><!-- </div>--> <div class="goodsList"> <ng-container *ngFor="let goods of goodsList;let gi = index;"> <div class="goodsItem"> <div class="goods-img"> <img [src]="picture + goods.url"> </div> <div class="goods-info"> <p class="model"> {{goods.brand}}&nbsp;&nbsp;&nbsp; <span>{{goods.model}}</span> </p> <p class="img-star"> <ng-container *ngFor="let star of goods.starList;let i = index;"> <span (click)="checkStar(i,gi)" [ngClass]="star" class="icon iconfont"></span> </ng-container> <span class="score">{{goods.score}}分</span> </p> </div> </div> </ng-container> </div> </div> <button class="submit-btn submit" (click)="submit()">提交评价</button></ion-content> <ion-header> <ion-navbar> <ion-title>申领评价</ion-title> </ion-navbar> </ion-header> <ion-content> <div class="order"><!-- <div class="orderTips">--><!-- <p>--><!-- <span *ngIf="item.status == 2">已申请</span>--><!-- <span *ngIf="item.status == 3">已领取</span>--><!-- <span *ngIf="item.status == 4">已驳回</span>--><!-- <span float-right>时间：{{item.submitTime | date:'yyyy-MM-dd HH:mm:ss'}}</span>--><!-- </p>--><!-- <p>--><!-- <span>申请人：{{item.applicantName}}</span>--><!-- <span float-right>申请部门：{{item.orgName}}</span>--><!-- </p>--><!-- </div>--> <div class="goodsList"> <ng-container *ngFor="let goods of goodsList;let gi = index;"> <div class="goodsItem"> <div class="goods-img"> <img [src]="picture + goods.url"> </div> <div class="goods-info"> <p class="model"> {{goods.brand}}&nbsp;&nbsp;&nbsp; <span>{{goods.model}}</span> </p> <p class="img-star"> <ng-container *ngFor="let star of goods.starList;let i = index;"> <span (click)="checkStar(i,gi)" [ngClass]="star" class="icon iconfont"></span> </ng-container><!-- <span class="score">{{goods.score}}分</span>--> </p> </div> </div> </ng-container> </div> </div> <button class="submit-btn submit" (click)="submit()">提交评价</button></ion-content>
\ No newline at end of file \ No newline at end of file
......
src/pages/serve-pages/goods-collect/evaluation/evaluation.ts
View file @ 31b5b5cb
...@@ -66,17 +66,18 @@ export class EvaluationPage { ...@@ -66,17 +66,18 @@ export class EvaluationPage {
const arr = this.goodsList.map(e => { const arr = this.goodsList.map(e => {
const a = { const a = {
id: e.id, id: e.id,
score: e.score score: e.score.toFixed(1)
}; };
return a return a
}); });
console.log(arr); this.serveSer.orderScore(arr).subscribe(
// this.serveSer.orderScore(arr).subscribe( (res) => {
// (res) => { if(res){
// this.navCtrl.pop(); this.navCtrl.pop();
// this.commonSer.toast('已评价成功'); this.commonSer.toast('已评价成功');
// } }
// ) }
)
}) })
} }
......
src/pages/serve-pages/meet-room/meet-room.ts
View file @ 31b5b5cb
...@@ -131,16 +131,18 @@ export class MeetRoomPage { ...@@ -131,16 +131,18 @@ export class MeetRoomPage {
//新增申请 //新增申请
goApply(item) { goApply(item) {
if (this.role.includes(0)) return false; if (this.role.includes(1) || this.role.includes(7)){
let data; let data;
if (item) { if (item) {
data = { data = {
roomId: item.id, roomId: item.id,
roomName: item.name, roomName: item.name,
startTime: this.selectDate + ' 9:00:00', equipmervice:item.equipmervice,
}; startTime: this.selectDate + ' 9:00:00',
} };
this.navCtrl.push(RoomApplyPage, {data: data}); }
this.navCtrl.push(RoomApplyPage, {data: data});
};
} }
} }
src/pages/serve-pages/meet-room/room-apply/room-apply.ts
View file @ 31b5b5cb
...@@ -73,10 +73,10 @@ export class RoomApplyPage { ...@@ -73,10 +73,10 @@ export class RoomApplyPage {
this.appMainSer.mineInfo.subscribe(value => { this.appMainSer.mineInfo.subscribe(value => {
this.mineInfo = value; this.mineInfo = value;
}) })
this.getList();
} }
ionViewDidLoad() { ionViewDidLoad() {
this.getList();
this.initParams(); this.initParams();
this.applyId = this.navParams.get('id'); this.applyId = this.navParams.get('id');
if (this.applyId) { if (this.applyId) {
...@@ -91,6 +91,8 @@ export class RoomApplyPage { ...@@ -91,6 +91,8 @@ export class RoomApplyPage {
this.obj.startTime = this.datePipe.transform(data.startTime, 'yyyy-MM-ddTHH:mm'); this.obj.startTime = this.datePipe.transform(data.startTime, 'yyyy-MM-ddTHH:mm');
this.obj.roomId = data.roomId; this.obj.roomId = data.roomId;
this.obj.roomText = data.roomName; this.obj.roomText = data.roomName;
this.obj.equipmervice = data.equipmervice.split(',');
} else { } else {
const now = this.datePipe.transform(new Date(), 'yyyy-MM-dd') + ' 9:00'; const now = this.datePipe.transform(new Date(), 'yyyy-MM-dd') + ' 9:00';
this.obj.startTime = this.datePipe.transform(now, 'yyyy-MM-ddTHH:mm'); this.obj.startTime = this.datePipe.transform(now, 'yyyy-MM-ddTHH:mm');
...@@ -185,6 +187,7 @@ export class RoomApplyPage { ...@@ -185,6 +187,7 @@ export class RoomApplyPage {
handler: () => { handler: () => {
this.obj.roomId = e.id; this.obj.roomId = e.id;
this.obj.roomText = e.name; this.obj.roomText = e.name;
this.obj.equipmervice = e.equipmervice.split(',');
this.roomMax = `该会议室可容纳${e.accommodation}人`; this.roomMax = `该会议室可容纳${e.accommodation}人`;
} }
}; };
......
src/pages/serve-pages/serve.service.ts
View file @ 31b5b5cb
This diff is collapsed.
src/pages/tabs/discover/discover.html
View file @ 31b5b5cb
...@@ -182,9 +182,9 @@ ...@@ -182,9 +182,9 @@
</div> </div>
</div> </div>
</ng-container> </ng-container>
<!-- <ng-container *ngIf="showBranch">--> <ng-container *ngIf="showBranch">
<party-person #partyPerson [list]="branchPersonList"></party-person> <party-person #partyPerson [list]="branchPersonList"></party-person>
<!-- </ng-container>--> </ng-container>
</div> </div>
<ion-infinite-scroll (ionInfinite)="doInfinite($event)"> <ion-infinite-scroll (ionInfinite)="doInfinite($event)">
<ion-infinite-scroll-content <ion-infinite-scroll-content
......
src/pages/tabs/discover/discover.ts
View file @ 31b5b5cb
...@@ -408,11 +408,19 @@ export class DiscoverPage { ...@@ -408,11 +408,19 @@ export class DiscoverPage {
//父级选择 //父级选择
changeParent(item) { changeParent(item) {
this.obj.parentName = item.name;
this.obj.childrenName = item.children[0].name;
if (this.obj.childrenName != "组织结构") {
this.branchPersonList = [];
this.showBranch = false;
this.obj.branchId = null;
}
this.newsContent.nativeElement.scrollLeft = 0; //二级菜单滑动重置 this.newsContent.nativeElement.scrollLeft = 0; //二级菜单滑动重置
this.indexParent = item.indexParent; this.indexParent = item.indexParent;
this.obj.parentName = item.name;
this.obj.childrenName = item.children[0].name;
this.toIndex = item.indexParent; this.toIndex = item.indexParent;
this.childrenList = item.children; this.childrenList = item.children;
...@@ -466,6 +474,7 @@ export class DiscoverPage { ...@@ -466,6 +474,7 @@ export class DiscoverPage {
//子级选择 //子级选择
changeChildren(item) { changeChildren(item) {
this.indexChildren = item.indexChildren; this.indexChildren = item.indexChildren;
this.obj.childrenName = item.name;
if (!this.obj.branchId) this.obj.branchId = "fe1af3207840431dbed4b500122d83ea"; if (!this.obj.branchId) this.obj.branchId = "fe1af3207840431dbed4b500122d83ea";
if (item.name == "组织结构") { if (item.name == "组织结构") {
this.getMemberList(this.obj.branchId); this.getMemberList(this.obj.branchId);
...@@ -478,9 +487,9 @@ export class DiscoverPage { ...@@ -478,9 +487,9 @@ export class DiscoverPage {
this.obj.branchId = null; this.obj.branchId = null;
} }
this.resourceType = item.name == "视频资料" ? 3 : 1; this.resourceType = item.name == "视频资料" ? 3 : 1;
this.isRecent = this.obj.parentName == "最新发布" ? 1 : 0; this.isRecent = this.obj.parentName == "最新发布" ? 1 : 0;
this.obj.childrenName = item.name;
if (this.obj.parentName == "主题教育") { if (this.obj.parentName == "主题教育") {
this.obj.plateType = null; this.obj.plateType = null;
...@@ -537,6 +546,17 @@ export class DiscoverPage { ...@@ -537,6 +546,17 @@ export class DiscoverPage {
//下拉刷新 //下拉刷新
doRefresh(e) { doRefresh(e) {
if (this.obj.childrenName == "组织结构") {
this.getMemberList(this.obj.branchId);
this.showBranch = true;
this.slideList[this.indexParent] = [];
e.complete();
return false;
} else {
this.branchPersonList = [];
this.showBranch = false;
this.obj.branchId = null;
}
this.getBanner(); this.getBanner();
const data = { const data = {
pageNum: 1, pageNum: 1,
......
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