Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
c01c83b9 by zhangmeng
Options

民生付

1 parent fe5fc24d
Inline Side-by-side
Showing 2 changed files with 77 additions and 33 deletions
src/utils/request.js
...@@ -185,7 +185,7 @@ service.interceptors.response.use( ...@@ -185,7 +185,7 @@ service.interceptors.response.use(
185 }, 185 },
186 (error) => { 186 (error) => {
187 console.log('err' + error) 187 console.log('err' + error)
188 alert(error) 188 // alert(error)
189 let { message } = error 189 let { message } = error
190 if (message === 'Network Error') { 190 if (message === 'Network Error') {
191 message = '后端接口连接异常' 191 message = '后端接口连接异常'
......
src/viewsPc/booking/pay.vue
...@@ -311,9 +311,10 @@ ...@@ -311,9 +311,10 @@
311 </el-col> 311 </el-col>
312 <el-col :lg="8" :md="12" :sm="12" :xs="24" /> 312 <el-col :lg="8" :md="12" :sm="12" :xs="24" />
313 <el-col :lg="8" :md="12" :sm="12" :xs="24" class="text-right text-warning"> 313 <el-col :lg="8" :md="12" :sm="12" :xs="24" class="text-right text-warning">
314 {{ form.paymentType == '1' ? '共计' : 'total' }}:{{ 314 {{ language.value==0?'共计':'total' }}:{{ form.paymentType == '3'||payType==3?'€' : '￥' }}{{ form.paymentType==3||payType==3?(totalFeeEn*1).toFixed(2):(totalFee*1).toFixed(2) }}
315 form.paymentType == '1' ? '￥' : '€' 315 <!-- {{ (form.paymentType == '1'||form.paymentType == '9' )&&language==0? '共计' : 'total' }}:{{-->
316 }}{{ Number(totalFee).toFixed(2) }} 316 <!-- (form.paymentType == '1'||form.paymentType == '9' )&&language==0 ? '￥' : '€'-->
317 <!-- }}{{ Number(totalFee).toFixed(2) }}-->
317 </el-col> 318 </el-col>
318 </el-row> 319 </el-row>
319 320
...@@ -345,9 +346,12 @@ ...@@ -345,9 +346,12 @@
345 }}：{{ form.phone }} 346 }}：{{ form.phone }}
346 </el-col> 347 </el-col>
347 <el-col :lg="8" :md="12" :sm="12" :xs="24"> 348 <el-col :lg="8" :md="12" :sm="12" :xs="24">
348 {{ language == 0 ? '共计' : 'total' }}:{{ 349 {{ language == 0 ? '共计' : 'total' }}:
349 language == 0 ? '￥' : '€' 350 {{
350 }}{{ Number(totalFee).toFixed(2) }} 351 form.paymentType==3||payType==3? '€' : '￥'
352 }}{{
353 form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2)
354 }}
351 </el-col> 355 </el-col>
352 </el-row> 356 </el-row>
353 357
...@@ -360,24 +364,44 @@ ...@@ -360,24 +364,44 @@
360 <div v-if="form.payDate" class="mt10">{{ language == 0 ? '支付方式' : 'Payment Method' }}： 364 <div v-if="form.payDate" class="mt10">{{ language == 0 ? '支付方式' : 'Payment Method' }}：
361 <span v-if="form.paymentType=='1'">{{ language == 0 ? '微信支付' : 'WePay' }}</span> 365 <span v-if="form.paymentType=='1'">{{ language == 0 ? '微信支付' : 'WePay' }}</span>
362 <span v-if="form.paymentType=='3'">PayPal</span> 366 <span v-if="form.paymentType=='3'">PayPal</span>
367 <span v-if="form.paymentType=='9'">{{ language==0? '民生付':'Minsheng Pay' }}</span>
363 </div> 368 </div>
364 </el-col> 369 </el-col>
365 <el-col :lg="12" class="result"> 370 <el-col :lg="12" class="result">
366 <div v-if="form.viewStatus=='0'" class="priceb">{{ language == 0 ? '待支付金额' : 'Amount Due' }}： 371 <div v-if="form.viewStatus=='0'" class="priceb">{{ language == 0 ? '待支付金额' : 'Amount Due' }}：
367 <span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span> 372 <span class="price">
373 {{ form.paymentType == 3 || payType == 3 ? '€' : '￥' }}
374 {{ form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2) }}</span>
368 </div> 375 </div>
369 <div v-if="form.viewStatus=='1'||form.viewStatus=='5'" class="priceb"> 376 <div v-if="form.viewStatus=='1'||form.viewStatus=='5'" class="priceb">
370 {{ language == 0 ? '已支付金额' : 'Amount Due' }}： 377 {{ language == 0 ? '已支付金额' : 'Amount Due' }}：
371 <span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span> 378 <span class="price">
379 <!-- {{ language == 0 ? '¥' : '€' }}-->
380 {{ form.paymentType==3||payType==3? '€' : '￥' }}
381 <!-- {{ Number(totalFee).toFixed(2) }}-->
382 {{ form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2) }}
383 </span>
372 </div> 384 </div>
373 <div v-if="form.viewStatus=='4'" class="priceb">{{ language == 0 ? '已退订' : 'Refunded' }}： 385 <div v-if="form.viewStatus=='4'" class="priceb">{{ language == 0 ? '已退订' : 'Refunded' }}：
374 <span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span> 386 <span class="price">
387 <!-- {{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}-->
388 {{ form.paymentType==3||payType==3? '€' : '￥' }}
389 {{ form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2) }}
390 </span>
375 </div> 391 </div>
376 <div v-if="form.viewStatus=='2'" class="priceb">{{ language == 0 ? '已取消' : 'Canceled' }}： 392 <div v-if="form.viewStatus=='2'" class="priceb">{{ language == 0 ? '已取消' : 'Canceled' }}：
377 <span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span> 393 <span class="price">
394 <!-- {{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}-->
395 {{ form.paymentType==3||payType==3? '€' : '￥' }}
396 {{ form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2) }}
397 </span>
378 </div> 398 </div>
379 <div v-if="form.viewStatus=='7'" class="priceb">{{ language == 0 ? '退款审核中' : 'Refund in review' }}： 399 <div v-if="form.viewStatus=='7'" class="priceb">{{ language == 0 ? '退款审核中' : 'Refund in review' }}：
380 <span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span> 400 <span class="price">
401 <!-- {{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}-->
402 {{ form.paymentType==3||payType==3? '€' : '￥' }}
403 {{ form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2) }}
404 </span>
381 </div> 405 </div>
382 </el-col> 406 </el-col>
383 <el-col :lg="24"> 407 <el-col :lg="24">
...@@ -465,7 +489,7 @@ ...@@ -465,7 +489,7 @@
465 /> 489 />
466 </svg> 490 </svg>
467 </el-radio> 491 </el-radio>
468 <el-radio border value="4">{{ language==0?'民生付':'Minsheng Pay' }}</el-radio> 492 <el-radio v-if="language==0" border value="4">{{ language==0?'民生付':'Minsheng Pay' }}</el-radio>
469 </el-radio-group> 493 </el-radio-group>
470 <div v-if="payType == '2'&&wePayCodeUrl"> 494 <div v-if="payType == '2'&&wePayCodeUrl">
471 <div class="payImgbox flexCenter"> 495 <div class="payImgbox flexCenter">
...@@ -496,7 +520,11 @@ ...@@ -496,7 +520,11 @@
496 <SuccessFilled /> 520 <SuccessFilled />
497 </el-icon> 521 </el-icon>
498 <p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p> 522 <p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p>
499 <h3 class="wePrice">{{ language == 0 ? '¥' : '€' }}{{ totalFee || 0 }}</h3> 523 <h3 class="wePrice">
524 <!-- {{ language == 0 ? '¥' : '€' }}{{ totalFee || 0 }}-->
525 {{ form.paymentType==3||payType==3? '€' : '￥' }}
526 {{ form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2) }}
527 </h3>
500 </div> 528 </div>
501 </div> 529 </div>
502 <el-row align="middle" class="mt20 mb60" justify="center"> 530 <el-row align="middle" class="mt20 mb60" justify="center">
...@@ -622,6 +650,7 @@ const showLoading = ref(false) ...@@ -622,6 +650,7 @@ const showLoading = ref(false)
622 const isLogin = ref(false) 650 const isLogin = ref(false)
623 const language = useStorage('language', 0) 651 const language = useStorage('language', 0)
624 const totalFee = ref('') 652 const totalFee = ref('')
653 const totalFeeEn = ref('')
625 const wePayCodeUrl = ref('') 654 const wePayCodeUrl = ref('')
626 const form = ref({}) 655 const form = ref({})
627 const formInfo = ref({}) 656 const formInfo = ref({})
...@@ -687,11 +716,13 @@ function getData() { ...@@ -687,11 +716,13 @@ function getData() {
687 booking.getCarBilldetailbyId({ orderId: orderId.value }).then(res => { 716 booking.getCarBilldetailbyId({ orderId: orderId.value }).then(res => {
688 form.value = res.data 717 form.value = res.data
689 matchId.value = res.data.activeId 718 matchId.value = res.data.activeId
690 if (language.value == 0) { 719 totalFee.value = res.data.total
691 totalFee.value = res.data.total 720 totalFeeEn.value = res.data.totalEn
692 } else { 721 // if (language.value == 0) {
693 totalFee.value = res.data.totalEn 722 // totalFee.value = res.data.total
694 } 723 // } else {
724 // totalFee.value = res.data.totalEn
725 // }
695 checkReceipt() 726 checkReceipt()
696 }).catch(err => { 727 }).catch(err => {
697 console.log(err) 728 console.log(err)
...@@ -700,11 +731,14 @@ function getData() { ...@@ -700,11 +731,14 @@ function getData() {
700 } 731 }
701 if (type.value == 'food') { 732 if (type.value == 'food') {
702 return booking.getFoodBilldetailbyId({ orderId: orderId.value }).then(res => { 733 return booking.getFoodBilldetailbyId({ orderId: orderId.value }).then(res => {
703 if (language.value == 0) { 734 totalFeeEn.value = res.data.totalEn
704 totalFee.value = res.data.total 735 totalFee.value = res.data.total
705 } else { 736
706 totalFee.value = res.data.totalEn 737 // if (language.value == 0) {
707 } 738 // totalFee.value = res.data.total
739 // } else {
740 // totalFee.value = res.data.totalEn
741 // }
708 form.value = res.data 742 form.value = res.data
709 form.value.messageObj = JSON.parse(form.value.message) 743 form.value.messageObj = JSON.parse(form.value.message)
710 form.value.extJsonObj = JSON.parse(form.value.extJson) 744 form.value.extJsonObj = JSON.parse(form.value.extJson)
...@@ -713,11 +747,13 @@ function getData() { ...@@ -713,11 +747,13 @@ function getData() {
713 } 747 }
714 if (type.value == 'hotel') { 748 if (type.value == 'hotel') {
715 return booking.getRoomBilldetailbyId({ orderId: orderId.value }).then(res => { 749 return booking.getRoomBilldetailbyId({ orderId: orderId.value }).then(res => {
716 if (language.value == 0) { 750 totalFeeEn.value = res.data.totalEn
717 totalFee.value = res.data.total 751 totalFee.value = res.data.total
718 } else { 752 // if (language.value == 0) {
719 totalFee.value = res.data.totalEn 753 // totalFee.value = res.data.total
720 } 754 // } else {
755 // totalFee.value = res.data.totalEn
756 // }
721 form.value = res.data 757 form.value = res.data
722 form.value.messageObj = JSON.parse(form.value.message) || {} 758 form.value.messageObj = JSON.parse(form.value.message) || {}
723 form.value.extJsonObj = JSON.parse(form.value.extJson) || {} 759 form.value.extJsonObj = JSON.parse(form.value.extJson) || {}
...@@ -757,7 +793,9 @@ function checkReceipt() { ...@@ -757,7 +793,9 @@ function checkReceipt() {
757 const getTravelOrderInfo = () => { 793 const getTravelOrderInfo = () => {
758 return booking.getScenicOrderInfo({ orderId: orderId.value }).then(res => { 794 return booking.getScenicOrderInfo({ orderId: orderId.value }).then(res => {
759 form.value = res.data 795 form.value = res.data
760 totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn 796 totalFeeEn.value = res.data.totalEn
797 totalFee.value = res.data.total
798 // totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
761 matchId.value = form.value.activeId 799 matchId.value = form.value.activeId
762 form.value.personArr = JSON.parse(form.value.message) 800 form.value.personArr = JSON.parse(form.value.message)
763 ScenicInfo() 801 ScenicInfo()
...@@ -776,7 +814,9 @@ async function getTicketOrderInfoFN() { ...@@ -776,7 +814,9 @@ async function getTicketOrderInfoFN() {
776 try { 814 try {
777 await getDetail(form.value.activeId) 815 await getDetail(form.value.activeId)
778 matchId.value = form.value.activeId 816 matchId.value = form.value.activeId
779 totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn 817 totalFeeEn.value = res.data.totalEn
818 totalFee.value = res.data.total
819 // totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
780 820
781 checkReceipt() 821 checkReceipt()
782 } catch (e) { 822 } catch (e) {
...@@ -899,7 +939,9 @@ function showLogin() { ...@@ -899,7 +939,9 @@ function showLogin() {
899 function MakeUpOrder() { 939 function MakeUpOrder() {
900 return booking.getMealOrderInfo({ orderId: orderId.value }).then(res => { 940 return booking.getMealOrderInfo({ orderId: orderId.value }).then(res => {
901 form.value = res.data 941 form.value = res.data
902 totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn 942 totalFeeEn.value = res.data.totalEn
943 totalFee.value = res.data.total
944 // totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
903 matchId.value = form.value.activeId 945 matchId.value = form.value.activeId
904 MakeUpIno() 946 MakeUpIno()
905 console.log(res) 947 console.log(res)
...@@ -933,7 +975,9 @@ function ScenicInfo() { ...@@ -933,7 +975,9 @@ function ScenicInfo() {
933 function photographyOrder() { 975 function photographyOrder() {
934 return booking.getPhotoOrderInfo({ orderId: orderId.value }).then(res => { 976 return booking.getPhotoOrderInfo({ orderId: orderId.value }).then(res => {
935 form.value = res.data 977 form.value = res.data
936 totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn 978 totalFeeEn.value = res.data.totalEn
979 totalFee.value = res.data.total
980 // totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
937 photographyInfo() 981 photographyInfo()
938 }).catch(err => { 982 }).catch(err => {
939 console.log(err) 983 console.log(err)
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!