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) { ...@@ -121,26 +121,27 @@ function popRemark(type) {
121 return 121 return
122 } 122 }
123 123
124 // if ((form.value.isJdView == 0 && type == '1')
125 // || (form.value.isCarView == 0 && type == '2')
126 // || (form.value.isFoodView == 0 && type == '3')
127 // || (form.value.isMealView == 0 && type == '4')
128 // || (type == '5' && form.value.isPhotoView == 0)
129 // || (type == '0')) {
130 // building()
131 // return
132 // }
133 if ((form.value.isJdView == 0 && type == '1') 124 if ((form.value.isJdView == 0 && type == '1')
134 || (type == '2') 125 || (form.value.isCarView == 0 && type == '2')
135 || ( type == '3') 126 || (form.value.isFoodView == 0 && type == '3')
136 || (form.value.isMealView == 0 && type == '4') 127 || (form.value.isMealView == 0 && type == '4')
137 || (type == '5') 128 || (type == '5' && form.value.isPhotoView == 0)
138 // || (type == '0') 129 // ||type==0
139 ) 130 ) {
140 {
141 building() 131 building()
142 return 132 return
143 } 133 }
134 // if ((form.value.isJdView == 0 && type == '1')
135 // || (type == '2')
136 // || ( type == '3')
137 // || (form.value.isMealView == 0 && type == '4')
138 // || (type == '5')
139 // // || (type == '0')
140 // )
141 // {
142 // building()
143 // return
144 // }
144 145
145 const params = { 146 const params = {
146 matchId: props.matchId, 147 matchId: props.matchId,
......
src/viewsPc/seat/order-detail.vue
...@@ -138,7 +138,7 @@ const detail = reactive({ ...@@ -138,7 +138,7 @@ const detail = reactive({
138 if (detail.pay_loading) return; 138 if (detail.pay_loading) return;
139 detail.pay_loading = true; 139 detail.pay_loading = true;
140 // 中文支付 140 // 中文支付
141 immediatePay({ orderSn: detail.data.orderSn, payType: 1 }) 141 immediatePay({ orderSn: detail.data.orderSn, payType:detail.data?.language=='zh-cn'? 1:2 })
142 .then((res) => { 142 .then((res) => {
143 if (res.data.language == "zh-cn") { 143 if (res.data.language == "zh-cn") {
144 detail.qrInfo = res.data; 144 detail.qrInfo = res.data;
...@@ -258,7 +258,7 @@ detail.fetchData(); ...@@ -258,7 +258,7 @@ detail.fetchData();
258 {{ languageFormat(language, "单价", "Price") }} 258 {{ languageFormat(language, "单价", "Price") }}
259 </div> 259 </div>
260 <div style="width: 10%" class="td"> 260 <div style="width: 10%" class="td">
261 {{ languageFormat(language, "数量", "Ticket Qty.") }} 261 {{ languageFormat(language, "数量", "Quantity") }}
262 </div> 262 </div>
263 <div style="width: 12%; text-align: right" class="td"> 263 <div style="width: 12%; text-align: right" class="td">
264 {{ languageFormat(language, "小计", "Subtotal") }} 264 {{ languageFormat(language, "小计", "Subtotal") }}
...@@ -269,14 +269,14 @@ detail.fetchData(); ...@@ -269,14 +269,14 @@ detail.fetchData();
269 <div style="width: 33%" class="td">{{ detail.data?.name }}</div> 269 <div style="width: 33%" class="td">{{ detail.data?.name }}</div>
270 <div style="width: 25%" class="td">{{ detail.data?.placeName }}</div> 270 <div style="width: 25%" class="td">{{ detail.data?.placeName }}</div>
271 <div style="width: 20%" class="td"> 271 <div style="width: 20%" class="td">
272 <span>{{ language == 0 ? "¥" : "€" }}</span> 272 <span>{{ detail.data?.language=='zh-cn'? "¥" : "€" }}</span>
273 {{ detail.data?.singlePrice }} 273 {{ detail.data?.singlePrice }}
274 </div> 274 </div>
275 <div style="width: 10%" class="td"> 275 <div style="width: 10%" class="td">
276 x{{ detail.data?.seatList?.length }} 276 x{{ detail.data?.seatList?.length }}
277 </div> 277 </div>
278 <div style="width: 12%; text-align: right" class="td"> 278 <div style="width: 12%; text-align: right" class="td">
279 <span>{{ language == 0 ? "¥" : "€" }}</span> 279 <span>{{ detail.data?.language=='zh-cn'? "¥" : "€" }}</span>
280 {{ detail.data?.payAmount }} 280 {{ detail.data?.payAmount }}
281 </div> 281 </div>
282 </div> 282 </div>
...@@ -284,18 +284,18 @@ detail.fetchData(); ...@@ -284,18 +284,18 @@ detail.fetchData();
284 <!-- 座位 --> 284 <!-- 座位 -->
285 <div class="seat_box"> 285 <div class="seat_box">
286 <div class="th"> 286 <div class="th">
287 <div style="width: 30.33%" class="td"> 287 <div style="width: 33%" class="td">
288 {{ languageFormat(language, "时间座位", "Seat Info") }} 288 {{ languageFormat(language, "时间座位", "Seat Info") }}
289 </div> 289 </div>
290 <div style="width: 30.33%" class="td"> 290 <div style="width: 33%" class="td">
291 {{ languageFormat(language, "订单信息", "Summary") }} 291 {{ languageFormat(language, "订单信息", "Summary") }}
292 </div> 292 </div>
293 <div style="width: 30.33%" class="td"> 293 <div style="width: 33%" class="td">
294 {{ languageFormat(language, "联系方式", "Contact details") }} 294 {{ languageFormat(language, "联系方式", "Contact details") }}
295 </div> 295 </div>
296 </div> 296 </div>
297 <div class="tr"> 297 <div class="tr">
298 <div style="width: 30.33%" class="td flex-col"> 298 <div style="width: 33%" class="td flex-col">
299 <div> 299 <div>
300 {{ detail.data?.dateStr }} 300 {{ detail.data?.dateStr }}
301 <span v-if="detail.data?.ticketType == 1" class="tag_t"> 301 <span v-if="detail.data?.ticketType == 1" class="tag_t">
...@@ -319,25 +319,32 @@ detail.fetchData(); ...@@ -319,25 +319,32 @@ detail.fetchData();
319 }}{{ languageFormat(language, "馆", "Venue") }}) 319 }}{{ languageFormat(language, "馆", "Venue") }})
320 </div> 320 </div>
321 </div> 321 </div>
322 <div style="width: 30.33%" class="td flex-col"> 322 <div style="width: 33%" class="td flex-col">
323 <div> 323 <div>
324 {{ languageFormat(language, "订单编号", "Order No.") }}：{{ 324 {{ languageFormat(language, "订单编号", "Order No.") }}：{{ detail.data?.orderSn }}
325 detail.data?.orderSn
326 }}
327 </div> 325 </div>
328 <div> 326 <div>
329 {{ languageFormat(language, "创建时间", "Order Time") }}：{{ 327 {{ languageFormat(language, "创建时间", "Order Time") }}：{{detail.data?.orderTime }}
330 detail.data?.orderTime
331 }}
332 </div> 328 </div>
333 </div> 329 </div>
334 <div style="width: 30.33%" class="td"> 330 <div style="width: 33%" class="td flex-col">
335 <div> 331 <div>
336 {{ languageFormat(language, "联系电话", "Telephone") }}：{{ 332 {{ languageFormat(language, "联系电话", "Telephone") }}：{{ detail.data?.contactPhone }}
337 detail.data?.contactPhone 333 <!-- <div>&nbsp;</div>-->
338 }} 334 <br>
339 </div> 335 </div>
336 <div>
337 {{languageFormat(language,'支付方式','Form of payments')}}：{{detail.data?.language=='en-us'?'PayPal':'微信'}}
338 </div>
339
340 </div> 340 </div>
341 <!-- <div style="width: 20%" class="td ">-->
342 <!-- <div>-->
343 <!--&lt;!&ndash; {{ languageFormat(language, "联系电话", "Telephone") }}：{{ detail.data?.contactPhone }}&ndash;&gt;-->
344 <!-- 微信-->
345 <!-- </div>-->
346
347 <!-- </div>-->
341 </div> 348 </div>
342 </div> 349 </div>
343 <!-- 购票人 --> 350 <!-- 购票人 -->
...@@ -353,9 +360,7 @@ detail.fetchData(); ...@@ -353,9 +360,7 @@ detail.fetchData();
353 > 360 >
354 <div>{{ it.name }}</div> 361 <div>{{ it.name }}</div>
355 <div class="idcard"> 362 <div class="idcard">
356 {{ languageFormat(language, "证件号", "ID number") }}：{{ 363 {{ languageFormat(language, "证件号", "ID number") }}：{{ it.idCard }}
357 it.idCard
358 }}
359 </div> 364 </div>
360 </div> 365 </div>
361 </div> 366 </div>
...@@ -390,7 +395,7 @@ detail.fetchData(); ...@@ -390,7 +395,7 @@ detail.fetchData();
390 class="value" 395 class="value"
391 :style="{ color: status[detail.data?.state]?.color }" 396 :style="{ color: status[detail.data?.state]?.color }"
392 > 397 >
393 <span>{{ language == 0 ? "¥" : "€" }}</span> 398 <span>{{ detail.data?.language=='zh-cn'? "¥" : "€" }}</span>
394 {{ detail.data?.payAmount }} 399 {{ detail.data?.payAmount }}
395 </div> 400 </div>
396 </div> 401 </div>
......
src/viewsPc/seat/order-list.vue
...@@ -235,10 +235,7 @@ onMounted(() => { ...@@ -235,10 +235,7 @@ onMounted(() => {
235 }}{{ languageFormat(language, "张", "tickets") }} 235 }}{{ languageFormat(language, "张", "tickets") }}
236 </div> 236 </div>
237 <div class="common"> 237 <div class="common">
238 {{ languageFormat(language, "金额", "Ticket Price") }}：<span 238 {{ languageFormat(language, "金额", "Ticket Price") }}：{{it.payType=='2'?'€':'￥'}}{{ it.payAmount }}
239 v-if="language == 0"
240 >￥</span
241 >{{ it.payAmount }}
242 </div> 239 </div>
243 <div class="status"> 240 <div class="status">
244 <div class="label"> 241 <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!