Merge branch 'test' into develop

README.md

@@ -1151,3 +1151,10 @@ fix
 update
 
 - ‘忧郁’文字  改成‘抑郁’，
+
+## v1.0.124
+
+`2024.5.13`
+update
+
+- ‘7天’，‘30天’文字  改成 ‘前7天’，‘前30天’，

src/config/models.js

@@ -8,7 +8,7 @@
 import store from "@/store";
 // 情绪模型
 const appTypeList = ['1'];
-export const VERSION_MODEL = '1.0.123F'; //版本号
+export const VERSION_MODEL = '1.0.124F'; //版本号
 export const IMAGE_URL = {
     production: 'http://zfb.ssjlai.com/web/',
     test: 'http://zfb.ssjlai.com/web/',

src/views/health/psychological/index.vue

@@ -10,9 +10,9 @@
       <div class="date-tab-con">
         <div class="date-tab-list">
           <div :class="[
-      'date-tab-item',
-      { active: current === index, notClick: false },
-    ]" @click="onTabClick(item.value, index)" v-for="(item, index) in dateList" :key="index">
+            'date-tab-item',
+            { active: current === index, notClick: false },
+          ]" @click="onTabClick(item.value, index)" v-for="(item, index) in dateList" :key="index">
             <img :src="tabImgUrl" alt v-if="index == 3" />
             <span>{{ item.text }}</span>
             <img class="more" :src="selectDownImg" alt v-if="index == 3" />
@@ -25,9 +25,9 @@
       <div class="psy-tab-con">
         <div class="psy-tab-list">
           <div :class="[
-      'psy-tab-item',
-      { active: psyCurrent === index, notClick: false },
-    ]" @click="onPsyTabClick(item.name, index)" v-for="(item, index) in psyList" :key="index">
+            'psy-tab-item',
+            { active: psyCurrent === index, notClick: false },
+          ]" @click="onPsyTabClick(item.name, index)" v-for="(item, index) in psyList" :key="index">
             <span>{{ item.text }}</span>
           </div>
         </div>
@@ -81,11 +81,11 @@
 
                 <div class="item-right">
                   <span :style="{ color: item.color }">{{
-      item.count ? item.count + "次" : "0次"
-    }}</span>
+                    item.count ? item.count + "次" : "0次"
+                  }}</span>
                   <label :style="{ color: item.color }">{{
-      item.percentage ? "(" + item.percentage + "%" + ")" : "(0%)"
-    }}</label>
+                    item.percentage ? "(" + item.percentage + "%" + ")" : "(0%)"
+                  }}</label>
                 </div>
               </div>
             </div>
@@ -103,8 +103,8 @@
 
               <div class="middle">
                 <span :style="{ color: calcResultColor(item.level) }">{{
-      item.value || "--"
-    }}</span>
+                  item.value || "--"
+                }}</span>
               </div>
 
               <div class="bottom">
@@ -146,8 +146,8 @@
               </p>
 
               <span class="font-28"><!-- 继续保持积极乐观，培养健康的生活习惯，预防消极事件对情绪带来的不良影响。 -->{{
-      advice
-    }}</span>
+                advice
+              }}</span>
             </div>
 
             <div class="friendly-reminder" v-if="emoType === 2">
@@ -169,8 +169,8 @@
                 <div class="item" v-for="(item, index) in emotionList" :key="index">
                   <p>
                     <span :style="{ color: item.color }" class="day">{{
-      item.days
-    }}</span>
+                      item.days
+                    }}</span>
                     <span class="day-text">天</span>
                   </p>
 
@@ -263,8 +263,8 @@ export default {
       // 日期选择标签
       dateList: [
         { name: "today", text: "今天", value: 0 },
-        { name: "week", text: "7天", value: 7 },
-        { name: "month", text: "30天", value: 30 },
+        { name: "week", text: "前7天", value: 7 },
+        { name: "month", text: "前30天", value: 30 },
         { name: "weekReport", text: "周报", value: 49 },
       ],
       // 情绪tab
@@ -1239,8 +1239,7 @@ export default {
       this.current = index;
       this.currentDays = value;
       this.$store.commit("tabClick", index);
-      let currentDate = new Date();
-      let leftText = value === 0 ? "今天" : value === 7 ? "7天" : "30天";
+      let currentDate = value === 0 ? new Date() : new Date(this.$dayjs().subtract(1, 'days'))
       this.surveyTitle = value === 7 ? "7天概览" : "30天概览";
       if (value === 7) {
         let dateList = this.getPostDate(currentDate, 6, true);