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

src/components/subject/SingleChoice.vue

@@ -9,14 +9,14 @@
             >（共{{ 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>
-        <i
+      <!--  <i
           class="iconfont icon-caidanzu answerSheet"
           @click="jumpAnswerSheet"
-        ></i>
+        ></i> -->
       </view>
       <swiper
         class="swiper-box"
@@ -166,7 +166,9 @@ export default {
   font-weight: bold;
   color: #da7878;
 }
-
+.ExamIndex_Box{
+	margin-right:20px;
+}
 .Exam_Total {
   font-size: 25rpx;
   color: gray;

src/pages/exam/examPaper.vue

@@ -25,6 +25,11 @@
     </van-nav-bar>
     <view class="exam-con">
       <view v-for="(item, index) in peaperDetail.Paper.GroupList" :key="index">
+		<i
+		  class="iconfont icon-caidanzu answerSheet"
+		  style="position:absolute;right:15px;top:85px;"
+		  @click="jumpAnswerSheet"
+		></i>
         <!-- 数字单选题 -->
         <SingleChoiceNumber
           :startIndex="item.startIndex"
@@ -273,6 +278,8 @@ import {
 } from "vue";
 import { getSystemInfo } from "../../utils/index";
 import { getPaperDetail } from "../../api/exam";
+import { changeNumToHan } from "../../utils/index";
+
 import SingleChoiceNumber from "../../components/subject/SingleChoiceNumber.vue";
 import SingleChoice from "../../components/subject/SingleChoice.vue";
 import MultipleChoice from "../../components/subject/MultipleChoice.vue";
@@ -328,6 +335,7 @@ export default {
       isLast: false, //用于判断是否从后往前翻
     });
     let methods = {
+	  changeNumToHan,
       jumpPage() {
         uni.navigateTo({
           url: "/pages/exam/examPaper",
@@ -361,6 +369,11 @@ export default {
         this.changeIndex--;
         this.isLast = true;
       },
+	  jumpAnswerSheet() {
+	    uni.navigateTo({
+	      url: "/pages/exam/answerSheet",
+	    });
+	  },
     };
     onMounted(() => {
       console.log(366, data.peaperDetail);
@@ -394,4 +407,9 @@ export default {
   box-sizing: border-box;
   /* padding: 0 30rpx 30rpx; */
 }
+.answerSheet {
+  font-size: 30rpx;
+  margin-left: 20rpx;
+  color: #000;
+}
 </style>