lex 2 éve
szülő
commit
14f135266d
1 módosított fájl, 8 hozzáadás és 5 törlés
  1. 8 5
      src/student/payment-result/index.tsx

+ 8 - 5
src/student/payment-result/index.tsx

@@ -19,7 +19,7 @@ import icon_success from './images/icon_success.png'
 import iconClose from './images/icon_close.png'
 import iconClose from './images/icon_close.png'
 import iconTradeing from './images/icon_tradeing.png'
 import iconTradeing from './images/icon_tradeing.png'
 import request from '@/helpers/request'
 import request from '@/helpers/request'
-import { useRoute, useRouter } from 'vue-router'
+import { onBeforeRouteLeave, useRoute, useRouter } from 'vue-router'
 import { orderStatus } from '@/constant'
 import { orderStatus } from '@/constant'
 import { browser, moneyFormat } from '@/helpers/utils'
 import { browser, moneyFormat } from '@/helpers/utils'
 import { useEventListener, useWindowScroll } from '@vueuse/core'
 import { useEventListener, useWindowScroll } from '@vueuse/core'
@@ -175,6 +175,13 @@ export default defineComponent({
       }
       }
     }
     }
 
 
+    onBeforeRouteLeave((leaveGuard: any) => {
+      // 判断是否是微信
+      if (browser().weixin && !['/payResult', '/payDefine'].includes(leaveGuard.path)) {
+        popStateEvent()
+      }
+    })
+
     onMounted(() => {
     onMounted(() => {
       getDetails()
       getDetails()
       getDefaultParams()
       getDefaultParams()
@@ -190,10 +197,6 @@ export default defineComponent({
           state.backIconColor = 'white'
           state.backIconColor = 'white'
         }
         }
       })
       })
-
-      if (browser().weixin) {
-        window.addEventListener('popstate', popStateEvent, false)
-      }
     })
     })
     return () => (
     return () => (
       <div class={styles.paymentResult}>
       <div class={styles.paymentResult}>