diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..66544f0 Binary files /dev/null and b/.DS_Store differ diff --git a/apis/interfaces/im.js b/apis/interfaces/im.js index e8fa10c..4c6c9b0 100644 --- a/apis/interfaces/im.js +++ b/apis/interfaces/im.js @@ -2,19 +2,27 @@ import { request } from '../index' +const getImToken = () => { + return request({ + url: 'im/token', + }, true) +} + const getFriends = () => { return request({ url: 'im/friends', - }) + }, true) } const getUserInfo = async (targetId) => { - const [err, res] = await request({ - url: 'im/userInfo/' + targetId, - }) - return res + const [err, res] = await uni.request({ + url: 'http://api.zh.shangkelian.cn/api/im/userInfo/' + targetId, + }) + return res.data.data } export { - getFriends + getImToken, + getFriends, + getUserInfo } diff --git a/pages.json b/pages.json index 8b8bd93..72c7d45 100644 --- a/pages.json +++ b/pages.json @@ -384,20 +384,12 @@ "buttons": [{ "float": "right", "fontSrc": "/static/uniicons.ttf", - "text": "\ue64d" + "text": "\ue607" }] } } } }, - { - "path": "pages/im/chum", - "name": "ImChum", - "style": { - "navigationBarTitleText": "好友", - "enablePullDownRefresh": false - } - }, { "path": "pages/wallet/add", "name": "WalletAdd", diff --git a/pages/im/chat.nvue b/pages/im/chat.nvue deleted file mode 100644 index e961d7f..0000000 --- a/pages/im/chat.nvue +++ /dev/null @@ -1,1208 +0,0 @@ - - - - - - - - - - {{currentInfo.userName}} - - - - - - - - 加载中... - - - - - - - - - {{item.content.content || ''}} - - - {{item.content.poi}} - - - - - - {{handleDuration(item.content.duration)}} - - - - {{handleDuration(item.content.duration)}} - - - - - - {{item.receivedTimeVal}} - - - - - - {{item.content.poi}} - - - - {{item.content.content || ''}} - - - {{handleDuration(item.content.duration)}} - - - - {{handleDuration(item.content.duration)}} - - - - - - - - - - - - - - - - - - 按住 说话 - - - - 发送 - - - - {{item.emoji}} - - - - - - - - 照片 - - - - - - 位置 - - - - - - - - {{tipContent}} - 确定 - - - - - - - 松开发送,上滑取消 - 取消 - 取消 - - - - - - - - - - - - diff --git a/pages/im/chum.vue b/pages/im/chum.vue deleted file mode 100644 index 9005142..0000000 --- a/pages/im/chum.vue +++ /dev/null @@ -1,19 +0,0 @@ - - - 好友列表 - - - - - - diff --git a/pages/im/detail.vue b/pages/im/detail.vue index 7376366..4b04d38 100644 --- a/pages/im/detail.vue +++ b/pages/im/detail.vue @@ -183,7 +183,8 @@ $footer-height: 55px; .scroll { - height: calc(100vh - 55px); + height: calc(100vh - 55px); + width: 100vw; padding: 0 $uni-spacing-col-lg; } @@ -242,11 +243,11 @@ } .msg { - font-size: $uni-font-size-lg; + font-size: $uni-font-size-base; margin: $uni-spacing-col-base; - padding: $uni-spacing-col-base + 5rpx; + padding: $uni-spacing-col-lg; word-wrap: break-word; - width: 70%; + width: 60%; border-radius: $uni-border-radius-base; position: relative; diff --git a/pages/im/friends/index.vue b/pages/im/friends/index.vue new file mode 100644 index 0000000..fabc223 --- /dev/null +++ b/pages/im/friends/index.vue @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/pages/im/friends/info.vue b/pages/im/friends/info.vue new file mode 100644 index 0000000..48d48ea --- /dev/null +++ b/pages/im/friends/info.vue @@ -0,0 +1,8 @@ + + + + + + diff --git a/pages/im/friends/mine.vue b/pages/im/friends/mine.vue new file mode 100644 index 0000000..48d48ea --- /dev/null +++ b/pages/im/friends/mine.vue @@ -0,0 +1,8 @@ + + + + + + diff --git a/pages/im/index.vue b/pages/im/index.vue index 9009d66..c0e94ed 100644 --- a/pages/im/index.vue +++ b/pages/im/index.vue @@ -1,43 +1,43 @@ - - - - - - - - - - - - - {{ friend(item.targetId).name }} - {{ item.sentTime|timeCustomCN }} + + + + + + + + + + {{ friend(item.targetId).name }} + {{ item.sentTime|timeCustomCN }} + + {{ item.latestMessage.content }} - {{ item.latestMessage.content }} + + + + 去登录 -