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(
},
(error) => {
console.log('err' + error)
alert(error)
// alert(error)
let { message } = error
if (message === 'Network Error') {
message = '后端接口连接异常'
......
src/viewsPc/booking/pay.vue
......@@ -311,9 +311,10 @@
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24" />
<el-col :lg="8" :md="12" :sm="12" :xs="24" class="text-right text-warning">
{{ form.paymentType == '1' ? '共计' : 'total' }}:{{
form.paymentType == '1' ? '￥' : '€'
}}{{ Number(totalFee).toFixed(2) }}
{{ language.value==0?'共计':'total' }}:{{ form.paymentType == '3'||payType==3?'€' : '￥' }}{{ form.paymentType==3||payType==3?(totalFeeEn*1).toFixed(2):(totalFee*1).toFixed(2) }}
<!-- {{ (form.paymentType == '1'||form.paymentType == '9' )&&language==0? '共计' : 'total' }}:{{-->
<!-- (form.paymentType == '1'||form.paymentType == '9' )&&language==0 ? '￥' : '€'-->
<!-- }}{{ Number(totalFee).toFixed(2) }}-->
</el-col>
</el-row>
......@@ -345,9 +346,12 @@
}}：{{ form.phone }}
</el-col>
<el-col :lg="8" :md="12" :sm="12" :xs="24">
{{ language == 0 ? '共计' : 'total' }}:{{
language == 0 ? '￥' : '€'
}}{{ Number(totalFee).toFixed(2) }}
{{ language == 0 ? '共计' : 'total' }}:
{{
form.paymentType==3||payType==3? '€' : '￥'
}}{{
form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2)
}}
</el-col>
</el-row>
......@@ -360,24 +364,44 @@
<div v-if="form.payDate" class="mt10">{{ language == 0 ? '支付方式' : 'Payment Method' }}：
<span v-if="form.paymentType=='1'">{{ language == 0 ? '微信支付' : 'WePay' }}</span>
<span v-if="form.paymentType=='3'">PayPal</span>
<span v-if="form.paymentType=='9'">{{ language==0? '民生付':'Minsheng Pay' }}</span>
</div>
</el-col>
<el-col :lg="12" class="result">
<div v-if="form.viewStatus=='0'" class="priceb">{{ language == 0 ? '待支付金额' : 'Amount Due' }}：
<span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">
{{ form.paymentType == 3 || payType == 3 ? '€' : '￥' }}
{{ form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2) }}</span>
</div>
<div v-if="form.viewStatus=='1'||form.viewStatus=='5'" class="priceb">
{{ language == 0 ? '已支付金额' : 'Amount Due' }}：
<span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">
<!-- {{ language == 0 ? '¥' : '€' }}-->
{{ form.paymentType==3||payType==3? '€' : '￥' }}
<!-- {{ Number(totalFee).toFixed(2) }}-->
{{ form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2) }}
</span>
</div>
<div v-if="form.viewStatus=='4'" class="priceb">{{ language == 0 ? '已退订' : 'Refunded' }}：
<span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">
<!-- {{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}-->
{{ form.paymentType==3||payType==3? '€' : '￥' }}
{{ form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2) }}
</span>
</div>
<div v-if="form.viewStatus=='2'" class="priceb">{{ language == 0 ? '已取消' : 'Canceled' }}：
<span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">
<!-- {{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}-->
{{ form.paymentType==3||payType==3? '€' : '￥' }}
{{ form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2) }}
</span>
</div>
<div v-if="form.viewStatus=='7'" class="priceb">{{ language == 0 ? '退款审核中' : 'Refund in review' }}：
<span class="price">{{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}</span>
<span class="price">
<!-- {{ language == 0 ? '¥' : '€' }}{{ Number(totalFee).toFixed(2) }}-->
{{ form.paymentType==3||payType==3? '€' : '￥' }}
{{ form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2) }}
</span>
</div>
</el-col>
<el-col :lg="24">
......@@ -465,7 +489,7 @@
/>
</svg>
</el-radio>
<el-radio border value="4">{{ language==0?'民生付':'Minsheng Pay' }}</el-radio>
<el-radio v-if="language==0" border value="4">{{ language==0?'民生付':'Minsheng Pay' }}</el-radio>
</el-radio-group>
<div v-if="payType == '2'&&wePayCodeUrl">
<div class="payImgbox flexCenter">
......@@ -496,7 +520,11 @@
<SuccessFilled />
</el-icon>
<p class="text-success">{{ language == 0 ? '支付成功' : 'successful!' }}</p>
<h3 class="wePrice">{{ language == 0 ? '¥' : '€' }}{{ totalFee || 0 }}</h3>
<h3 class="wePrice">
<!-- {{ language == 0 ? '¥' : '€' }}{{ totalFee || 0 }}-->
{{ form.paymentType==3||payType==3? '€' : '￥' }}
{{ form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2) }}
</h3>
</div>
</div>
<el-row align="middle" class="mt20 mb60" justify="center">
......@@ -622,6 +650,7 @@ const showLoading = ref(false)
const isLogin = ref(false)
const language = useStorage('language', 0)
const totalFee = ref('')
const totalFeeEn = ref('')
const wePayCodeUrl = ref('')
const form = ref({})
const formInfo = ref({})
......@@ -687,11 +716,13 @@ function getData() {
booking.getCarBilldetailbyId({ orderId: orderId.value }).then(res => {
form.value = res.data
matchId.value = res.data.activeId
if (language.value == 0) {
totalFee.value = res.data.total
} else {
totalFee.value = res.data.totalEn
}
totalFee.value = res.data.total
totalFeeEn.value = res.data.totalEn
// if (language.value == 0) {
// totalFee.value = res.data.total
// } else {
// totalFee.value = res.data.totalEn
// }
checkReceipt()
}).catch(err => {
console.log(err)
......@@ -700,11 +731,14 @@ function getData() {
}
if (type.value == 'food') {
return booking.getFoodBilldetailbyId({ orderId: orderId.value }).then(res => {
if (language.value == 0) {
totalFee.value = res.data.total
} else {
totalFee.value = res.data.totalEn
}
totalFeeEn.value = res.data.totalEn
totalFee.value = res.data.total
// if (language.value == 0) {
// totalFee.value = res.data.total
// } else {
// totalFee.value = res.data.totalEn
// }
form.value = res.data
form.value.messageObj = JSON.parse(form.value.message)
form.value.extJsonObj = JSON.parse(form.value.extJson)
......@@ -713,11 +747,13 @@ function getData() {
}
if (type.value == 'hotel') {
return booking.getRoomBilldetailbyId({ orderId: orderId.value }).then(res => {
if (language.value == 0) {
totalFee.value = res.data.total
} else {
totalFee.value = res.data.totalEn
}
totalFeeEn.value = res.data.totalEn
totalFee.value = res.data.total
// if (language.value == 0) {
// totalFee.value = res.data.total
// } else {
// totalFee.value = res.data.totalEn
// }
form.value = res.data
form.value.messageObj = JSON.parse(form.value.message) || {}
form.value.extJsonObj = JSON.parse(form.value.extJson) || {}
......@@ -757,7 +793,9 @@ function checkReceipt() {
const getTravelOrderInfo = () => {
return booking.getScenicOrderInfo({ orderId: orderId.value }).then(res => {
form.value = res.data
totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
totalFeeEn.value = res.data.totalEn
totalFee.value = res.data.total
// totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
matchId.value = form.value.activeId
form.value.personArr = JSON.parse(form.value.message)
ScenicInfo()
......@@ -776,7 +814,9 @@ async function getTicketOrderInfoFN() {
try {
await getDetail(form.value.activeId)
matchId.value = form.value.activeId
totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
totalFeeEn.value = res.data.totalEn
totalFee.value = res.data.total
// totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
checkReceipt()
} catch (e) {
......@@ -899,7 +939,9 @@ function showLogin() {
function MakeUpOrder() {
return booking.getMealOrderInfo({ orderId: orderId.value }).then(res => {
form.value = res.data
totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
totalFeeEn.value = res.data.totalEn
totalFee.value = res.data.total
// totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
matchId.value = form.value.activeId
MakeUpIno()
console.log(res)
......@@ -933,7 +975,9 @@ function ScenicInfo() {
function photographyOrder() {
return booking.getPhotoOrderInfo({ orderId: orderId.value }).then(res => {
form.value = res.data
totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
totalFeeEn.value = res.data.totalEn
totalFee.value = res.data.total
// totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
photographyInfo()
}).catch(err => {
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!