合并冲突

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 = {
@@ -504,234 +506,236 @@
 		flex-direction: column;
 		height: 100vh;
 		overflow: hidden;
+	}
+
+	.top-bg {
+		background: linear-gradient(16deg, rgba(234, 246, 255, 0) 0%, #c3e6ff 100%);
+		height: 480rpx;
+		width: 100%;
+	}
+
+	.bot-bg {
+		// background-color: #F6F8FF;
+		background: linear-gradient(136deg, rgba(234, 246, 255, 0) 0%, #c3e6ff 100%);
+		width: 100%;
+		flex: 1;
+	}
+
+	.index-dialog-body {
+		position: absolute;
+		overflow: hidden;
+		left: 0;
+		top: 0%;
+		height: 100%;
+		width: 100%;
+		padding: 0;
+		box-sizing: border-box;
+
+		// display: flex;
+		// flex-direction: column;
+		.body-title {
+			height: 140rpx;
+			text-align: center;
+			font-size: 33rpx;
+			padding-top: 70rpx;
+			line-height: 46rpx;
+			box-sizing: border-box;
+			font-weight: 500;
+			color: #000;
+			position: relative;
+
+			// margin-bottom: 23rpx;
+			.arrow-icon {
+				position: absolute;
+				left: 36rpx;
+				top: 80rpx;
+				color: #000;
 			}
-		.top-bg {
-			background: linear-gradient(16deg, rgba(234, 246, 255, 0) 0%, #c3e6ff 100%);
-			height: 480rpx;
-			width: 100%;
 		}
 
-		.bot-bg {
+		.seek-setting {
-			// background-color: #F6F8FF;
-			background: linear-gradient(136deg, rgba(234, 246, 255, 0) 0%, #c3e6ff 100%);
-			width: 100%;
-			flex: 1;
-		}
-
-		.index-dialog-body {
 			position: absolute;
+			z-index: 3;
+			right: 45rpx;
+			top: 68rpx;
+			font-size: 26rpx;
+			width: 140rpx;
+			height: 52rpx;
+			padding: 10rpx 0;
 			overflow: hidden;
-			left: 0;
+			line-height: 32rpx;
-			top: 0%;
+			text-align: right;
-			height: 100%;
+			padding-right: 48rpx;
-			width: 100%;
+
-			padding: 0;
+			.image-icon {
+				width: 30rpx;
+				height: 32rpx;
+				position: absolute;
+				right: 0;
+				top: 10rpx;
+			}
+
+			.image-icon-new {
+				right: 50rpx;
+				width: 30rpx;
+				height: 32rpx;
+				position: absolute;
+				top: 10rpx;
+			}
+		}
+
+		.ai-info {
+			padding: 0 24rpx;
+			height: 250rpx;
+			overflow: hidden;
+			padding-top: 72rpx;
+			margin-bottom: 24rpx;
+			position: relative;
 			box-sizing: border-box;
 
-			// display: flex;
+			.image-pet {
-			// flex-direction: column;
+				width: 230rpx;
-			.body-title {
+				height: 235rpx;
-				height: 140rpx;
+				position: absolute;
-				text-align: center;
+				right: 24rpx;
-				font-size: 33rpx;
+				top: 15rpx;
-				padding-top: 70rpx;
+				z-index: 2;
-				line-height: 46rpx;
-				box-sizing: border-box;
-				font-weight: 500;
-				color: #000;
-				position: relative;
-
-				// margin-bottom: 23rpx;
-				.arrow-icon {
-					position: absolute;
-					left: 36rpx;
-					top: 80rpx;
-					color: #000;
-				}
 			}
 
-			.seek-setting {
+			.image-pet-bg {
+				position: absolute;
+				padding: 0 24rpx;
+				box-sizing: border-box;
+				width: 100%;
+				height: 230rpx;
+				left: 0;
+				bottom: 0;
+				z-index: 2;
+			}
+
+			.ai-info-bg-box {
 				position: absolute;
 				z-index: 3;
-				right: 45rpx;
+				left: 0;
 				top: 68rpx;
-				font-size: 26rpx;
+				width: 100%;
-				width: 140rpx;
+				// background-color: #ccc;
-				height: 52rpx;
+				padding: 0 64rpx;
-				padding: 10rpx 0;
+				height: 178rpx;
-				overflow: hidden;
-				line-height: 32rpx;
-				text-align: right;
-				padding-right: 48rpx;
 
-				.image-icon {
+				.hello-text {
-					width: 30rpx;
+					height: 54rpx;
-					height: 32rpx;
+					line-height: 44rpx;
-					position: absolute;
+					font-size: 28rpx;
-					right: 0;
+					color: #666;
-					top: 10rpx;
 				}
 
-				.image-icon-new {
+				.info-text {
-					right: 50rpx;
+					height: 44rpx;
-					width: 30rpx;
+					line-height: 44rpx;
-					height: 32rpx;
+					font-size: 32rpx;
-					position: absolute;
+					color: #000;
-					top: 10rpx;
+					font-weight: 600;
-				}
-			}
-
-			.ai-info {
-				padding: 0 24rpx;
-				height: 250rpx;
-				overflow: hidden;
-				padding-top: 72rpx;
-				margin-bottom: 24rpx;
-				position: relative;
-				box-sizing: border-box;
-
-				.image-pet {
-					width: 230rpx;
-					height: 235rpx;
-					position: absolute;
-					right: 24rpx;
-					top: 15rpx;
-					z-index: 2;
 				}
 
-				.image-pet-bg {
+				.info-btn {
-					position: absolute;
+					width: 220rpx;
-					padding: 0 24rpx;
-					box-sizing: border-box;
-					width: 100%;
-					height: 230rpx;
-					left: 0;
-					bottom: 0;
-					z-index: 2;
-				}
-
-				.ai-info-bg-box {
-					position: absolute;
-					z-index: 3;
-					left: 0;
-					top: 68rpx;
-					width: 100%;
-					// background-color: #ccc;
-					padding: 0 64rpx;
-					height: 178rpx;
-
-					.hello-text {
-						height: 54rpx;
-						line-height: 44rpx;
-						font-size: 28rpx;
-						color: #666;
-					}
-
-					.info-text {
-						height: 44rpx;
-						line-height: 44rpx;
-						font-size: 32rpx;
-						color: #000;
-						font-weight: 600;
-					}
-
-					.info-btn {
-						width: 220rpx;
-						font-size: 29rpx;
-						height: 54rpx;
-						color: #fff;
-						background: linear-gradient(104deg, #5547f3 0%, #4e86f4 100%);
-						line-height: 54rpx;
-						text-align: center;
-						border-radius: 15rpx 15rpx 0 0;
-						position: absolute;
-						left: 68rpx;
-						bottom: 0;
-					}
-				}
-			}
-
-			.questions-view {
-				padding-left: 24rpx;
-				padding-right: 24rpx;
-				height: 184rpx;
-				box-sizing: border-box;
-
-				.question-row {
-					white-space: nowrap;
-					margin-bottom: 16rpx;
-				}
-
-				.question-item {
-					white-space: nowrap;
-					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;
-					}
-				}
-			}
-
-			.router-list {
-				height: 84rpx;
-				padding: 22rpx 30rpx 0;
-				background-color: #fff;
-				border-radius: 15rpx 15rpx 0 0;
-				white-space: nowrap;
-				box-sizing: border-box;
-
-				.btns-item {
-					display: inline-block;
-					box-sizing: border-box;
-					height: 62rpx;
-					border: 2rpx solid #e0dede;
-					border-radius: 15rpx;
-					margin-right: 16rpx;
-					padding: 0 20rpx 0 64rpx;
-					line-height: 58rpx;
 					font-size: 29rpx;
-					position: relative;
+					height: 54rpx;
-
+					color: #fff;
-					.image-icon {
+					background: linear-gradient(104deg, #5547f3 0%, #4e86f4 100%);
-						position: absolute;
+					line-height: 54rpx;
-						width: 31rpx;
+					text-align: center;
-						height: 31rpx;
+					border-radius: 15rpx 15rpx 0 0;
-						top: 50%;
+					position: absolute;
-						transform: translateY(-50%);
+					left: 68rpx;
-						left: 24rpx;
+					bottom: 0;
-					}
-
-					&:last-child {
-						margin-right: 0;
-					}
-				}
-			}
-
-			.talking-list {
-				height: calc(100% - 832rpx);
-				padding: 12rpx 24rpx;
-				box-sizing: border-box;
-
-				.talking-scroll-list {
-					height: 100%;
 				}
 			}
 		}
 
-		.talking-list{
+		.questions-view {
+			padding-left: 24rpx;
+			padding-right: 24rpx;
+			height: 184rpx;
+			box-sizing: border-box;
+
+			.question-row {
+				white-space: nowrap;
+				margin-bottom: 16rpx;
+			}
+
+			.question-item {
+				white-space: nowrap;
+				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;
+				}
+			}
+		}
+		.router-list {
+			height: 84rpx;
+			padding: 22rpx 30rpx 0;
+			background-color: #fff;
+			border-radius: 15rpx 15rpx 0 0;
+			white-space: nowrap;
+			box-sizing: border-box;
+
+			.btns-item {
+				display: inline-block;
+				box-sizing: border-box;
+				height: 62rpx;
+				border: 2rpx solid #e0dede;
+				border-radius: 15rpx;
+				margin-right: 16rpx;
+				padding: 0 20rpx 0 64rpx;
+				line-height: 58rpx;
+				font-size: 29rpx;
+				position: relative;
+
+				.image-icon {
+					position: absolute;
+					width: 31rpx;
+					height: 31rpx;
+					top: 50%;
+					transform: translateY(-50%);
+					left: 24rpx;
+				}
+
+				&:last-child {
+					margin-right: 0;
+				}
+			}
+		}
+
+		.talking-list {
 			height: calc(100% - 832rpx);
 			padding: 12rpx 24rpx;
 			box-sizing: border-box;
-			.talking-scroll-list{
+
+			.talking-scroll-list {
 				height: 100%;
 			}
 		}
+	}
+
+
+	.talking-list {
+		height: calc(100% - 832rpx);
+		padding: 12rpx 24rpx;
+		box-sizing: border-box;
+
+		.talking-scroll-list {
+			height: 100%;
+		}
+	}
 </style>