theluyuan/demingshangjia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'xbx' (#39) from xbx into master

Browse Source 
Reviewed-on: http://git.luyuan.tk/luyuan/demingshangjia/pulls/39
This commit is contained in:
luyuan 2020-08-11 18:28:33 +08:00
commit 5500dc9f73
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pages/messages/messagesList.vue
View File

@ -113,10 +113,7 @@
font-size: 26rpx; font-size: 26rpx;
color: #666666; color: #666666;
height: 30rpx; height: 30rpx;
height: 30rpx; line-height: 30rpx;
overflow:hidden; //超出的文本隐藏
text-overflow:ellipsis; //用省略号显示
white-space:nowrap; //不换行
} }
.times{ .times{
position: absolute; position: absolute;

12
static/imservice.js
View File

@ -299,7 +299,8 @@ IMService.prototype.initialIMListeners = function () {
friend.text = message.type != "text" ? "其他消息" : message.payload.text friend.text = message.type != "text" ? "其他消息" : message.payload.text
let time = new Date(message.timestamp) let time = new Date(message.timestamp)
friend.date = message.timestamp friend.date = message.timestamp
friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds() friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
console.log(that.friends) console.log(that.friends)
that.friendsarr = [] that.friendsarr = []
for(let i in that.friends){ for(let i in that.friends){
@ -325,7 +326,8 @@ IMService.prototype.initialIMListeners = function () {
friend.text = message.type != "text" ? "其他消息" : message.payload.text friend.text = message.type != "text" ? "其他消息" : message.payload.text
let time = new Date(message.timestamp) let time = new Date(message.timestamp)
friend.date = message.timestamp friend.date = message.timestamp
friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds() friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
console.log(this.friends) console.log(this.friends)
that.friendsarr = [] that.friendsarr = []
for(let i in this.friends){ for(let i in this.friends){
@ -424,7 +426,8 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
friend.text = message friend.text = message
let time = new Date() let time = new Date()
friend.date = time.getTime() friend.date = time.getTime()
friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds() friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
console.log(that.friends) console.log(that.friends)
that.friendsarr = [] that.friendsarr = []
for(let i in that.friends){ for(let i in that.friends){
@ -448,7 +451,8 @@ IMService.prototype.sendMessagesSetStorage = function (friendId,message){
friend.text = message friend.text = message
let time = new Date() let time = new Date()
friend.date = time.getTime() friend.date = time.getTime()
friend.time = time.getHours() + ":" + time.getMinutes() + ":" + time.getSeconds() friend.time = (time.getHours() < 10 ? '0' + time.getHours() : time.getHours()) + ":" + (time.getMinutes() < 10 ? '0' + time.getMinutes() : time.getMinutes()) + ":" + (time.getSeconds() < 10 ? '0' + time.getSeconds() : time.getSeconds())
console.log(this.friends) console.log(this.friends)
that.friendsarr = [] that.friendsarr = []
for(let i in this.friends){ for(let i in this.friends){