|
@@ -77,9 +77,23 @@ function getDetial() {
|
|
|
})
|
|
|
}
|
|
|
function handlePay() {
|
|
|
- window.open(qrCodeUrl.value)
|
|
|
+ if (orderDetal.value.payType == 5 || orderDetal.value.payType == 6) {
|
|
|
+ openPay({
|
|
|
+ orderSn: orderSn.value,
|
|
|
+ payType: paysidtype[selectedPayType.value],
|
|
|
+ productName: getRemark(orderDetal.value.goodsInfo, orderDetal.value.orderType, t),
|
|
|
+ openId: ''
|
|
|
+ }).then((res) => {
|
|
|
+ qrCodeUrl.value = res.qrCodeUrl || res.redirect
|
|
|
+ window.open(qrCodeUrl.value)
|
|
|
+ // inverRequest()
|
|
|
+ })
|
|
|
+ } else {
|
|
|
+ window.open(qrCodeUrl.value)
|
|
|
+ }
|
|
|
}
|
|
|
async function getCode() {
|
|
|
+ if (orderDetal.value.payType == 5 || orderDetal.value.payType == 6) return
|
|
|
qrCodeUrl.value = ''
|
|
|
openPay({
|
|
|
orderSn: orderSn.value,
|
|
@@ -116,7 +130,7 @@ async function getCode() {
|
|
|
? 'vip'
|
|
|
: orderDetal.orderType == 'cooperationOrder'
|
|
|
? 'cooperationOrder'
|
|
|
- : orderDetal.orderType == 'downOrder'
|
|
|
+ : orderDetal.orderType == 'downOrder'
|
|
|
? 'downdesc'
|
|
|
: 'goqy'
|
|
|
}`
|
|
@@ -129,11 +143,14 @@ async function getCode() {
|
|
|
>
|
|
|
<span v-if="item">
|
|
|
<span v-if="index != 0">、</span>
|
|
|
-
|
|
|
+
|
|
|
<span style="margin-right: 5px" v-if="orderDetal.orderType == 'cooperationOrder'">
|
|
|
- {{ $t('mall.cooperationOrderName',{count: item.count }) }}
|
|
|
+ {{ $t('mall.cooperationOrderName', { count: item.count }) }}
|
|
|
</span>
|
|
|
- <span style="margin-right: 5px" v-else-if="orderDetal.orderType != 'incrementOrder'">
|
|
|
+ <span
|
|
|
+ style="margin-right: 5px"
|
|
|
+ v-else-if="orderDetal.orderType != 'incrementOrder'"
|
|
|
+ >
|
|
|
{{
|
|
|
orderDetal.orderType == 'downOrder'
|
|
|
? `${item.name} (${item.sceneNum})`
|
|
@@ -151,7 +168,13 @@ async function getCode() {
|
|
|
: $t('payInfo.zyhy')
|
|
|
}}
|
|
|
</span>
|
|
|
- <span v-if="orderDetal.orderType != 'downOrder' && orderDetal.orderType != 'cooperationOrder'">× {{ item.count }}</span>
|
|
|
+ <span
|
|
|
+ v-if="
|
|
|
+ orderDetal.orderType != 'downOrder' &&
|
|
|
+ orderDetal.orderType != 'cooperationOrder'
|
|
|
+ "
|
|
|
+ >× {{ item.count }}</span
|
|
|
+ >
|
|
|
</span>
|
|
|
<!-- <span v-else>1</span> -->
|
|
|
<span v-if="orderDetal.orderType == 'incrementOrder'"
|
|
@@ -203,7 +226,7 @@ async function getCode() {
|
|
|
<h-icon type="vip_true" class="select-icon"></h-icon>
|
|
|
<img src="@/assets/images/vip_true.svg" class="t-click" alt />
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
<div
|
|
|
v-if="isEur"
|
|
|
class="pay-type paypal-pay"
|