Waiting/suke-mp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug修复

Browse Source
This commit is contained in:
Waiting
2024-04-18 00:37:43 +08:00
parent b87c8e8292
commit 6c4c2ac85d
16 changed files with 110 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/pages/home/index.vue
View File

@@ -122,9 +122,7 @@ onShow(async () => {
if(isLogin()) {
// userStore.getProfile();
if(userInfo.value.maOpenId) {
if(getCompanyId() === '') {
switchCompany();
}
fetchCompanyList();
} else {
await userStore.getProfile();
}
@@ -134,18 +132,52 @@ onShow(async () => {
});
const switchCompany = () => {
getCompanyList(userInfo.value.maOpenId).then(res => {
const companyList = res.map((res: { company: any }) => res.company);
const userList = res.map((res: { user: any }) => res.user);
// getCompanyList(userInfo.value.maOpenId).then(res => {
// const companyList = res.map((res: { company: any }) => res.company);
// const userList = res.map((res: { user: any }) => res.user);
// uni.showActionSheet({
// itemList: companyList.map((res: { companyName: string }) => res.companyName),
// success: (res) => {
// userStore.setUserInfo(userList[res.tapIndex]);
// userStore.setCompanyInfo(companyList[res.tapIndex]);
// }
// });
// });
fetchCompanyList((companyList: any[], userList: any[]) => {
uni.showActionSheet({
itemList: companyList.map((res: { companyName: string }) => res.companyName),
success: (res) => {
userStore.setUserInfo(userList[res.tapIndex]);
userStore.setCompanyInfo(companyList[res.tapIndex]);
}
});
});
};
const fetchCompanyList = (fn: any = undefined) => {
getCompanyList(userInfo.value.maOpenId).then(res => {
const companyList = res.map((res: { company: any }) => res.company);
const userList = res.map((res: { user: any }) => res.user);
if(fn != undefined && fn instanceof Function) {
fn(companyList, userList);
} else {
let index = companyList.findIndex((res: { id: string }) => res.id === getCompanyId());
if(index < 0) {
index = 0;
}
userStore.setUserInfo(userList[index]);
userStore.setCompanyInfo(companyList[index]);
}
// uni.showActionSheet({
// itemList: companyList.map((res: { companyName: string }) => res.companyName),
// success: (res) => {
// userStore.setUserInfo(userList[res.tapIndex]);
// userStore.setCompanyInfo(companyList[res.tapIndex]);
// }
// });
});
};
const swiperChange = (e: any) => {
currentBannerIndex.value = e.detail.current;
};