From 8d5115c2cdbbf7f83b4b7d18240d0432dcb67bef Mon Sep 17 00:00:00 2001
From: JinxChen <2183691628@qq.com>
Date: Wed, 28 Jun 2023 14:17:31 +0800
Subject: [PATCH] =?UTF-8?q?update=20-=20=E5=BF=83=E7=90=86=E7=9B=91?=
 =?UTF-8?q?=E6=B5=8B=E9=A6=96=E9=A1=B5=20=20=20=20=20-=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=20=E8=B7=AF=E7=94=B1=E4=BC=A0=E5=8F=82=E9=9D=9E?=
 =?UTF-8?q?=E7=A9=BA=E5=88=A4=E6=96=AD=E7=9A=84=E9=97=AE=E9=A2=98=20=20=20?=
 =?UTF-8?q?=20=20-=20=E4=BC=98=E5=8C=96=20=E6=97=A5=E6=9C=9F=E4=BC=A0?=
 =?UTF-8?q?=E5=8F=82=EF=BC=8C=E5=BD=93=E8=B7=AF=E7=94=B1=E5=AD=98=E5=9C=A8?=
 =?UTF-8?q?date=E5=8F=82=E6=95=B0=E5=B9=B6=E4=B8=94=E5=9C=A8=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=80=89=E4=B8=AD=E6=9C=89=E6=97=A5=E6=9C=9F=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E8=B7=AF=E7=94=B1=E7=9A=84=E6=97=A5=E6=9C=9F=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=8F=98=E6=88=90=E9=80=89=E4=B8=AD=E7=9A=84=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F=20=20=20=20=20-=20=E4=BF=AE=E6=94=B9=20=E6=97=A5?=
 =?UTF-8?q?=E5=8E=86=E7=BB=84=E4=BB=B6=E7=9A=84=E9=AB=98=E5=BA=A6=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     | 13 +++++++++++--
 src/config/models.js                          |  2 +-
 src/views/health/psychological-main/index.vue |  5 +++--
 src/views/health/psychological/index.vue      |  3 ++-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index b6f1808..fabf38c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-06-25 16:08:26
+ * @LastEditTime: 2023-06-28 14:16:35
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -553,4 +553,13 @@ update
 `2023.6.27`
 fix
 - 心理监测首页
-    - 修复 从详情页面返回重新进入详情页面参数传递错误的问题
\ No newline at end of file
+    - 修复 从详情页面返回重新进入详情页面参数传递错误的问题
+
+
+## v1.0.70
+`2023.6.28`
+update
+- 心理监测首页
+    - 优化 路由传参非空判断的问题
+    - 优化 日期传参，当路由存在date参数并且在详情选中有日期时，路由的日期参数变成选中的日期
+    - 修改 日历组件的高度样式
\ No newline at end of file
diff --git a/src/config/models.js b/src/config/models.js
index f671175..88f7853 100644
--- a/src/config/models.js
+++ b/src/config/models.js
@@ -5,7 +5,7 @@
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.69F'; //版本号
+export const VERSION_MODEL = '1.0.70F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',
diff --git a/src/views/health/psychological-main/index.vue b/src/views/health/psychological-main/index.vue
index 9d517dc..daee65c 100644
--- a/src/views/health/psychological-main/index.vue
+++ b/src/views/health/psychological-main/index.vue
@@ -42,6 +42,7 @@
 
 <script>
 import axios from "axios";
+import { isNotNull} from "@/utils/index";
 export default {
   name: 'psychologicalMain',
   data(){
@@ -59,7 +60,7 @@ export default {
   },
   computed: {
     isShowLeft() {
-        return this.$route.query.fromUrl !== undefined;
+        return isNotNull(this.$route.query.fromUrl);
     }
   },
   created() {
@@ -117,7 +118,7 @@ export default {
         })
     },
     onNavBack() {
-        if(this.isShowLeft && this.$route.query.fromUrl !== undefined) {
+        if(this.isShowLeft) {
             window.location.href = `${this.$route.query.fromUrl}/#/device`;
         } else {
             this.$router.go(-1);
diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue
index cca2ee6..aff4231 100644
--- a/src/views/health/psychological/index.vue
+++ b/src/views/health/psychological/index.vue
@@ -1000,6 +1000,7 @@ export default {
         //   返回
         onNavBack() {
             this.params.name = '';
+            this.params.date = this.selectDate || this.params.date;
             this.$router.replace({
                 name: 'psychologicalMain',
                 query: {
@@ -1154,7 +1155,7 @@ export default {
    /*  height: 300px; */
     overflow: scroll;
     .van-calendar {
-        height: 300px;
+        height: 350px;
         .van-calendar__days .van-calendar__day {
             width: 27px;
             height: 27px;