x

src/pages/me/index.vue

@@ -235,8 +235,10 @@
 		if (status) {
 			getCheckInInfo();
 		}
+		
 		pointsRef.value.open(pointsList, badgesList);
 	};
+	
 	const badgeConfirm = (status, pointsList = [], badgesList = []) => {
 		// nextTick(() => {
 		// 	badgeRef.value.close();
@@ -256,6 +258,7 @@
 			});
 		}
 	};
+	
 	const click_loginout = () => {
 		common.show('确定退出登录？').then(async (res) => {
 			if (!res) return;

src/pages/pointsAndRank/badge.vue

@@ -14,7 +14,7 @@
 				<view class="back_div" @click="common.navigateBack()">
 					<view class="back-icon"></view>
 				</view>
-				<view>我的徽章</view>
+				<view>勋章墙</view>
 			</view>
 			<view class="personal_information">
 				<view class="profile">
@@ -110,10 +110,12 @@
 </script>
 
 <style lang="scss" scoped>
+	.main-div {
+		padding-top: 30rpx;
+	}
 	.personal_information {
 		padding: 40rpx 26rpx 0 6vw;
 		display: flex;
-
 		// 个人头像框框
 		.profile {
 			border-radius: 100%;
@@ -142,7 +144,7 @@
 					font-family: PingFangSC;
 					font-weight: 600;
 					font-size: 28rpx;
-					color: #000000;
+					color: #ffffff;
 					line-height: 40rpx;
 				}
 			}
@@ -151,7 +153,7 @@
 				font-family: PingFangSC;
 				font-weight: 400;
 				font-size: 25rpx;
-				color: #666666;
+				color: rgba(255, 255, 255, 0.7);
 				line-height: 48rpx;
 				text-align: left;
 				font-style: normal;
@@ -166,12 +168,12 @@
 		align-items: center;
 		justify-content: center;
 		flex-wrap: nowrap;
-		margin: 30rpx 0;
+		margin: 20rpx 30rpx;
 		.title {
 			margin: 0 16rpx;
 			font-weight: 600;
 			font-size: 34rpx;
-			color: #ae723b;
+			color: #ffd1a8;
 			text-align: center;
 			font-style: normal;
 			white-space: nowrap;
@@ -213,15 +215,12 @@
 				white-space: nowrap;
 				overflow: hidden;
 				text-overflow: ellipsis;
-				font-weight: 600;
+				font-weight: 500;
 				font-size: 30rpx;
-				color: #ae723b;
 				line-height: 30px;
 				text-align: center;
 				font-style: normal;
-			}
-			.light-up {
-				color: #8f4628;
+				color: #e2d1cc;
 			}
 		}
 	}
@@ -231,10 +230,10 @@
 		height: 70rpx;
 		font-size: 33rpx;
 		font-weight: 500;
-		color: #000;
+		color: #fff;
 		position: relative;
 		text-align: center;
-		margin-top: var(--status-bar-height);
+		margin-top: calc(var(--status-bar-height) + 20rpx);
 		.delete_div {
 			position: absolute;
 			right: 20rpx;
@@ -273,8 +272,8 @@
 				left: 25%;
 				width: 40%;
 				height: 40%;
-				border-top: 4rpx solid #000;
-				border-left: 4rpx solid #000;
+				border-top: 4rpx solid #fff;
+				border-left: 4rpx solid #fff;
 				transform: rotate(-45deg);
 			}
 		}