From b1b68d68ef1a9196c49c58c8bf2141cd69187e5d Mon Sep 17 00:00:00 2001 From: lr Date: Tue, 18 Feb 2025 18:09:05 +0800 Subject: [PATCH] 1 --- jiuyi2/common/js/config.js | 2 + jiuyi2/common/js/util.js | 6 + jiuyi2/components/shop/detail/footerMenu.vue | 5 +- jiuyi2/pages/mine/homepage.vue | 2 + jiuyi2/pages/mine/mine.vue | 199 +-- jiuyi2/pages/news/chat/chat.vue | 1122 ++++++++--------- jiuyi2/vite.config.js | 4 +- service/App.vue | 5 +- service/common/js/util.js | 4 +- service/components/public/Mixins.js | 46 + .../public/jy-commodity-information/index.vue | 187 +++ service/pages.json | 6 + service/pages/chat/chat.vue | 712 +++++++++++ .../pages/chat/components/news-temp/index.vue | 223 ++++ service/pages/chat/emoji.js | 33 + service/pages/chat/emoji.vue | 42 + service/pages/chat/fn.js | 30 + service/pages/chat/index.scss | 118 ++ service/pages/chat/jy-plus.vue | 344 +++++ service/pages/chat/jy-voice.vue | 280 ++++ service/pages/index/index.vue | 25 +- service/static/audio.png | Bin 0 -> 3730 bytes 22 files changed, 2714 insertions(+), 681 deletions(-) create mode 100644 service/components/public/Mixins.js create mode 100644 service/components/public/jy-commodity-information/index.vue create mode 100644 service/pages/chat/chat.vue create mode 100644 service/pages/chat/components/news-temp/index.vue create mode 100644 service/pages/chat/emoji.js create mode 100644 service/pages/chat/emoji.vue create mode 100644 service/pages/chat/fn.js create mode 100644 service/pages/chat/index.scss create mode 100644 service/pages/chat/jy-plus.vue create mode 100644 service/pages/chat/jy-voice.vue create mode 100644 service/static/audio.png 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 @@