|
|
@@ -6,6 +6,7 @@ import VillageApi from '@/api/inhert/VillageApi';
|
|
|
|
|
|
export const useCollectStore = defineStore('collect', () => {
|
|
|
const collectableModules = ref(new Map<string, number>());
|
|
|
+ const collectableAllModules = ref(new Map<string, number>());
|
|
|
const collectableCatalogs = ref<number[]>([]);
|
|
|
const authStore = useAuthStore();
|
|
|
|
|
|
@@ -25,13 +26,12 @@ export const useCollectStore = defineStore('collect', () => {
|
|
|
return collectableModules.value.has(module);
|
|
|
}
|
|
|
function getCollectModuleId(module: string) {
|
|
|
- if (collectableModules.value.has(CollectableModulesNameMapping[module]))
|
|
|
- return collectableModules.value.get(CollectableModulesNameMapping[module]);
|
|
|
- return collectableModules.value.get(module);
|
|
|
+ if (collectableAllModules.value.has(CollectableModulesNameMapping[module]))
|
|
|
+ return collectableAllModules.value.get(CollectableModulesNameMapping[module]);
|
|
|
+ return collectableAllModules.value.get(module);
|
|
|
}
|
|
|
function getCollectModuleInternalNameById(id: number) {
|
|
|
- console.log('collectableModules.value', id, collectableModules.value);
|
|
|
- for (const [key, value] of collectableModules.value) {
|
|
|
+ for (const [key, value] of collectableAllModules.value) {
|
|
|
if (value == id) {
|
|
|
for (const k2 in CollectableModulesNameMapping) {
|
|
|
if (CollectableModulesNameMapping[k2] == key) {
|
|
|
@@ -47,6 +47,8 @@ export const useCollectStore = defineStore('collect', () => {
|
|
|
const res = await VillageApi.getVolunteerInfo();
|
|
|
const collectableModules = res.collectModule || [];
|
|
|
const collectableModulesMap = await VillageApi.getCollectModuleMap();
|
|
|
+ for (const [k,v] of collectableModulesMap)
|
|
|
+ collectableAllModules.value.set(k, v);
|
|
|
const needRemoveKeys = new Set<string>();
|
|
|
if (!authStore.isAdmin) {
|
|
|
for (const [key,id] of collectableModulesMap)
|
|
|
@@ -56,8 +58,6 @@ export const useCollectStore = defineStore('collect', () => {
|
|
|
for (const key of needRemoveKeys)
|
|
|
collectableModulesMap.delete(key);
|
|
|
collectableCatalogs.value = res.catalogIds || [];
|
|
|
- console.log('collectableModulesMap', collectableModulesMap);
|
|
|
-
|
|
|
setCollectableModules(collectableModulesMap);
|
|
|
}
|
|
|
|