Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu into master

src/components/subject/SingleChoiceNumber.vue

@@ -24,7 +24,7 @@
         <swiper-item>
           <!-- 第一页 -->
         </swiper-item>
-        <swiper-item v-for="(item1, index1) in data.DetailsList" :key="index1">
+        <swiper-item class="swiper-box" v-for="(item1, index1) in data.DetailsList" :key="index1">
           <view class="item1">
             <view class="flex flex_start_center">
               <view class="num" v-html="item1.Title"></view>
@@ -77,6 +77,7 @@ export default {
     sortTotal: Number,
     isLast: Boolean,
     startIndex: Number,
+	ExamStatus: Number
   },
   setup(props, context) {
     let { ctx } = getCurrentInstance();
@@ -149,7 +150,10 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
-
+.swiper-box {
+  height: calc(100vh - 270rpx);
+  box-sizing: border-box;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;

src/pages/exam/examPaper.vue

@@ -364,7 +364,9 @@ export default {
     let data = reactive({
       time: 999,
       statusBarHeight: 0,
-      msg: { GuestId: 0, PaperId: 0, PublishId: 0 },
+      msg: { GuestId: 0, PaperId: 0, PublishId: 0},
+	  // msg: { GuestId: 20, PaperId: 9, PublishId: 1,isShowAnswer:true},
+	  
       peaperDetail: {},
       changeIndex: 0, //大题序号
       isLast: false, //用于判断是否从后往前翻
@@ -454,7 +456,6 @@ export default {
       this.msg.PublishId = options.Id;
     }
     if (options.Exam_Student_Id) {
-      this.msg.GuestId = options.Exam_Student_Id;
       this.Exam_Student_Id = options.Exam_Student_Id;
     }
 	if (options.ExamStatus){