|
|
@@ -188,7 +188,7 @@
|
|
|
<!-- PayPal 支付按钮挂载容器(必须唯一ID) -->
|
|
|
<div id="paypal-button-container" v-if="pageRedirectionData && orderInfo.payMethod == 'paypal'"></div>
|
|
|
</div>
|
|
|
- <div class="mt20 font_size14">录播和体验课课程属于虚拟商品,购买后无特殊原因,不支持退款</div>
|
|
|
+ <!-- <div class="mt20 font_size14">录播和体验课课程属于虚拟商品,购买后无特殊原因,不支持退款</div> -->
|
|
|
<div class="mt20 gap10 cursor-pointer" @click="agreement = !agreement">
|
|
|
<div class="checkType" :class="{'active': agreement}"></div>
|
|
|
我已阅读并同意 <span class="color_theme bold">《AI学习论坛服务协议》</span> 和 <span class="color_theme bold">《AI学习论坛知识产权保护协议》</span>
|
|
|
@@ -203,7 +203,7 @@ import yinlianIcon from '@/assets/imgs/pay/yinlian.png'
|
|
|
import paypalIcon from '@/assets/imgs/pay/paypal.png'
|
|
|
import qianbaoIcon from '@/assets/imgs/pay/qianbao.png'
|
|
|
|
|
|
-
|
|
|
+import { paySuccess } from '@/utils/util.js'
|
|
|
import FileUploader from '@/components/FileUploader.vue'
|
|
|
import { calRate, createOrder,payResult,payConfigDearch } from '@/api/order.js'
|
|
|
import qrcode from 'qrcode'
|
|
|
@@ -215,6 +215,8 @@ import { useRoute, useRouter } from 'vue-router'
|
|
|
import DGTMessage from '@/utils/message'
|
|
|
import { useAppStore } from '@/pinia/appStore'
|
|
|
const appStore = useAppStore()
|
|
|
+import { useI18n } from 'vue-i18n'
|
|
|
+const { t } = useI18n()
|
|
|
//获取参数
|
|
|
const route = useRoute()
|
|
|
const router = useRouter()
|
|
|
@@ -293,7 +295,7 @@ const payNowFn = () => {
|
|
|
loading.value = false;
|
|
|
break;
|
|
|
case 'paypal':
|
|
|
- pageRedirectionData.value = payData.body || '';
|
|
|
+ pageRedirectionData.value = payData || '';
|
|
|
nextTick(() => {
|
|
|
pay_paypal();
|
|
|
})
|
|
|
@@ -327,7 +329,9 @@ const startPolling = () => {
|
|
|
pollingTimer.value = setInterval(() => {
|
|
|
payResult({id:orderId.value}).then((res) => {
|
|
|
if (res.code == 200 && res.data) {
|
|
|
- DGTMessage.success('支付成功!');
|
|
|
+ // DGTMessage.success('支付成功!');
|
|
|
+ // 确认弹框
|
|
|
+ paySuccess({t});
|
|
|
appStore.USERINFO();
|
|
|
stopPolling()
|
|
|
}
|
|
|
@@ -350,11 +354,11 @@ const pay_paypal = () => {
|
|
|
loading.value = false;
|
|
|
paypal.Buttons({
|
|
|
createOrder: (data, actions) => {
|
|
|
- return "06S82458P0047241R"
|
|
|
+ return pageRedirectionData.value
|
|
|
},
|
|
|
onApprove: (data, actions) => {
|
|
|
return actions.order.capture().then((details) => {
|
|
|
- DGTMessage.success('支付成功!')
|
|
|
+ paySuccess({t});
|
|
|
stopPolling()
|
|
|
});
|
|
|
}
|