|
@@ -138,7 +138,7 @@ defineOptions({ name: 'PayCashier' })
|
|
|
|
|
|
const message = useMessage() // 消息弹窗
|
|
|
const route = useRoute() // 路由
|
|
|
-const { push, currentRoute } = useRouter() // 路由
|
|
|
+const { push, currentRoute, replace } = useRouter() // 路由
|
|
|
const { delView } = useTagsViewStore() // 视图操作
|
|
|
|
|
|
const id = ref(undefined) // 支付单号
|
|
@@ -435,19 +435,26 @@ const goReturnUrl = (payResult) => {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- const url =
|
|
|
- returnUrl.value.indexOf('?') >= 0
|
|
|
- ? returnUrl.value + '&payResult=' + payResult
|
|
|
- : returnUrl.value + '?payResult=' + payResult
|
|
|
- // 如果有配置,且是 http 开头,则浏览器跳转
|
|
|
- if (returnUrl.value.indexOf('http') === 0) {
|
|
|
- location.href = url
|
|
|
- } else {
|
|
|
- delView(unref(currentRoute))
|
|
|
- push({
|
|
|
- path: url
|
|
|
- })
|
|
|
- }
|
|
|
+ // const url =
|
|
|
+ // returnUrl.value.indexOf('?') >= 0
|
|
|
+ // ? returnUrl.value + '&payResult=' + payResult
|
|
|
+ // : returnUrl.value + '?payResult=' + payResult
|
|
|
+ // // 如果有配置,且是 http 开头,则浏览器跳转
|
|
|
+ // if (returnUrl.value.indexOf('http') === 0) {
|
|
|
+ // location.href = url
|
|
|
+ // } else {
|
|
|
+ // delView(unref(currentRoute))
|
|
|
+ // push({
|
|
|
+ // path: url
|
|
|
+ // })
|
|
|
+ // }
|
|
|
+ delView(unref(currentRoute))
|
|
|
+ replace({
|
|
|
+ path: '/pay/demo/order',
|
|
|
+ query: {
|
|
|
+ reload: new Date().getTime()
|
|
|
+ }
|
|
|
+ })
|
|
|
}
|
|
|
|
|
|
/** 初始化 */
|