diff --git a/jiuyi2/common/js/config.js b/jiuyi2/common/js/config.js index d9448b2f..f652f32b 100644 --- a/jiuyi2/common/js/config.js +++ b/jiuyi2/common/js/config.js @@ -7,6 +7,8 @@ const config = { // #endif // #ifndef H5 host: 'http://91f.xyz:8080', + // host: 'https://b433d23.r24.cpolar.top/', + // host: 'http://hvw2rn.natappfree.cc', // #endif // 支付方式配置 payType: { diff --git a/jiuyi2/common/js/util.js b/jiuyi2/common/js/util.js index ea7d3236..ff57358a 100644 --- a/jiuyi2/common/js/util.js +++ b/jiuyi2/common/js/util.js @@ -1766,6 +1766,12 @@ const util = { success: (res) => { if (res && res.result) { let result = JSON.parse(res.result) + if (result.type == 'ADDFRIEND') { + uni.navigateTo({ + url: `/pages/news/addFriend?account=${result.account}` + }); + return + } if (result.key == 'user') { // 跳转申请添加好友界面 uni.navigateTo({ diff --git a/jiuyi2/components/shop/detail/footerMenu.vue b/jiuyi2/components/shop/detail/footerMenu.vue index 11753f50..3b92574e 100644 --- a/jiuyi2/components/shop/detail/footerMenu.vue +++ b/jiuyi2/components/shop/detail/footerMenu.vue @@ -99,7 +99,6 @@ function toCustomer() { util.toChat(param) - uni.navigateTo({ url: util.setUrl('/pages/news/chat/chat', param) }) @@ -131,10 +130,10 @@ function toCustomer() { - + diff --git a/jiuyi2/pages/mine/homepage.vue b/jiuyi2/pages/mine/homepage.vue index d22444a0..68665713 100644 --- a/jiuyi2/pages/mine/homepage.vue +++ b/jiuyi2/pages/mine/homepage.vue @@ -18,6 +18,8 @@ import { useStore, } from 'vuex' + // api + import api from '@/api/index.js' // 工具库 import util from '@/common/js/util'; // 代理 diff --git a/jiuyi2/pages/mine/mine.vue b/jiuyi2/pages/mine/mine.vue index be0ee4af..67c55d99 100644 --- a/jiuyi2/pages/mine/mine.vue +++ b/jiuyi2/pages/mine/mine.vue @@ -1,57 +1,71 @@ \ No newline at end of file diff --git a/jiuyi2/pages/news/chat/chat.vue b/jiuyi2/pages/news/chat/chat.vue index e45ff3c7..809c204c 100644 --- a/jiuyi2/pages/news/chat/chat.vue +++ b/jiuyi2/pages/news/chat/chat.vue @@ -1,460 +1,454 @@