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

src/pages/course/study.vue

@@ -40,7 +40,9 @@
 		<view class="course-study-body" v-show="step === 2">
 			<view class="seek-setting">
 				<view class="inline-block" @click="showChangeSeekModelNow">{{chooseRate}}倍</view>
-				<image src="@/static/images/course/setting.png" alt="" class="image-icon" @click.stop="showChangeBgModelNow"></image>
+				<view class="image-icon" @click="showChangeBgModelNow">
+					<image src="@/static/images/course/setting.png" alt="" class="image-icon-img"></image>
+				</view>
 			</view>
 			<view class="body-title" @click="scrollToBottomNow">
 				<uv-icon class="arrow-icon" name="arrow-left" @click="backRouter()"/>
@@ -176,6 +178,21 @@ const answerValue = ref('')
 const inputRef = ref('')
 const flagVal = ref('1')
 const isUploadingVoice = ref(false)
+
+const {
+	// windowWidth,
+	// windowHeight,
+	// windowTop,
+	statusBarHeight,
+	screenTop,
+	safeArea,
+	// screenHeight,
+	// safeAreaInsets
+} = uni.getWindowInfo()
+
+console.log(safeArea,screenTop,statusBarHeight)
+const pageTopPadding = computed(() => statusBarHeight + 'px')
+
 // 初始化数据
 const getData = async (flag) => {
 	try{
@@ -924,22 +941,26 @@ const chooseRateNow = (item) => {
 			position: absolute;
 			z-index: 3;
 			right: 20rpx;
-			top: 68rpx;
+			top: calc(v-bind(pageTopPadding) + 8rpx);
 			font-size: 26rpx;
 			width: 140rpx;
-			height: 52rpx;
-			padding: 10rpx 0;
+			height: 92rpx;
+			padding: 30rpx 0;
 			overflow: hidden;
 			line-height: 32rpx;
 			text-align: right;
-			padding-right: 48rpx;
+			padding-right: 68rpx;
 			
 			.image-icon{
 				width: 30rpx;
 				height: 32rpx;
 				position: absolute;
-				right: 0;
-				top: 10rpx;
+				right: 10rpx;
+				top: 30rpx;
+				.image-icon-img{
+					width: 100%;
+					height: 100%;
+				}
 			}
 		}
 		.course-study-body{
@@ -953,12 +974,12 @@ const chooseRateNow = (item) => {
 			box-sizing: border-box;
 			display: flex;
 			flex-direction: column;
+			padding-top: v-bind(pageTopPadding);
 			.body-title{
-				
-				height: 150rpx;
+				height: 110rpx;
 				text-align: center;
 				font-size: 33rpx;
-				padding-top: 70rpx;
+				padding-top: 30rpx;
 				line-height: 46rpx;
 				box-sizing: border-box;
 				font-weight: 500;
@@ -968,7 +989,7 @@ const chooseRateNow = (item) => {
 				.arrow-icon{
 					position: absolute;
 					left:21rpx;
-					top:65rpx;
+					top:25rpx;
 					color: #000;
 					padding: 15rpx;
 					// background-color: red;

src/pages/index/dialog.vue

@@ -707,7 +707,7 @@
 		}
 		.router-list {
 			height: 84rpx;
-			padding: 22rpx 30rpx 0;
+			padding: 20rpx 30rpx 0;
 			background-color: #fff;
 			border-radius: 15rpx 15rpx 0 0;
 			white-space: nowrap;