Merge branch 'merge-master'

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-08-21 10:29:15
+ * @LastEditTime: 2023-09-18 10:51:40
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -680,3 +680,14 @@ update
 `2023.8.21`
 update
 - 增加 区分心里健康接口正式环境和测试环境
+
+
+## v1.0.85
+`2023.9.16`
+update
+- 修改 返回随手精灵的地址
+
+## v1.0.86
+`2023.9.18`
+update
+- 增加 建模答题错误提示弹窗

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.84F'; //版本号
+export const VERSION_MODEL = '1.0.86F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

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);
         }

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);
             }
@@ -173,18 +173,18 @@ 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) {
                     // 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 ? 'device' : ''}`);
                 }
 			} else {
 				this.$toast(re.msg)
             }
-            setTimeout(() => {
-                this.isSHowPage = true;
-            }, 800)
 		},
 		toQuestion() {
 			this.$router.replace(`/PsychologicalQuestionnaire?uid=${this.uid}`)

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) {