Merge remote-tracking branch 'origin/2024鹅状元' into 2024鹅状元

# Conflicts:
#	pages/wrong/index.vue

common/styles/global/pages.scss

@@ -811,8 +811,40 @@
 		.segmented-control__item--button{height: 62rpx;border: 0;border-radius: 8rpx;}
 		.segmented-control__item--button--active .segmented-control__text{color: #fff!important;}
 	}
-	.cuoti-content-box{
-		background-color: rgba(255, 255, 255, 0.6);z-index: 3;margin: 10rpx 20rpx;
+	.cuoti-content-box{flex: 1;background-color: rgba(255, 255, 255, 0.6);z-index: 3;margin: 10rpx 20rpx;}
+	.cuoti-scroll-view{overflow-y: auto;}
+	
+	// item
+	.list-item-box{
+		width: 94%;background-color: transparent!important;
+		border-bottom: 1px dashed #77d6f7;margin: 0 3%;
+		.uni-list-item__header{display: none;}
+		.uni-list-item__container{flex-direction: column;position: relative;padding:36rpx 0;overflow: unset;}
+		.item-date-row{
+			display: flex;align-items: center;color:#28bdf2;margin-bottom: 16rpx;
+			.data-icon{
+				width: 35rpx;height: 35rpx;margin: 10rpx;font-size: 28rpx;
+				@include ezy-no-repeat-cover;background-image: url("@/static/images/exam/cuoti-time-icon.png");}
+		}
+		.item-cuoti-row{
+			display: flex;flex-direction: row;color:#444;
+			.icon-num-box{display: flex;}
+			.cuoti-content{display: flex;align-items: center;}
+			.cuoti-icon{
+				width: 35rpx;height: 35rpx;margin: 10rpx;font-size: 28rpx;
+				@include ezy-no-repeat-cover;background-image: url("@/static/images/exam/cuoti-icon.png");
+			}
+			.cuoti-text{color: #ff0101;margin-right: 6rpx;}
+		}
+		.cuoti-btn{
+			width: 160rpx;height: 40rpx;line-height: 38rpx;box-sizing: border-box;padding-left: 24rpx;
+			background-color: #068aea;font-size: 24rpx;color: #fff;border-radius: 20rpx 0 0 20rpx;
+			position: absolute;right: -3%;top: 114rpx;
+		}
+		.cuoti-btn::after{
+			content: '';width: 14rpx;height: 24rpx;display: block;position: absolute;top: 8rpx;right: 16rpx;
+			@include ezy-no-repeat-cover;background-image: url("@/static/images/my/list-jt.png");
+		}
 	}
 	
 }

pages/wrong/index.vue

@@ -9,20 +9,24 @@
 				@clickItem="onChangeTab" class="cuo-tab-box" />
 			<view class="cuoti-content-box">
 				<view v-if="data.current === 0">
-					<scroll-view style="height: 300px;" scroll-y="true" refresher-enabled="true"
+					<scroll-view scroll-y="true" refresher-enabled="true"
 						:refresher-triggered="data.shuxue.loading" :refresher-threshold="50"
-						refresher-background="lightgreen" @refresherrefresh="onRefresh">
+						refresher-background="lightgreen" @refresherrefresh="onRefresh" class="cuoti-scroll-view">
 						<!--数学-->
 						<uni-list>
-							<uni-list-item v-for="item in data.shuxue.list">
+							<uni-list-item v-for="item in data.shuxue.list" class="list-item-box">
 								<template v-slot:body>
-									<view class="slot-box">
-										<!-- 时间 -->
-										<text class="slot-text">日期{{ item.cdate }}</text>
-										<!-- 数量 -->
-										<text class="slot-text">错题数：{{ item.count }}题</text>
-										<button @click="getCuotiData(item)">查看错题</button>
+									<!-- 时间 -->
+									<view class="item-date-row">
+										<icon class="data-icon"></icon>
+										<text>{{ item.date }}</text>
+									</view>
+									<!-- 数量 -->
+									<view class="item-cuoti-row">
+											<icon class="cuoti-icon"></icon>
+											<view class="cuoti-content">错题数：<text class="cuoti-text">{{ item.count }}</text>题</view>
 									</view>
+									<view @click="getCuotiData(item)" class="cuoti-btn">查看错题</view>
 								</template>
 							</uni-list-item>
 							<uni-load-more :status="data.shuxue.state" @click="getMore(0)"