Sfoglia il codice sorgente

扫描二维码后,文字加icon勾

Michael Wang 3 anni fa
parent
commit
c4016dde3d

+ 6 - 2
src/features/OnlineExam/Examing/TextQuestionView.vue

@@ -427,9 +427,13 @@ function photosReseted(urls: string[]) {
                   isAudioAnswerType ? "录音" : "拍照"
                 }},并上传文件。
               </div>
-              <div v-if="qrScanned" style="margin-top: 30px; font-size: 30px">
+              <div
+                v-if="qrScanned"
+                class="tw-flex tw-items-center"
+                style="margin-top: 30px; font-size: 30px"
+              >
                 {{ examQuestion.studentAnswer ? "已上传" : "已扫描" }}
-                <n-icon :componet="Checkmark" />
+                <n-icon :component="Checkmark" />
               </div>
             </div>
           </div>

+ 17 - 6
src/features/OnlineExam/Examing/UploadPhotos.vue

@@ -5,7 +5,7 @@ import "viewerjs/dist/viewer.css";
 import Viewer from "viewerjs";
 import { watch } from "vue";
 import { store } from "@/store/store";
-import { Eye, TrashOutline } from "@vicons/ionicons5";
+import { Eye, TrashOutline, Checkmark } from "@vicons/ionicons5";
 
 const props = defineProps<{
   defaultList: string[];
@@ -102,7 +102,10 @@ function modalCloseClicked() {
         "检测到二维码被扫描,但是图片未上传。关闭此窗口后,将不再接受小程序图片上传。",
       positiveText: "确定关闭",
       negativeText: "取消关闭",
-      onPositiveClick: () => (uploadModalVisible = false),
+      onPositiveClick: () => {
+        uploadModalVisible = false;
+        return true;
+      },
       onNegativeClick: () => undefined,
     });
     return;
@@ -196,19 +199,23 @@ function prepareUpload() {
             :value="qrValue"
             :options="{ width: 200 }"
             :style="{
-              'margin-left': '-10px',
+              margin: '-10px',
               filter: totalList.length >= 6 ? 'blur(10px)' : 'none',
             }"
           />
-          <div style="font-size: 24px; margin-top: 10px">
+          <div style="font-size: 24px; margin-top: -5px; margin-left: 20px">
             <div>
               请使用<span style="font-weight: 900; color: #1e90ff">微信</span
               >扫描二维码后,在微信小程序上拍照,并上传文件。<br />
               上传期间,请勿关闭二维码。
             </div>
-            <div v-if="qrScanned" style="margin-top: 30px; font-size: 30px">
+            <div
+              v-if="qrScanned"
+              class="tw-flex tw-items-center"
+              style="margin-top: 30px; font-size: 30px"
+            >
               {{ uploaded ? "已上传" : "已扫描" }}
-              <n-icon type="md-checkmark" />
+              <n-icon :component="Checkmark" />
             </div>
           </div>
         </div>
@@ -299,4 +306,8 @@ function prepareUpload() {
   cursor: pointer;
   margin: 0 2px;
 }
+
+.total-images {
+  height: 110px;
+}
 </style>