diff --git a/TUIKit/components/TUIChat/index.vue b/TUIKit/components/TUIChat/index.vue index 29e74c6..4e4c2b3 100644 --- a/TUIKit/components/TUIChat/index.vue +++ b/TUIKit/components/TUIChat/index.vue @@ -204,13 +204,16 @@ function sendCustomMessage(myitem, youritem) { const payload = { data: JSON.stringify({ businessID: "pk", - title: "PK邀请", - buttonText1: "接受邀请", - buttonText2: "拒绝邀请", keyid: keyid, myitem: counter.myitem.id, + pkIdA: youritem.id, + pkIdB: myitem.id, + userIdA: youritem.senderId, + userIdB: myitem.senderId, + pkTime: youritem.pkTime, + pkNumber: youritem.pkNumber, + link:"https://vv-1317974657.cos.ap-shanghai.myqcloud.com/util/pk.png", btnDisplay: true, - mytitle: "等待对方接受邀请", }), description: "邀请参加PK", extension: "邀请参加PK", @@ -252,6 +255,7 @@ function sendCustomMessage(myitem, youritem) { userIdA: youritem.senderId, userIdB: myitem.senderId, pkTime: youritem.pkTime, + pkNumber: youritem.pkNumber, status: 0, }, userInfo: false, 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 79c5a7c..150b026 100644 --- a/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue +++ b/TUIKit/components/TUIChat/message-list/message-elements/message-custom.vue @@ -63,20 +63,12 @@ @@ -104,27 +96,22 @@ import TUIChatEngine, { import { useCounterStore } from "@/stores/counter"; import request from "@/components/request"; import { Message } from "@tencentcloud/chat"; +import TencentCloudChat from "@tencentcloud/chat"; // import message from '@tencentcloud/chat-uikit-uniapp/locales/en/message'; const counter = useCounterStore(); -const status = { agree: 1, refuse: 2 }; interface Props { messageItem: IMessageModel; content: any; } -//``````````````````````````````````````````````````` +//```````````````````````````````````````````````````标记 - -function handleAccept(status: number, customData: ICustomMessagePayload) { - console.log(custom.value); - console.log(message.value); - message.value.payload.title = "Hello Tencent"; - TUIChatService.modifyMessage(message.value).then((res) => { - console.log(res); - }).catch((err) => { - console.log(err); - }); +function handleAccept(customData: ICustomMessagePayload) { + const customDatainfo = JSON.stringify(customData); + uni.redirectTo({ + url: `/pages/PKMessageprocessing/PKMessageprocessing?customData=${customDatainfo}`, + }); } //``````````````````````````````````````````````````` const props = withDefaults(defineProps(), { @@ -226,7 +213,7 @@ a { align-items: center; justify-content: center; height: 100%; - background-color: #f5f5f5; + background-color: #ffffff; border-radius: 10px; padding: 20px; box-sizing: border-box; @@ -270,4 +257,8 @@ a { } //`````````````````````````````````````````````````````````````````````````````````` } +.Custommessageimage{ + width: 385rpx; + height: 195rpx; +} diff --git a/pages.json b/pages.json index 3d35f61..8fde0db 100644 --- a/pages.json +++ b/pages.json @@ -30,6 +30,12 @@ "navigationBarTitleText": "PK信息" } }, + { + "path": "pages/PKMessageprocessing/PKMessageprocessing", + "style": { + "navigationBarTitleText": "PK信息处理" + } + }, { "path": "pages/index/index", "style": { diff --git a/pages/Home/Home.vue b/pages/Home/Home.vue index 4fed68a..ce9f519 100644 --- a/pages/Home/Home.vue +++ b/pages/Home/Home.vue @@ -22,7 +22,6 @@ import Advertisement from "../../components/Advertisement/Advertisement"; import contentList from "../../components/contentList/contentList"; import tabBar from "../../components/tabBar/tabBar"; import TUIlogin from "../../components/TUILogin.js"; -import TencentCloudChat from "@tencentcloud/chat"; import { useCounterStore } from '@/stores/counter' const counter = useCounterStore() export default { @@ -62,6 +61,7 @@ export default { }); }, }); + }, methods: { goAdvertisement() { diff --git a/pages/NewAddedPk/NewAddedPk.vue b/pages/NewAddedPk/NewAddedPk.vue index 6501001..13619a7 100644 --- a/pages/NewAddedPk/NewAddedPk.vue +++ b/pages/NewAddedPk/NewAddedPk.vue @@ -8,13 +8,18 @@ src="../../static/Fork.png" mode="scaleToFill" /> - 发布新PK + + + + + + @@ -30,10 +35,9 @@ 金币数量: - + 单位: K @@ -110,7 +113,7 @@ 选择场数: - + 次 + + + + + + + + + + + + + + + + + + {{ SenderData.anchorId }} + + + + + + + 21 + + + + + + + 21 + + + {{ SenderData.country }} + + PK时间:{{ formatDate(SenderData.pkTime) }} + + + + + {{ SenderData.coin }} + 金币 + + + + + + {{ SenderData.pkNumber }} + PK场数 + + + + + + + + + + + + {{ ReceiverData.anchorId }} + + + + + + + 21 + + + + + + + 21 + + + {{ ReceiverData.country }} + + PK时间:{{ formatDate(ReceiverData.pkTime) }} + + + + + {{ ReceiverData.coin }} + 金币 + + + + + + {{ ReceiverData.pkNumber }} + PK场数 + + + + + + + + + + + + + + + + diff --git a/pages/pkDetail/pkDetail.vue b/pages/pkDetail/pkDetail.vue index dd4769d..c9043b9 100644 --- a/pages/pkDetail/pkDetail.vue +++ b/pages/pkDetail/pkDetail.vue @@ -1,39 +1,83 @@