Merge branch 'develop' into test

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 && re.response.progress === 1) {
                     // 2023.6.1 需求变更，建模完成直接跳到心理健康汇总页面
                     this.$router.push(`/psychologicalMain?uid=${this.uid}`);
                 } else {