修改一堆bug

src/components/points-and-badge/badge.vue

@@ -20,7 +20,8 @@
 								<view class="img-div">
 									<image-preview :src="item.pointsBadgeImg" class="img" mode="aspectFit"></image-preview>
 								</view>
-								<view class="points-msg-div">{{ item.pointsBadgeName }}</view>
+								<view class="points-title-div">{{ item.pointsBadgeName }}</view>
+								<view class="points-msg-div" v-if="item.remark">{{ item.remark }}</view>
 							</swiper-item>
 						</swiper>
 						<view class="doct_icon right" @click="doct_click(1)" v-show="multiple">
@@ -30,7 +31,6 @@
 							</view>
 						</view>
 					</view>
-
 					<view class="button-div">
 						<uv-button
 							class="button"
@@ -56,16 +56,14 @@
 	const popup = ref(null);
 	const current = ref(0);
 	const opacity = ref(1);
-	let CloseComplete
+	let CloseComplete;
 	const badgesList = ref([]);
 	const pointsList = ref([]);
 	const multiple = computed(() => badgesList.value.length > 1);
 	const titleNumberText = ['', '两', '三', '四', '五', '六', '七', '八', '九', '十'];
 
 	const title = computed(() =>
-		badgesList.value.length === 1
-			? '恭喜你获得徽章'
-			: `恭喜你获得${titleNumberText[badgesList.value.length - 1]}枚徽章`
+		badgesList.value.length === 1 ? '恭喜你获得徽章' : `恭喜你获得${titleNumberText[badgesList.value.length - 1]}枚徽章`
 	);
 	const buttonColor = 'linear-gradient( 270deg, #F81758 0%, #FFA062 100%)';
 	const customStyle = {
@@ -101,7 +99,7 @@
 	// 点击
 	const clickFun = (status = true) => {
 		emits('confirm', status, pointsList.value, badgesList.value, () => {});
-		CloseComplete(status, pointsList.value, badgesList.value)
+		CloseComplete(status, pointsList.value, badgesList.value);
 	};
 
 	const open = (points = [], badges = [], complete = () => {}) => {
@@ -110,7 +108,7 @@
 			return;
 		}
 		console.log('badges', badges);
-		CloseComplete = complete
+		CloseComplete = complete;
 		badgesList.value = badges;
 		pointsList.value = points;
 		opacity.value = 1;
@@ -118,8 +116,7 @@
 		uni.$emit('update_me_data', true);
 		popup.value.open('center');
 	};
-	onUnmounted(() => {
-	});
+	onUnmounted(() => {});
 	defineExpose({ open, close });
 </script>
 
@@ -130,20 +127,28 @@
 		align-items: center;
 		justify-content: space-between;
 		.swiper {
-			height: 660rpx;
+			height: 700rpx;
 			flex: 1;
 			margin: 0 50rpx;
+			// background-color: red;
 			.swiper-item-div {
 				display: flex;
 				align-items: center;
-				justify-content: center;
+				// justify-content: center;
 				flex-direction: column;
 
+				.points-title-div {
+					margin-top: 40rpx;
+					// position: absolute;
+					// bottom: 60rpx;
+				}
 				.points-msg-div {
-					position: absolute;
-					bottom: -30rpx;
+					margin: 30rpx 20rpx 0 20rpx;
+					// position: absolute;
+					// bottom: 0rpx;
 				}
 				.img-div {
+					margin-top: 60rpx;
 					position: relative;
 					display: flex;
 					align-items: center;
@@ -215,15 +220,21 @@
 			flex-direction: column;
 		}
 	}
-	.points-msg-div {
-		height: 120rpx;
+	.points-title-div {
+		// height: 120rpx;
 		font-family: PingFangSC, PingFang SC;
 		font-weight: 500;
 		font-size: 36rpx;
 		color: #dec38c;
-		line-height: 120rpx;
 		text-align: center;
-		font-style: normal;
+	}
+	.points-msg-div {
+		// height: 120rpx;
+		font-family: PingFangSC, PingFang SC;
+		font-weight: 500;
+		font-size: 26rpx;
+		color: #dec38c;
+		text-align: center;
 	}
 	.button-div {
 		height: 80rpx;