Merge branch 'main' into dev

app/pages/externallinks/index.vue

@@ -0,0 +1,18 @@
+<script setup>
+definePageMeta({
+  layout: 'default',
+  i18n: 'menu.profile',
+})
+const route = useRoute()
+const url=route.query.url??''
+</script>
+
+<template>
+<div>
+  <iframe :src="url"></iframe>
+</div>
+</template>
+
+<style scoped>
+
+</style>

app/pages/payment/index.vue

@@ -10,6 +10,7 @@ const payStatus=ref(0)
 definePageMeta({
   i18n: 'payment.title'
 })
+const router=useRouter()
 const changePayStatus=()=>{
   payStatus.value=payStatus.value===0?1:0
 }
@@ -36,6 +37,12 @@ const confirmPay=async ()=>{
    testReturnEndPoint:'/payment/result'
  })
   if (res.status===0){
+/*    router.push({
+      path:'/externallinks',
+      query:{
+        url:res.data.checkoutSessionUrl
+      }
+    })*/
     window.location.href=res.data.checkoutSessionUrl
   }
 }