From f075cdab9744ce010ecb29eed1616ca5381e51f7 Mon Sep 17 00:00:00 2001
From: steven <844541199@qq.com>
Date: Tue, 8 Nov 2022 15:30:52 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=A2=84=E8=A7=88=E9=80=BB=E8=BE=91bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/Layouts/BaseLayout.vue | 17 +++++----
src/views/Answer/components/PreviewLayout.vue | 36 +++++++++++++++++--
src/views/Answer/components/js/mock.js | 10 +++++-
src/views/Answer/questions/QConsent.vue | 7 +++-
src/views/Answer/questions/high/QMXD.vue | 12 +++----
5 files changed, 65 insertions(+), 17 deletions(-)
diff --git a/src/Layouts/BaseLayout.vue b/src/Layouts/BaseLayout.vue
index e8f35fe7..5d3a858a 100644
--- a/src/Layouts/BaseLayout.vue
+++ b/src/Layouts/BaseLayout.vue
@@ -222,12 +222,15 @@ const toPage = (path, title) => {
document.title = title;
};
-const toPreview = () => {
- router.push({
- path: "/preview",
- query: route.query,
- });
- document.title = name;
+const toPreview = async () => {
+ var res = await canPlanetPublish(route.query.sn);
+ if (res) {
+ router.push({
+ path: "/preview",
+ query: route.query,
+ });
+ document.title = name;
+ }
};
const openPublishModal = async () => {
@@ -238,7 +241,7 @@ const openPublishModal = async () => {
visible.value = true;
return;
}
-
+
// //console.log();
// // return;
// let isFb = true;
diff --git a/src/views/Answer/components/PreviewLayout.vue b/src/views/Answer/components/PreviewLayout.vue
index 7b357123..506b6ce0 100644
--- a/src/views/Answer/components/PreviewLayout.vue
+++ b/src/views/Answer/components/PreviewLayout.vue
@@ -70,13 +70,24 @@
-
+
+

+
感谢您的反馈,期待您下次参与
+
+
-
+
+

+
感谢您的反馈,期待您下次参与
+
+
@@ -538,6 +549,27 @@ export default defineComponent({
}
}
+.action {
+ padding-top: 99px;
+ text-align: center;
+ background-size: 224px 118px;
+ background-repeat: no-repeat;
+ background-position: calc(100% - 10px) 24px;
+ background-image: url("../../../assets/img/answer/pc-bg.png");
+
+ img {
+ width: 200px;
+ height: 150px;
+ margin-bottom: 12px;
+ }
+
+ .msg {
+ font-size: 16px;
+ color: #70b936;
+ line-height: 24px;
+ }
+}
+
.container {
height: 100%;
}
diff --git a/src/views/Answer/components/js/mock.js b/src/views/Answer/components/js/mock.js
index 66b0be6d..45698c5a 100644
--- a/src/views/Answer/components/js/mock.js
+++ b/src/views/Answer/components/js/mock.js
@@ -1,5 +1,4 @@
import getlogicStatus from "./logical";
-const questions = {}
// 更新code
function updateCode(action, skipQuestionIndex) {
@@ -103,5 +102,14 @@ export default function answerMock(questionsData, page) {
data.action.code = 20011;
data.action.msg = "成功结束页";
}
+ // 拒绝知情同意书
+ const refuseIndex = questionsData.questions.findIndex(
+ (question) => question.question_type === 23 && question.answer.value === "2"
+ );
+ if (refuseIndex !== -1) {
+ data.action.code = 20013;
+ data.action.msg = "不同意继续参与,已结束作答";
+ }
+ // 返回数据
return data;
}
diff --git a/src/views/Answer/questions/QConsent.vue b/src/views/Answer/questions/QConsent.vue
index 56f6b104..c100ad72 100644
--- a/src/views/Answer/questions/QConsent.vue
+++ b/src/views/Answer/questions/QConsent.vue
@@ -12,7 +12,12 @@
{{
config.disagree_button_text
}}
- {{ config.agree_button_text }}({{ time }}s)
diff --git a/src/views/Answer/questions/high/QMXD.vue b/src/views/Answer/questions/high/QMXD.vue
index d8d21ba6..de5a7336 100644
--- a/src/views/Answer/questions/high/QMXD.vue
+++ b/src/views/Answer/questions/high/QMXD.vue
@@ -320,12 +320,12 @@ export default defineComponent({
// 下一页
function next() {
// 作答模式下不进行选择判断
- if (!props.isAnswer) {
- if (page.value === pages.value) {
- return context.emit("next");
- }
- return (page.value += 1);
- }
+ // if (!props.isAnswer) {
+ // if (page.value === pages.value) {
+ // return context.emit("next");
+ // }
+ // return (page.value += 1);
+ // }
// 当前页答案
const currentOptions = allOptions.value[page.value - 1];
if (currentOptions.findIndex((option) => option.value === "b") === -1) {