Skip to content
This repository was archived by the owner on Aug 11, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
126 changes: 63 additions & 63 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"vuex": "^3.6.2"
},
"devDependencies": {
"@babel/core": "^7.21.4",
"@babel/core": "^7.21.5",
"@babel/eslint-parser": "^7.21.3",
"@vue/cli-plugin-babel": "~5.0.0",
"@vue/cli-plugin-eslint": "~5.0.0",
Expand Down
2 changes: 1 addition & 1 deletion src/components/MessageArea/MessageArea.vue
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ export default {
},
filters: {
timeFormater(time) {
return date.convertTime(time);
return date.wrapSendTime(time);
},
},
mounted() {
Expand Down
2 changes: 2 additions & 0 deletions src/components/MessageArea/MessageBottomInputArea.vue
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ const emojiData = require("@/assets/emoji.json");
import { mapGetters, mapState } from "vuex";
import { messageType2wsType } from "@/utils/common";
import { API_BASE_URL, FILE_UPLOAD_API_URL } from "@/config/api";
import date from "@/utils/date";
export default {
name: "MessageBottomInputArea",
data() {
Expand Down Expand Up @@ -119,6 +120,7 @@ export default {
name,
ws_type: messageType2wsType(contentType, this.isGroup),
contentType,
updateTime: date.getCurrentTime(),
content,
url,
size,
Expand Down
2 changes: 1 addition & 1 deletion src/utils/date.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import dayjs from "dayjs";
export default {
getCurrentTime: () => {
return dayjs().add(8, "h").format("YYYY-MM-DD HH:mm:ss");
return dayjs().format("YYYY-MM-DD HH:mm:ss");
},
convertTime: (time) => {
return dayjs(time).add(-8, "h").format("YYYY-MM-DD HH:mm:ss");
Expand Down