Merge branch 'fanpeng' into 'develop'

Fanpeng

See merge request StarlockTeam/wx-starlock!43

manifest.json

@@ -22,11 +22,6 @@
       "subPackages": true
     },
     "plugins": {
-      "xp2p": {
-        "version": "latest",
-        "provider": "wx1319af22356934bf",
-        "export": "exportForXp2pPlugin.js"
-      },
       "wmpf-voip": {
         "version": "latest",
         "provider": "wxf830863afde621eb",

pages.json

@@ -41,6 +41,11 @@
         }
       ],
       "plugins": {
+        "xp2p": {
+          "version": "latest",
+          "provider": "wx1319af22356934bf",
+          "export": "exportForXp2pPlugin.js"
+        },
         "wechat-p2p-player": {
           "version": "latest",
           "provider": "wx9e8fbc98ceac2628",

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 {

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({