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