htc il y a 5 jours
Parent
commit
ec073b2c43

+ 3 - 3
pages/my.vue

@@ -22,13 +22,13 @@
 			</view>
 			<view class="info-tip">
 				<view class="info-tip-pre adfacjb" @click="handleTurnPage('/pagesMy/information')">
-					<view class="left">家庭公益名称:<text v-if="userInfo">{{userInfo?.welfareName||''}}</text><text style="color: #657588;" v-else>暂无,快去填写吧~</text></view>
+					<view class="left">{{isFamilyMember?'个人':'家庭'}}公益名称:<text v-if="userInfo">{{userInfo?.welfareName||''}}</text><text style="color: #657588;" v-else>暂无,快去填写吧~</text></view>
 					<view class="right">
 						<image src="https://oss.familydaf.cn/sxsnfile/20251218/938f573288ad401fbd1e57404a870059.png"></image>
 					</view>
 				</view>
 				<view class="info-tip-pre adfacjb" @click="handleTurnPage('/pagesMy/information')">
-					<view class="left">家庭公益口号:<text v-if="userInfo">{{userInfo?.welfareSlogan||''}}</text><text style="color: #657588;" v-else>暂无,快去填写吧~</text></view>
+					<view class="left">{{isFamilyMember?'个人':'家庭'}}公益口号:<text v-if="userInfo">{{userInfo?.welfareSlogan||''}}</text><text style="color: #657588;" v-else>暂无,快去填写吧~</text></view>
 					<view class="right">
 						<image src="https://oss.familydaf.cn/sxsnfile/20251218/938f573288ad401fbd1e57404a870059.png"></image>
 					</view>
@@ -238,7 +238,7 @@
 			}
 		}
 		if(url == '/pagesMy/achievement'){
-			url = `/pagesMy/achievement?numInfo=`+JSON.stringify(numInfo.value)
+			url = `/pagesMy/achievement?numInfo=`+JSON.stringify(numInfo.value)+`&userLevel=`+userInfo.value?.userLevel
 		}
 		uni.navigateTo({ url })
 	}

+ 2 - 0
pagesHome/activityDetail.vue

@@ -653,6 +653,8 @@
 				return proxy.$showToast(res.msg)
 			} 
 			activityInfo.value = res.data;
+			if(activityInfo.value.activityStartTime) activityInfo.value.activityStartTime = new Date(activityInfo.value.activityStartTime).Format('yyyy年MM月dd日 hh:mm')
+			if(activityInfo.value.activityEndTime) activityInfo.value.activityEndTime = new Date(activityInfo.value.activityEndTime).Format('yyyy年MM月dd日 hh:mm')
 			// 更新海报数据
 			posterData.title = activityInfo.value?.activityName || posterData.title;
 			posterData.time = `${new Date(activityInfo.value?.activityStartTime).Format('MM.dd-hh:mm') } ~ ${new Date(activityInfo.value?.activityEndTime).Format('MM.dd-hh:mm')}` || posterData.time;

+ 4 - 2
pagesMy/achievement.vue

@@ -7,7 +7,7 @@
 			<view class="info-top adfac">
 				<image class="avatar" :src="userInfo?.avatarPath||'https://oss.familydaf.cn/sxsnfile/20251218/ad5a1a788b6944358b0bc93e2506bf17.png'"></image>
 				<view class="name">Hi~ {{userInfo?.realName||userInfo?.name||''}}</view>
-				<view class="level adfac" @click="handleTurnPage('/pagesMy/levelDetail')"><text>Lv&nbsp;</text><text>{{userInfo?.userLevel||0}}</text></view>
+				<view class="level adfac" @click="handleTurnPage('/pagesMy/levelDetail')"><text>Lv&nbsp;</text><text>{{userLevel}}</text></view>
 			</view>
 			<view class="info-num">收获勋章:{{numInfo?.myMedals||0}} <text>枚</text></view>
 			<view class="info-memo">共参与<text>{{numInfo?.activityCount||0}}</text>次公益活动,累计义工时长<text>{{numInfo?.volunteerHours||0}}</text>小时</view>
@@ -80,7 +80,8 @@
 	import { onLoad } from '@dcloudio/uni-app'
 	import { ref, getCurrentInstance } from 'vue'
 	const { proxy } = getCurrentInstance()
-	
+	
+	const userLevel = ref(0)
 	const userInfo = ref(null)
 	const numInfo = ref(null)
 	const queryParams = ref({
@@ -381,6 +382,7 @@
 		try{
 			userInfo.value = uni.getStorageSync('isFamilyMember')?JSON.parse(uni.getStorageSync('familyMemberInfo')):JSON.parse(uni.getStorageSync('userInfo'));
 			numInfo.value = options.numInfo&&JSON.parse(options.numInfo);
+			userLevel.value = options.userLevel||0;
 			queryParams.value.userId = userInfo.value&&userInfo.value.id;
 			if(uni.getStorageSync('isFamilyMember')) queryParams.value.memberId = userInfo.value&&userInfo.value.id;
 			getList()

+ 0 - 1
pagesNonprofit/nonprofitDetail.vue

@@ -379,7 +379,6 @@
 				}
 				.right{
 					width: calc(100% - 120rpx);
-					padding-left: 20rpx;
 					box-sizing: border-box;
 					font-family: PingFangSC, PingFang SC;
 					font-weight: 400;