diff --git a/README.md b/README.md index b8fac85..594c937 100644 --- a/README.md +++ b/README.md @@ -1151,3 +1151,10 @@ fix update - ‘忧郁’文字 改成‘抑郁’, + +## v1.0.124 + +`2024.5.13` +update + +- ‘7天’,‘30天’文字 改成 ‘前7天’,‘前30天’, diff --git a/src/config/models.js b/src/config/models.js index f1af03d..2772976 100644 --- a/src/config/models.js +++ b/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/', diff --git a/src/views/health/psychological/index.vue b/src/views/health/psychological/index.vue index bc291b7..a67b981 100644 --- a/src/views/health/psychological/index.vue +++ b/src/views/health/psychological/index.vue @@ -10,9 +10,9 @@
+ 'date-tab-item', + { active: current === index, notClick: false }, + ]" @click="onTabClick(item.value, index)" v-for="(item, index) in dateList" :key="index"> {{ item.text }} @@ -25,9 +25,9 @@
+ 'psy-tab-item', + { active: psyCurrent === index, notClick: false }, + ]" @click="onPsyTabClick(item.name, index)" v-for="(item, index) in psyList" :key="index"> {{ item.text }}
@@ -81,11 +81,11 @@
{{ - item.count ? item.count + "次" : "0次" - }} + item.count ? item.count + "次" : "0次" + }} + item.percentage ? "(" + item.percentage + "%" + ")" : "(0%)" + }}
@@ -103,8 +103,8 @@
{{ - item.value || "--" - }} + item.value || "--" + }}
@@ -146,8 +146,8 @@

{{ - advice - }} + advice + }}
@@ -169,8 +169,8 @@

{{ - item.days - }} + item.days + }}

@@ -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);