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

src/components/examination/subject.vue

@@ -40,12 +40,12 @@
 				</template>
 			</view>
 		</view>
-		<view class="question_text">
+		<view class="question_text" v-show="props.showStem">
 			{{ subject_data.qnsContent }}
 		</view>
 		<view :style="{ height: animationHeight }" :class="{ collapse_wrapper: props.mode === 'mistake' }" ref="wrapperRef">
 			<view class="collapse-content" ref="contentRef">
-				<view class="option_div">
+				<view class="option_div" v-show="props.showStem">
 					<template v-if="qnsTyp === 'ES'">
 						<questionVue
 							:status="subject_data.es_status"
@@ -154,6 +154,10 @@
 			type: Object,
 			required: true
 		},
+		showStem: {
+			type: Boolean,
+			required: true
+		},
 		mode: {
 			type: String,
 			required: true,

src/pages/course/components/talkingItem.vue

@@ -55,7 +55,7 @@
 					{{ showContent }}
 				</text>
 				<!-- 试题问题 -->
-				<Subject v-if="[4, 8].indexOf(type) >= 0 && dataInfo.qnsTyp !== 'ES'" :isPreview="!isLast" :item="subjectInfo"
+				<Subject v-if="[4, 8].indexOf(type) >= 0 && dataInfo.qnsTyp !== 'ES'" :isPreview="!isLast" :item="subjectInfo" :showStem="type===4"
 					:mode="mode" :clearResult="type === 4" @subject_click="subject_click" />
 				<!-- 试题问题反馈 -->
 				<!-- <RadioSubjectRequest v-if="[8].indexOf(type) >= 0 && dataInfo.qnsTyp !== 'ES'" :item="dataInfo" :mode="mode" @subject_click="subject_click" /> -->
@@ -396,10 +396,18 @@
 			return false;
 		}
 		if (type.value === 5) {
-			return true;
+			if(dataInfo.value.stdyStat !== 'Y' && dataInfo.value.isLastQns === 'Y'){
+				return false
+			}else{
+				return true;
+			}
 		}
 		if (type.value === 8) {
-			return !!dataInfo.value.traQnsInfoVo?.judgeResult;
+			if(dataInfo.value.stdyStat !== 'Y' && dataInfo.value.isLastQns === 'Y'){
+				return false
+			}else{
+				return !!dataInfo.value.traQnsInfoVo?.judgeResult;
+			}
 		}
 		if (type.value === 9) {
 			return dataInfo.value.stdyStat === 'Y';
@@ -772,10 +780,18 @@
 		clickNow();
 		if ([5, 8].indexOf(props.type) >= 0) {
 			// 完成问题
-			emit('nextQuestion', unref(dataInfo));
+			if(dataInfo.value.stdyStat === 'Y' && dataInfo.value.isLastQns === 'Y'){
+				emit('nextQuestion', unref(dataInfo), 'overNextGraph');
+			}else{
+				emit('nextQuestion', unref(dataInfo));
+			}
 		} else if ([3].indexOf(props.type) >= 0) {
 			// 完成段落
-			emit('nextQuestion', unref(dataInfo), 'overGraph');
+			if(unref(dataInfo).hasQns !=='Y'){
+				emit('nextQuestion', unref(dataInfo), 'overNextGraph');
+			}else{
+				emit('nextQuestion', unref(dataInfo), 'overGraph');
+			}
 		} else if ([9].indexOf(props.type) >= 0) {
 			// 下一段落
 			emit('nextQuestion', unref(dataInfo), 'nextGraph');

src/pages/course/study.vue

@@ -573,40 +573,21 @@ const nextQuestionSuccess = (info, type = 'next') => {
     scrollToBottomNow()
     getQuestionInfoUnStudy(info.pgrphId)
   } else if (type === 'overGraph') {
-    unref(ajaxApi)({
+		overPgrhNow(info,getQuestionInfoUnStudy,_id)
-      processType: 'PRGH-OVER',
+	} else if (type === 'overNextGraph') {
-      requestBody: JSON.stringify({
+		overPgrhNow(info,($id)=>{
-        stdyId: unref(stdyId),
+			getGraphInfoUnStudy(0, $id)
-        pgrphId: info?.pgrphId,
+		},_id)
-        logId: info?.logId,
+	} else if (type === 'nextGraph') {
-        oldStdyId: unref(oldStdyId),
+	  talkingList.value.push({
-        isContinue: isContinue.value
+	    crsId: info.crsId,
-      })
+	    pgrphId: info.pgrphId,
-    })
+	    talkingContent: '继续学',
-      .then(res => {
+	    type: 0,
-        talkingList.value.push({
+	    id: _id
-          crsId: info.crsId,
+	  })
-          pgrphId: info.pgrphId,
+	  // 下个段落
-          talkingContent: '继续',
+	  getGraphInfoUnStudy(0, info.pgrphId)
-          type: 0,
-          id: _id
-        })
-        scrollToBottomNow()
-        getQuestionInfoUnStudy(info.pgrphId)
-      })
-      .finally(() => {
-        isGetting.value = false
-      })
-  } else if (type === 'nextGraph') {
-    talkingList.value.push({
-      crsId: info.crsId,
-      pgrphId: info.pgrphId,
-      talkingContent: '继续学',
-      type: 0,
-      id: _id
-    })
-    // 下个段落
-    getGraphInfoUnStudy(0, info.pgrphId)
   } else if (type === 'reStart') {
     talkingList.value.push({
       crsId: info.crsId,
@@ -695,6 +676,35 @@ const nextQuestionSuccess = (info, type = 'next') => {
       })
   }
 }
+const overPgrhNow = (info,cb = ()=>{},_id) => {
+	  unref(ajaxApi)({
+	    processType: 'PRGH-OVER',
+	    requestBody: JSON.stringify({
+	      stdyId: unref(stdyId),
+	      pgrphId: info?.pgrphId,
+	      logId: info?.logId || logId.value,
+	      oldStdyId: unref(oldStdyId),
+	      isContinue: isContinue.value
+	    })
+	  })
+	    .then(res => {
+	      talkingList.value.push({
+	        crsId: info.crsId,
+	        pgrphId: info.pgrphId,
+	        talkingContent: '继续',
+	        type: 0,
+	        id: _id
+	      })
+	      scrollToBottomNow(300)
+				setTimeout(()=>{
+					cb(info.pgrphId)
+				},500)
+				// cb(info.pgrphId)
+	    })
+	    .finally(() => {
+	      isGetting.value = false
+	    })
+}
 const scrollBoxRef = ref()
 const scrollTop = ref(99999)
 const scrollToBottomNow = (time = 500) => {
@@ -1146,7 +1156,9 @@ const getQuestionEvalateRequest = (id, data, num) => {
     unref(ajaxApi)({
       processType: 'ANSER-RESULT',
       requestBody: JSON.stringify({
-        execLogId: loadingExecLogId.value
+        execLogId: loadingExecLogId.value,
+	      pgrphId: data.pgrphId,
+				stdyId: stdyId.value
       })
     }).then(res => {
       let _body = res.body || {}

src/pages/index/dialog.vue

@@ -3,31 +3,17 @@
 		<!-- <MarkdownPreview/> -->
 		<view class="top-bg"></view>
 		<view class="bot-bg"></view>
-		<scroll-view
+		<scroll-view class="index-dialog-body" :scroll-y="true" upper-threshold="0" refresher-enabled="true"
-			class="index-dialog-body"
+			refresher-default-style="none" @refresherrefresh="scrolltolower">
-			:scroll-y="true"
-			upper-threshold="0"
-			refresher-enabled="true"
-			refresher-default-style="none"
-			@refresherrefresh="scrolltolower"
-		>
 			<view class="body-title">
 				<!-- <uv-icon class="arrow-icon" name="arrow-left" @click="common.navigateBack()"/> -->
 				AI问答
 				<view class="top-desc">内容由AI生成</view>
 				<view class="seek-setting">
-					<image
+					<image src="@/static/images/dialog/new-dialog.png" alt="" class="image-icon-new" @click="createNewDialog">
-						src="@/static/images/dialog/new-dialog.png"
+					</image>
-						alt=""
+					<image src="@/static/images/dialog/history.png" alt="" class="image-icon"
-						class="image-icon-new"
+						@click="showMenuList = !showMenuList"></image>
-						@click="createNewDialog"
-					></image>
-					<image
-						src="@/static/images/dialog/history.png"
-						alt=""
-						class="image-icon"
-						@click="showMenuList = !showMenuList"
-					></image>
 					<view :class="['more-list', showMenuList ? 'show' : '']">
 						<view class="more-item" @click.stop="showHistory">历史</view>
 						<view class="more-item" @click.stop="toMessage">消息</view>
@@ -36,7 +22,7 @@
 				</view>
 			</view>
 
-			<view class="ai-info">
+			<view class="ai-info" v-show="talkingList.length === 0">
 				<!-- <image src="@/static/images/dialog/pet-3.png" alt="" class="image-pet-bg"></image> -->
 				<image src="@/static/images/dialog/pet-bg-base.png" alt="" class="image-pet-bg"></image>
 				<image :src="luimgAddr" alt="" class="image-pet" mode="widthFix"></image>
@@ -46,7 +32,17 @@
 					<view class="info-btn">试试他的能力</view>
 				</view>
 			</view>
-			<view class="questions-view">
+			<view class="talking-list talking-list-qns" v-show="talkingList.length === 0">
+				<scroll-view class="talking-scroll-list" :scroll-y="true" :scroll-top="scrollTop" :show-scrollbar="false"
+					:scroll-with-animation="false">
+					<view class="question-item-box" v-show="talkingList.length === 0" v-for="item in questionList">
+						<view class="question-item" @click="sendText(item.hotContent)">
+							{{ item.hotContent }}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+			<!-- <view class="questions-view">
 				<scroll-view :scroll-x="true" :show-scrollbar="false">
 					<view class="question-row">
 						<view
@@ -67,24 +63,20 @@
 						</view>
 					</view>
 				</scroll-view>
-			</view>
+			</view> -->
-			<view class="talking-list">
+			<view class="talking-list" v-show="talkingList.length > 0">
-				<scroll-view
+				<scroll-view class="talking-scroll-list" :scroll-y="true" :scroll-top="scrollTop" :show-scrollbar="false"
-					class="talking-scroll-list"
+					:scroll-with-animation="false">
-					:scroll-y="true"
+					<TalkingItem v-for="(item, index) in talkingList" :talkingType="item.type" :talkingInfo="item"
-					:scroll-top="scrollTop"
+						:isLast="index + 1 === talkingList.length" :isAnswering="!answerIsOver"
-					:show-scrollbar="false"
+						:activeVoiceId="activeVoiceTalkingItemId" @handleEvents="talkItemEvents"></TalkingItem>
-					:scroll-with-animation="false"
+
-				>
+					<view class="question-item-box mt-16" v-for="item in talkQnsList">
-					<TalkingItem
+						<view class="question-item" @click="sendText(item.hotContent)">
-						v-for="(item, index) in talkingList"
+							{{ item.hotContent }}
-						:talkingType="item.type"
+						</view>
-						:talkingInfo="item"
+					</view>
-						:isLast="index + 1 === talkingList.length"
+
-						:isAnswering="!answerIsOver"
-						:activeVoiceId="activeVoiceTalkingItemId"
-						@handleEvents="talkItemEvents"
-					></TalkingItem>
 				</scroll-view>
 			</view>
 			<view class="router-list">
@@ -119,23 +111,16 @@
 					</view>
 				</scroll-view>
 			</view>
-			<TouchBtn
+			<TouchBtn class="talk-btns" @uploadVoice="uploadRecordNow" @submitAnswer="submitAnswerNow"
-				class="talk-btns"
+				@startRecord="startRecordCallback" :loadingText="sendLoadingText" :isLoading="!answerIsOver"
-				@uploadVoice="uploadRecordNow"
+				:adjustPosition="true" :isDisabled="isHistory" />
-				@submitAnswer="submitAnswerNow"
-				@startRecord="startRecordCallback"
-				:loadingText="sendLoadingText"
-				:isLoading="!answerIsOver"
-				:adjustPosition="true"
-				:isDisabled="isHistory"
-			/>
 			<History ref="historyRef" @showDetail="showHistoryDetail"></History>
 			<PreviewVue ref="previewRef" />
 		</scroll-view>
 	</view>
 
-		<badge ref="badgeRef"></badge>
+	<badge ref="badgeRef"></badge>
-		<points ref="pointsRef"></points>
+	<points ref="pointsRef"></points>
 	<!-- 反馈组件 -->
 	<Feedback ref="feedbackRef" @feedbackAnswer="feedbackAnswer"></Feedback>
 	<!-- <file-preview ref="previewFileRef" :file-id="'603058d8-88e0-43d2-8242-3132b85bc91c'" v-model="showPreview" /> -->
@@ -144,19 +129,49 @@
 </template>
 
 <script setup>
-	import { ref, unref, onMounted, watch, nextTick, computed, onActivated } from 'vue';
+	import {
+		ref,
+		unref,
+		onMounted,
+		watch,
+		nextTick,
+		computed,
+		onActivated
+	} from 'vue';
 	import common from '@/common/common';
-	import { setupKeyboardHeightListener } from '@/common/common';
+	import {
+		setupKeyboardHeightListener
+	} from '@/common/common';
 	import TouchBtn from '@/pages/course/components/touchBtn.vue';
 	import TalkingItem from './components/talking-item.vue';
 	import PreviewVue from './components/preview.vue';
-	import { useSocketStore } from '@/store/socket.js';
+	import {
-	import { useStorageStore } from '@/store/storage.js';
+		useSocketStore
-	import { storeToRefs } from 'pinia';
+	} from '@/store/socket.js';
-	import { onLoad, onShow, onUnload, onHide, onBackPress } from '@dcloudio/uni-app';
+	import {
-	import { get_base_url, goto_login_fun } from '@/api/request';
+		useStorageStore
-	import { getUserInfo, getPhoneEnvBool } from '@/common/common';
+	} from '@/store/storage.js';
-	import { commonUploadVoiceFile } from '@/api/common.js';
+	import {
+		storeToRefs
+	} from 'pinia';
+	import {
+		onLoad,
+		onShow,
+		onUnload,
+		onHide,
+		onBackPress
+	} from '@dcloudio/uni-app';
+	import {
+		get_base_url,
+		goto_login_fun
+	} from '@/api/request';
+	import {
+		getUserInfo,
+		getPhoneEnvBool
+	} from '@/common/common';
+	import {
+		commonUploadVoiceFile
+	} from '@/api/common.js';
 	import {
 		queryHotQuestionApi,
 		insertTraAskFeedback,
@@ -166,23 +181,31 @@
 	} from '@/api/dialog.js';
 	import Feedback from './components/feedback.vue';
 	import History from './components/history.vue';
-	import badge from '@/components/points-and-badge/badge'; 
+	import badge from '@/components/points-and-badge/badge';
 	import points from '@/components/points-and-badge/points';
 	import usePointsAndBadge from '@/components/points-and-badge/usePointsAndBadge';
-	const { pointAndBadgesRun, badgeRef, pointsRef } = usePointsAndBadge();
+	const {
+		pointAndBadgesRun,
+		badgeRef,
+		pointsRef
+	} = usePointsAndBadge();
 
-	const { statusBarHeight } = uni.getWindowInfo();
+	const {
+		statusBarHeight
+	} = uni.getWindowInfo();
 
 	const pageTopPadding = computed(() => statusBarHeight + 'px');
 
 	const socketStore = useSocketStore();
-	const { SocketObj } = storeToRefs(socketStore);
+	const {
+		SocketObj
+	} = storeToRefs(socketStore);
 
 	const feedbackRef = ref();
 	const watermarkRef = ref();
 	const userInfo = ref(getUserInfo());
-	const luimgAddr = computed(()=> unref(userInfo)?.mascotInfo?.imgAddr || '')
+	const luimgAddr = computed(() => unref(userInfo)?.mascotInfo?.imgAddr || '')
-	const userParams = '/' + (unref(userInfo)?.loginName??'')
+	const userParams = '/' + (unref(userInfo)?.loginName ?? '')
 	const questionList = ref([
 		// '对公小程序开户流程？',
 		// '厅堂服务经理2025年管理办法？',
@@ -229,6 +252,7 @@
 	const showModelComfirm = ref(false);
 	const reconcatNum = ref(1);
 	const askTime = ref(0)
+	const talkQnsList = ref([])
 	const initsocketTask = () => {
 		isHistory.value = false;
 		socketStore.creatSocket('/traask/asksocket/open?summary=');
@@ -262,7 +286,11 @@
 				});
 		});
 		unref(SocketObj).on('message', (res) => {
-			const { rtnCode, body, commond } = JSON.parse(res.data);
+			const {
+				rtnCode,
+				body,
+				commond
+			} = JSON.parse(res.data);
 			let _id = new Date().getTime() + 'id';
 			if (rtnCode === '0000') {
 				if (commond === 'ASK-OPEN') {
@@ -329,7 +357,7 @@
 				if (commond === 'ASK-ANSWER') {
 					if (body.event === 'start') {
 						console.log('开始回答！');
-						if (askTime.value === 0){
+						if (askTime.value === 0) {
 							pointAndBadgesRun('06')
 							askTime.value = 1
 						}
@@ -361,6 +389,7 @@
 						let _data = body.data;
 						talkingList.value[talkingList.value.length - 1].talkingFiles = _data.knowledgeList || [];
 						talkingList.value[talkingList.value.length - 1].talkingCrsList = _data.crsList || [];
+						talkQnsList.value = _data.qnsList || []//questionList.value.splice(0, 3);
 					}
 					return;
 				}
@@ -398,6 +427,9 @@
 		}, 3000);
 	};
 	const sendMessage = (data) => {
+		if (data.commond === 'ASK') {
+			talkQnsList.value = []
+		}
 		unref(SocketObj).send(data);
 	};
 	watch(
@@ -417,7 +449,12 @@
 
 	const isDownloading = ref(false)
 	const stopAnswerCallBack = ref(null);
-	const talkItemEvents = ({ type, data, id, info = {} }) => {
+	const talkItemEvents = ({
+		type,
+		data,
+		id,
+		info = {}
+	}) => {
 		switch (type) {
 			case 'reAnswer':
 				console.log('重新提问回答');
@@ -492,7 +529,7 @@
 				});
 				break;
 			case 'preview':
-				common.navigateTo('/pages/index/preview?fileId=' + info.docId); 
+				common.navigateTo('/pages/index/preview?fileId=' + info.docId);
 				// if (getPhoneEnvBool('AND')) {
 				// 	common.navigateTo('/pages/index/preview?fileId=' + info.docId);
 				// } else {
@@ -530,8 +567,7 @@
 			return new Promise((resolve, reject) => {
 				console.log('开始下载:', fileUrl);
 				const dtask = plus.downloader.createDownload(
-					fileUrl,
+					fileUrl, {
-					{
 						filename: localFilePath
 					},
 					(d, status) => {
@@ -676,28 +712,28 @@
 		scrollToBottomNow();
 		commonUploadVoiceFile(voicePath, '/traask/traAskchat/voiceTrans', {})
 			.then((_res) => {
-        if (!!(_res.body.transContent || '').trim()) {
+				if (!!(_res.body.transContent || '').trim()) {
-          askData.value = {
+					askData.value = {
-            reqBatch: reqBatch.value,
+						reqBatch: reqBatch.value,
-            intrctWay: '02', //01-文本；02-语音；03-图片
+						intrctWay: '02', //01-文本；02-语音；03-图片
-            intrctContent: _res.body.transContent,
+						intrctContent: _res.body.transContent,
-            bucketKey: _res.body.fileId,
+						bucketKey: _res.body.fileId,
-            ossFileAddr: _res.body.ossFileAddr,
+						ossFileAddr: _res.body.ossFileAddr,
-            talkingVoice: voicePath,
+						talkingVoice: voicePath,
 						voiceTime: voiceTime
-          };
+					};
-          sendMessage({
+					sendMessage({
-            commond: 'ASK',
+						commond: 'ASK',
-            body: askData.value
+						body: askData.value
-          });
+					});
-        } else {
+				} else {
-          talkingList.value.pop();
+					talkingList.value.pop();
-          uni.showToast({
+					uni.showToast({
-            title: '未识别到文字',
+						title: '未识别到文字',
-            icon: 'none',
+						icon: 'none',
-            duration: 1000
+						duration: 1000
-          });
+					});
-        }
+				}
 			})
 			.catch((err) => {
 				talkingList.value.pop();
@@ -726,7 +762,9 @@
 			commond: 'ASK',
 			body: askData.value
 		});
-		setHeight({height: 0})
+		setHeight({
+			height: 0
+		})
 	};
 	const startRecordCallback = () => {
 		// 开始录音回调
@@ -793,7 +831,7 @@
 	};
 	onLoad(() => {
 		//#ifdef APP-PLUS
-		 plus.screen.lockOrientation('portrait-primary')
+		plus.screen.lockOrientation('portrait-primary')
 		// #endif
 		changeAppHeightBottom();
 		if (!common.isLogin()) {
@@ -824,9 +862,9 @@
 	const keyboardHeight = ref('0px');
 	const setHeight = (res) => {
 		keyboardHeight.value = (res.height || 0) + 'px';
-		setTimeout(()=>{
+		setTimeout(() => {
 			console.log(totalBotHeight.value)
-		},1000)
+		}, 1000)
 	};
 	const keyBoardIsHide = computed(() => {
 		return parseInt(keyboardHeight.value) == 0;
@@ -837,7 +875,8 @@
 		// #ifdef APP-PLUS
 		isIos = (plus.os.name == "iOS")
 		// #endif
-		return isIos || keyBoardIsHide.value ? 0 + 'px' : parseInt(keyboardHeight.value) + parseInt(bottomHeight.value) + 'px';
+		return isIos || keyBoardIsHide.value ? 0 + 'px' : parseInt(keyboardHeight.value) + parseInt(bottomHeight.value) +
+			'px';
 	});
 	const changeAppHeightBottom = (height) => {
 		//#ifdef APP-PLUS
@@ -846,15 +885,15 @@
 		// 计算安全区域底部高度
 		bottomHeight.value = systemInfo.screenHeight - systemInfo.safeArea.bottom + 'px';
 		console.log(systemInfo)
-		console.log(systemInfo.screenHeight , systemInfo.safeArea.bottom )
+		console.log(systemInfo.screenHeight, systemInfo.safeArea.bottom)
 		// #endif
 	};
 
 	const deleteFolder = () => {
 		//#ifdef APP-PLUS
-		plus.io.resolveLocalFileSystemURL('_doc/pdf_view', function (entry) {
+		plus.io.resolveLocalFileSystemURL('_doc/pdf_view', function(entry) {
 			console.log('entry', entry);
-			entry.removeRecursively(function (res) {
+			entry.removeRecursively(function(res) {
 				console.log('删除成功');
 			});
 		});
@@ -871,7 +910,7 @@
 		nextTick(() => {
 			watermarkRef.value?.updateWatermarkText();
 		});
-		
+
 	});
 	// #endif
 	onUnload(() => {
@@ -932,7 +971,8 @@
 			font-weight: 500;
 			color: #000;
 			position: relative;
-			.top-desc{
+
+			.top-desc {
 				position: absolute;
 				bottom: -10rpx;
 				font-size: 18rpx;
@@ -941,7 +981,7 @@
 				transform: translateX(-50%);
 			}
 
-			.top-desc{
+			.top-desc {
 				position: absolute;
 				bottom: -10rpx;
 				font-size: 18rpx;
@@ -949,6 +989,7 @@
 				left: 50%;
 				transform: translateX(-50%);
 			}
+
 			// margin-bottom: 23rpx;
 			.arrow-icon {
 				position: absolute;
@@ -971,6 +1012,7 @@
 			line-height: 32rpx;
 			text-align: right;
 			padding-right: 48rpx;
+
 			.more-list {
 				position: absolute;
 				top: 100%;
@@ -982,9 +1024,11 @@
 				padding: 16rpx 0;
 				display: none;
 				z-index: 21;
+
 				&.show {
 					display: block;
 				}
+
 				.more-item {
 					line-height: 60rpx;
 					font-size: 29rpx;
@@ -993,6 +1037,7 @@
 					z-index: 22;
 				}
 			}
+
 			.image-icon {
 				width: 30rpx;
 				height: 32rpx;
@@ -1145,13 +1190,50 @@
 		}
 
 		.talking-list {
-			height: calc(100% - 772rpx);
+			height: calc(100% - 328rpx);
 			min-height: 300rpx;
 			padding: 12rpx 24rpx;
 			box-sizing: border-box;
 			min-height: 300rpx;
+
+			&.talking-list-qns {
+				height: calc(100% - 600rpx);
+			}
+
 			.talking-scroll-list {
 				height: 100%;
+
+				.question-item-box {
+					float: left;
+					width: 100%;
+
+					&.mt-16 {
+						margin-top: 16rpx;
+
+						.question-item {
+							margin-bottom: 0rpx;
+						}
+					}
+
+					.question-item {
+						// white-space: nowrap;
+						float: left;
+						width: auto;
+						min-height: 66rpx;
+						line-height: 56rpx;
+						background-color: #fff;
+						border: 2rpx solid #e0dede;
+						padding: 5rpx 16rpx;
+						border-radius: 11rpx;
+						margin-bottom: 16rpx;
+						// display: inline-block;
+						font-size: 26rpx;
+
+						&:last-child {
+							margin-right: 0;
+						}
+					}
+				}
 			}
 		}
 	}
@@ -1165,4 +1247,4 @@
 	// 		height: 100%;
 	// 	}
 	// }
-</style>
+</style>