Skip to content

Commit 87fdf62

Browse files
committed
feat(maimai2): improve serverMission/pointExchange pages
1 parent d3566d8 commit 87fdf62

File tree

3 files changed

+45
-1
lines changed

3 files changed

+45
-1
lines changed

src/app/sega/maimai2/maimai2-point-exchanges/maimai2-point-exchanges.component.html

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,18 @@ <h4 class="mb-0">任务点数兑换 - 舞萌DX</h4>
6363
</div>
6464
</div>
6565
<div class="col-md-4 d-flex align-items-end">
66+
<div class="form-check form-switch hide-completed-toggle">
67+
<input
68+
class="form-check-input"
69+
type="checkbox"
70+
role="switch"
71+
id="onlyEnable"
72+
[(ngModel)]="onlyEnable"
73+
/>
74+
<label class="form-check-label" for="onlyEnable">
75+
只显示允许兑换的
76+
</label>
77+
</div>
6678
<button
6779
class="btn btn-outline-primary w-50"
6880
(click)="loadExchangeItemDataList(0)"

src/app/sega/maimai2/maimai2-point-exchanges/maimai2-point-exchanges.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,8 @@ export class Maimai2PointExchangesComponent implements OnInit {
6161

6262
searchKeyword: string = "";
6363

64+
onlyEnable = false;
65+
6466
userExchangeInfoMap: Map<number, Maimai2UserExchangeItemData> = new Map<number, Maimai2UserExchangeItemData>();
6567

6668
ngOnInit() {
@@ -99,6 +101,7 @@ export class Maimai2PointExchangesComponent implements OnInit {
99101
.set('aimeId', this.aimeId)
100102
.set('page', page)
101103
.set('size', this.pageSize)
104+
.set('onlyEnable', this.onlyEnable)
102105
.set('filterItemType', this.filterItemType == null ? 0 : this.filterItemType)
103106
.set('searchPattern', this.searchKeyword);
104107

src/app/sega/maimai2/maimai2-server-missions/maimai2-server-missions.component.ts

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,37 @@ export class Maimai2ServerMissionsComponent implements OnInit {
7171
this.loadUserServerMissionInfo();
7272
}
7373

74-
updateFilterUserServerMissionInfoList(){
74+
getRefreshSCycleOrderValue(cycle: Maimai2ServerMissionRefreshCycle): number {
75+
switch (cycle) {
76+
case Maimai2ServerMissionRefreshCycle.EveryDay:
77+
return 1;
78+
case Maimai2ServerMissionRefreshCycle.EveryWeek:
79+
return 2;
80+
case Maimai2ServerMissionRefreshCycle.EveryMonth:
81+
return 3;
82+
default:
83+
return 99;
84+
}
85+
}
86+
87+
updateFilterUserServerMissionInfoList() {
7588
this.filterUserServerMissionInfoList = this.hideCompleted ? this.userServerMissionInfoList.filter(m => !this.isMissionCompleted(m)) : this.userServerMissionInfoList;
89+
if (this.filterUserServerMissionInfoList && this.filterUserServerMissionInfoList.length > 0)
90+
this.filterUserServerMissionInfoList = this.filterUserServerMissionInfoList.sort((a, b) => {
91+
//先按刷新周期分类
92+
var order = this.getRefreshSCycleOrderValue(a.refreshCycle) - this.getRefreshSCycleOrderValue(b.refreshCycle);
93+
if (order != 0)
94+
return order;
95+
/*
96+
//再按任务状态分类,未完成的在前面
97+
order = Number(this.isMissionCompleted(a)) - Number(this.isMissionCompleted(b));
98+
if (order != 0)
99+
return order;
100+
*/
101+
//最后按任务标题排序
102+
order = a.missionTitle.localeCompare(b.missionTitle);
103+
return order;
104+
});
76105
}
77106

78107
loadUserPointsInfo(page: number = 0) {

0 commit comments

Comments
 (0)