From e85b9c2c0de91fb2b75921c43ca555a0b6b1a0ec Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 18 Jan 2022 15:12:13 +0800 Subject: [PATCH] =?UTF-8?q?IM=20=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E8=81=8A=E5=A4=A9=E5=88=97=E8=A1=A8?= =?UTF-8?q?-=E8=AF=A6=E6=83=85=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .DS_Store | Bin 0 -> 6148 bytes apis/interfaces/im.js | 20 +- pages.json | 10 +- pages/im/chat.nvue | 1208 ------------------------------------ pages/im/chum.vue | 19 - pages/im/detail.vue | 9 +- pages/im/friends/index.vue | 14 + pages/im/friends/info.vue | 8 + pages/im/friends/mine.vue | 8 + pages/im/index.vue | 63 +- store/modules/im.js | 4 +- utils/im/index.js | 4 + 12 files changed, 94 insertions(+), 1273 deletions(-) create mode 100644 .DS_Store delete mode 100644 pages/im/chat.nvue delete mode 100644 pages/im/chum.vue create mode 100644 pages/im/friends/index.vue create mode 100644 pages/im/friends/info.vue create mode 100644 pages/im/friends/mine.vue diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..66544f017c880eea9e05fd2d544a58a0a328c19d GIT binary patch literal 6148 zcmeHKOKQU~5S>X)F?8c)m%2i3AWV9KT%aX^PzWxxN!DKVTsd0ad^X1I&e?=FFnZEx zo`l}Q;}H?<&-=AVCn7D}P=0Ngo9&y=Y?ToO!g0o@>@M5y;rKNiX4!uSjQcD4-ZW$e#hzg+>MLt-uXFauu5Z literal 0 HcmV?d00001 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 @@ -