From 050ceedd59d263603c1a031b9a2b8013db66625e Mon Sep 17 00:00:00 2001 From: pengxiaolong <15716207+pengxiaolong711@user.noreply.gitee.com> Date: Fri, 30 May 2025 22:04:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- App.vue | 12 +- TUIKit/components/TUIChat/index.vue | 57 +++-- .../message-elements/message-custom.vue | 196 ++++++++------- TUIKit/interface.ts | 4 + components/generateFileName.js | 1 - components/generateMsgId.js | 18 ++ components/request.js | 5 +- pages.json | 21 +- pages/Home/Home.vue | 3 + pages/Mine/Mine.vue | 47 ++++ pages/Mine/minecomponents/contact.vue | 31 +++ pages/Mine/minecomponents/pkInformation.vue | 237 ++++++++++++++++++ pages/Mine/minecomponents/pkRecord.vue | 125 +++++++++ pages/NewAddedPk/NewAddedPk.vue | 13 +- pages/UserInformation/UserInformation.vue | 3 + pages/login/login.vue | 3 + pages/pkDetail/pkDetail.vue | 3 +- .../.sourcemap/mp-weixin/NewAddedPk.js.map | 2 +- .../message-elements/message-custom.js.map | 2 +- .../mp-weixin/TUIKit/components/index.js.map | 2 +- .../dist/dev/.sourcemap/mp-weixin/app.js.map | 2 +- .../.sourcemap/mp-weixin/common/assets.js.map | 2 +- .../components/generateFileName.js.map | 2 +- .../mp-weixin/components/generateMsgId.js.map | 1 + .../mp-weixin/components/request.js.map | 2 +- .../mp-weixin/pages/Home/Home.js.map | 2 +- .../mp-weixin/pages/Mine/Mine.js.map | 2 +- .../pages/Mine/minecomponents/contact.js.map | 1 + .../Mine/minecomponents/pkInformation.js.map | 1 + .../pages/Mine/minecomponents/pkRecord.js.map | 1 + .../UserInformation/UserInformation.js.map | 2 +- .../mp-weixin/pages/login/login.js.map | 2 +- .../mp-weixin/pages/pkDetail/pkDetail.js.map | 2 +- unpackage/dist/dev/mp-weixin/NewAddedPk.js | 21 +- .../message-elements/message-custom.js | 33 ++- .../message-elements/message-custom.wxml | 2 +- .../dev/mp-weixin/TUIKit/components/index.js | 51 +++- unpackage/dist/dev/mp-weixin/app.js | 12 + unpackage/dist/dev/mp-weixin/app.json | 3 + unpackage/dist/dev/mp-weixin/common/assets.js | 26 +- unpackage/dist/dev/mp-weixin/common/vendor.js | 2 +- .../components/contentList/contentList.js | 2 +- .../dev/mp-weixin/components/generateMsgId.js | 16 ++ .../dist/dev/mp-weixin/components/request.js | 6 +- .../components/topNavigation/topNavigation.js | 2 +- .../dist/dev/mp-weixin/pages/Home/Home.js | 3 + .../dist/dev/mp-weixin/pages/Mine/Mine.js | 20 +- .../dist/dev/mp-weixin/pages/Mine/Mine.wxml | 2 +- .../dist/dev/mp-weixin/pages/Mine/Mine.wxss | 21 ++ .../pages/Mine/minecomponents/contact.js | 20 ++ .../pages/Mine/minecomponents/contact.json | 4 + .../pages/Mine/minecomponents/contact.wxml | 1 + .../pages/Mine/minecomponents/contact.wxss | 8 + .../Mine/minecomponents/pkInformation.js | 124 +++++++++ .../Mine/minecomponents/pkInformation.json | 4 + .../Mine/minecomponents/pkInformation.wxml | 1 + .../Mine/minecomponents/pkInformation.wxss | 91 +++++++ .../pages/Mine/minecomponents/pkRecord.js | 41 +++ .../pages/Mine/minecomponents/pkRecord.json | 4 + .../pages/Mine/minecomponents/pkRecord.wxml | 1 + .../pages/Mine/minecomponents/pkRecord.wxss | 53 ++++ .../pages/NewAddedPk/NewAddedPk.wxml | 2 +- .../pages/UserInformation/UserInformation.js | 5 +- .../dist/dev/mp-weixin/pages/login/login.js | 11 +- .../dev/mp-weixin/pages/pkDetail/pkDetail.js | 4 +- .../mp-weixin/pages/pkDetail/pkDetail.wxml | 2 +- 66 files changed, 1215 insertions(+), 190 deletions(-) create mode 100644 components/generateMsgId.js create mode 100644 pages/Mine/minecomponents/contact.vue create mode 100644 pages/Mine/minecomponents/pkInformation.vue create mode 100644 pages/Mine/minecomponents/pkRecord.vue create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/components/generateMsgId.js.map create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/Mine/minecomponents/contact.js.map create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/Mine/minecomponents/pkInformation.js.map create mode 100644 unpackage/dist/dev/.sourcemap/mp-weixin/pages/Mine/minecomponents/pkRecord.js.map create mode 100644 unpackage/dist/dev/mp-weixin/components/generateMsgId.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/Mine/minecomponents/contact.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/Mine/minecomponents/contact.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/Mine/minecomponents/contact.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/Mine/minecomponents/contact.wxss create mode 100644 unpackage/dist/dev/mp-weixin/pages/Mine/minecomponents/pkInformation.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/Mine/minecomponents/pkInformation.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/Mine/minecomponents/pkInformation.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/Mine/minecomponents/pkInformation.wxss create mode 100644 unpackage/dist/dev/mp-weixin/pages/Mine/minecomponents/pkRecord.js create mode 100644 unpackage/dist/dev/mp-weixin/pages/Mine/minecomponents/pkRecord.json create mode 100644 unpackage/dist/dev/mp-weixin/pages/Mine/minecomponents/pkRecord.wxml create mode 100644 unpackage/dist/dev/mp-weixin/pages/Mine/minecomponents/pkRecord.wxss diff --git a/App.vue b/App.vue index 0ec01bd..11ff243 100644 --- a/App.vue +++ b/App.vue @@ -2,7 +2,8 @@ // #ifdef APP-PLUS || H5 import { TUIChatKit } from './TUIKit'; - +import { useCounterStore } from '@/stores/counter' +const counter = useCounterStore() TUIChatKit.init(); // #endif // Required information @@ -19,6 +20,15 @@ export default { }; }, onLoad(option) { + uni.getStorage({ + key: "userinfo", + success: (res) => { + this.info = res.data; + counter.$patch({ myitem:this.info}) + }, + fail: () => { + }, + }) }, provide() { return { diff --git a/TUIKit/components/TUIChat/index.vue b/TUIKit/components/TUIChat/index.vue index 52df043..29e74c6 100644 --- a/TUIKit/components/TUIChat/index.vue +++ b/TUIKit/components/TUIChat/index.vue @@ -133,22 +133,22 @@ import { initChat, logout } from "./entry-chat-only.ts"; import { isEnabledMessageReadReceiptGlobal } from "./utils/utils"; import OfflinePushInfoManager from "./offlinePushInfoManager/index"; import { TUIChatService } from "@tencentcloud/chat-uikit-engine"; -import { useCounterStore } from '@/stores/counter' -const counter = useCounterStore() +import { useCounterStore } from "@/stores/counter"; +import request from "@/components/request"; +import generateMsgId from "../../../components/generateMsgId.js"; +const counter = useCounterStore(); let myitem = ref(); let youritem = ref(); +let MessageListinfo = ref(); onLoad((options) => { initChat(options); - if (options.myitem) { - myitem.value = JSON.parse(options.myitem); - counter.$patch({ myitem:myitem.value }) - youritem.value = JSON.parse(options.youritem); - counter.$patch({ youritem:youritem.value }) - setTimeout(() => { - sendCustomMessage(myitem, youritem); - }, 1000); - } + myitem.value = JSON.parse(options.myitem); + youritem.value = JSON.parse(options.youritem); + counter.$patch({ youritem: youritem.value }); + setTimeout(() => { + sendCustomMessage(myitem.value, youritem.value); + }, 1000); }); onUnload(() => { @@ -200,12 +200,17 @@ TUIStore.watch(StoreName.CONV, { }); function sendCustomMessage(myitem, youritem) { + const keyid = generateMsgId(); const payload = { data: JSON.stringify({ businessID: "pk", title: "PK邀请", buttonText1: "接受邀请", buttonText2: "拒绝邀请", + keyid: keyid, + myitem: counter.myitem.id, + btnDisplay: true, + mytitle: "等待对方接受邀请", }), description: "邀请参加PK", extension: "邀请参加PK", @@ -218,7 +223,6 @@ function sendCustomMessage(myitem, youritem) { payload, needReadReceipt: isEnabledMessageReadReceiptGlobal(), }; - const offlinePushInfoCreateParams = { conversation: currentConversation.value, payload: options.payload, @@ -227,15 +231,36 @@ function sendCustomMessage(myitem, youritem) { const sendMessageOptions = { offlinePushInfo: OfflinePushInfoManager.create(offlinePushInfoCreateParams), }; - TUIChatService.sendCustomMessage(options, sendMessageOptions); - TUIChatService.getMessageList().then((res) => { - console.log("消息列表···································",res); + TUIChatService.sendCustomMessage(options, sendMessageOptions).then((res) => { + const messagein = request({ + url: "chat/add", + method: "POST", + data: { + messageInfo: JSON.stringify(res.data.message), + keyId: keyid, + }, + userInfo: false, + }); + }); + + const messageList = request({ + url: "pk/createPkRecord", + method: "POST", + data: { + pkIdA: youritem.id, + pkIdB: myitem.id, + userIdA: youritem.senderId, + userIdB: myitem.senderId, + pkTime: youritem.pkTime, + status: 0, + }, + userInfo: false, }); myitem.value = null; youritem.value = null; currentConversation.value = null; } -//````````````````````````````````````````````````````````````````````` +//`````````````````````````````````````````````````````````````````````标记 const isInputToolbarShow = computed(() => { return isUniFrameWork ? inputToolbarDisplayType.value !== "none" : true; }); diff --git a/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue b/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue index 174a4dd..79c5a7c 100644 --- a/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue +++ b/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue @@ -1,6 +1,6 @@