Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
8a47e770 by zhangmeng
Options

paypal

1 parent d9f91d5e
Inline Side-by-side
Showing 3 changed files with 46 additions and 43 deletions
src/viewsPc/match/components/quick-row.vue
......@@ -121,26 +121,27 @@ function popRemark(type) {
return
}
// if ((form.value.isJdView == 0 && type == '1')
// || (form.value.isCarView == 0 && type == '2')
// || (form.value.isFoodView == 0 && type == '3')
// || (form.value.isMealView == 0 && type == '4')
// || (type == '5' && form.value.isPhotoView == 0)
// || (type == '0')) {
// building()
// return
// }
if ((form.value.isJdView == 0 && type == '1')
|| (type == '2')
|| ( type == '3')
|| (form.value.isMealView == 0 && type == '4')
|| (type == '5')
// || (type == '0')
)
{
|| (form.value.isCarView == 0 && type == '2')
|| (form.value.isFoodView == 0 && type == '3')
|| (form.value.isMealView == 0 && type == '4')
|| (type == '5' && form.value.isPhotoView == 0)
// ||type==0
) {
building()
return
}
// if ((form.value.isJdView == 0 && type == '1')
// || (type == '2')
// || ( type == '3')
// || (form.value.isMealView == 0 && type == '4')
// || (type == '5')
// // || (type == '0')
// )
// {
// building()
// return
// }
const params = {
matchId: props.matchId,
......
src/viewsPc/seat/order-detail.vue
......@@ -138,7 +138,7 @@ const detail = reactive({
if (detail.pay_loading) return;
detail.pay_loading = true;
// 中文支付
immediatePay({ orderSn: detail.data.orderSn, payType: 1 })
immediatePay({ orderSn: detail.data.orderSn, payType:detail.data?.language=='zh-cn'? 1:2 })
.then((res) => {
if (res.data.language == "zh-cn") {
detail.qrInfo = res.data;
......@@ -258,7 +258,7 @@ detail.fetchData();
{{ languageFormat(language, "单价", "Price") }}
</div>
<div style="width: 10%" class="td">
{{ languageFormat(language, "数量", "Ticket Qty.") }}
{{ languageFormat(language, "数量", "Quantity") }}
</div>
<div style="width: 12%; text-align: right" class="td">
{{ languageFormat(language, "小计", "Subtotal") }}
......@@ -269,14 +269,14 @@ detail.fetchData();
<div style="width: 33%" class="td">{{ detail.data?.name }}</div>
<div style="width: 25%" class="td">{{ detail.data?.placeName }}</div>
<div style="width: 20%" class="td">
<span>{{ language == 0 ? "¥" : "€" }}</span>
<span>{{ detail.data?.language=='zh-cn'? "¥" : "€" }}</span>
{{ detail.data?.singlePrice }}
</div>
<div style="width: 10%" class="td">
x{{ detail.data?.seatList?.length }}
</div>
<div style="width: 12%; text-align: right" class="td">
<span>{{ language == 0 ? "¥" : "€" }}</span>
<span>{{ detail.data?.language=='zh-cn'? "¥" : "€" }}</span>
{{ detail.data?.payAmount }}
</div>
</div>
......@@ -284,18 +284,18 @@ detail.fetchData();
<!-- 座位 -->
<div class="seat_box">
<div class="th">
<div style="width: 30.33%" class="td">
<div style="width: 33%" class="td">
{{ languageFormat(language, "时间座位", "Seat Info") }}
</div>
<div style="width: 30.33%" class="td">
<div style="width: 33%" class="td">
{{ languageFormat(language, "订单信息", "Summary") }}
</div>
<div style="width: 30.33%" class="td">
<div style="width: 33%" class="td">
{{ languageFormat(language, "联系方式", "Contact details") }}
</div>
</div>
<div class="tr">
<div style="width: 30.33%" class="td flex-col">
<div style="width: 33%" class="td flex-col">
<div>
{{ detail.data?.dateStr }}
<span v-if="detail.data?.ticketType == 1" class="tag_t">
......@@ -319,25 +319,32 @@ detail.fetchData();
}}{{ languageFormat(language, "馆", "Venue") }})
</div>
</div>
<div style="width: 30.33%" class="td flex-col">
<div style="width: 33%" class="td flex-col">
<div>
{{ languageFormat(language, "订单编号", "Order No.") }}：{{
detail.data?.orderSn
}}
{{ languageFormat(language, "订单编号", "Order No.") }}：{{ detail.data?.orderSn }}
</div>
<div>
{{ languageFormat(language, "创建时间", "Order Time") }}：{{
detail.data?.orderTime
}}
{{ languageFormat(language, "创建时间", "Order Time") }}：{{detail.data?.orderTime }}
</div>
</div>
<div style="width: 30.33%" class="td">
<div style="width: 33%" class="td flex-col">
<div>
{{ languageFormat(language, "联系电话", "Telephone") }}：{{
detail.data?.contactPhone
}}
{{ languageFormat(language, "联系电话", "Telephone") }}：{{ detail.data?.contactPhone }}
<!-- <div>&nbsp;</div>-->
<br>
</div>
<div>
{{languageFormat(language,'支付方式','Form of payments')}}：{{detail.data?.language=='en-us'?'PayPal':'微信'}}
</div>
</div>
<!-- <div style="width: 20%" class="td ">-->
<!-- <div>-->
<!--&lt;!&ndash; {{ languageFormat(language, "联系电话", "Telephone") }}：{{ detail.data?.contactPhone }}&ndash;&gt;-->
<!-- 微信-->
<!-- </div>-->
<!-- </div>-->
</div>
</div>
<!-- 购票人 -->
......@@ -353,9 +360,7 @@ detail.fetchData();
>
<div>{{ it.name }}</div>
<div class="idcard">
{{ languageFormat(language, "证件号", "ID number") }}：{{
it.idCard
}}
{{ languageFormat(language, "证件号", "ID number") }}：{{ it.idCard }}
</div>
</div>
</div>
......@@ -390,7 +395,7 @@ detail.fetchData();
class="value"
:style="{ color: status[detail.data?.state]?.color }"
>
<span>{{ language == 0 ? "¥" : "€" }}</span>
<span>{{ detail.data?.language=='zh-cn'? "¥" : "€" }}</span>
{{ detail.data?.payAmount }}
</div>
</div>
......
src/viewsPc/seat/order-list.vue
......@@ -235,10 +235,7 @@ onMounted(() => {
}}{{ languageFormat(language, "张", "tickets") }}
</div>
<div class="common">
{{ languageFormat(language, "金额", "Ticket Price") }}：<span
v-if="language == 0"
>￥</span
>{{ it.payAmount }}
{{ languageFormat(language, "金额", "Ticket Price") }}：{{it.payType=='2'?'€':'￥'}}{{ it.payAmount }}
</div>
<div class="status">
<div class="label">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!