Merge branch 'dev' of gitlab2.dui88.com:sparkprojects/20250528_FHQ1 into dev

pages/library/ContentLibrary.vue

@@ -959,3 +959,17 @@
 
 	}
 </style>
+
+
+<!-- contentList0: ,
+	contentList1: ,
+	contentList2: ,
+	contentList01:,
+	contentList11:,
+	contentList21:,
+	contentList02:,
+	contentList12:,
+	contentList22:,
+	contentList03:,
+	contentList13:,
+	contentList23: -->
\ No newline at end of file

views/Integral.vue

@@ -132,7 +132,7 @@
 				
 				<!-- 第三行 -->
 				<view class="info-row">
-					<text class="count-text">{{ `${recentAnnualPointsTotal}/${nextGradeScoreRuleMin}` }}</text>
+					<text class="count-text">{{ `当前：${points}` }}</text>
 					<text class="expire-text">{{`(有${willExpiredPoints ? willExpiredPoints : 0}积分将到期)`}}</text>
 				</view>
 			</view>
@@ -545,6 +545,7 @@
 	const goodsData = ref([]);//商品数据
 	const imgInfos = ref([]);//权益信息
 	const vipLvsQuanyi = ref([]);//会员不同等级权益
+	const points = ref(0);//积分
 
 	const activeIndex = ref(0);//tabbar选中项
 
@@ -648,7 +649,8 @@
 		if(url != ""){
 			jump({
 				type: JumpType.MINI,
-				url: url
+				url: url, 
+				extra: {appId: "wx4205ec55b793245e"}
 			})
 		}
 		console.log('bannerHandler=',url);
@@ -782,7 +784,6 @@
 		console.log('onBeforeMount');
 		const {data} = await fetchIntegralJSON();
 		integralData.value = {...data};
-
 	})
 
 	onMounted(async() => {
@@ -819,6 +820,8 @@
 		willExpiredPoints.value = memberInfo.value.willExpiredPoints;
 		nextGradeScoreRuleMin.value = memberInfo.value.nextGradeScoreRuleMin;
 		vipLevel.value = memberInfo.value.grade;
+		points.value = memberInfo.value.points;
+
 		if(memberInfo.value.memberId == "not_login"){
 			islogin.value = false;
 		}else{
@@ -1083,10 +1086,10 @@
 				flex-direction: row;
 				position: relative;
 				height: 26rpx;
-				margin-top: 0rpx;
+				margin-top: -5rpx;
 				margin-left: 26rpx;
 				.count-text {
-					font-size: 24rpx;
+					font-size: 26rpx;
 					color: #b27c1e;
 				}