Merge branch 'feat' into test

README.md

@@ -685,4 +685,9 @@ 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.85F'; //版本号
+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/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}`)

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