Merge commit '6bef8301' into dev

杨炀
Showing 2 changed files with 72 additions and 58 deletions
src/viewsPc/booking/ticket/confirmOrder.vue
src/viewsPc/center/myReservation.vue
--- a/src/viewsPc/booking/ticket/confirmOrder.vue
View file @2ef19ff
+++ b/src/viewsPc/booking/ticket/confirmOrder.vue
View file @2ef19ff
@@ -18,7 +18,7 @@
              <div class="address">{{ TickForm2.sessionType=='1000'?'日间场':'夜间场' }}</div>
              <div class="address">{{ TickForm2.ticketName }}</div>
-              <div class="address">剩余数量： {{ (TickForm2.limitCount||0)-(TickForm3.counts||0) }}</div>
+              <div v-if="TickForm2.ticketType=='0'" class="address">剩余数量： {{ leftCount }}</div>
            </div>
            <div class="ticket_info mb20">
@@ -207,7 +207,7 @@ const rules = ref({
 const formRef = ref(null)
 const TickForm = ref({})
 const TickForm2 = ref({})
-const TickForm3 = ref({})
+const leftCount = ref({})
 const deskList = ref([])
 const currDesk = ref(null)
 const currSeat = ref([])
@@ -235,7 +235,7 @@ onMounted(() => {
      getListByAtstId({
        atstId: route.params.latstId
      }).then(res => {
-        TickForm3.value = res.data[0]
+        leftCount.value = res.data
      })
    }
  })
@@ -277,19 +277,21 @@ async function paymentHandle() {
    return
  }
-  if (currSeat.value.length == 0) {
+  if (TickForm2.value.ticketType == '1') {
-    ElMessage({
+    if (currSeat.value.length == 0) {
-      message: language.value == 0 ? '请选择座位' : 'Please select the seat',
+      ElMessage({
-      type: 'error'
+        message: language.value == 0 ? '请选择座位' : 'Please select the seat',
-    })
+        type: 'error'
-    return
+      })
-  }
+      return
-  if (currSeat.value.length != orderForm.value.customerIds.length) {
+    }
-    ElMessage({
+    if (currSeat.value.length != orderForm.value.customerIds.length) {
-      message: language.value == 0 ? '座位数与人数不一致' : '',
+      ElMessage({
-      type: 'error'
+        message: language.value == 0 ? '座位数与人数不一致' : '',
-    })
+        type: 'error'
-    return
+      })
+      return
+    }
  }
  await formRef.value.validate()
--- a/src/viewsPc/center/myReservation.vue
View file @2ef19ff
+++ b/src/viewsPc/center/myReservation.vue
View file @2ef19ff
@@ -8,7 +8,7 @@
        <!--        <el-button class="fr" type="primary" plain @click="toInvoice">{{ language==0?'发票开具':'Invoice' }}</el-button>-->
        <!--        <el-button class="fr" type="primary" plain @click="toInvoice">{{ language==0?'我的发票':'My Invoice' }}</el-button>-->
      </div>
-      <el-empty v-if="list?.length == 0" :image="`/img/order_no.png`" :image-size="228"/>
+      <el-empty v-if="list?.length == 0" :image="`/img/order_no.png`" :image-size="228" />
      <div class="pd20">
        <div v-for="b in list" class="item">
@@ -25,23 +25,23 @@
          </div>
          <div class="status-po">
-              <span v-if="b.status == '0'&&b.surplus!='0,0'&&b.surplus!='0'" class="bg-warning">
+            <span v-if="b.status == '0'&&b.surplus!='0,0'&&b.surplus!='0'" class="bg-warning">
-                {{ language == 0 ? '待支付' : 'Unpaid' }}
+              {{ language == 0 ? '待支付' : 'Unpaid' }}
-              </span>
+            </span>
            <span v-if="b.status == '0'&&(b.surplus=='0,0'||b.surplus=='0')" class="bg-warning">{{
-                language == 0 ? '已取消' : 'Canceled'
+              language == 0 ? '已取消' : 'Canceled'
-              }}</span>
+            }}</span>
            <span v-if="b.status == '1'" class="bg-blue">{{ language == 0 ? '支付成功' : 'successful' }}</span>
            <span v-if="b.status == '2'" class="bg-warning">{{ language == 0 ? '已取消' : 'Canceled' }}</span>
            <span v-if="b.status == '3'||b.status == '4'" class="bg-danger">{{
-                language == 0 ? '已退订' : 'Refunded'
+              language == 0 ? '已退订' : 'Refunded'
-              }}</span>
+            }}</span>
            <span v-if="b.status == '7'" class="bg-danger">{{
-                language == 0 ? '退款审核中' : 'Refund in review'
+              language == 0 ? '退款审核中' : 'Refund in review'
-              }}</span>
+            }}</span>
            <span v-if="b.status == '-1'" class="bg-blue">{{
-                language == 0 ? '已核销' : 'Completed'
+              language == 0 ? '已核销' : 'Completed'
-              }}</span>
+            }}</span>
          </div>
          <el-row align="middle" class="pd20 mt10" justify="space-between">
@@ -56,8 +56,8 @@
              <div v-if="b.orderType == 1">
                <h3 class="name">{{ b.name }}</h3>
                <div>
-                  <p>{{b.extJsonObj.pickUpBo.count}} 人</p>
+                  <p>{{ b.extJsonObj.pickUpBo.count }} 人</p>
-                  <p>{{b.extJsonObj.pickUpBo.revTime}}</p>
+                  <p>{{ b.extJsonObj.pickUpBo.revTime }}</p>
                </div>
                <!--                <p>{{b.messageObj}}</p>-->
                <!--                <p>{{b.extJsonObj}}</p>-->
@@ -94,7 +94,7 @@
              <div v-if="b.orderType == 6">
                <h3 class="name">{{ b.name }}</h3>
                <p>出行时间：{{ b.extJsonObj.dcStart }}</p>
-                <p v-for="t in b.extJsonObj.touristList">{{ t.gateName }}：{{t.name}}</p>
+                <p v-for="t in b.extJsonObj.touristList">{{ t.gateName }}：{{ t.name }}</p>
              </div>
            </el-col>
            <el-col :lg="6" :md="12" :sm="12" :xs="24">
@@ -102,10 +102,8 @@
                <p>{{ b.messageObj?.roomName }}</p>
                <p>{{ b.messageObj?.roomInfo }}</p>
              </div>
-              <div v-if="b.orderType == 1">
+              <div v-if="b.orderType == 1" />
-              </div>
+              <div v-if="b.orderType == 2" />
-              <div v-if="b.orderType == 2">
-              </div>
              <div v-if="b.orderType == 3||b.orderType == 4">
                <p>{{ b.extJsonObj.packageName }}</p>
              </div>
@@ -125,27 +123,41 @@
                  :value="b.countdown"
                  format="mm:ss"
                  value-style="color:#E60012;font-size:16px;"
-                  @finish="finish(b)"/>
+                  @finish="finish(b)"
+                />
              </div>
              <div class="text-right">
-                <el-button v-if="(b.orderType == 0||b.orderType == 5)&&b.viewStatus!=0" class="mb10" plain round
+                <el-button
-                           size="small" type="success"
+                  v-if="(b.orderType == 0||b.orderType == 5)&&b.viewStatus!=0" class="mb10" plain round
-                           @click="Rebook(b)">
+                  size="small" type="success"
+                  @click="Rebook(b)"
+                >
                  {{ language == 0 ? '再次预订' : 'Rebook' }}
                </el-button>
-                <el-button class="mb10" plain round size="small" type="primary" @click="goDetail(b)">
+                <el-button
+                  class="mb10" plain round size="small" type="primary"
+                  @click="goDetail(b)"
+                >
                  {{ language == 0 ? '详情' : 'Detail' }}
                </el-button>
-                <el-button v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" class="mb10"
+                <el-button
-                           plain round size="small" type="primary" @click="goDetail(b)">
+                  v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" class="mb10"
+                  plain round size="small" type="primary" @click="goDetail(b)"
+                >
                  {{ language == 0 ? '支付' : 'Pay' }}
                </el-button>
-                <el-button v-if="b.viewStatus==0" class="mb10" plain round size="small" type="warning"
+                <el-button
-                           @click="cancel(b)">
+                  v-if="b.viewStatus==0" class="mb10" plain round size="small"
+                  type="warning"
+                  @click="cancel(b)"
+                >
                  {{ language == 0 ? '取消订单' : 'Cancel Order' }}
                </el-button>
-                <el-button v-if="b.viewStatus==5" class="mb10" plain round size="small" type="" @click="unsubscribe(b)">
+                <el-button
+                  v-if="b.viewStatus==5" class="mb10" plain round size="small"
+                  type="" @click="unsubscribe(b)"
+                >
                  {{ language == 0 ? '退订' : 'Unsubscribe' }}
                </el-button>
@@ -155,26 +167,26 @@
        </div>
      </div>
    </el-card>
-    <div class="pd20"></div>
+    <div class="pd20" />
  </div>
 </template>
 <script setup>
-import {onMounted, getCurrentInstance} from "@vue/runtime-core";
+import { onMounted, getCurrentInstance } from '@vue/runtime-core'
-import {useStorage} from "@vueuse/core/index";
+import { useStorage } from '@vueuse/core/index'
-import {newbilllist} from "@/apiPc/common";
+import { newbilllist } from '@/apiPc/common'
-import useUserStore from "@/store/modules/user";
+import useUserStore from '@/store/modules/user'
 import dayjs from 'dayjs'
-import {cancelOrder2, cancelOrder} from "/@/apiPc/booking";
+import { cancelOrder2, cancelOrder } from '/@/apiPc/booking'
-import {ElMessage} from "element-plus";
+import { ElMessage } from 'element-plus'
 const router = useRouter()
 const language = useStorage('language', 0)
 const list = ref([])
 const user = useUserStore().user
-const {proxy} = getCurrentInstance()
+const { proxy } = getCurrentInstance()
 onMounted(() => {
  getList()
@@ -186,9 +198,9 @@ function finish(bill) {
 }
 function getList() {
-  newbilllist({createById: user.userId}).then(res => {
+  newbilllist({ createById: user.userId }).then(res => {
    list.value = res.rows || []
-    for (let b of list.value) {
+    for (const b of list.value) {
      b.messageObj = JSON.parse(b.message) || {}
      b.extJsonObj = JSON.parse(b.extJson) || {}
      if (b.orderType == 5) {
@@ -200,7 +212,7 @@ function getList() {
        }
      }
      if (b.surplus && b.status == '0' && (b.surplus != '0,0' && b.surplus != '0')) {
-        b.countdown = Date.now() + Number((b.surplus.split(',')[0] * 60 + b.surplus.split(',')[1]) * 10)
+        b.countdown = dayjs().add(b.surplus.split(',')[0], 'minute').add(b.surplus.split(',')[1], 'second') 
      }
    }
  })
@@ -233,14 +245,14 @@ function Rebook(row) {
    router.push({
      name: 'ticket',
      params: {
-        activeId: row.activeId,
+        activeId: row.activeId
      }
    })
  }
 }
 const cancel = (row) => {
-//取消订单
+// 取消订单
  proxy.$modal.confirm(language.value == 0 ? '确定取消订单吗 ?' : `Are you sure to cancel the order?`).then(() => {
    return cancelOrder2(row.id).then(res => {
      getList()