diff --git a/pages/archive/archive-manage.vue b/pages/archive/archive-manage.vue index 9bf6019..d012aca 100644 --- a/pages/archive/archive-manage.vue +++ b/pages/archive/archive-manage.vue @@ -58,6 +58,7 @@ const { useLoad, useShow } = useGuard(); const { account } = storeToRefs(useAccount()); const corpId = ref(''); const teamId = ref(''); +const corpUserId = ref('') const enableHis = ref(false); const customers = ref([]); @@ -96,6 +97,7 @@ async function unBindArchive(customer) { useLoad(options => { teamId.value = options.teamId; corpId.value = options.corpId; + corpUserId.value = options.corpUserId; }) useShow(() => { diff --git a/pages/archive/edit-archive.vue b/pages/archive/edit-archive.vue index ec01701..0a8f26e 100644 --- a/pages/archive/edit-archive.vue +++ b/pages/archive/edit-archive.vue @@ -43,6 +43,7 @@ const { account, externalUserId } = storeToRefs(useAccount()); const { getExternalUserId } = useAccount() const corpId = ref(''); const corpName = ref(''); +const corpUserId = ref(''); const customer = ref({}); const customerId = ref(''); const customers = ref([]); @@ -72,8 +73,8 @@ function change({ title, value }) { const age = dayjs().diff(birthday, 'year'); form.value.age = Math.max(1, age); } - } else if (title === 'birthday' && formItems.value.some(i => i.title === 'age')) { - const age = dayjs().diff(birthday, 'year'); + } else if (title === 'birthday' && formItems.value.some(i => i.title === 'age') && value && dayjs(value).valueOf()) { + const age = dayjs().diff(value, 'year'); form.value.age = Math.max(1, age); } @@ -150,7 +151,6 @@ async function addArchive() { loading.value = false; const res = await api('addCustomer', { params }); if (res && res.success) { - set('home-invite-teamId', teamId.value); uni.$emit('reloadTeamCustomers') uni.redirectTo({ url: `/pages/archive/archive-result?corpId=${corpId.value}&teamId=${teamId.value}` @@ -161,7 +161,7 @@ async function addArchive() { } async function getResponsiblePerson() { - const res = await api('getResponsiblePerson', { corpId: corpId.value, externalUserId: externalUserId.value, teamId: teamId.value }); + const res = await api('getResponsiblePerson', { corpId: corpId.value, externalUserId: externalUserId.value, teamId: teamId.value, corpUserId: corpUserId.value }); return res && res.data ? res.data : '' } @@ -175,7 +175,6 @@ async function bindArchive(customerId) { if (res && res.success) { await toast('绑定成功'); uni.$emit('reloadTeamCustomers') - set('home-invite-teamId', teamId.value); uni.switchTab({ url: '/pages/home/home' }) @@ -284,6 +283,7 @@ async function unBindArchive() { onLoad(options => { customerId.value = options.id || ''; + corpUserId.value = options.corpUserId || ''; uni.setNavigationBarTitle({ title: customerId.value ? '编辑档案' : '新增档案' }) }) diff --git a/pages/article/article-list.vue b/pages/article/article-list.vue index 36112e1..91a6cb3 100644 --- a/pages/article/article-list.vue +++ b/pages/article/article-list.vue @@ -1,18 +1,18 @@ diff --git a/pages/message/hooks/use-group-chat.js b/pages/message/hooks/use-group-chat.js index 6e7014c..e93ffcc 100644 --- a/pages/message/hooks/use-group-chat.js +++ b/pages/message/hooks/use-group-chat.js @@ -47,7 +47,7 @@ export default function useGroupChat(groupID) { const getUserAvatar = (userId) => { const member = chatMember.value[userId] if (!member) { - return userId === openid.value ? '/static/default-patient-avatar.png' : '/static/default-avatar.svg' + return userId === openid.value ? '/static/default-patient-avatar.png' : '/static/default-avatar.png' } // 如果有头像且不为空字符串,返回头像 @@ -55,7 +55,7 @@ export default function useGroupChat(groupID) { return member.avatar } - return member.isTeamMember ? '/static/default-avatar.svg' : '/static/default-patient-avatar.png' + return member.isTeamMember ? '/static/default-avatar.png' : '/static/default-patient-avatar.png' } // 获取群聊信息和成员头像 async function getGroupInfo(id) { diff --git a/pages/survey/survey-list.vue b/pages/survey/survey-list.vue index 5e0367a..77f560a 100644 --- a/pages/survey/survey-list.vue +++ b/pages/survey/survey-list.vue @@ -1,17 +1,18 @@