Merge branch '20250528-dev-king' into dev

views/Integral.vue

@@ -531,15 +531,15 @@
 					isNewArr: [6,7]
 				},
 				{
-					qunyiList: [7,8,0,2,4,5],
-					isNewArr: [7,8]
+					qunyiList: [8,6,7,0,2,4,5],
+					isNewArr: [8]
 				},
 				{
-					qunyiList: [9,0,2,4,5,6,7,8],
+					qunyiList: [9,8,6,7,0,2,4,5],
 					isNewArr: [9]
 				},
 				{
-					qunyiList: [9,0,2,4,5,6,7,8],
+					qunyiList: [9,8,6,7,0,2,4,5],
 					isNewArr: [9]
 				}
 			]
@@ -962,15 +962,15 @@
 			isNewArr: [6,7]
 		},
 		{
-			qunyiList: [7,8,0,2,4,5],
-			isNewArr: [7,8]
+			qunyiList: [8,6,7,0,2,4,5],
+			isNewArr: [8]
 		},
 		{
-			qunyiList: [9,0,2,4,5,6,7,8],
+			qunyiList: [9,8,6,7,0,2,4,5],
 			isNewArr: [9]
 		},
 		{
-			qunyiList: [9,0,2,4,5,6,7,8],
+			qunyiList: [9,8,6,7,0,2,4,5],
 			isNewArr: [9]
 		}
 	]);
@@ -1233,6 +1233,7 @@
 		console.log('onBeforeMount');
 		const {data} = await fetchIntegralJSON();
 		integralData.value = {...data};
+
 	})
 
 	onMounted(async() => {
@@ -1262,6 +1263,9 @@
 		await userStore.loadMemberInfo();
 
 		initNetData();
+
+
+		itemIndex.value = vipLevel.value;
 	});
 
 	const initNetData = () => {
@@ -1480,7 +1484,7 @@
 				justify-content: space-between;
 				
 					.integral-value{
-						background-color: #6f6d67;
+						// background-color: #6f6d67;
 						margin-left: 26rpx;
 						margin-top: 23rpx;
 				.integral-text {
@@ -1494,11 +1498,11 @@
 							color:#1d1e25
 						}
 						.next-icon{
-							margin-top: -60rpx;
-							margin-left: -30rpx;
+							top: -25rpx;
+							margin-left: -28rpx;
 							width: 66rpx;
 							height: 27rpx;
-							// position: absolute;
+							position: relative;
 						}
 					}