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

# Conflicts:
#	src/components/subject/answer.vue

src/components/subject/Calculation.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/
           <text class="Exam_Total">{{ data.DetailsList.length }}</text>
@@ -132,6 +132,9 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
+.ExamIndex_Box{
+  margin-right:20px;
+ }
 .Exam_Total {
   font-size: 25rpx;
   color: gray;

src/components/subject/Cloze.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/
           <text class="Exam_Total">{{ data.DetailsList.length }}</text>
@@ -141,6 +141,9 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Exam_Total {
   font-size: 25rpx;
   color: gray;

src/components/subject/Connect.vue

@@ -4,7 +4,7 @@
     <view class="item" style="padding: 0 20px">
       <view class="name">
         <view> {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }} </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/<text class="Exam_Total">{{ data.DetailsList.length }}</text>
         </view>
@@ -120,7 +120,9 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
-
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;

src/components/subject/Dataquestion.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/
           <text class="Exam_Total">{{ data.DetailsList.length }}</text>
@@ -138,6 +138,9 @@ export default {
   font-size: 25rpx;
   color: gray;
 }
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;

src/components/subject/EntryProblem.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/
           <text class="Exam_Total">{{ data.DetailsList.length }}</text>
@@ -138,6 +138,9 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Exam_Total {
   font-size: 25rpx;
   color: gray;

src/components/subject/FillInTheBlanks.vue

@@ -4,7 +4,7 @@
     <view class="item" style="padding: 0 20px">
       <view class="name">
         <view> {{ changeNumToHan(sortIndex) }}、{{ data.GroupName }} </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/<text class="Exam_Total">{{ data.DetailsList.length }}</text>
         </view>
@@ -113,7 +113,9 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
-
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;

src/components/subject/ListenTopic.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/<text class="Exam_Total">{{ data.DetailsList.length }}</text>
         </view>
@@ -299,7 +299,9 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
-
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;

src/components/subject/MultipleChoice.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/<text class="Exam_Total">{{ data.DetailsList.length }}</text>
         </view>
@@ -137,6 +137,9 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;

src/components/subject/Other.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/
           <text class="Exam_Total">{{ data.DetailsList.length }}</text>
@@ -132,7 +132,9 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
-
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;

src/components/subject/SharingChoose.vue

@@ -7,7 +7,7 @@
 					{{ changeNumToHan(sortIndex) }}、{{ data.GroupName }}
 					<text style="color:#999999;">（共{{data.DetailsList.length}}道,{{data.GScore}}分）</text>
 				</view>
-				<view>
+				<view class="ExamIndex_Box">
 					<text class="Single_Before">{{ExamIndex}}</text>/
 					<text class="Exam_Total">{{data.DetailsList.length}}</text>
 				</view>
@@ -164,6 +164,9 @@
 	  font-size: 25rpx;
 	  color: gray;
 	}
+	.ExamIndex_Box{
+	  margin-right:20px;
+	}
 	.Single_Before {
 		font-size: 28rpx;
 		font-weight: bold;

src/components/subject/SingleChoiceNumber.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/<text class="Exam_Total">{{ data.DetailsList.length }}</text>
         </view>
@@ -155,7 +155,9 @@ export default {
   font-weight: bold;
   color: #da7878;
 }
-
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Exam_Total {
   font-size: 25rpx;
   color: gray;

src/components/subject/SortingProblem.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/
           <text class="Exam_Total">{{ data.DetailsList.length }}</text>
@@ -202,6 +202,9 @@ export default {
   font-size: 25rpx;
   color: gray;
 }
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;

src/components/subject/Spoken.vue

@@ -9,9 +9,8 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
-          <text class="Single_Before">{{ ExamIndex }}</text
-          >/
+        <view class="ExamIndex_Box">
+          <text class="Single_Before">{{ ExamIndex }}</text>/
           <text class="Exam_Total">{{ data.DetailsList.length }}</text>
         </view>
       </view>
@@ -132,7 +131,9 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
-
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;

src/components/subject/answer.vue

@@ -77,13 +77,14 @@ import {
 } from "vue";
 import { changeNumToHan } from "../../utils/index";
 export default {
+  props: {
+    paperData: Object,
+  },
   setup() {
-    let paperData = uni.getStorageSync("paperData");
-    console.log(66, paperData);
     let Gid = uni.getStorageSync("userInfo").Id;
     let data = reactive({
       msg: { GuestId: Gid, PaperId: 5, PublishId: 1 },
-      questionList: paperData.Paper.GroupList,
+      questionList: props.paperData.Paper.GroupList,
     });
     let methods = {
       changeNumToHan,
@@ -93,25 +94,12 @@ export default {
             "/pages/exam/examPaper?index=" + index + "&&index1=" + (index1 + 1),
         });
       },
-
-      // async getPaperDetail() {
-      //   let res = await getPaperDetail(data.msg);
-      //   if (res) {
-      //     data.questionList = res.Data.Paper.GroupList;
-      //     console.log(90, res.Data.Paper.GroupList);
-      //   }
-      // },
     };
     return {
       ...toRefs(data),
       ...methods,
     };
   },
-  //   onLoad() {
-  //     uni.setNavigationBarTitle({
-  //       title: "答题卡",
-  //     });
-  //   },
 };
 </script>
 

src/components/subject/easyQuestion.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/
           <text class="Exam_Total">{{ data.DetailsList.length }}</text>
@@ -132,6 +132,9 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Exam_Total {
   font-size: 25rpx;
   color: gray;

src/components/subject/judge.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/<text class="Exam_Total">{{ data.DetailsList.length }}</text>
         </view>
@@ -141,7 +141,9 @@ export default {
   align-items: center;
   justify-content: space-between;
 }
-
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;

src/components/subject/nounExplanation.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/
           <text class="Exam_Total">{{ data.DetailsList.length }}</text>
@@ -133,6 +133,9 @@ export default {
   font-size: 25rpx;
   color: gray;
 }
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;

src/components/subject/readingCompre.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/<text class="Exam_Total">{{ data.DetailsList.length }}</text>
         </view>
@@ -256,7 +256,9 @@ export default {
   box-sizing: border-box;
   padding: 0 30rpx;
 }
-
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;

src/components/subject/shortAnswer.vue

@@ -9,7 +9,7 @@
             >（共{{ data.DetailsList.length }}道,{{ data.GScore }}分）</text
           >
         </view>
-        <view>
+        <view class="ExamIndex_Box">
           <text class="Single_Before">{{ ExamIndex }}</text
           >/
           <text class="Exam_Total">{{ data.DetailsList.length }}</text>
@@ -136,6 +136,9 @@ export default {
   font-size: 25rpx;
   color: gray;
 }
+.ExamIndex_Box{
+  margin-right:20px;
+}
 .Single_Before {
   font-size: 28rpx;
   font-weight: bold;