修改

src/components/subject/Calculation.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != 1"></swiper-item>
 				<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
 					<view class="item1">
 						<view class="flex flex_start_center">
@@ -26,7 +26,7 @@
 						</view>
 					</view>
 				</swiper-item>
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != sortTotal"></swiper-item>
 			</swiper>
 		</view>
 		<van-toast id="van-toast" />
@@ -51,12 +51,11 @@
 		props: {
 			paperData: Object,
 			sort: Number,
+			sortTotal: Number,
 			isLast: Boolean
 		},
 		setup(props, context) {
-			let {
-				ctx
-			} = getCurrentInstance();
+			let {ctx} = getCurrentInstance();
 			props.paperData.DetailsList.forEach((item, index) => {
 				item.myAnswer = "";
 			});
@@ -64,6 +63,7 @@
 				data: props.paperData,
 				autoplay: false,
 				sortIndex: props.sort + 1,
+				sortTotal: props.sortTotal,
 				current: 1, //默认从第几个开始-用于从快捷菜单点入
 				ExamIndex: 1, //第几题
 			});

src/components/subject/Cloze.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != 1"></swiper-item>
 				<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
 					<view class="item1">
 						<view class="flex flex_start_center">
@@ -26,7 +26,7 @@
 						</view>
 					</view>
 				</swiper-item>
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != sortTotal"></swiper-item>
 			</swiper>
 		</view>
 		<van-toast id="van-toast" />
@@ -51,6 +51,7 @@
 		props: {
 			paperData: Object,
 			sort: Number,
+			sortTotal: Number,
 			isLast: Boolean
 		},
 		setup(props, context) {
@@ -64,6 +65,7 @@
 				data: props.paperData,
 				autoplay: false,
 				sortIndex: props.sort + 1,
+				sortTotal: props.sortTotal,
 				current: 1, //默认从第几个开始-用于从快捷菜单点入
 				ExamIndex: 1, //第几题
 			});

src/components/subject/Dataquestion.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != 1"></swiper-item>
 				<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
 					<view class="item1">
 						<view class="flex flex_start_center">
@@ -26,7 +26,7 @@
 						</view>
 					</view>
 				</swiper-item>
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != sortTotal"></swiper-item>
 			</swiper>
 		</view>
 		<van-toast id="van-toast" />
@@ -51,6 +51,7 @@
 		props: {
 			paperData: Object,
 			sort: Number,
+			sortTotal: Number,
 			isLast: Boolean
 		},
 		setup(props, context) {
@@ -64,6 +65,7 @@
 				data: props.paperData,
 				autoplay: false,
 				sortIndex: props.sort + 1,
+				sortTotal: props.sortTotal,
 				current: 1, //默认从第几个开始-用于从快捷菜单点入
 				ExamIndex: 1, //第几题
 			});

src/components/subject/Other.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != 1"></swiper-item>
 				<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
 					<view class="item1">
 						<view class="flex flex_start_center">
@@ -26,7 +26,7 @@
 						</view>
 					</view>
 				</swiper-item>
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != sortTotal"></swiper-item>
 			</swiper>
 		</view>
 		<van-toast id="van-toast" />
@@ -51,6 +51,7 @@
 		props: {
 			paperData: Object,
 			sort: Number,
+			sortTotal: Number,
 			isLast: Boolean
 		},
 		setup(props, context) {
@@ -64,6 +65,7 @@
 				data: props.paperData,
 				autoplay: false,
 				sortIndex: props.sort + 1,
+				sortTotal: props.sortTotal,
 				current: 1, //默认从第几个开始-用于从快捷菜单点入
 				ExamIndex: 1, //第几题
 			});

src/components/subject/SortingProblem.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != 1"></swiper-item>
 				<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
 					<view class="item1">
 						<view class="flex flex_start_center">
@@ -26,7 +26,7 @@
 						</view>
 					</view>
 				</swiper-item>
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != sortTotal"></swiper-item>
 			</swiper>
 		</view>
 		<van-toast id="van-toast" />
@@ -51,6 +51,7 @@
 		props: {
 			paperData: Object,
 			sort: Number,
+			sortTotal: Number,
 			isLast: Boolean
 		},
 		setup(props, context) {
@@ -64,6 +65,7 @@
 				data: props.paperData,
 				autoplay: false,
 				sortIndex: props.sort + 1,
+				sortTotal: props.sortTotal,
 				current: 1, //默认从第几个开始-用于从快捷菜单点入
 				ExamIndex: 1, //第几题
 			});

src/components/subject/Spoken.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != 1"></swiper-item>
 				<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
 					<view class="item1">
 						<view class="flex flex_start_center">
@@ -26,7 +26,7 @@
 						</view>
 					</view>
 				</swiper-item>
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != sortTotal"></swiper-item>
 			</swiper>
 		</view>
 		<van-toast id="van-toast" />
@@ -51,6 +51,7 @@
 		props: {
 			paperData: Object,
 			sort: Number,
+			sortTotal: Number,
 			isLast: Boolean
 		},
 		setup(props, context) {
@@ -64,6 +65,7 @@
 				data: props.paperData,
 				autoplay: false,
 				sortIndex: props.sort + 1,
+				sortTotal: props.sortTotal,
 				current: 1, //默认从第几个开始-用于从快捷菜单点入
 				ExamIndex: 1, //第几题
 			});

src/components/subject/easyQuestion.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != 1"></swiper-item>
 				<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
 					<view class="item1">
 						<view class="flex flex_start_center">
@@ -26,7 +26,7 @@
 						</view>
 					</view>
 				</swiper-item>
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != sortTotal"></swiper-item>
 			</swiper>
 		</view>
 		<van-toast id="van-toast" />
@@ -51,6 +51,7 @@
 		props: {
 			paperData: Object,
 			sort: Number,
+			sortTotal: Number,
 			isLast: Boolean
 		},
 		setup(props, context) {
@@ -64,6 +65,7 @@
 				data: props.paperData,
 				autoplay: false,
 				sortIndex: props.sort + 1,
+				sortTotal: props.sortTotal,
 				current: 1, //默认从第几个开始-用于从快捷菜单点入
 				ExamIndex: 1, //第几题
 			});

src/components/subject/judge.vue

@@ -4,7 +4,7 @@
     <view class="item" style="padding: 0 20px">
       <view class="name">
         <view>
-          {{ changeNumToHan(data.GSortNum + 1) }}、{{ data.GroupName }}
+          {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
           <text style="color: #999999"
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >

src/components/subject/nounExplanation.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != 1"></swiper-item>
 				<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
 					<view class="item1">
 						<view class="flex flex_start_center">
@@ -26,7 +26,7 @@
 						</view>
 					</view>
 				</swiper-item>
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != sortTotal"></swiper-item>
 			</swiper>
 		</view>
 		<van-toast id="van-toast" />
@@ -51,6 +51,7 @@
 		props: {
 			paperData: Object,
 			sort: Number,
+			sortTotal: Number,
 			isLast: Boolean
 		},
 		setup(props, context) {
@@ -64,6 +65,7 @@
 				data: props.paperData,
 				autoplay: false,
 				sortIndex: props.sort + 1,
+				sortTotal: props.sortTotal,
 				current: 1, //默认从第几个开始-用于从快捷菜单点入
 				ExamIndex: 1, //第几题
 			});

src/components/subject/shortAnswer.vue

@@ -13,7 +13,7 @@
 				</view>
 			</view>
 			<swiper class="swiper-box" :autoplay="autoplay" :current="current" @change="onchange">
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != 1"></swiper-item>
 				<swiper-item v-for="(item1, index1) in data.DetailsList" :key="item1.id">
 					<view class="item1">
 						<view class="flex flex_start_center">
@@ -26,7 +26,7 @@
 						</view>
 					</view>
 				</swiper-item>
-				<swiper-item></swiper-item>
+				<swiper-item v-if="sortIndex != sortTotal"></swiper-item>
 			</swiper>
 		</view>
 		<van-toast id="van-toast" />
@@ -51,6 +51,7 @@
 		props: {
 			paperData: Object,
 			sort: Number,
+			sortTotal: Number,
 			isLast: Boolean
 		},
 		setup(props, context) {
@@ -63,6 +64,7 @@
 			let data = reactive({
 				data: props.paperData,
 				autoplay: false,
+				sortTotal: props.sortTotal,
 				sortIndex: props.sort + 1,
 				current: 1, //默认从第几个开始-用于从快捷菜单点入
 				ExamIndex: 1, //第几题

src/pages/exam/examPaper.vue

@@ -106,6 +106,7 @@
           :paperData="item"
           :isLast="isLast"
           :sort="index"
+		  :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
           v-if="
@@ -117,6 +118,7 @@
           :paperData="item"
           :isLast="isLast"
           :sort="index"
+		  :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
           v-if="
@@ -128,6 +130,7 @@
           :paperData="item"
           :isLast="isLast"
           :sort="index"
+		  :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
           v-if="
@@ -139,6 +142,7 @@
           :paperData="item"
           :isLast="isLast"
           :sort="index"
+		  :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
           v-if="item.QuestionTypeKey === 'calculation' && index === changeIndex"
@@ -148,15 +152,27 @@
           :paperData="item"
           :isLast="isLast"
           :sort="index"
+		  :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
           v-if="item.QuestionTypeKey === 'spoken' && index === changeIndex"
         />
+		<!-- 分录题 -->
+		<EntryProblem 
+		 :paperData="item"
+		 :isLast="isLast"
+		 :sort="index"
+		 :sortTotal="peaperDetail.Paper.GroupList.length"
+		 @getAfterTopic="getAfterTopic()"
+		 @getBeforeTopic="getBeforeTopic()"
+		 v-if="item.QuestionTypeKey === 'entry-problem' && index === changeIndex"
+		/>
         <!-- 其他 -->
         <Other
           :paperData="item"
           :isLast="isLast"
           :sort="index"
+		  :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
           v-if="item.QuestionTypeKey === 'other' && index === changeIndex"
@@ -166,6 +182,7 @@
           :paperData="item"
           :isLast="isLast"
           :sort="index"
+		  :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
           v-if="item.QuestionTypeKey === 'cloze' && index === changeIndex"
@@ -175,6 +192,7 @@
           :paperData="item"
           :isLast="isLast"
           :sort="index"
+		  :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
           v-if="
@@ -186,6 +204,7 @@
           :paperData="item"
           :isLast="isLast"
           :sort="index"
+		  :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
           v-if="
@@ -193,14 +212,15 @@
           "
         />
         <!-- 连线题待完善 -->
-        <Connect
+    <!--    <Connect
           :paperData="item"
           :isLast="isLast"
           :sort="index"
+		  :sortTotal="peaperDetail.Paper.GroupList.length"
           @getAfterTopic="getAfterTopic()"
           @getBeforeTopic="getBeforeTopic()"
           v-if="item.QuestionTypeKey === 'matching' && index === changeIndex"
-        />
+        /> -->
       </view>
     </view>
     <van-toast id="van-toast" />
@@ -231,6 +251,7 @@ import ShortAnswer from "../../components/subject/shortAnswer.vue";
 import nounExplanation from "../../components/subject/nounExplanation.vue";
 import easyQuestion from "../../components/subject/easyQuestion.vue";
 import Calculation from "../../components/subject/Calculation.vue";
+import EntryProblem from "../../components/subject/EntryProblem.vue";
 import Spoken from "../../components/subject/Spoken.vue";
 import Other from "../../components/subject/Other.vue";
 import Cloze from "../../components/subject/Cloze.vue";