From b2e7b6d104b9f4597a5156459e7b0c24eda36c98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E5=86=A0=E5=AD=A6?= <1109935898@qq.com>
Date: Mon, 20 May 2024 14:53:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E7=AD=94=EF=BC=8C=E8=A2=AB=E7=94=84?=
 =?UTF-8?q?=E5=88=AB=E5=90=8E=E7=AB=8B=E5=8D=B3=E8=B7=B3=E8=BD=AC=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=EF=BC=8C=E4=B8=8D=E8=83=BD=E8=B7=B3=E8=BD=AC=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E6=98=BE=E7=A4=BA=E4=BA=86=E9=97=AE=E9=A2=98=EF=BC=8C?=
 =?UTF-8?q?=E5=BA=94=E8=AF=A5=E6=98=BE=E7=A4=BA=E8=A2=AB=E7=94=84=E5=88=AB?=
 =?UTF-8?q?=E9=A1=B5=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Answer/components/AnswerMob.vue   |  1 +
 src/views/Answer/components/AnswerPc.vue    |  1 +
 src/views/Answer/components/JumpLoading.vue | 24 +++++++++++++++++++++
 src/views/Answer/components/js/answer.js    |  3 ++-
 src/views/Answer/components/js/questions.js |  3 +--
 5 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 src/views/Answer/components/JumpLoading.vue

diff --git a/src/views/Answer/components/AnswerMob.vue b/src/views/Answer/components/AnswerMob.vue
index 8202fe95..de10fc4f 100644
--- a/src/views/Answer/components/AnswerMob.vue
+++ b/src/views/Answer/components/AnswerMob.vue
@@ -52,6 +52,7 @@
                 :survey="questionsData.survey"
                 isAnswer/>
       </div>
+      <JumpLoading v-else-if="[-20004, -20011, -20016].includes(questionsData.action?.code)" />
       <!-- 密码 -->
       <div v-else-if="questionsData.action?.code === 20015" class="action">
         <password :sn="$route.query.sn" @success="getQuetions" isMobile />
diff --git a/src/views/Answer/components/AnswerPc.vue b/src/views/Answer/components/AnswerPc.vue
index efa9b5c7..6bbaa811 100644
--- a/src/views/Answer/components/AnswerPc.vue
+++ b/src/views/Answer/components/AnswerPc.vue
@@ -37,6 +37,7 @@
                 :survey="questionsData.survey"
                 isAnswer/>
       </div>
+      <JumpLoading v-else-if="[-20004, -20011, -20016].includes(questionsData.action?.code)" />
       <!-- 密码 -->
       <div v-else-if="questionsData.action?.code === 20015" class="action">
         <password :sn="$route.query.sn" @success="getQuetions" />
diff --git a/src/views/Answer/components/JumpLoading.vue b/src/views/Answer/components/JumpLoading.vue
new file mode 100644
index 00000000..cf38dff9
--- /dev/null
+++ b/src/views/Answer/components/JumpLoading.vue
@@ -0,0 +1,24 @@
+<script setup>
+import { inject, onBeforeUnmount } from 'vue'
+
+
+const questionsData = inject('questionsData') // 问卷数据
+
+let timer = setTimeout(() => {
+  questionsData.value.action.code = -1 * questionsData.value.action.code
+  timer = null
+}, 5e3)
+
+onBeforeUnmount(() => timer && clearTimeout(timer))
+</script>
+
+<template>
+  <a-spin :spinning="true" class="jump-loading-page"></a-spin>
+</template>
+
+<style scoped lang="scss">
+.jump-loading-page {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/src/views/Answer/components/js/answer.js b/src/views/Answer/components/js/answer.js
index c0e60bf4..a73e1c3d 100644
--- a/src/views/Answer/components/js/answer.js
+++ b/src/views/Answer/components/js/answer.js
@@ -5,13 +5,14 @@ import QuestionsMob from "../QuestionsMob.vue";
 import PfeButton from "../../../../components/PfeButton.vue";
 import QLast from "../../questions/QLast.vue";
 import Password from "../../questions/Password/Index.vue";
+import JumpLoading from '../JumpLoading.vue'
 
 import LangTranslate from "../LangTranslate.vue";
 import { getLanguage } from "../../components/js/language";
 import {useStore} from "vuex";
 
 export default defineComponent({
-  components: { QuestionsPc, QuestionsMob, PfeButton, QLast, Password, LangTranslate },
+  components: { QuestionsPc, QuestionsMob, PfeButton, QLast, Password, LangTranslate, JumpLoading },
   props: {
     // 是否移动端
     isMobile: {
diff --git a/src/views/Answer/components/js/questions.js b/src/views/Answer/components/js/questions.js
index 454b1755..b66bdc6b 100644
--- a/src/views/Answer/components/js/questions.js
+++ b/src/views/Answer/components/js/questions.js
@@ -731,8 +731,7 @@ export default defineComponent({
 
       // 跳转链接
       if (countTime <= 0 && url) {
-        page.value += 2; // 防止 QuestionsMob QuestionPc 组件里显示最后一页
-        questionsData.value.action.code = 9999999; // 防止 AnswerMob AnswerPc 组件里显示最后一页
+        questionsData.value.action.code = -1 * code; // 防止 AnswerMob AnswerPc 组件里显示最后一页
 
         url = url.replaceAll('#sn#', questionsData.value.answer.sn);
         url = url.replaceAll('#user#', questionsData.value.answer.respondent);