Merge branch 'feat' into test

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)