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

common/styles/global/components.scss

@@ -124,13 +124,17 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 		width: 100%;line-height:96rpx;border-radius: 8px;margin-bottom: 20rpx;
 		font-size: 32rpx;color: #333;box-sizing: border-box;padding: 10rpx 24rpx;
 		display: flex;
-		.option-change{flex-shrink: 0;line-height: 1.6;}
+		.option-change{
+			width: 48rpx;height: 48rpx;line-height: 48rpx;box-sizing: border-box;
+			flex-shrink: 0;border-radius: 50%;border: 1rpx solid;margin-right: 16rpx;
+			    display: flex;align-items: center;justify-content: center;
+			}
 		.option-question{font-size: 32rpx;line-height: 1.6;margin-left: 6rpx;@include ezy-rich-text;
 		text-align: justify;word-wrap: break-word;word-break: break-all;display: block;}
 	}
-	.danxuan-option-box.active{color: #0589e9;}
-	.danxuan-option-box.showError{color: #ff5757;}
-	.danxuan-option-box.active_right{color: #1ac136;}
+	.danxuan-option-box.active .option-change{color: #FFF;background-color:#0589e9;border-color:#0589e9;}
+	.danxuan-option-box.showError .option-change{color: #FFF;background-color:#ff5757;border-color:#ff5757;}
+	.danxuan-option-box.active_right .option-change{color: #FFF;background-color:#1ac136;border-color:#1ac136;}
 }
 /***** 判断题 *****/
 .ezy-panduan-box{

common/styles/global/pages.scss

@@ -741,6 +741,7 @@
 	width: 750rpx;height: 1250rpx;@include ezy-no-repeat-cover;
 	background-image: url("@/static/images/course/video-finish-bj.png");
 	margin-bottom: 20%;position: relative;
+	.text-score{display: none;}
 	.return-btn,.continue-btn{width: 115.38rpx;height: 135rpx;@include ezy-no-repeat-cover;margin: 0 36rpx;}
 	.course-btn-box{position: absolute;bottom: 200rpx;display: flex;left: 50%;transform: translateX(-50%);}
 	.return-btn{background-image: url("@/static/images/course/fh-btn.png");}

components/question/danxuan.vue

@@ -6,8 +6,8 @@
 		<rich-text :nodes="data.name" class="ezy-shiti-question"></rich-text>
 		<!-- 选项区域 -->
 		<view v-for="(item,index) in data.contents" class="danxuan-option-box" :class="formatClass(index)" :key="index" @click="onSelect(index)">
-			<text class="option-change">{{item.number}}.</text>
-			<rich-text :nodes="item.label" class="option-question"></rich-text>
+			<text class="option-change">{{item.number}}</text>
+			<rich-text :nodes="item.label" class="option-question" @itemclick="onSelect(index)"></rich-text>
 		</view>
 	</view>
 </template>

pages/unitTest/useUnit.js

@@ -196,6 +196,7 @@ export function useExam() {
 
 // 提示信息显示隐藏
 function useTishiLeftRight() {
+	let timer = null;
 	const {
 		updateTishi,
 		getTishi
@@ -205,11 +206,16 @@ function useTishiLeftRight() {
 	function handleCloseTishi() {
 		updateTishi();
 		showTishi.value = false;
+		clearTimeout(timer);
+		timer = null;
 	}
 	// 大鹅显示追加缓存 --- 单独针对当前手机的缓存提示
 	function handleShowTishi() {
 		const isNotShow = Boolean(getTishi());
 		showTishi.value = !isNotShow;
+		timer = setTimeout(() => {
+			handleCloseTishi();
+		},3000)
 	}
 
 	return {

utils/request.js

@@ -50,7 +50,7 @@ const request = config => {
 				if (code === 401) {
 					showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
 						if (res.confirm) {
-							if(cacheManager.get(auth)){
+							if(cacheManager.get('auth')){
 								cacheManager.clearAll()
 							}
 							uni.reLaunch({
@@ -62,7 +62,7 @@ const request = config => {
 				} else if (code === 405) {
 					showConfirm('登录状态已过期，您可以继续留在该页面，或者重新登录?').then(res => {
 						if (res.confirm) {
-							if(cacheManager.get(auth)){
+							if(cacheManager.get('auth')){
 								cacheManager.clearAll()
 							}
 							uni.reLaunch({