民生付

zhangmeng
Showing 4 changed files with 71 additions and 9 deletions
src/assets/images/query/min.png
src/viewsPc/booking/pay.vue
src/viewsPc/booking/ticket/confirmOrder.vue
src/viewsPc/center/myReservation.vue
--- a/src/assets/images/query/min.png 0 → 100644
View file @27fd798
+++ b/src/assets/images/query/min.png 0 → 100644
View file @27fd798
--- a/src/viewsPc/booking/pay.vue
View file @27fd798
+++ b/src/viewsPc/booking/pay.vue
View file @27fd798
@@ -295,10 +295,19 @@
                    }}</span>
                  </el-col>
                  <el-col :lg="8" :md="8" :sm="12" :xs="24" class="text-right">
-                    <span v-if="language == 0 " class="text-primary">
+                    <span v-if="form.paymentType">
-                      ￥ {{ form.price }}
+                      {{ form.paymentType==3?'€':'￥' }}{{ form.paymentType==3?form.priceEn:form.price }}
                    </span>
-                    <span v-else>€ {{ form.priceEn || 0 }}</span>
+                    <span v-else>
+                      {{ payType==3?'€':'￥' }}{{ payType==3?form.priceEn:form.price }}
+                    </span>
+                    <!--                    <span v-else>-->
+                    <!--                      1-->
+                    <!--                    </span>-->
+                    <!--                    <span v-if="language == 0 " class="text-primary">-->
+                    <!--                      ￥ {{ form.price }}-->
+                    <!--                    </span>-->
+                    <!--                    <span v-else>€ {{ form.priceEn || 0 }}</span>-->
                  </el-col>
                </el-row>
                <el-row style="width: 100%">
@@ -349,7 +358,8 @@
                    {{ language == 0 ? '共计' : 'total' }}:
                    {{
                      form.paymentType==3||payType==3? '€' : '￥'
-                    }}{{
+                    }}
+                    {{
                      form.paymentType==3||payType==3? Number(totalFeeEn).toFixed(2) : Number(totalFee).toFixed(2)
                    }}
                  </el-col>
@@ -449,6 +459,13 @@
              <!--                  />-->
              <!--                </svg>-->
              <!--              </el-radio>-->
+              <el-radio border value="4">
+                <div class="minLogo">
+                  <img src="@/assets/images/query/min.png" alt="">
+                  <span>{{ language==0?'民生付':'Minsheng Pay' }}</span>
+                </div>
+              </el-radio>
              <el-radio v-if="language==1" border value="3">
                <!--paypal-->
                <svg
@@ -489,7 +506,7 @@
                  />
                </svg>
              </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">
@@ -715,6 +732,7 @@ function getData() {
    booking.getCarBilldetailbyId({ orderId: orderId.value }).then(res => {
      form.value = res.data
+      if (form.value.paymentType)payType.value = null
      matchId.value = res.data.activeId
      totalFee.value = res.data.total
      totalFeeEn.value = res.data.totalEn
@@ -740,6 +758,8 @@ function getData() {
      //   totalFee.value = res.data.totalEn
      // }
      form.value = res.data
+      if (form.value.paymentType)payType.value = null
      form.value.messageObj = JSON.parse(form.value.message)
      form.value.extJsonObj = JSON.parse(form.value.extJson)
      console.log(form.value)
@@ -758,6 +778,7 @@ function getData() {
      form.value.messageObj = JSON.parse(form.value.message) || {}
      form.value.extJsonObj = JSON.parse(form.value.extJson) || {}
      matchId.value = form.value.extJsonObj?.activeId
+      if (form.value.paymentType) payType.value = null
    }).catch(err => {
      console.log(err)
      errorBox.value = true
@@ -793,6 +814,7 @@ function checkReceipt() {
 const getTravelOrderInfo = () => {
  return booking.getScenicOrderInfo({ orderId: orderId.value }).then(res => {
    form.value = res.data
+    if (form.value.paymentType)payType.value = null
    totalFeeEn.value = res.data.totalEn
    totalFee.value = res.data.total
    // totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
@@ -810,6 +832,7 @@ const getTravelOrderInfo = () => {
 async function getTicketOrderInfoFN() {
  const res = await getTicketOrderInfo({ orderId: orderId.value })
  form.value = res.data
+  if (form.value.paymentType) payType.value = null
  form.value.extJson = JSON.parse(form.value.extJson)
  try {
    await getDetail(form.value.activeId)
@@ -939,6 +962,8 @@ function showLogin() {
 function MakeUpOrder() {
  return booking.getMealOrderInfo({ orderId: orderId.value }).then(res => {
    form.value = res.data
+    if (form.value.paymentType)payType.value = null
    totalFeeEn.value = res.data.totalEn
    totalFee.value = res.data.total
    // totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
@@ -975,6 +1000,7 @@ function ScenicInfo() {
 function photographyOrder() {
  return booking.getPhotoOrderInfo({ orderId: orderId.value }).then(res => {
    form.value = res.data
+    if (form.value.paymentType)payType.value = null
    totalFeeEn.value = res.data.totalEn
    totalFee.value = res.data.total
    // totalFee.value = language.value == 0 ? form.value.total : form.value.totalEn
@@ -1280,4 +1306,21 @@ const showSJ = async() => {
    margin: 5px 12px;
  }
 }
+.minLogo{
+  display: flex;
+  justify-content: space-between;
+  img{
+    width: 40px;
+    height: 40px;
+  }
+  span{
+    font-size: 16px;
+    font-weight: bold;
+    position: relative;
+    bottom: -11px;
+    margin-left: 10px;
+  }
+}
 </style>
--- a/src/viewsPc/booking/ticket/confirmOrder.vue
View file @27fd798
+++ b/src/viewsPc/booking/ticket/confirmOrder.vue
View file @27fd798
@@ -375,7 +375,8 @@ async function paymentHandle() {
        ticketType: TickForm2.value.ticketType,
        contacts: orderForm.value.contacts,
        phone: orderForm.value.phone,
-        price: language.value == '0' ? TickForm2.value.price : TickForm2.value.priceEn,
+        price: TickForm2.value.price ?? 0,
+        priceEn: TickForm2.value.priceEn ?? 0,
        orderCustomerList: orderCustomerList
      })
      if (res.code == 200 && res.data.orderId > 0) {
--- a/src/viewsPc/center/myReservation.vue
View file @27fd798
+++ b/src/viewsPc/center/myReservation.vue
View file @27fd798
@@ -103,7 +103,8 @@
                  {{ b.extJsonObj.atstName }}</p>
                <p v-for="(p,i) in b.extJsonObj?.orderCustomerList" :key="i">
                  <el-tag v-if="p.deskNo" class="mr10">{{ p.deskNo }}-{{ p.seatNo }}</el-tag>
-                  {{ p.name }} - {{ p.paymentType == '3' ? '€' : '￥' }}{{ b.extJsonObj.price }}
+                  {{ p.name }}
+                  <!--                  - {{ p.paymentType == '3' ? '€' : '￥' }}{{ b.extJsonObj.price }}-->
                </p>
              </div>
              <div v-if="b.orderType == 6">
@@ -127,8 +128,25 @@
              </div>
            </el-col>
            <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
-              <span class="text-warning"> {{ language == 0 ? '¥' : '€' }}
+              <span class="text-warning">
-                <span class="bigMoney">{{ language == 0 ? b.total : b.totalEn }}</span>
+                <span v-if="b.paymentType">
+                  {{ b.paymentType == 3 ? '€': '¥' }}
+                </span>
+                <span v-else>
+                  {{ language == 1 ? '€': '¥' }}
+                </span>
+                <span class="bigMoney">
+                  <span v-if="b.paymentType">
+                    {{ b.paymentType == 3 ? b.totalEn: b.total }}
+                  </span>
+                  <span v-else>
+                    {{ language == 1 ? b.totalEn: b.total }}
+                  </span>
+                </span>
              </span>
            </el-col>
            <el-col :lg="6" :md="16" :sm="16" :xs="16">