Merge branch 'develop' of http://25.13.9.101:9000/K17_AITS/tra-app into develop

src/pages/course/index.vue

@@ -369,7 +369,8 @@ import { onShow } from "@dcloudio/uni-app"
 					overflow-y: auto;
 					z-index: 2;
 					background-color: #f9f9f9;
-					box-shadow: 0rpx 3.85rpx 38rpx rgba(0,0,0,.05);
+					box-shadow: 0rpx 19rpx 19rpx rgba(160,160,160,.5);
+					border-radius: 0 0 20rpx 20rpx;
 					padding: 0rpx 25rpx;
 					box-sizing: border-box;
 					.filter-type{

src/pages/index/dialog.vue

@@ -117,7 +117,7 @@
 	import { 
 		commonUploadVoiceFile
 	} from "@/api/common.js"
-
+	
 	const socketStore = useSocketStore()
 	const { SocketObj } = storeToRefs(socketStore)
 	const userInfo = computed(() => getUserInfo())
@@ -470,6 +470,7 @@
 	display: flex;
 	flex-direction: column;
 	height: 100vh;
+	overflow: hidden;
 	.top-bg{
 		background: linear-gradient(16deg,rgba(234,246,255,0) 0%,#c3e6ff 100%);
 		height: 480rpx;
@@ -485,8 +486,8 @@
 		position: absolute;
 		overflow: hidden;
 		left:0;
-		top: 0;
-		height: 100%;
+		top: 1%;
+		height: 102%;
 		width: 100%;
 		padding: 0;
 		box-sizing: border-box;
@@ -616,14 +617,15 @@
 			}
 			.question-item{
 				white-space: nowrap;
-				height: 76rpx;
-				line-height: 74rpx;
+				height: 66rpx;
+				line-height: 66rpx;
 				background-color: #fff;
 				border: 2rpx solid #e0dede;
 				padding: 0 16rpx;
 				border-radius: 11rpx;
 				margin-right: 16rpx;
 				display: inline-block;
+				font-size: 26rpx;
 				&:last-child{
 					margin-right: 0;
 				}

src/pages/index/index.vue

@@ -708,18 +708,18 @@
 			.study_duration_div {
 				height: 162rpx;
 				background: linear-gradient(180deg, rgba(238, 246, 255, 0.65) 0%, #C5DFFD 4%, #FFFFFF 100%);
+				
 				border-radius: 23rpx;
 				display: flex;
 				justify-content: space-around;
 				z-index: 20;
-
+				
 				.item {
 					flex: 1;
 					// background-color: red;
 					display: flex;
 					flex-direction: column;
 					justify-content: center;
-
 					.top {
 						font-family: PingFangSC, PingFang SC;
 						font-weight: 400;

src/pages/login/login.vue

@@ -118,7 +118,8 @@ const login_fun = (): void => {
 						back_state.value = false;
 						common.navigateBack(); // 返回登录的上一页
 					} else {
-						common.switchTab('/pages/index/index');
+						// common.switchTab('/pages/index/index');
+						common.redirectTo('/pages/index/dialog', {animationType: 'slide-in-bottom'});
 					}
 				}
 			})