|
@@ -1,4 +1,4 @@
|
|
|
-import { CONVERTER_ADD_DEFAULT, DataModel, transformArrayDataModel } from '@imengyu/js-request-transform';
|
|
|
|
|
|
|
+import { CONVERTER_ADD_DEFAULT, DataModel, transformArrayDataModel, type KeyValue } from '@imengyu/js-request-transform';
|
|
|
import { AppServerRequestModule } from '../RequestModules';
|
|
import { AppServerRequestModule } from '../RequestModules';
|
|
|
import { findAProp, transformSomeToArray } from '../Utils';
|
|
import { findAProp, transformSomeToArray } from '../Utils';
|
|
|
import { LoginResult } from '../auth/UserApi';
|
|
import { LoginResult } from '../auth/UserApi';
|
|
@@ -203,13 +203,13 @@ export class VillageApi extends AppServerRequestModule<DataModel> {
|
|
|
const res = await this.get('/village/village/getVillageList', '获取已认领村落', {
|
|
const res = await this.get('/village/village/getVillageList', '获取已认领村落', {
|
|
|
village_volunteer_id: volunteerId,
|
|
village_volunteer_id: volunteerId,
|
|
|
});
|
|
});
|
|
|
- return transformArrayDataModel<VillageListItem>(VillageListItem, transformSomeToArray(res.data2), `村落`, true);
|
|
|
|
|
|
|
+ return transformArrayDataModel<VillageListItem>(VillageListItem, transformSomeToArray(res.data), `村落`, true);
|
|
|
}
|
|
}
|
|
|
async getCanClaimVallageList() {
|
|
async getCanClaimVallageList() {
|
|
|
const res = await this.get('/village/village/getClaimList', '可认领村落列表', {
|
|
const res = await this.get('/village/village/getClaimList', '可认领村落列表', {
|
|
|
main_body_id: 2,
|
|
main_body_id: 2,
|
|
|
});
|
|
});
|
|
|
- return transformArrayDataModel<VillageListItem>(VillageListItem, transformSomeToArray(res.data2), `村落`, true);
|
|
|
|
|
|
|
+ return transformArrayDataModel<VillageListItem>(VillageListItem, transformSomeToArray(res.data), `村落`, true);
|
|
|
}
|
|
}
|
|
|
async claimVallage(data: any) {
|
|
async claimVallage(data: any) {
|
|
|
return this.post('/village/village/addVillageClaim', '认领村落', data);
|
|
return this.post('/village/village/addVillageClaim', '认领村落', data);
|
|
@@ -219,17 +219,17 @@ export class VillageApi extends AppServerRequestModule<DataModel> {
|
|
|
history_level: level,
|
|
history_level: level,
|
|
|
status,
|
|
status,
|
|
|
});
|
|
});
|
|
|
- return transformArrayDataModel<VillageListItem>(VillageListItem, transformSomeToArray(res.data2), `村落`, true);
|
|
|
|
|
|
|
+ return transformArrayDataModel<VillageListItem>(VillageListItem, transformSomeToArray(res.data), `村落`, true);
|
|
|
}
|
|
}
|
|
|
async getVolunteerInfo() {
|
|
async getVolunteerInfo() {
|
|
|
const res = await this.post('/village/volunteer/getInfo', '获取志愿者信息', {}, undefined, VolunteerInfo);
|
|
const res = await this.post('/village/volunteer/getInfo', '获取志愿者信息', {}, undefined, VolunteerInfo);
|
|
|
return res.data as VolunteerInfo;
|
|
return res.data as VolunteerInfo;
|
|
|
}
|
|
}
|
|
|
async getVolunteerRanklist(category?: number) {
|
|
async getVolunteerRanklist(category?: number) {
|
|
|
- const res = await this.post('/village/volunteer/getRanklist', '志愿者排行榜', {
|
|
|
|
|
|
|
+ const res = await this.post<any[]>('/village/volunteer/getRanklist', '志愿者排行榜', {
|
|
|
category,
|
|
category,
|
|
|
});
|
|
});
|
|
|
- return transformArrayDataModel<VolunteerRanklistItem>(VolunteerRanklistItem, res.data2, ``, true);
|
|
|
|
|
|
|
+ return transformArrayDataModel<VolunteerRanklistItem>(VolunteerRanklistItem, res.data ?? [], ``, true);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
async addVolunteer(data: VolunteerInfo) {
|
|
async addVolunteer(data: VolunteerInfo) {
|
|
@@ -280,7 +280,7 @@ export class VillageApi extends AppServerRequestModule<DataModel> {
|
|
|
village_id: villageId,
|
|
village_id: villageId,
|
|
|
status,
|
|
status,
|
|
|
});
|
|
});
|
|
|
- return transformArrayDataModel<VolunteerInfo>(VolunteerInfo, res.data2 || [], ``, true);
|
|
|
|
|
|
|
+ return transformArrayDataModel<VolunteerInfo>(VolunteerInfo, res.data || [], ``, true);
|
|
|
}
|
|
}
|
|
|
async reviewVillageVolunteer(villageId: number, volunteerId: number, status: number) {
|
|
async reviewVillageVolunteer(villageId: number, volunteerId: number, status: number) {
|
|
|
return this.post('/village/village/claimReview', '审核志愿者', {
|
|
return this.post('/village/village/claimReview', '审核志愿者', {
|
|
@@ -291,48 +291,49 @@ export class VillageApi extends AppServerRequestModule<DataModel> {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
async getCollectModuleList() {
|
|
async getCollectModuleList() {
|
|
|
- const res = await this.get('/village/volunteer/getCollectModuleList', '获取采集版块列表', {});
|
|
|
|
|
|
|
+ const res = await this.get<KeyValue>('/village/volunteer/getCollectModuleList', '获取采集版块列表', {});
|
|
|
const result = [] as {
|
|
const result = [] as {
|
|
|
value: string,
|
|
value: string,
|
|
|
label: string,
|
|
label: string,
|
|
|
}[];
|
|
}[];
|
|
|
- for (const key in res.data2) {
|
|
|
|
|
|
|
+ const data = res.data ?? {};
|
|
|
|
|
+ for (const key in data) {
|
|
|
result.push({
|
|
result.push({
|
|
|
value: key,
|
|
value: key,
|
|
|
- label: res.data2[key],
|
|
|
|
|
|
|
+ label: data[key] as string,
|
|
|
});
|
|
});
|
|
|
}
|
|
}
|
|
|
return result;
|
|
return result;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
async getCollectModuleMap() {
|
|
async getCollectModuleMap() {
|
|
|
- const res = await this.post('/village/volunteer/getCollectModuleList', '采集板块列表', {});
|
|
|
|
|
|
|
+ const res = await this.post<any[]>('/village/volunteer/getCollectModuleList', '采集板块列表', {});
|
|
|
const map = new Map<string, number>();
|
|
const map = new Map<string, number>();
|
|
|
- if (!res.data2 || typeof res.data2 !== 'object')
|
|
|
|
|
|
|
+ if (!res.data || typeof res.data !== 'object')
|
|
|
return map;
|
|
return map;
|
|
|
- for (const key in res.data2) {
|
|
|
|
|
- if (typeof res.data2[key] !== 'string')
|
|
|
|
|
- throw new Error(`采集板块列表键值对值不是字符串: ${key} -> ${res.data2[key]}`);
|
|
|
|
|
|
|
+ for (const key in res.data || []) {
|
|
|
|
|
+ if (typeof res.data[key] !== 'string')
|
|
|
|
|
+ throw new Error(`采集板块列表键值对值不是字符串: ${key} -> ${res.data[key]}`);
|
|
|
if (isNaN(Number(key)))
|
|
if (isNaN(Number(key)))
|
|
|
throw new Error(`采集板块列表键值对键不是数字: ${key}`);
|
|
throw new Error(`采集板块列表键值对键不是数字: ${key}`);
|
|
|
- map.set(res.data2[key], Number(key));
|
|
|
|
|
|
|
+ map.set(res.data[key], Number(key));
|
|
|
}
|
|
}
|
|
|
return map;
|
|
return map;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
async getCatalogList(villageId?: number, volunteerId?: number, pid?: number) {
|
|
async getCatalogList(villageId?: number, volunteerId?: number, pid?: number) {
|
|
|
- const res = await this.get('/village/village/getCatalogList', '村落目录列表', {
|
|
|
|
|
|
|
+ const res = await this.get<any[]>('/village/village/getCatalogList', '村落目录列表', {
|
|
|
village_id: villageId,
|
|
village_id: villageId,
|
|
|
village_volunteer_id: volunteerId,
|
|
village_volunteer_id: volunteerId,
|
|
|
pid: pid === 0 ? undefined : pid,
|
|
pid: pid === 0 ? undefined : pid,
|
|
|
});
|
|
});
|
|
|
- return transformArrayDataModel<VillageCatalogListItem>(VillageCatalogListItem, res.data2, `村落目录列表`, true);
|
|
|
|
|
|
|
+ return transformArrayDataModel<VillageCatalogListItem>(VillageCatalogListItem, res.data ?? [], `村落目录列表`, true);
|
|
|
}
|
|
}
|
|
|
async getVillageMenuList(id: number) {
|
|
async getVillageMenuList(id: number) {
|
|
|
- const res = await this.get('/village/menu/getList', '村落菜单列表', {
|
|
|
|
|
|
|
+ const res = await this.get<any[]>('/village/menu/getList', '村落菜单列表', {
|
|
|
village_id: id,
|
|
village_id: id,
|
|
|
});
|
|
});
|
|
|
- return transformArrayDataModel<VillageMenuListItem>(VillageMenuListItem, res.data2, `村落菜单`, true);
|
|
|
|
|
|
|
+ return transformArrayDataModel<VillageMenuListItem>(VillageMenuListItem, res.data ?? [], `村落菜单`, true);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|