Merge branch 'master' of http://git.ringzle.com:3000/yangen/SxsnWechat

pages/my.vue

@@ -43,7 +43,7 @@
 			<view class="box-card adfacjb">
 				<view class="box-card-pre adffcac red" @click="handleTurnPage('/pagesMy/heartNumber?loveValue='+(isFamilyMember?(numInfo?.loveValueBalance??0):numInfo?.loveValue))">
 					<image class="top" src="https://oss.familydaf.cn/sxsnfile/20251218/046c057625704329a478d535cd1b4364.png"></image>
-					<view class="num">{{isFamilyMember?((numInfo?.loveValueBalance||0)).toFixed(2):((numInfo?.loveValue||0)).toFixed(2)}}</view>
+					<view class="num">{{isFamilyMember?(numInfo?.loveValueBalance||0):(numInfo?.loveValue||0)}}</view>
 					<view class="text adf">
 						<text>{{isFamilyMember?'爱心值余额':'我的爱心值'}}</text>
 						<image src="https://oss.familydaf.cn/sxsnfile/20251218/2e8332c5f36a45cab3af336aa324d20c.png"></image>
@@ -51,13 +51,13 @@
 				</view>
 				<view class="box-card-pre adffcac purple" @click="handleTurnPage('/pagesMy/archives')">
 					<image class="top" src="https://oss.familydaf.cn/sxsnfile/20251218/ee5fffc2b10647ef9492150aed6bb29d.png"></image>
-					<view class="num">{{(numInfo?.myArchives||0).toFixed(2)}}</view>
+					<view class="num">{{numInfo?.myArchives||0}}</view>
 					<view class="text adf">
 						<text>我的档案</text>
 						<image src="https://oss.familydaf.cn/sxsnfile/20251218/6e9e879da03944a4911b48550e915641.png"></image>
 					</view>
 				</view>
-				<view class="box-card-pre adffcac orange" @click="handleTurnPage('/pagesMy/volunteerHours?volunteerHours='+numInfo?.volunteerHours)">
+				<view class="box-card-pre adffcac orange" @click="handleTurnPage('/pagesMy/volunteerHours?volunteerHours='+numInfo?.volunteerHours)" v-if="isFamilyMember">
 					<image class="top" src="https://oss.familydaf.cn/sxsnfile/20251218/3fdb7e3c0d3c444ab03dd5f51a5e3fe0.png"></image>
 					<view class="num">{{(numInfo?.volunteerHours||0).toFixed(2)}}</view>
 					<view class="text adf">

pagesHome/activityDetail.vue

@@ -305,7 +305,7 @@
 	
 	//立即报名
 	const handleApply = async () => {
-		let level = JSON.parse(uni.getStorageSync('userInfo'))?.userLevel;
+		let level = uni.getStorageSync('familyMemberInfo')?JSON.parse(uni.getStorageSync('familyMemberInfo'))?.userLevel:JSON.parse(uni.getStorageSync('userInfo'))?.userLevel;
 		if(level<activityInfo.value.userLevel) return proxy.$showModal(`很抱歉，当前活动限制报名等级为${activityInfo.value.userLevel}级，您当前等级为${level}级，不满足报名条件。`)
 		
 		let { loveValue, couponIds } = await getUserLoveTicket();

pagesMy/archivesDetail.vue

@@ -57,6 +57,7 @@
 		proxy.$api.get(`/core/activity/signup/getMemberProfile/${options?.activityId}/${options?.memberId}`).then(({data:res})=>{
 			if(res.code!==0) return proxy.$showToast(res.msg)
 			info.value = res.data;
+			if(res.data.avatarPath) avatar.value = res.data.avatarPath;
 			if(info.value.activityStartTime) info.value.activityStartTime = new Date(info.value.activityStartTime).Format('yyyy.MM.dd hh:mm')
 			if(info.value.activityEndTime) info.value.activityEndTime = new Date(info.value.activityEndTime).Format('yyyy.MM.dd hh:mm')
 			imgs.value = res.data.activityFile&&res.data.activityFile.split(';');