Merge branch 'develop' into test

README.md

@@ -447,4 +447,12 @@ update
 update
 - 心理监测详情页面
     - 优化 图表显示内容，两边增加留白区域
-    - 优化 7天和30天图表圆角柱形图展示
+    - 优化 7天和30天图表圆角柱形图展示
+
+## v1.0.55
+`2023.5.31`
+update
+- 心理监测详情页面
+    - 增加 动态填充uid
+- 问卷调查页面
+    - 修复 toast无限加载的问题

src/config/models.js

@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.54F'; //版本号
+export const VERSION_MODEL = '1.0.55F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/health/psychological/index.vue

@@ -309,6 +309,7 @@ export default {
             ],
             // 选中的日历日期
             selectDate: '',
+            uid: ''
         };
     },
     computed: {
@@ -630,6 +631,7 @@ export default {
             if (params) {
                 this.emoName = EmotionModel[params.name].name;
                 this.emoType = EmotionModel[params.name].type;
+                this.uid = params.uid;
                 console.log("当前情绪是", EmotionModel[params.name].name);
             }
         },
@@ -637,7 +639,7 @@ export default {
         getCalendarData() {
             let reqUrl = `https://dbmq.rzliot.com/heart/api/Data/GetCalendarData`;
             let reqParams = {
-                uid: "tenghao",
+                uid: this.uid,
                 month: this.$dayjs(new Date()).format('YYYY-MM')
             };
             axios.get(reqUrl, {
@@ -672,7 +674,7 @@ export default {
                 ? this.$dayjs(date).format("YYYY-MM-DD")
                 : this.$dayjs(this.defaultDate).format("YYYY-MM-DD") /* "2023-05-23" */;
             let reqParams = {
-                uid: "tenghao",
+                uid: this.uid,
                 startDate: reqDate,
                 endDate: reqDate,
                 type: this.emoType

src/views/psychological-questionnaire/index.vue

@@ -177,7 +177,7 @@ export default {
 				}
 			} else {
 				this.$toast(re.msg)
-			}
+            }
 		},
 		async submit() {
 			let temp = {
@@ -226,7 +226,7 @@ export default {
 				this.$toast.loading({
 					message: '',
 					forbidClick: true,
-					duration: 0,
+					duration: 1500,
 				})
 			}, 100)
 			let baseUrl = 'https://dbmq.rzliot.com/heart'