Merge branch 'test' into develop

README.md

@@ -1,7 +1,7 @@
 <!--
  * @Date: 2022-08-17 16:19:13
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-10-30 10:07:43
+ * @LastEditTime: 2023-11-02 09:12:50
  * @FilePath: \TelpoH5FrontendWeb\README.md
  * @description: 项目说明
 -->
@@ -762,4 +762,12 @@ fix
 `2023.10.30`
 fix
 - 话费查询
-    - 修复 异步问题导致首次进入页面白屏的问题
+    - 修复 异步问题导致首次进入页面白屏的问题
+
+
+## v1.0.96
+`2023.11.2`
+update
+- 心理监测详情
+    - 修改 温馨提示语
+- 新增 一个周报/月报页面

src/config/models.js

@@ -1,11 +1,11 @@
 /*
  * @Date: 2021-11-20 10:26:39
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-10-30 10:07:56
+ * @LastEditTime: 2023-11-02 09:12:59
  * @FilePath: \TelpoH5FrontendWeb\src\config\models.js
  * @description:
  */
-export const VERSION_MODEL = '1.0.95F'; //版本号
+export const VERSION_MODEL = '1.0.96F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/health/psychological/index.vue

@@ -615,7 +615,8 @@ export default {
             return `${today}${this.emoName}数据图`;
         },
         warmTips() {
-            return `正常连续佩戴手表，每半小时计算一个${this.emoName}分值，睡眠期间不进行计算。`
+            return `正常连续佩戴腕表，每半小时计算一个${this.emoName}分值。`;
+            /* return `正常连续佩戴手表，每半小时计算一个${this.emoName}分值，睡眠期间不进行计算。` */
         },
         title1() {
             return EmotionModel[this.params.name].title1;

src/views/health/psychological/report.scss

@@ -0,0 +1,21 @@
+.report{
+    height: 100vh;
+    width: 100%;
+    overflow: hidden;
+    background-color: #fff;
+    .main {
+        height: calc(100vh - 45px);
+        overflow: scroll;
+        padding: 5px 15px;
+        h5 {
+            font-size: 16px;
+        }
+        .overall-rating {
+            display: flex;
+            justify-content: flex-start;
+            align-items: flex-start;
+            flex-direction: column;
+            font-size: 14px;
+        }
+    }
+}

src/views/health/psychological/report.vue

@@ -1,18 +1,35 @@
 <!--
  * @Date: 2023-10-30 11:30:22
  * @LastEditors: JinxChen
- * @LastEditTime: 2023-10-30 11:40:51
+ * @LastEditTime: 2023-10-30 15:56:20
  * @FilePath: \TelpoH5FrontendWeb\src\views\health\psychological\report.vue
  * @description:
 -->
 <template>
     <!-- 周/月报 -->
     <div class="report">
-        <van-nav-bar title="心理周报" :border="true"  :left-arrow="true" @click-left="onNavBack">
+        <van-nav-bar title="心理监测周报" :border="true"  :left-arrow="true" @click-left="onNavBack">
             <template #left>
                 <van-icon name="arrow-left" size="24" style="padding: 0"/>
             </template>
         </van-nav-bar>
+        <div class="main">
+            <!-- 总评 -->
+            <div class="overall-rating">
+                <h5>本周总评:</h5>
+                <p>轻度抑郁倾向</p>
+                <p>监测次数: 20次</p>
+                <p>发发发发发个规格egg嘎嘎</p>
+            </div>
+            <!-- 趋势对比-饼状图 -->
+            <div class="pie-chart"></div>
+            <!-- 数据图-柱形图 -->
+            <div class="bar-chart "></div>
+            <!-- 建议 -->
+            <div class="advise"></div>
+            <!-- 概览 -->
+            <div class="overview"></div>
+        </div>
     </div>
 </template>
 
@@ -31,6 +48,6 @@ export default {
 }
 </script>
 
-<style scoped>
-
+<style scoped lang="scss">
+@import "./report.scss";
 </style>