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

src/pages/course/components/touchBtn.vue

@@ -103,14 +103,27 @@ const initRecord = () => {
 	// stopRecord()
 	unref(recordObjCom)?.onStop((res, duration)=>{
 		audioPath.value = res.tempFilePath
-		showTalkingModel.value = false
 		if(!isOut.value){
 			if(startFlag.value !== 2){
-				common.msg('说话时间太短，没有听清！')
-				showTalkingModel.value = false
-				return
+				// setTimeout(() => {
+				// 	showTalkingModel.value = false
+				// 	nextTick(() => {
+				// 		// showTalkingModel.value = false
+				// 		common.msg('说话时间太短，没有听清！')
+				// 	})
+				// },100)
+				closeModel(()=>{
+					nextTick(() => {
+						// showTalkingModel.value = false
+						common.msg('说话时间太短，没有听清！')
+					})
+				})
+			}else{
+				closeModel()
+				emit('uploadVoice', audioPath.value)
 			}
-			emit('uploadVoice', audioPath.value)
+		}else{
+			closeModel()
 		}
 	})
 	unref(recordObjCom).onStart(() => {
@@ -131,15 +144,21 @@ const startRecord = () => {
 }
 
 const stopRecord = () => {
-	if(unref(recordObjCom).stop){
 		try{
-			unref(recordObjCom)?.stop()
+			if(unref(recordObjCom).stop){
+					unref(recordObjCom).stop()
+			}else{
+				closeModel()
+			}
 		}catch{
-			showTalkingModel.value = false
+			closeModel()
 		}
-	}else{
+}
+const closeModel = (cb = () => {}) => {
+	setTimeout(() => {
 		showTalkingModel.value = false
-	}
+		cb && cb()
+	},100)
 }
 // #endif
 //#ifndef APP-PLUS

src/pages/course/study.vue

@@ -953,6 +953,7 @@ const chooseRateNow = (item) => {
 			display: flex;
 			flex-direction: column;
 			.body-title{
+				
 				height: 150rpx;
 				text-align: center;
 				font-size: 33rpx;
@@ -965,9 +966,11 @@ const chooseRateNow = (item) => {
 				// margin-bottom: 23rpx;
 				.arrow-icon{
 					position: absolute;
-					left:36rpx;
-					top:80rpx;
+					left:21rpx;
+					top:65rpx;
 					color: #000;
+					padding: 15rpx;
+					// background-color: red;
 				}
 			}
 			.study-num{

src/pages/courseDetail/components/comment.vue

@@ -75,7 +75,7 @@
 				@click="common.navigateTo('/pages/courseDetail/submit?crsNum='+props.crsNum+'&imgId='+props.imgId)">发布评价</uv-button>
 		</view>
 
-		<uni-popup ref="popup" background-color="red">
+		<uni-popup ref="popup">
 			<view class="bottom_reply_input_div">
 				<uv-input v-model="reply_data.bbsContent" placeholderStyle='color:#999999;font-size:26rpx'
 					:placeholder="reply_data.placeholder" :focus="true" :maxlength="100">

src/pages/courseDetail/index.vue

@@ -148,9 +148,12 @@
 	.back_div {
 		margin-right: 10rpx;
 		position: fixed;
-		left: 46rpx;
-		top: 64rpx;
-
+		left: 25rpx;
+		top: 45rpx;
+		// background-color: red;
+		// width: 60rpx;
+		// height: 60rpx;
+		padding: 20rpx;
 		.back-icon {
 			position: relative;
 			width: 40rpx;

src/pages/courseDetail/submit.vue

@@ -251,8 +251,9 @@
 		align-items: center;
 
 		.back_div {
-			margin-right: 10rpx;
-
+			// margin-right: 10rpx;
+			padding: 15rpx;
+			// background-color: red;
 			.back-icon {
 				position: relative;
 				width: 40rpx;

src/pages/index/dialog.vue

@@ -525,8 +525,8 @@
 		position: absolute;
 		overflow: hidden;
 		left: 0;
-		top: 1%;
-		height: 102%;
+		top: 0%;
+		height: 100%;
 		width: 100%;
 		padding: 0;
 		box-sizing: border-box;
@@ -682,7 +682,6 @@
 				}
 			}
 		}
-
 		.router-list {
 			height: 84rpx;
 			padding: 22rpx 30rpx 0;
@@ -719,7 +718,7 @@
 		}
 
 		.talking-list {
-			height: calc(100% - 834rpx);
+			height: calc(100% - 832rpx);
 			padding: 12rpx 24rpx;
 			box-sizing: border-box;
 

src/pages/me/index.vue

@@ -59,6 +59,7 @@
 		</view>
 		<!-- 4个导航 -->
 		<view class="navigation_div">
+			<!-- <scroll-view class="scroll-view" :scroll-x="true" :show-scrollbar="false"> -->
 			<view class="group">
 				<view class="item">
 					<image class="icon" src="@/static/images/me/study.png"></image>
@@ -77,6 +78,7 @@
 					<view class="title">我的报告</view>
 				</view>
 			</view>
+			<!-- </scroll-view> -->
 		</view>
 		<view class="cell_div">
 			<uv-cell-group :border="false">

src/pages/search/search.vue

@@ -62,14 +62,15 @@
 	}
 
 	.fixed_search_div {
-		padding: calc(10rpx + var(--status-bar-height)) 15rpx 24rpx 30rpx;
+		padding: calc(10rpx + var(--status-bar-height)) 15rpx 24rpx 10rpx;
 		background: linear-gradient(90deg, #F1F7FF 0%, #D8EDFF 50%, #C3E6FF 100%);
 		display: flex;
 		align-items: center;
 
 		.back_div {
-			margin-right: 10rpx;
-
+			// margin-right: 10rpx;
+			padding: 10rpx 10rpx 10rpx 20rpx;
+			// background-color: red;
 			.back-icon {
 				position: relative;
 				width: 40rpx;