diff --git a/.DS_Store b/.DS_Store index f7fcacf..5d1d9e1 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/manifest.json b/manifest.json index fe85297..c09ce08 100644 --- a/manifest.json +++ b/manifest.json @@ -21,7 +21,8 @@ "OAuth" : {}, "Payment" : {}, "Share" : {}, - "SQLite" : {} + "SQLite" : {}, + "VideoPlayer" : {} }, /* 应用发布信息 */ "distribute" : { diff --git a/pages.json b/pages.json index 8e0bfba..f322b7a 100644 --- a/pages.json +++ b/pages.json @@ -393,6 +393,13 @@ } } }, + { + "path": "pages/im/private/call", + "name": "imPrivateCall", + "style": { + "navigationStyle": "custom" + } + }, { "path": "pages/im/private/setting", "name": "imPrivateSetting", diff --git a/pages/im/friends/group/index.vue b/pages/im/friends/group/index.vue new file mode 100644 index 0000000..047b2fb --- /dev/null +++ b/pages/im/friends/group/index.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue index b30252b..5e4a375 100644 --- a/pages/im/friends/info.vue +++ b/pages/im/friends/info.vue @@ -2,10 +2,10 @@ - + - {{ userInfo.name }} - 地址:{{ userInfo.address }} + {{userInfo.name}} + 地址:{{userInfo.address}} @@ -20,15 +20,15 @@ - + - + - + - + - + @@ -39,15 +39,21 @@ - + + + 删除好友 - + + + 发送消息 - - + + + + 视频通话 @@ -55,55 +61,68 @@ - + + + 申请好友 + + diff --git a/pages/im/group/index.vue b/pages/im/group/index.vue index 047b2fb..3d1727e 100644 --- a/pages/im/group/index.vue +++ b/pages/im/group/index.vue @@ -1,19 +1,10 @@ diff --git a/pages/im/private/index.vue b/pages/im/private/index.vue index e4dfe4b..9f5029d 100644 --- a/pages/im/private/index.vue +++ b/pages/im/private/index.vue @@ -5,21 +5,24 @@ - + - {{ item.content.content }} + {{ item.content.content }} - - - 10" - + + + 10" + {{targetId}}{{ item.sentStatus == 50 ? '已读': '未读'}} - - + + @@ -29,34 +32,36 @@ - - - - - - - - - - - + + + + + + + + + + + - - - - - - 录音中 {{transcribeTime}} s + + + + + + 录音中 {{transcribeTime}} s -