huxuejian/ykt-team-wxapp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev-wdb' into dev-hjf

Browse Source
This commit is contained in:
Jafeng 2026-02-06 11:04:13 +08:00
commit 3341b24c3b
13 changed files with 416 additions and 333 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.development
View File

@ -1,5 +1,5 @@
MP_API_BASE_URL=https://patient.youcan365.com
MP_CACHE_PREFIX=development
MP_WX_APP_ID=wx93af55767423938e
MP_WX_APP_ID=wx6ee11733526b4f04
MP_TIM_SDK_APP_ID=1600123876
MP_CORP_ID=wwe3fb2faa52cf9dfb

2
.env.localhost
View File

@ -1,5 +1,5 @@
MP_API_BASE_URL=http://localhost:8080
MP_CACHE_PREFIX=development
MP_WX_APP_ID=wx93af55767423938e
MP_WX_APP_ID=wx6ee11733526b4f04
MP_TIM_SDK_APP_ID=1600123876
MP_CORP_ID=wwe3fb2faa52cf9dfb

2
manifest.json
View File

@ -50,7 +50,7 @@
"quickapp" : {},
/* 小程序特有相关 */
"mp-weixin" : {
"appid": "wx93af55767423938e",
"appid" : "wx6ee11733526b4f04",
"setting" : {
"urlCheck" : false
},

10
pages.json
View File

@ -1,6 +1,5 @@
{
"pages": [
{
"pages": [{
"path": "pages/home/home",
"style": {
"navigationBarTitleText": "首页",
@ -41,14 +40,14 @@
{
"path": "pages/login/login",
"style": {
"navigationBarTitleText": "柚健康",
"navigationBarTitleText": "健康柚",
"navigationStyle": "custom"
}
},
{
"path": "pages/login/redirect-page",
"style": {
"navigationBarTitleText": "柚健康"
"navigationBarTitleText": "健康柚"
}
},
{
@ -159,8 +158,7 @@
"selectedColor": "#007aff",
"backgroundColor": "#ffffff",
"borderStyle": "white",
"list": [
{
"list": [{
"pagePath": "pages/home/home",
"iconPath": "static/tabbar/home.png",
"selectedIconPath": "static/tabbar/home_selected.png",

3
pages/archive/bind-popup.vue
View File

@ -95,4 +95,7 @@ watch(() => props.visible, n => {
width: 48rpx;
height: 48rpx;
}
.popup-content-scroll{
max-height: 65vh;
}
</style>

213
pages/home/customer-archive.vue
View File

@ -18,11 +18,19 @@
</view>
<scroll-view scroll-x="true">
<view class="flex flex-nowrap pb-5">
<view v-for="i in customers" :key="i._id" class="customer-card flex-shrink-0 mr-15 relative"
:class="current && i._id === current._id ? 'current-customer' : ''" @click="toggle(i)">
<view
v-for="i in customers"
:key="i._id"
class="customer-card flex-shrink-0 mr-15 relative"
:class="current && i._id === current._id ? 'current-customer' : ''"
@click="toggle(i)"
>
<!-- 关系标签 -->
<view v-if="i.relationship" class="relationship-tag"
:class="i.relationship === '本人' ? 'tag-blue' : 'tag-green'">
<view
v-if="i.relationship"
class="relationship-tag"
:class="i.relationship === '本人' ? 'tag-blue' : 'tag-green'"
>
{{ i.relationship }}
</view>
<view class="flex flex-col items-center">
@ -32,18 +40,27 @@
</view>
</view>
<!-- 选中状态底部条和三角 -->
<view v-if="current && i._id === current._id" class="active-indicator">
<view
v-if="current && i._id === current._id"
class="active-indicator"
>
<view class="active-bar"></view>
<view class="active-triangle"></view>
</view>
</view>
</view>
</scroll-view>
<view v-if="canAuth" class="px-10 py-5 mt-5 flex items-center bg-danger rounded-sm">
<view
v-if="canAuth"
class="px-10 py-5 mt-5 flex items-center bg-danger rounded-sm"
>
<view class="mr-5 w-0 flex-grow text-base text-white">
点击右侧授权按钮, 我们将更精准的为您服务
</view>
<view class="px-12 py-5 text-base rounded-sm text-dark bg-white" @click="auth()">
<view
class="px-12 py-5 text-base rounded-sm text-dark bg-white"
@click="auth()"
>
授权
</view>
</view>
@ -53,18 +70,32 @@
<view class="info-content">
<view class="flex items-center justify-between mb-8">
<view class="info-title">个人基本信息</view>
<image class="arrow-icon-small" src="/static/home/arrow-right-blue.png" mode="aspectFit"></image>
<image
class="arrow-icon-small"
src="/static/home/arrow-right-blue.png"
mode="aspectFit"
></image>
</view>
<view v-if="baseInfoError" class="text-sm text-danger">请完善您的个人信息</view>
<view v-if="baseInfoError" class="text-sm text-danger"
>请完善您的个人信息</view
>
<view v-else class="info-subtitle">完善个人信息</view>
</view>
</view>
<view v-if="hasHealthTemp" class="ml-10 info-card-new flex-grow" @click="toHealthList()">
<view
v-if="hasHealthTemp"
class="ml-10 info-card-new flex-grow"
@click="toHealthList()"
>
<view class="info-bg info-bg-health"></view>
<view class="info-content">
<view class="flex items-center justify-between mb-8">
<view class="info-title">健康信息</view>
<image class="arrow-icon-small" src="/static/home/arrow-right-blue.png" mode="aspectFit"></image>
<image
class="arrow-icon-small"
src="/static/home/arrow-right-blue.png"
mode="aspectFit"
></image>
</view>
<view class="info-subtitle">上传健康档案</view>
</view>
@ -73,28 +104,28 @@
</view>
</template>
<script setup>
import { computed, onMounted, ref, watch } from 'vue';
import { storeToRefs } from 'pinia'
import useAccount from '@/store/account';
import api from '@/utils/api';
import { toast, confirm } from '@/utils/widget';
import { computed, onMounted, ref, watch } from "vue";
import { storeToRefs } from "pinia";
import useAccount from "@/store/account";
import api from "@/utils/api";
import { toast, confirm } from "@/utils/widget";
const props = defineProps({
corpId: {
type: String,
default: ''
default: "",
},
customers: {
type: Array,
default: () => []
default: () => [],
},
team: {
type: Object,
default: () => ({})
}
})
default: () => ({}),
},
});
const emit = defineEmits(['update:customers']);
const emit = defineEmits(["update:customers"]);
const { account } = storeToRefs(useAccount());
const current = ref(null);
@ -102,41 +133,61 @@ const customers = ref([]);
const canAuth = computed(() => {
if (current.value && props.team && props.team.teamId) {
const teamIds = Array.isArray(current.value.teamId) ? current.value.teamId : [];
const teamIds = Array.isArray(current.value.teamId)
? current.value.teamId
: [];
return !teamIds.includes(props.team.teamId);
}
return false
})
return false;
});
const qrcode = computed(() => {
const qrcodes = props.team && Array.isArray(props.team.qrcodes) ? props.team.qrcodes : [];
return qrcodes[0] || ''
})
const qrcodes =
props.team && Array.isArray(props.team.qrcodes) ? props.team.qrcodes : [];
return qrcodes[0] || "";
});
const hasHealthTemp = computed(() => qrcode.value && Array.isArray(qrcode.value.healthTempList) && qrcode.value.healthTempList.length > 0)
const baseInfo = computed(() => qrcode.value && qrcode.value.teamFileds && Array.isArray(qrcode.value.teamFileds.baseInfo) ? qrcode.value.teamFileds.baseInfo : [])
const hasHealthTemp = computed(
() =>
qrcode.value &&
Array.isArray(qrcode.value.healthTempList) &&
qrcode.value.healthTempList.length > 0
);
const baseInfo = computed(() =>
qrcode.value &&
qrcode.value.teamFileds &&
Array.isArray(qrcode.value.teamFileds.baseInfo)
? qrcode.value.teamFileds.baseInfo
: []
);
const baseInfoError = computed(() => {
const requiredTitles = baseInfo.value.filter(i => i.required).map(i => i.title);
return current.value && requiredTitles.some(i => !current.value[i]);
})
const requiredTitles = baseInfo.value
.filter((i) => i.required)
.map((i) => i.title);
return current.value && requiredTitles.some((i) => !current.value[i]);
});
function fillBaseInfo() {
if (canAuth.value) {
toast('请先授权本服务团队')
toast("请先授权本服务团队");
} else {
uni.navigateTo({
url: `/pages/archive/edit-archive?teamId=${props.team.teamId}&corpId=${props.corpId}&id=${current.value._id}`
})
url: `/pages/archive/edit-archive?teamId=${props.team.teamId}&corpId=${props.corpId}&id=${current.value._id}`,
});
}
}
function toHealthList() {
if (canAuth.value) {
toast('请先授权本服务团队')
toast("请先授权本服务团队");
} else {
const name = `${current.value.name} ${current.value.relationship ? `(${current.value.relationship})` : ''}`
const name = `${current.value.name} ${
current.value.relationship ? `(${current.value.relationship})` : ""
}`;
uni.navigateTo({
url: `/pages/health/list?teamId=${props.team.teamId}&corpId=${props.corpId}&id=${current.value._id}&name=${encodeURIComponent(name)}`
})
url: `/pages/health/list?teamId=${props.team.teamId}&corpId=${
props.corpId
}&id=${current.value._id}&name=${encodeURIComponent(name)}`,
});
}
}
@ -145,54 +196,67 @@ function toggle(i) {
}
function toManagePage() {
uni.navigateTo({ url: `/pages/archive/archive-manage?corpId=${props.corpId}&teamId=${props.team.teamId}` })
uni.navigateTo({
url: `/pages/archive/archive-manage?corpId=${props.corpId}&teamId=${props.team.teamId}`,
});
}
async function auth() {
await confirm(`是否授权${props.team.name}提供服务`);
const res = await api('authCustomerToTeam', { corpId: props.corpId, teamId: props.team.teamId, id: current.value._id });
const res = await api("authCustomerToTeam", {
corpId: props.corpId,
teamId: props.team.teamId,
id: current.value._id,
});
if (res && res.success) {
await toast('授权成功');
getCustomers()
await toast("授权成功");
getCustomers();
} else {
toast(res?.message || '授权失败');
toast(res?.message || "授权失败");
}
}
async function getCustomers() {
const res = await api('getMiniAppCustomers', { miniAppId: account.value.openid, corpId: props.corpId });
const res = await api("getMiniAppCustomers", {
miniAppId: account.value.openid,
corpId: props.corpId,
});
if (res && res.success) {
customers.value = res && Array.isArray(res.data) ? res.data : [];
const customer = customers.value.find(i => current.value && i._id === current.value._id);
const customer = customers.value.find(
(i) => current.value && i._id === current.value._id
);
current.value = customer || customers.value[0] || null;
// 向父组件传递 customers 数据
emit('update:customers', customers.value);
emit("update:customers", customers.value);
} else {
toast(res.message || '获取档案失败');
toast(res.message || "获取档案失败");
}
}
onMounted(() => {
uni.$on('reloadTeamCustomers', getCustomers)
})
uni.$on("reloadTeamCustomers", getCustomers);
});
watch(() => props.corpId, n => {
watch(
() => props.corpId,
(n) => {
if (n) {
getCustomers()
getCustomers();
} else {
customers.value = [];
}
}, { immediate: true });
},
{ immediate: true }
);
</script>
<style scoped>
.archive-container {
padding: 24rpx 30rpx;
margin: 0 30rpx;
background: linear-gradient(181deg, #C2DCFF 1.01%, #FFFFFF 43.31%);
background: linear-gradient(181deg, #c2dcff 1.01%, #ffffff 43.31%);
border-radius: 16rpx;
box-shadow:
inset 0 2rpx 0 0 rgba(255, 255, 255, 0.82),
box-shadow: inset 0 2rpx 0 0 rgba(255, 255, 255, 0.82),
0 8rpx 10rpx 0 rgba(60, 169, 145, 0.06);
}
@ -214,19 +278,18 @@ watch(() => props.corpId, n => {
display: flex;
align-items: center;
justify-content: center;
background: linear-gradient(180deg, #FFFFFF 0%, #E6EFFB 100%);
background: linear-gradient(180deg, #ffffff 0%, #e6effb 100%);
border-radius: 12rpx;
border: 2rpx solid #AECAF2;
border: 2rpx solid #aecaf2;
transition: all 0.2s;
position: relative;
}
.current-customer {
background: #FFFFFF;
border: 2rpx solid #065BD6;
background: #ffffff;
border: 2rpx solid #065bd6;
}
.relationship-tag {
position: absolute;
top: -2rpx;
@ -241,7 +304,7 @@ watch(() => props.corpId, n => {
}
.relationship-tag::after {
content: '';
content: "";
position: absolute;
right: 0;
bottom: -8rpx;
@ -251,19 +314,19 @@ watch(() => props.corpId, n => {
}
.tag-blue {
background: #065BD6;
background: #065bd6;
}
.tag-blue::after {
border-top: 8rpx solid #003F96;
border-top: 8rpx solid #003f96;
}
.tag-green {
background: #1DBF98;
background: #1dbf98;
}
.tag-green::after {
border-top: 8rpx solid #0F8C6D;
border-top: 8rpx solid #0f8c6d;
}
.active-indicator {
@ -291,7 +354,7 @@ watch(() => props.corpId, n => {
transform: translateX(-50%) rotate(45deg);
width: 12rpx;
height: 12rpx;
background: #065BD6;
background: #065bd6;
margin-top: -8rpx;
}
@ -307,12 +370,11 @@ watch(() => props.corpId, n => {
margin-bottom: 12rpx;
}
.info-card-new {
position: relative;
padding: 24rpx;
border-radius: 16rpx;
background: linear-gradient(115deg, #F4F9FF 14.74%, #DBEAFF 66.11%);
background: linear-gradient(115deg, #f4f9ff 14.74%, #dbeaff 66.11%);
box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.06);
overflow: hidden;
width: 310rpx;
@ -339,23 +401,22 @@ watch(() => props.corpId, n => {
}
.info-bg-base {
background-image: url('/static/home/basic-info-bg.svg');
background-image: url("/static/home/basic-info-bg.svg");
}
.info-bg-health {
background-image: url('/static/home/health-info-bg.svg');
background-image: url("/static/home/health-info-bg.svg");
}
.info-title {
color: #213E80;
color: #213e80;
font-size: 32rpx;
font-weight: 400;
line-height: 56rpx;
}
.info-subtitle {
color: #78808F;
color: #78808f;
font-size: 24rpx;
}

2
pages/login/login.vue
View File

@ -118,7 +118,7 @@ async function getPhoneNumber(e) {
bindTeam(account.value)
} else if (redirectUrl.value) {
await attempToPage(redirectUrl.value);
} else if (res) {
} else {
toHome();
}
}

48
pages/message/chat.scss
View File

@ -382,22 +382,23 @@ $primary-color: #0877F1;
background: #fff;
border-top: 1rpx solid #e0e0e0;
position: relative;
z-index: 200; // 确保输入区域在评价卡片之上，但在弹窗之下
// padding: 32rpx 16rpx 28rpx 16rpx;
z-index: 200;
padding-bottom: env(safe-area-inset-bottom);
}
.input-toolbar {
display: flex;
align-items: flex-end;
padding: 28rpx 0 28rpx 0;
align-items: center;
padding: 16rpx 20rpx;
gap: 12rpx;
padding-left: 20rpx;
padding-right: 20rpx;
}
.voice-toggle-btn {
width: 56rpx;
height: 56rpx;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
padding: 0;
}
@ -407,6 +408,7 @@ $primary-color: #0877F1;
height: 56rpx;
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
padding: 0;
}
@ -418,7 +420,7 @@ $primary-color: #0877F1;
font-weight: 600;
border: none;
border-radius: 40rpx;
height: 64rpx;
height: 56rpx;
min-width: 112rpx;
padding: 0 32rpx;
box-shadow: 0 2rpx 8rpx rgba(56, 118, 246, 0.08);
@ -441,16 +443,14 @@ $primary-color: #0877F1;
align-items: center;
justify-content: center;
min-width: 0;
max-width: calc(100vw - 280rpx);
}
.text-input,
.voice-input-btn {
flex: 1;
padding: 26rpx 46rpx;
padding: 16rpx;
background-color: #f3f5fa;
border-radius: 20rpx;
margin: 0 16rpx;
border-radius: 10rpx;
font-size: 28rpx;
min-height: 80rpx;
max-height: 200rpx;
@ -459,16 +459,27 @@ $primary-color: #0877F1;
box-sizing: border-box;
line-height: 1.5;
color: #333;
}
.voice-input-btn {
height: 80rpx;
display: flex;
align-items: center;
justify-content: center;
padding: 0 46rpx;
}
.text-input {
padding: 20rpx;
display: block;
line-height: 1.5;
height: 80rpx;
}
.voice-input-btn {
height: 56rpx;
display: flex;
align-items: center;
justify-content: center;
padding: 0 24rpx;
text-align: center;
line-height: 80rpx;
line-height: 56rpx;
}
.more-panel {
@ -1031,6 +1042,7 @@ $primary-color: #0877F1;
.text-input:-ms-input-placeholder,
.text-input::placeholder {
line-height: 1.5;
vertical-align: middle;
}
.voice-input-btn::-webkit-input-placeholder,
@ -1038,7 +1050,7 @@ $primary-color: #0877F1;
.voice-input-btn::-moz-placeholder,
.voice-input-btn:-ms-input-placeholder,
.voice-input-btn::placeholder {
line-height: 80rpx;
line-height: 56rpx;
text-align: center;
}

7
pages/message/components/chat-input.vue
View File

@ -8,7 +8,7 @@
<view class="input-area">
<textarea v-if="!showVoiceInput" class="text-input" v-model="inputText" placeholder="我来说两句..."
@confirm="sendTextMessage" @focus="handleInputFocus" @input="handleInput"
:auto-height="true" :show-confirm-bar="false" :adjust-position="true" />
:auto-height="true" :show-confirm-bar="false" :adjust-position="true" :cursor-spacing="40" />
<input v-else class="voice-input-btn" :class="{ recording: isRecording }" @touchstart="startRecord"
@touchmove="onRecordTouchMove" @touchend="stopRecord" @touchcancel="cancelRecord" :placeholder="isRecording ? '松开发送' : '按住说话'" disabled>
</input>
@ -152,6 +152,9 @@ const sendTextMessage = async () => {
await sendMessage("text", inputText.value);
inputText.value = "";
// 收起键盘
uni.hideKeyboard();
};
@ -333,7 +336,7 @@ const goToArticleList = () => {
const morePanelButtons = [
{ text: "照片", icon: "/static/icon/zhaopian.png", action: showImagePicker },
{ text: "宣教", icon: "/static/icon/xuanjiaowenzhang.png", action: goToArticleList },
// { text: "宣教", icon: "/static/icon/xuanjiaowenzhang.png", action: goToArticleList },
];
function handleInputFocus() {

7
pages/message/hooks/use-group-avatars.js
View File

@ -9,7 +9,8 @@ import useTeamStore from '@/store/team.js'
export default function useGroupAvatars() {
const groupAvatarMap = ref({}) // { groupID: [avatarUrl1, avatarUrl2, ...] }
const teamStore = useTeamStore()
const patientDefaultAvatar = '/static/default-avatar.svg'
const patientDefaultAvatar = '/static/default-patient-avatar.png'
const teamMemberDefaultAvatar = '/static/default-avatar.svg'
/**
* 获取单个群聊的头像列表
@ -36,10 +37,10 @@ export default function useGroupAvatars() {
// 提取头像列表（过滤掉空头像，使用默认头像替代）
const avatarList = Object.values(memberMap)
.map(member => {
// 如果成员有头像且不为空，使用成员头像；否则使用默认头像
// 如果成员有头像且不为空，使用成员头像；否则使用团队成员默认头像
return (member.avatar && member.avatar.trim() !== '')
? member.avatar
: patientDefaultAvatar
: teamMemberDefaultAvatar
})
// 添加患者默认头像

13
pages/message/hooks/use-group-chat.js
View File

@ -1,7 +1,9 @@
import { ref, computed } from 'vue'
import { onShow, onUnload } from '@dcloudio/uni-app'
import { storeToRefs } from 'pinia'
import api from '@/utils/api.js'
import useTeamStore from '@/store/team.js'
import useAccountStore from '@/store/account.js'
/**
* 群聊hook - 管理群聊成员和头像
@ -13,6 +15,7 @@ export default function useGroupChat(groupID) {
const teamMemberIds = ref([]) // 存储团队成员的userId列表
const patientId = ref('') // 存储患者ID
const teamStore = useTeamStore()
const { openid } = storeToRefs(useAccountStore())
// 群聊成员映射
const chatMember = computed(() => {
@ -45,8 +48,9 @@ export default function useGroupChat(groupID) {
const member = chatMember.value[userId]
if (!member) {
// 如果找不到成员信息，根据是否为团队成员返回默认头像
// 团队成员和患者都使用 default-avatar.svg
return '/static/default-avatar.svg'
// 患者（userId为当前账户openid）使用 default-patient-avatar.png
// 其他情况使用 default-avatar.svg
return userId === openid.value ? '/static/default-patient-avatar.png' : '/static/default-avatar.svg'
}
// 如果有头像且不为空字符串，返回头像
@ -54,8 +58,9 @@ export default function useGroupChat(groupID) {
return member.avatar
}
// 否则使用默认头像
return '/static/default-avatar.svg'
// 否则根据是否为团队成员返回默认头像
// 患者使用 default-patient-avatar.png，团队成员使用 default-avatar.svg
return member.isTeamMember ? '/static/default-avatar.svg' : '/static/default-patient-avatar.png'
}
// 获取群聊信息和成员头像

BIN
static/default-patient-avatar.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.6 KiB

0
static/doctor-avatar.png
View File