8.12 gengxing

zrj
Showing 6 changed files with 56 additions and 32 deletions
src/assets/styles/index.scss
src/viewsPc/about/operation.vue
src/viewsPc/booking/hotelOrder.vue
src/viewsPc/booking/pay.vue
src/viewsPc/center/info/reservationInfo.vue
src/viewsPc/components/pickup.vue
--- a/src/assets/styles/index.scss
View file @6becb6f
+++ b/src/assets/styles/index.scss
View file @6becb6f
@@ -230,6 +230,7 @@ aside {
 }
 .w100{width: 100%;}
 .w200px{min-width: 200px;}
+.w120px{min-width: 120px;}
 .pt30{padding-top: 30px;}
 .d-form-border{
  border: 1px solid #E5E5E5;margin: 20px 0;padding: 20px}
--- a/src/viewsPc/about/operation.vue
View file @6becb6f
+++ b/src/viewsPc/about/operation.vue
View file @6becb6f
@@ -209,6 +209,6 @@ const getMenuList = () => {
  p {
    margin: 13px 0 0;
  }
 }
 </style>
--- a/src/viewsPc/booking/hotelOrder.vue
View file @6becb6f
+++ b/src/viewsPc/booking/hotelOrder.vue
View file @6becb6f
@@ -54,7 +54,7 @@
                  <div v-if="language==1" class="tip">If you need to make a hotel reservation, please fill in the full
                    names of all required persons when booking the hotel.
                    <!--                    (For two or more people, please use ',')-->
-                    (For two people, please separate the names with a comma ',)
+                    (For two people, please separate the names with a comma ",")
                  </div>
                </el-form-item>
@@ -504,6 +504,7 @@ function submit() {
          router.push({
            name: 'bookingPay',
            query: {
+              matchId:room.value.activityId,
              orderId: res.data.orderId,
              money: res.data.total,
              type: 'hotel'
--- a/src/viewsPc/booking/pay.vue
View file @6becb6f
+++ b/src/viewsPc/booking/pay.vue
View file @6becb6f
@@ -422,7 +422,7 @@
          <div class="leftboderTT">{{ language == 0 ? '选择支付方式' : 'Choose payment method' }}</div>
          <div class="mt20">
            <el-radio-group v-model="payType">
-              <el-radio v-if="language==0" border value="2">
+              <el-radio v-if="language==0" border label="2">
                <!--              微信-->
                <svg class="icon" height="40" p-id="24747" t="1709002960407"
                     version="1.1" viewBox="0 0 3152 1024" width="94" xmlns="http://www.w3.org/2000/svg">
@@ -434,7 +434,7 @@
                      fill="#595757" p-id="24749"></path>
                </svg>
              </el-radio>
-              <el-radio v-if="language==1" border value="3">
+              <el-radio v-if="language==1" border label="3">
                <!--paypal-->
                <svg class="icon" height="40" p-id="22654" t="1709002828937"
                     version="1.1" viewBox="0 0 4220 1024" width="94" xmlns="http://www.w3.org/2000/svg">
@@ -464,10 +464,10 @@
                      fill="#003087" p-id="22662"></path>
                </svg>
              </el-radio>
-              <el-radio value="4" v-if="language==0&&type=='hotel'" border>
+              <el-radio label="4" v-if="language==0&&type=='hotel'" border>
                对公打款
              </el-radio>
-              <el-radio v-if="language==1&&type=='hotel'" border value="5">
+              <el-radio v-if="language==1&&type=='hotel'" border label="5">
                Corporate payment
              </el-radio>
            </el-radio-group>
@@ -579,10 +579,9 @@
        </div>
      </div>
    </el-dialog>
-    <el-dialog v-model="showOfflineSuccessDialog" :title="language==0?'提示':'Tip'" width="460px"
+    <el-dialog v-model="showOfflineSuccessDialog" :title="language==0?'提示':'Tip'" width="460px" :show-close="false">
-               @close="OfflineSuccessDialogClose">
      <el-result
-          :sub-title="language==0?'请在7日内上传凭证，否则订单取消':'Please upload the payment receipt within 7 days, otherwise the order will be cancelled'"
+          :sub-title="language==0?'请及时上传转账凭证，若未能上传，订单可能被取消。您可直接下载本订单的缴费单，亦可前往于订单中心下载合并后的缴费单。':'Please upload your payment proof promptly. If you fail to upload it, your booking may be canceled.'"
          :title="language==0?'订单已提交':'Order submitted'"
          icon="success"
      >
@@ -590,6 +589,14 @@
          <el-button class="btn-lineG w200px" round type="primary" @click="downOfflineInvoice">
            {{ language == 0 ? '下载缴费单' : 'Download Invoice' }}
          </el-button>
+          <div style="margin-top: 20px">
+            <el-button style="display: inline-block" class="btn-lineG w120px" round type="primary" @click="toContinue">
+              {{ language == 0 ? '继续预定' : 'Continue Reservation' }}
+            </el-button>
+            <el-button style="display: inline-block" class="btn-lineG w120px" round type="primary" @click="toMyReservation">
+              {{ language == 0 ? '前往订单中心' : 'View Orders' }}
+            </el-button>
+          </div>
        </template>
      </el-result>
    </el-dialog>
@@ -615,6 +622,7 @@ const tableData = ref([])
 const payType = ref('2')
 const orderId = ref(route.query.orderId)
 const matchId = ref()
+const matchIdHistory = ref()
 const groupId = ref()
 const proofUrl = ref()
 import useUserStore from "@/store/modules/user";
@@ -690,7 +698,7 @@ onMounted(() => {
    }
  }
  if (route.query.matchId) {
-    matchId.value = route.query.matchId
+    matchIdHistory.value = route.query.matchId
  }
  getData()
 })
@@ -749,7 +757,8 @@ function getData() {
        hideconfirmbtn.value = true
      }
      if (form.value.paymentType) {
-        payType.value = form.value.paymentType
+        payType.value = '2'
+        // payType.value = form.value.paymentType
      }
    }).catch(err => {
      console.log(err)
@@ -1051,6 +1060,19 @@ const downOfflineInvoice = () => {
    ...obj
  }, `Invoice_${new Date().getTime()}.pdf`)
 }
+const toContinue = () => {
+  router.push({
+    path: `/booking/hotel/${matchIdHistory.value}`
+  })
+}
+const toMyReservation = () => {
+  router.push({
+    path: `/center/myReservation`
+  })
+}
 const submitProof = () => {
  //提交凭证
  if (!form.value.pic) {
--- a/src/viewsPc/center/info/reservationInfo.vue
View file @6becb6f
+++ b/src/viewsPc/center/info/reservationInfo.vue
View file @6becb6f
@@ -100,13 +100,13 @@
              </span>
        </el-col>
        <el-col :lg="6" :md="16" :sm="16" :xs="16">
-          <div class="text-right mb20 text-danger" v-if="b.status == '0' && b.countdown>0">
+<!--          <div class="text-right mb20 text-danger" v-if="b.status == '0' && b.countdown>0">-->
-            <el-countdown
+<!--            <el-countdown-->
-                :value="b.countdown"
+<!--                :value="b.countdown"-->
-                format="D天 HH:mm:ss"
+<!--                format="D天 HH:mm:ss"-->
-                value-style="color:#E60012;font-size:16px;"
+<!--                value-style="color:#E60012;font-size:16px;"-->
-                @finish="finish(b)"/>
+<!--                @finish="finish(b)"/>-->
-          </div>
+<!--          </div>-->
          <div class="text-right">
            <el-button v-if="(b.orderType == 0||b.orderType == 5)&&b.viewStatus!=0 &&!min" class="mb10" plain round
--- a/src/viewsPc/components/pickup.vue
View file @6becb6f
+++ b/src/viewsPc/components/pickup.vue
View file @6becb6f
@@ -98,13 +98,13 @@
            <el-form-item :label="language==0?'送达酒店':'Destination Hotel'" prop="pickUpBo.hotle" required>
              <el-input v-model="form.pickUpBo.hotle"/>
            </el-form-item>
-            <el-form-item :label="language==0?'行程单':'Round-Trip Itinerary'" prop="pickUpBo.itinerary" required>
+            <el-form-item :label="language==0?'行程单':'Round-Trip Itinerary'" prop="pickUpBo.itinerary">
              <image-upload v-model="form.pickUpBo.itinerary" :button-text="language==0?'上传':'Upload'"
                            :is-show-tip="false"
                            :limit="1"/>
            </el-form-item>
-            <el-form-item :label="language==0?'酒店预订单':'Hotel Reservation'" prop="pickUpBo.hotleFile" required>
+            <el-form-item :label="language==0?'酒店预订单':'Hotel Reservation'" prop="pickUpBo.hotleFile">
              <image-upload v-model="form.pickUpBo.hotleFile" :button-text="language==0?'上传':'Upload'"
                            :is-show-tip="false"
                            :limit="1"/>
@@ -195,13 +195,13 @@
            <el-form-item :label="language==0?'出发酒店':'Departure Hotel'" prop="downOffBo.hotle" required>
              <el-input v-model="form.downOffBo.hotle"/>
            </el-form-item>
-            <el-form-item :label="language==0?'行程单':'Round-Trip Itinerary'" prop="downOffBo.itinerary" required>
+            <el-form-item :label="language==0?'行程单':'Round-Trip Itinerary'" prop="downOffBo.itinerary">
              <image-upload v-model="form.downOffBo.itinerary" :button-text="language==0?'上传':'Upload'"
                            :is-show-tip="false"
                            :limit="1"/>
            </el-form-item>
-            <el-form-item :label="language==0?'酒店预订单':'Hotel Reservation'" prop="downOffBo.hotleFile" required>
+            <el-form-item :label="language==0?'酒店预订单':'Hotel Reservation'" prop="downOffBo.hotleFile">
              <image-upload v-model="form.downOffBo.hotleFile" :button-text="language==0?'上传':'Upload'"
                            :is-show-tip="false"
                            :limit="1"/>
@@ -318,11 +318,11 @@ const rules = ref(
      trigger: 'change',
      message: language.value == 0 ? '请输入' : 'Please enter'
    },],
-    'pickUpBo.itinerary': [{
+    // 'pickUpBo.itinerary': [{
-      required: true,
+    //   required: true,
-      trigger: 'change',
+    //   trigger: 'change',
-      message: language.value == 0 ? '请选择' : 'Please choose'
+    //   message: language.value == 0 ? '请选择' : 'Please choose'
-    },],
+    // },],
    'downOffBo.nationalitys': [{
      required: true,
      trigger: 'blur',
@@ -378,11 +378,11 @@ const rules = ref(
      trigger: 'change',
      message: language.value == 0 ? '请输入' : 'Please enter'
    },],
-    'downOffBo.itinerary': [{
+    // 'downOffBo.itinerary': [{
-      required: true,
+    //   required: true,
-      trigger: 'change',
+    //   trigger: 'change',
-      message: language.value == 0 ? '请选择' : 'Please choose'
+    //   message: language.value == 0 ? '请选择' : 'Please choose'
-    },],
+    // },],
  })
 const open = (params) => {