From 09f6f3c48ed3b4cda1ec9c64b1c353fec1520eea Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Sat, 16 Sep 2023 09:26:39 +0800 Subject: [PATCH 1/3] =?UTF-8?q?update=20-=20=E4=BF=AE=E6=94=B9=20=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=9A=8F=E6=89=8B=E7=B2=BE=E7=81=B5=E7=9A=84=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 10 ++++++++-- src/config/models.js | 2 +- src/views/health/psychological-main/index.vue | 2 +- src/views/psychological-modeling/index.vue | 2 +- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 292072a..6b86a5d 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ @@ -679,4 +679,10 @@ update ## v1.0.84 `2023.8.21` update -- 增加 区分心里健康接口正式环境和测试环境 \ No newline at end of file +- 增加 区分心里健康接口正式环境和测试环境 + + +## v1.0.85 +`2023.9.16` +update +- 修改 返回随手精灵的地址 \ No newline at end of file diff --git a/src/config/models.js b/src/config/models.js index c894922..918b36f 100644 --- a/src/config/models.js +++ b/src/config/models.js @@ -5,7 +5,7 @@ * @FilePath: \TelpoH5FrontendWeb\src\config\models.js * @description: */ -export const VERSION_MODEL = '1.0.84F'; //版本号 +export const VERSION_MODEL = '1.0.85F'; //版本号 export const IMAGE_URL = { production: 'http://zfb.ssjlai.com/web/', test: 'http://zfb.ssjlai.com/web/', diff --git a/src/views/health/psychological-main/index.vue b/src/views/health/psychological-main/index.vue index 177aee1..17a4531 100644 --- a/src/views/health/psychological-main/index.vue +++ b/src/views/health/psychological-main/index.vue @@ -145,7 +145,7 @@ export default { }, onNavBack() { if(this.isShowLeft) { - window.location.href = `${this.$route.query.fromUrl}/#/device`; + window.location.href = `${this.$route.query.fromUrl}/#/${ this.$route.query.fromMenu || 'device'}`; } else { this.$router.go(-1); } diff --git a/src/views/psychological-modeling/index.vue b/src/views/psychological-modeling/index.vue index 74fba13..55d591e 100644 --- a/src/views/psychological-modeling/index.vue +++ b/src/views/psychological-modeling/index.vue @@ -151,7 +151,7 @@ export default { let fromSsjl = this.$store.getters.fromSsjl === 'true'; if(fromSsjl) { let baseUrl = this.fromUrl; - window.location.href = `${baseUrl}/#/device`; + window.location.href = `${baseUrl}/#/${ this.$route.query.fromMenu || 'device'}`; } else { this.$router.go(-1); } From 3d093128bbb10d3bc53fc5f4ca39f274eccd2238 Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Sat, 16 Sep 2023 10:20:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?update=20-=20=E4=BF=AE=E6=94=B9=20=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E9=9A=8F=E6=89=8B=E7=B2=BE=E7=81=B5=E7=9A=84=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= 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 55d591e..d405fde 100644 --- a/src/views/psychological-modeling/index.vue +++ b/src/views/psychological-modeling/index.vue @@ -177,7 +177,7 @@ export default { this.$toast('用户不存在或未绑定手表') } else if (re.response && re.response.initScaleState === 1 && re.response.progress === 1 && !this.autoJump) { // 2023.6.1 需求变更，建模完成直接跳到心理健康汇总页面 - this.$router.replace(`/psychologicalMain?uid=${this.uid}&fromUrl=${this.fromUrl || ''}`); + this.$router.replace(`/psychologicalMain?uid=${this.uid}&fromUrl=${this.fromUrl || ''}&fromMenu=${ this.showLeftArrow ? 'health' : ''}`); } } else { this.$toast(re.msg) From 6e27bc1d5b71e5c8579084a0e988d084eb5181f8 Mon Sep 17 00:00:00 2001 From: JinxChen <2183691628@qq.com> Date: Mon, 18 Sep 2023 10:47:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?update=20-=20=E5=A2=9E=E5=8A=A0=20=E5=BB=BA?= =?UTF-8?q?=E6=A8=A1=E7=AD=94=E9=A2=98=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 7 ++++++- src/config/models.js | 4 ++-- src/views/psychological-modeling/index.vue | 6 +++--- src/views/psychological-questionnaire/index.vue | 6 +++++- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 6b86a5d..5e1a825 100644 --- a/README.md +++ b/README.md @@ -685,4 +685,9 @@ update ## v1.0.85 `2023.9.16` update -- 修改 返回随手精灵的地址 \ No newline at end of file +- 修改 返回随手精灵的地址 + +## v1.0.86 +`2023.9.18` +update +- 增加 建模答题错误提示弹窗 \ No newline at end of file diff --git a/src/config/models.js b/src/config/models.js index 918b36f..10c2755 100644 --- a/src/config/models.js +++ b/src/config/models.js @@ -1,11 +1,11 @@ /* * @Date: 2021-11-20 10:26:39 * @LastEditors: JinxChen - * @LastEditTime: 2023-08-15 10:55:03 + * @LastEditTime: 2023-09-18 10:45:59 * @FilePath: \TelpoH5FrontendWeb\src\config\models.js * @description: */ -export const VERSION_MODEL = '1.0.85F'; //版本号 +export const VERSION_MODEL = '1.0.86F'; //版本号 export const IMAGE_URL = { production: 'http://zfb.ssjlai.com/web/', test: 'http://zfb.ssjlai.com/web/', diff --git a/src/views/psychological-modeling/index.vue b/src/views/psychological-modeling/index.vue index d405fde..938fbd0 100644 --- a/src/views/psychological-modeling/index.vue +++ b/src/views/psychological-modeling/index.vue @@ -173,6 +173,9 @@ export default { }, ssjlToken) if (re.success) { this.info = re.response + setTimeout(() => { + this.isSHowPage = true; + }, 800) if (re.response && re.response.state === -1) { this.$toast('用户不存在或未绑定手表') } else if (re.response && re.response.initScaleState === 1 && re.response.progress === 1 && !this.autoJump) { @@ -182,9 +185,6 @@ export default { } else { this.$toast(re.msg) } - setTimeout(() => { - this.isSHowPage = true; - }, 800) }, toQuestion() { this.$router.replace(`/PsychologicalQuestionnaire?uid=${this.uid}`) diff --git a/src/views/psychological-questionnaire/index.vue b/src/views/psychological-questionnaire/index.vue index b5761a0..798d0ec 100644 --- a/src/views/psychological-questionnaire/index.vue +++ b/src/views/psychological-questionnaire/index.vue @@ -206,7 +206,11 @@ export default { window.history.back(-1) }, 3000) } else { - this.$toast(re.msg) + //this.$toast(re.msg); + this.$dialog.confirm({ + message: re.msg, + showCancelButton: false, + }); } }, onRadio(index, value) {