合并冲突

src/pages/index/dialog.vue

@@ -33,7 +33,8 @@
 						<view class="question-item"
 							v-for="item in questionList.length - Math.ceil(questionList.length/2)"
 							@click="sendText(questionList[item + Math.ceil(questionList.length/2)-1])">
-							{{questionList[item + Math.ceil(questionList.length/2)-1]}}</view>
+							{{questionList[item + Math.ceil(questionList.length/2)-1]}}
+						</view>
 					</view>
 				</scroll-view>
 			</view>
@@ -393,7 +394,8 @@
 		})
 		scrollToBottomNow()
 		console.log(voicePath, 111111111)
-		commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {}).then(res => {			let _res = JSON.parse(res.data)
+		commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {}).then(res => {
+			let _res = JSON.parse(res.data)
 			if (_res.rtnCode === '0000') {
 				if (!!(_res.body.transContent || '').trim()) {
 					askData.value = {
@@ -505,6 +507,7 @@
 		height: 100vh;
 		overflow: hidden;
 	}
+
 	.top-bg {
 		background: linear-gradient(16deg, rgba(234, 246, 255, 0) 0%, #c3e6ff 100%);
 		height: 480rpx;
@@ -679,7 +682,6 @@
 				}
 			}
 		}
-
 		.router-list {
 			height: 84rpx;
 			padding: 22rpx 30rpx 0;
@@ -726,11 +728,13 @@
 		}
 	}
 
-		.talking-list{
+
+	.talking-list {
 		height: calc(100% - 832rpx);
 		padding: 12rpx 24rpx;
 		box-sizing: border-box;
-			.talking-scroll-list{
+
+		.talking-scroll-list {
 			height: 100%;
 		}
 	}