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

pages/my.vue

@@ -38,11 +38,11 @@
 		<view class="box" style="margin-top: 40rpx;">
 			<view class="box-title">公益记录</view>
 			<view class="box-card adfacjb">
-				<view class="box-card-pre adffcac red" @click="handleTurnPage('/pagesMy/heartNumber?loveValue='+numInfo?.loveValue)">
+				<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">{{(numInfo?.loveValue||0).toFixed(2)}}</view>
+					<view class="num">{{isFamilyMember?((numInfo?.loveValueBalance||0)).toFixed(2):((numInfo?.loveValue||0)).toFixed(2)}}</view>
 					<view class="text adf">
-						<text>我的爱心值</text>
+						<text>{{isFamilyMember?'爱心值余额':'我的爱心值'}}</text>
 						<image src="https://oss.familydaf.cn/sxsnfile/20251218/2e8332c5f36a45cab3af336aa324d20c.png"></image>
 					</view>
 				</view>
@@ -243,22 +243,22 @@
 		uni.navigateTo({ url })
 	}
 	
-	const deepClone = (obj) => {
-		  if (obj === null || typeof obj !== 'object') {
-			return obj;
-		  }
-		  
-		  if (Array.isArray(obj)) {
-			return obj.map(item => deepClone(item));
-		  }
-		  
-		  const clonedObj = {};
-		  
-		  for (const key in obj) {
-			clonedObj[key] = deepClone(obj[key]);
-		  }
-		  
-		  return clonedObj;
+	const deepClone = (obj) => {
+		  if (obj === null || typeof obj !== 'object') {
+			return obj;
+		  }
+		  
+		  if (Array.isArray(obj)) {
+			return obj.map(item => deepClone(item));
+		  }
+		  
+		  const clonedObj = {};
+		  
+		  for (const key in obj) {
+			clonedObj[key] = deepClone(obj[key]);
+		  }
+		  
+		  return clonedObj;
 	}
 	
 	const getUserInfo = () => {

pagesMy/heartNumber.vue

@@ -4,7 +4,7 @@
 		<image src="https://oss.familydaf.cn/sxsnfile/20251218/812f9cd7c1cf4c1b82853f3a6266e93a.png" class="top_bg_img" mode="widthFix"></image>
 		<view class="top">
 			<view class="num">{{loveValue}}</view>
-			<view class="text">{{isFamilyMember?'使用爱心值':'剩余爱心值'}}</view>
+			<view class="text">{{isFamilyMember?'爱心值余额':'剩余爱心值'}}</view>
 		</view>
 		<view class="list" v-if="list.length">
 			<up-list @scrolltolower="scrolltolower" style="height: 100%;">