diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js index 2b4096ae..efd8ba89 100644 --- a/jiuyi2/common/js/config.js +++ b/jiuyi2/common/js/config.js @@ -7,7 +7,7 @@ const config = { // #endif // #ifndef H5 host: 'http://91f.xyz:8080', - // host: 'https://1e49a851.r24.cpolar.top/', + // host: 'https://1a880cd5.r24.cpolar.top/', // #endif // 支付方式配置 payType: { diff --git a/jiuyi2/common/js/util.js b/jiuyi2/common/js/util.js index 3961d7bd..7034117b 100644 --- a/jiuyi2/common/js/util.js +++ b/jiuyi2/common/js/util.js @@ -66,14 +66,14 @@ const util = { showCancel: obj.showCancel, cancelText: obj.cancelText, success: res => { - obj.success ? obj.success(res) : () => {} + obj.success ? obj.success(res) : () => { } resolve(res) }, fail: err => { - obj.fail ? obj.fail(err) : () => {} + obj.fail ? obj.fail(err) : () => { } reject(err) }, - complete: res => {} + complete: res => { } }) }) }, @@ -921,7 +921,7 @@ const util = { const file_suffix = util.config[{ 'file': 'file_suffix', 'audio': 'audio_suffix', - } [type]] + }[type]] let result = '' if (url) result = file_suffix.find(item => item.id === url.split('.').pop().toLowerCase()) return result @@ -1047,7 +1047,7 @@ const util = { obj.fail ? obj.fail('no data') : '' } break - // app支付 + // app支付 case "app": uni.requestPayment({ provider: "wxpay", @@ -1069,7 +1069,7 @@ const util = { break } break - // 支付宝支付 + // 支付宝支付 case "2": switch (obj.method) { // app支付 @@ -1094,7 +1094,7 @@ const util = { break } break - // 钱包支付 + // 钱包支付 case "4": obj.success ? obj.success(rs) : '' result_goto('success') @@ -1166,7 +1166,7 @@ const util = { util.alert("您拒绝了授权"); // 失败 - obj.fail ? obj.fail(res) : (res) => {}; + obj.fail ? obj.fail(res) : (res) => { }; }, complete() { // 结束 @@ -1366,11 +1366,11 @@ const util = { return new Promise((resolve, reject) => { // 是否在微信小程序限制范围内 if (!['scope.userInfo', 'scope.userLocation', 'scope.userLocationBackground', - 'scope.address', - 'scope.record', 'scope.writePhotosAlbum', 'scope.camera', - 'scope.invoice', - 'scope.invoiceTitle', 'scope.werun' - ].includes(obj.scope)) { + 'scope.address', + 'scope.record', 'scope.writePhotosAlbum', 'scope.camera', + 'scope.invoice', + 'scope.invoiceTitle', 'scope.werun' + ].includes(obj.scope)) { resolve({ msg: '不在限制范围内', }) @@ -1466,11 +1466,32 @@ const util = { userID: userinfo.id + '', userSig: imSig, }).then(rs => { + util.updateMyProfile(userinfo) console.log('im login success', rs) }) }) }, + // 更新im个人资料 + updateMyProfile(userinfo) { + // 验证sdk是否准备完毕 + let isReady = uni.$chat.isReady(); + if (!isReady) { + setTimeout(function () { + util.updateMyProfile(userinfo); + }, 800); + return + } + + let obj = { + nick: userinfo.userNickname, + avatar: userinfo.avatar + } + uni.$chat.updateMyProfile(obj).then(res => { + // console.log(res); + }) + }, + /** * 获取用户信息 * @param {Function} cb 回调函数 @@ -1731,7 +1752,7 @@ const util = { } }); }, - showToastAndRedirect(title, icon = 'none', fun = () => {}) { + showToastAndRedirect(title, icon = 'none', fun = () => { }) { uni.showToast({ title, icon, @@ -1767,7 +1788,7 @@ const util = { success: (res) => { if (res && res.result) { let result = JSON.parse(res.result) - if (result.type == 'ADDFRIEND') { + if (result.type == 'ADDFRIEND') { uni.navigateTo({ url: `/pages/news/addFriend?account=${result.account}` }); diff --git a/jiuyi2/components/news/msgList.vue b/jiuyi2/components/news/msgList.vue index 48b77f75..1a8a965a 100644 --- a/jiuyi2/components/news/msgList.vue +++ b/jiuyi2/components/news/msgList.vue @@ -111,6 +111,7 @@ function getList() { uni.$chat.getConversationList().then(rs => { let res = rs.data.conversationList + console.log(res); let arr = [] res.forEach(item => { let obj = {} diff --git a/jiuyi2/vite.config.js b/jiuyi2/vite.config.js index a3922799..9602af2b 100644 --- a/jiuyi2/vite.config.js +++ b/jiuyi2/vite.config.js @@ -4,7 +4,7 @@ import { import uni from '@dcloudio/vite-plugin-uni'; let target = 'http://91f.xyz:8080' -// let target = 'https://1e49a851.r24.cpolar.top/' +// let target = 'https://1a880cd5.r24.cpolar.top/' export default defineConfig({ plugins: [uni()],