From 012dc3c93d5c4cab93c433eb9d92b2ad3068bf3a Mon Sep 17 00:00:00 2001 From: fanpeng <438123081@qq.com> Date: Wed, 11 Jun 2025 14:15:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9xp2p=E6=8F=92?= =?UTF-8?q?=E4=BB=B6=E5=BC=95=E5=85=A5=E4=BB=8E=E4=B8=BB=E5=8C=85=E6=94=B9?= =?UTF-8?q?=E5=88=B0=E5=88=86=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- manifest.json | 5 ----- pages.json | 5 +++++ .../p2p/exportForPlayerPlugin.js | 0 exportForXp2pPlugin.js => pages/p2p/exportForXp2pPlugin.js | 0 pages/p2p/p2pPlayer.vue | 3 +++ 5 files changed, 8 insertions(+), 5 deletions(-) rename exportForPlayerPlugin.js => pages/p2p/exportForPlayerPlugin.js (100%) rename exportForXp2pPlugin.js => pages/p2p/exportForXp2pPlugin.js (100%) diff --git a/manifest.json b/manifest.json index c6b79b4..503c8fa 100644 --- a/manifest.json +++ b/manifest.json @@ -22,11 +22,6 @@ "subPackages": true }, "plugins": { - "xp2p": { - "version": "latest", - "provider": "wx1319af22356934bf", - "export": "exportForXp2pPlugin.js" - }, "wmpf-voip": { "version": "latest", "provider": "wxf830863afde621eb", diff --git a/pages.json b/pages.json index cf2e4a7..fbf61bb 100644 --- a/pages.json +++ b/pages.json @@ -41,6 +41,11 @@ } ], "plugins": { + "xp2p": { + "version": "latest", + "provider": "wx1319af22356934bf", + "export": "exportForXp2pPlugin.js" + }, "wechat-p2p-player": { "version": "latest", "provider": "wx9e8fbc98ceac2628", diff --git a/exportForPlayerPlugin.js b/pages/p2p/exportForPlayerPlugin.js similarity index 100% rename from exportForPlayerPlugin.js rename to pages/p2p/exportForPlayerPlugin.js diff --git a/exportForXp2pPlugin.js b/pages/p2p/exportForXp2pPlugin.js similarity index 100% rename from exportForXp2pPlugin.js rename to pages/p2p/exportForXp2pPlugin.js diff --git a/pages/p2p/p2pPlayer.vue b/pages/p2p/p2pPlayer.vue index 2359966..ab83dbb 100644 --- a/pages/p2p/p2pPlayer.vue +++ b/pages/p2p/p2pPlayer.vue @@ -126,6 +126,8 @@ import { useUserStore } from '@/stores/user' import { passthrough } from '@/api/sdk' import { getLockNetTokenRequest } from '@/api/lock' + import * as A from './exportForXp2pPlugin' + import * as B from './exportForPlayerPlugin' const $bluetooth = useBluetoothStore() const $basic = useBasicStore() @@ -156,6 +158,7 @@ const isVideoLoaded = ref(false) onMounted(async () => { + console.log(A, B) buttonInfo.value = await $basic.getButtonInfo() const { code, data, message } = await passthrough({ From e8ce432e03249864ec1c359e11f6d1c3131714e6 Mon Sep 17 00:00:00 2001 From: fanpeng <438123081@qq.com> Date: Wed, 11 Jun 2025 15:12:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E6=8E=88=E6=9D=83=E7=8A=B6=E6=80=81=E5=88=A4?= =?UTF-8?q?=E6=96=ADbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/p2p/authorizeWechat.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pages/p2p/authorizeWechat.vue b/pages/p2p/authorizeWechat.vue index 7687be8..4068106 100644 --- a/pages/p2p/authorizeWechat.vue +++ b/pages/p2p/authorizeWechat.vue @@ -82,8 +82,9 @@ if (authResult?.data?.wxOpenid === getStorage('openid')) { if (data.status === 1) { reject.value = false + weChatTicketsFlag.value = false } else if (data.status === 0) { - reject.value = false + reject.value = true weChatTicketsFlag.value = false } } else {