From 35323c8a1228de407d0a2365570bd2c3c51c2923 Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Thu, 1 Jun 2023 18:19:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=BB=BA=E6=A8=A1?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/psychological-modeling/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/psychological-modeling/index.vue b/src/views/psychological-modeling/index.vue index 403c6ed..4e53f71 100644 --- a/src/views/psychological-modeling/index.vue +++ b/src/views/psychological-modeling/index.vue @@ -107,7 +107,7 @@ export default { if (re.success) { if (re.response && re.response.state === -1) { this.$toast('用户不存在或未绑定手表') - } else if (re.response && re.response.state === 1) { + } else if (re.response && re.response.initScaleState === 1) { // 2023.6.1 需求变更，建模完成直接跳到心理健康汇总页面 this.$router.push(`/psychologicalMain?uid=${this.uid}`); } else { From b19e37f2297d32a5594bbf2bb499cc6aa50a5eb4 Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Thu, 1 Jun 2023 18:21:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20=E4=BD=A9=E6=88=B4?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E7=8A=B6=E6=80=81=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/psychological-modeling/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/psychological-modeling/index.vue b/src/views/psychological-modeling/index.vue index 4e53f71..3165538 100644 --- a/src/views/psychological-modeling/index.vue +++ b/src/views/psychological-modeling/index.vue @@ -107,7 +107,7 @@ export default { if (re.success) { if (re.response && re.response.state === -1) { this.$toast('用户不存在或未绑定手表') - } else if (re.response && re.response.initScaleState === 1) { + } else if (re.response && re.response.initScaleState === 1 && re.response.progress === 1) { // 2023.6.1 需求变更，建模完成直接跳到心理健康汇总页面 this.$router.push(`/psychologicalMain?uid=${this.uid}`); } else {