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

.env.development

@@ -7,7 +7,7 @@ ENV = 'development'
 # VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001'
 
 
-VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
+VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7003'
 
 
 

src/components/image-preview/preview-detail.vue

@@ -6,7 +6,7 @@
 		</view>
 		<view class="overlay-box" @click="playEnded" @touchmove.stop v-if="fileType === 'image'">
 			<movable-area scale-area class="detail-movable">
-				<movable-view class="detail-movable-view" direction="all" @scale="onScale" :scale="true" scale-min="0.5"
+				<movable-view class="detail-movable-view" :out-of-bounds="true" direction="all" @scale="onScale" :scale="true" scale-min="0.5"
 					scale-max="4" :scale-value="scale">
 					<image class="detail-img" :src="fileUrlShow" mode="aspectFit"></image>
 				</movable-view>
@@ -304,6 +304,7 @@
 		background-color: rgba(0, 0, 0, 0.65);
 
 		movable-view {
+			position: fixed;
 			display: flex;
 			align-items: center;
 			justify-content: center;
@@ -312,8 +313,8 @@
 		}
 
 		movable-area {
-			width: 100%;
-			height: 100%;
+			width: 620rpx;
+			height: 100vh;
 			position: fixed;
 			overflow: hidden;
 		}

src/pages/course/components/talkingItem.vue

@@ -913,6 +913,7 @@
 				}
 				
 				.file-items{
+					padding-top: 12rpx;
 					.file-item {
 						line-height: 36rpx;
 						font-size: 28rpx;

src/pages/courseDetail/components/introduce.vue

@@ -43,7 +43,7 @@
 				{{ modelValue.crsCore }}
 			</view>
 		</view>
-		<view class="mb-64" v-if="(modelValue.fileList || []).length>0">
+		<view class="mb-64 file-items" v-if="(modelValue.fileList || []).length>0">
 			<view class="fz-30 font_pf fw-600 mb-4">知识资料</view>
 			<view class="file-item" v-for="item in modelValue.fileList" @click="previewFile(item)">
 				{{item.fileName.replace(/.docx|.doc|.txt/g, '.pdf')}}
@@ -161,6 +161,9 @@
 		}
 	}
 
+	.file-items {
+		padding-bottom: 26rpx;
+	}
 	.file-item {
 		padding-top: 12rpx;
 		color: #06f;

src/pages/sparring/index.vue

@@ -487,7 +487,7 @@
 		position: relative;
 		display: flex;
 		flex-direction: column;
-		height: calc(100vh - 70px);
+		height: calc(100vh - 1rpx);
 		.top-bg {
 			background-color: #fff;
 			background: linear-gradient(16deg, rgba(234, 246, 255, 0) 0%, #c3e6ff 100%);