Merge branch 'sit' into 'uat'

Sit

See merge request K17_AITS/tra-app!62

src/pages/index/dialog.vue

@@ -733,7 +733,6 @@
 		height: calc(100% - 832rpx);
 		padding: 12rpx 24rpx;
 		box-sizing: border-box;
-
 		.talking-scroll-list {
 			height: 100%;
 		}

src/pages/index/index.vue

@@ -14,7 +14,7 @@
 				<view class="message_div">
 					<image src="@/static/images/index/message_b.png" class="message_img"></image>
 					<view class="message_text">消息</view>
-					<view class="message_num">30</view>
+					<view class="message_num message_num_font">30</view>
 				</view>
 			</view>
 
@@ -32,7 +32,7 @@
 				<view class="message_div">
 					<image src="@/static/images/index/message.png" class="message_img"></image>
 					<view class="message_text">消息</view>
-					<view class="message_num">
+					<view class="message_num message_num_font">
 						30
 					</view>
 				</view>
@@ -593,15 +593,24 @@
 					position: absolute;
 					top: 2rpx;
 					right: -4rpx;
-					padding: 1rpx 1rpx 1rpx 2rpx;
+					padding: 2rpx 3rpx 2rpx 3rpx;
 					background-color: #ff1926;
 					border-radius: 10rpx;
-					width: 22rpx;
-					height: 20rpx;
-					font-size: 10rpx;
+					// width: 22rpx;
+					// height: 20rpx;
+					// font-size: 10rpx;
+					// font-size: 30rpx;
 					color: #ffffff;
 
 				}
+				.message_num_font {
+					width: 22rpx;
+					height: 22rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 16rpx;
+				}
 			}
 
 		}
@@ -643,15 +652,23 @@
 					position: absolute;
 					top: 2rpx;
 					right: -4rpx;
-					padding: 1rpx 1rpx 1rpx 2rpx;
+					padding: 2rpx 3rpx 2rpx 3rpx;
 					background-color: #ff1926;
-					border-radius: 10rpx;
-					width: 22rpx;
-					height: 20rpx;
-					font-size: 10rpx;
+					border-radius: 20rpx;
+					// width: 22rpx;
+					// height: 20rpx;
+					// font-size: 10rpx;
 					color: #ffffff;
 
 				}
+				.message_num_font {
+					width: 22rpx;
+					height: 22rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 16rpx;
+				}
 			}
 		}
 
@@ -717,7 +734,7 @@
 				display: flex;
 				justify-content: space-around;
 				z-index: 20;
-				
+				opacity: .9;
 				.item {
 					flex: 1;
 					// background-color: red;

src/pages/mascot/mascot_select_list.vue

@@ -83,8 +83,7 @@
 	const windowsInfo = uni.getWindowInfo()
 	const nowWidth = ref(0);
 	const pages = getCurrentPages();
-	const swiperCount = 4; // 总轮播项数量
-
+	const swiperCount = computed(() => mascotList.length)
 	let swiperIndex = ref(0); // 当前显示第1个（索引0）
 	const isAnimating = ref(false); // 标记动画是否进行中
 
@@ -98,7 +97,7 @@
 	const doct_click = (num) => {
 		if (isAnimating.value) return; // 1. 如果动画正在进行，直接忽略点击
 		isAnimating.value = true;
-		let newIndex = (swiperIndex.value + num + swiperCount) % swiperCount;
+		let newIndex = (swiperIndex.value + num + swiperCount.value) % swiperCount.value;
 		swiperIndex.value = newIndex; // 更新当前索引
 	};
 	const select_it = () => {
@@ -116,7 +115,6 @@
 			common.msg('设置成功')
 			common.setValue('mascotState', false)
 			setTimeout(() => {
-
 				if (pages.length >= 2) {
 					// 页面栈只有一页，没有返回页，那就返回首页
 					back_state.value = false;
@@ -137,7 +135,6 @@
 			Object.assign(mascotList, {
 				...body
 			})
-			console.log(mascotList);
 			common.hideLoading()
 		})
 	})