Merge branch 'dev' of https://code.itechtop.cn/yangyang/dance-pc into dev

杨炀
Showing 6 changed files with 191 additions and 128 deletions
src/viewsPc/booking/car.vue
src/viewsPc/booking/pay.vue
src/viewsPc/booking/ticket/index.vue
src/viewsPc/booking/travelDetail.vue
src/viewsPc/center/myReservation.vue
src/viewsPc/register/personal.vue
--- a/src/viewsPc/booking/car.vue
View file @bafb8f2
+++ b/src/viewsPc/booking/car.vue
View file @bafb8f2
@@ -237,7 +237,7 @@ async function changeSelectIn() {
 async function changeSelectOut() {
  const res = await booking.getVehicleByCheckIn({
    activityId: route.params.cptId,
-    checkIn: form1.value.checkIn,
+    checkIn: form2.value.checkIn,
    category: '1'
  })
  form2.value.checkOut = ''
@@ -273,13 +273,21 @@ async function handleSubmit(v) {
    //   category: v
    // })
  }
-  await router.push({
+  const res = await booking.checkOrderPay('1')
-    name: 'carList',
+  if (!res.data) {
-    params: {
+    await proxy.$modal.confirm(language == 0 ? '您有未支付的订单，请前往支付！' : 'You have unpaid orders, please proceed to payment!')
-      id: route.params.cptId
+    await router.push({
-    },
+      path: '/center/myReservation'
-    query: obj
+    })
-  })
+  } else {
+    await router.push({
+      name: 'carList',
+      params: {
+        id: route.params.cptId
+      },
+      query: obj
+    })
+  }
 }
--- a/src/viewsPc/booking/pay.vue
View file @bafb8f2
+++ b/src/viewsPc/booking/pay.vue
View file @bafb8f2
@@ -271,19 +271,26 @@
                <el-col :span="24">{{ language == 0 ? '备注' : 'Remarks' }}：{{ form.remarks }}</el-col>
              </el-row>
              <el-row v-if="type == 'ticket'" style="width: 100%">
-                <el-col :lg="12">
+                <el-col :lg="8">
                  {{ language == 0 ? '联系人' : 'Contact' }}：{{ form.contacts }}
                </el-col>
-                <el-col :lg="12">
+                <el-col :lg="8">
+                  {{ language == 0 ? '联系方式' : 'Contact' }}：{{ form.phone }}
+                </el-col>
+                <el-col :lg="8">
                  {{ language == 0 ? '联系方式' : 'Contact' }}：{{ form.phone }}
                </el-col>
                <el-row v-for="(v,i) in form.extJson?.orderCustomerList" :key="i" style="width: 100%">
-                  <el-col :lg="12" :md="12" :sm="12" :xs="24">
+                  <el-col :lg="8" :md="8" :sm="12" :xs="24">
                    {{ v.name }} -
                    <span class="text-gray">{{ v.idCard }}</span>
                  </el-col>
-                  <el-col :lg="12" :md="12" :sm="12" :xs="24" class="text-right">
+                  <el-col :lg="8" :md="8" :sm="12" :xs="24" class="">
+                    <span v-if="v.deskNo" class="">{{ language == 0 ? '座位号' : 'Seat Number' }} ：{{
+                      v.deskNo + '-' + v.seatNo
+                    }}</span>
+                  </el-col>
+                  <el-col :lg="8" :md="8" :sm="12" :xs="24" class="text-right">
                    <span v-if="language == 0 " class="text-primary">￥ {{ form.price }}</span>
                    <span v-else>€ {{ form.priceEn || 0 }}</span>
                  </el-col>
--- a/src/viewsPc/booking/ticket/index.vue
View file @bafb8f2
+++ b/src/viewsPc/booking/ticket/index.vue
View file @bafb8f2
 <template>
  <div>
    <!-- top -->
-    <div class="container top">
+    <div class="container top father">
      <img :src="fillImgUrl(matchForm.ticketImg)" alt="" class="cover_img">
      <div class="info">
        <div class="title">{{ matchForm.name }}</div>
@@ -114,6 +114,7 @@
              >
                {{ it.name }}
              </div>
+              <div v-if="remarks" class="remarks">{{ remarks }}</div>
            </div>
          </div>
@@ -151,15 +152,15 @@
              {{ triggerLanguage(language, "票型", "Ticket Type") }} :
            </div>
            <div>
-              <span
+              <!--              <span-->
-                v-if="currTick?.images"
+              <!--                v-if="currTick?.images"-->
-                style="color: #493ceb;cursor:pointer;font-weight:600;font-size: 14px"
+              <!--                style="color: #493ceb;cursor:pointer;font-weight:600;font-size: 14px"-->
-                @click="showUrl=currTick.images;show=true"
+              <!--                @click="showUrl=currTick.images;show=true"-->
-              > <span style="color: red;font-size: 18px">*</span>
+              <!--              > <span style="color: red;font-size: 18px">*</span>-->
-                {{
+              <!--                {{-->
-                  language == 0 ? '点击查看区域布局' : 'View Area Layout'
+              <!--                  language == 0 ? '点击查看区域布局' : 'View Area Layout'-->
-                }}
+              <!--                }}-->
-              </span>
+              <!--              </span>-->
            </div>
          </div>
          <div class="select_item_box">
@@ -221,7 +222,15 @@
          </div>
        </div>
+        <el-image
+          v-if="currTick?.images"
+          :preview-src-list="[fillImgUrl(currTick?.images)]"
+          :src="fillImgUrl(currTick?.images) "
+          class="son"
+          fit="cover"
+          preview-teleported
+          style="width:200px"
+        />
      </div>
    </div>
@@ -278,6 +287,7 @@ const active = ref(1)
 const props = defineProps({
  activityId: [String, Number]
 })
+const remarks = ref()
 const timeData = ref()
 const endTime = ref()
 const matchForm = ref({})
@@ -336,6 +346,7 @@ async function getVenueList() {
  venueList.value = res.rows
  currVenue.value = res.rows[0]
  selectForm.value.latsId = res.rows[0]?.id
+  if (venueList.value.length > 0) remarks.value = res.rows[0].remarks
  await getTicketListType()
 }
@@ -345,10 +356,10 @@ async function getTicketListType() {
  tickList.value = res.data
  selectForm.value.sessionType = Object.keys(res.data)[0]
-  currTick.value = tickList.value[selectForm.value.sessionType][0]
+  // currTick.value = tickList.value[selectForm.value.sessionType][0]
-  selectForm.value.latstId = currTick.value?.id
+  // selectForm.value.latstId = currTick.value?.id
-  selectForm.value.price = currTick.value?.price
+  // selectForm.value.price = currTick.value?.price
-  selectForm.value.priceEn = currTick.value?.priceEn
+  // selectForm.value.priceEn = currTick.value?.priceEn
 }
 function select(v) {
@@ -371,19 +382,20 @@ function selectVenue(v) {
  selectForm.value.id = null
  selectForm.value.price = '--'
  selectForm.value.priceEn = '--'
+  remarks.value = v.remarks
  getTicketListType()
 }
 function selectSessionType(key) {
  selectForm.value.sessionType = key
-  currTick.value = tickList.value[selectForm.value.sessionType][0]
+  // currTick.value = tickList.value[selectForm.value.sessionType][0]
  selectForm.value.latstId = currTick.value?.id
  selectForm.value.price = currTick.value?.price
  selectForm.value.priceEn = currTick.value?.priceEn
 }
+// 选择票型
 function selectTick(v) {
  currTick.value = v
  selectForm.value.latstId = v.id
@@ -760,4 +772,20 @@ getmatchData()
  text-align: center;
 }
+.father {
+  position: relative;
+}
+.son {
+  position: absolute;
+  bottom: 30px;
+  right: 50px;
+}
+.remarks {
+  font-size: 17px;
+  margin-left: 20px;
+  line-height: 40px;
+  color: #2b2f3a;
+}
 </style>
--- a/src/viewsPc/booking/travelDetail.vue
View file @bafb8f2
+++ b/src/viewsPc/booking/travelDetail.vue
View file @bafb8f2
@@ -2,7 +2,7 @@
  <div>
    <!-- top -->
    <div class="container top">
-      <img :src="fillImgUrl(travel.cover)" alt="" class="cover_img" st>
+      <img :src="fillImgUrl(travel.cover)" alt="" class="cover_img">
      <div class="info">
        <div class="title">{{ travel.name }}</div>
        <div class="select_item_box">
@@ -30,10 +30,10 @@
          <br>
          <div v-for="v in ticketList" v-show="v.leftNum!=0" :key="v.id">
            <div class="select_item_box">
-              <div class="label ticket">
+              <div class="ticket ticket-row">
-                {{ v.name }} :
+                <span class="label">
-              </div>
+                  {{ v.name }} :
-              <div class="rowBox">
+                </span>
                <span class="titleTick">
                  {{
                    triggerLanguage(language, v.price, v.priceEn)
@@ -42,11 +42,17 @@
                    triggerLanguage(language, '￥/人', '€/person')
                  }}
                </span>
-                <el-input-number
+              </div>
-                  v-model="v.count" :max="v.leftNum" :min="0" :precision="0" class="inputNumber"
+              <div class="rowBox">
-                  @change="countTotal"
-                />
+                <span>
-                <i class="residue">{{ language == 0 ? '剩余票数' : 'Remaining votes' }}{{ v.leftNum }}</i>
+                  <el-input-number
+                    v-model="v.count" :max="v.leftNum" :min="0" :precision="0" class="inputNumber"
+                    @change="countTotal"
+                  />
+                  <i class="residue">{{ language == 0 ? '剩余票数' : 'Remaining votes' }}{{ v.leftNum }}</i>
+                </span>
              </div>
            </div>
          </div>
@@ -79,14 +85,18 @@
          </div>
          <div
-            v-if="endTime<=0" class="btn" style="margin-left: 40px;opacity: 0.5;cursor: not-allowed;margin-top: 10px"
+            v-if="endTime<=0" class="btn"
+            style="margin-left: 40px;opacity: 0.5;cursor: not-allowed;margin-top: 10px"
            @click="toSelectClosed"
          >
            {{
              triggerLanguage(language, "售票结束", "Sale closed")
            }}
          </div>
-          <div v-else class="btn" style="margin-left: 40px;margin-top: 10px" @click="toSelectSeat()">
+          <div
+            v-else v-show="travel?.dateList?.length>0" class="btn" style="margin-left: 40px;margin-top: 10px"
+            @click="toSelectSeat()"
+          >
            {{
              triggerLanguage(language, "立即购票", "Buy tickets now")
            }}
@@ -202,8 +212,8 @@ function countTotal() {
      })]
    }
  }
-  selectForm.value.price = price
+  selectForm.value.price = price?.toFixed(2)
-  selectForm.value.priceEn = priceEn
+  selectForm.value.priceEn = priceEn?.toFixed(2)
 }
 async function toSelectSeat() {
@@ -348,23 +358,29 @@ function toSelectClosed() {
      .ticket {
        height: 40px;
        line-height: 40px;
-        width: 100px;
+        width: 320px;
+      }
+      .ticket-row {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
      }
+      .titleTick {
+        color: #493ceb;
+        cursor: pointer;
+        font-weight: 600;
+        font-size: 18px;
+        margin-right: 30px;
+        height: 40px;
+        line-height: 40px;
+      }
      .rowBox {
        display: flex;
-        .titleTick {
-          color: #493ceb;
-          cursor: pointer;
-          font-weight: 600;
-          font-size: 18px;
-          margin-right: 30px;
-          height: 40px;
-          line-height: 40px;
-          width: 180px;
-          //text-align: center;
-        }
        .inputNumber {
          height: 35px;
--- a/src/viewsPc/center/myReservation.vue
View file @bafb8f2
+++ b/src/viewsPc/center/myReservation.vue
View file @bafb8f2
@@ -4,12 +4,12 @@
      <div class="indexTitle">
        <h3 class="leftboderTT">{{ language == 0 ? '我的预订' : 'My reservation' }}
        </h3>
        <!--        <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">
          <div class="title">
@@ -20,27 +20,29 @@
            <label v-if="b.orderType == 4" class="orangeTag"> {{ language == 0 ? '拍摄' : 'Shooting ' }} </label>
            <label v-if="b.orderType == 5" class="greenTag"> {{ language == 0 ? '票务' : 'TICKETING ' }} </label>
            <label v-if="b.orderType == 6" class="orangeTag"> {{ language == 0 ? '旅游' : 'Travel ' }} </label>
            <span>{{ language == 0 ? '订单编号：' : 'No.' }} {{ b.id }}</span>
          </div>
          <div class="status-po">
            <span v-if="b.status == '0'&&b.surplus!='0,0'&&b.surplus!='0'" class="bg-warning">
              {{ language == 0 ? '待支付' : 'Unpaid' }}
            </span>
-            <span v-if="b.status == '0'&&(b.surplus=='0,0'||b.surplus=='0')"
+            <span
-                  class="bg-warning">{{ language == 0 ? '已取消' : 'Canceled' }}</span>
+              v-if="b.status == '0'&&(b.surplus=='0,0'||b.surplus=='0')"
+              class="bg-warning"
+            >{{ language == 0 ? '已取消' : 'Canceled' }}</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' }}</span>
          </div>
          <el-row align="middle" class="pd20 mt10" justify="space-between">
            <el-col :lg="9" :md="12" :sm="12" :xs="24">
              <div v-if="b.orderType == 0">
@@ -48,7 +50,7 @@
                <p v-if="language==0">{{ b.messageObj?.roomStayDate }}</p>
                <p v-else>{{ b.messageObj?.roomStayDate.replace('共', ' total ').replace('晚', ' days') }}</p>
                <p>{{ b.messageObj?.roomInfo }}</p>
              </div>
              <div v-if="b.orderType == 1">
                <h3 class="name">{{ b.name }}</h3>
@@ -68,7 +70,7 @@
                </div>
                <p>{{ language == 0 ? '配送日期' : 'Delivery Date' }}：{{ b.extJsonObj.dcEnd }} ~
                  {{ b.extJsonObj.dcEnd }}</p>
              </div>
              <div v-if="b.orderType==3 ||b.orderType == 4">
                <h3 class="name">{{ b.name }}</h3>
@@ -78,15 +80,19 @@
                  }}
                </p>
              </div>
              <div v-if="b.orderType==5">
                <h3 class="name">{{ b.name }}</h3>
                <p v-if="b.extJsonObj.ticketDate.name">
                  {{ b.extJsonObj.ticketDate.name }}
                </p>
-                <p>{{ b.extJsonObj.atName }} ｜ {{ b.extJsonObj.atsName }} ｜ {{ b.extJsonObj.atstName }}</p>
+                <p>{{ b.extJsonObj.atName }} ｜ {{ b.extJsonObj.atsName }} ｜
-                <p v-for="p in b.extJsonObj?.orderCustomerList">
+                  {{
-                  <el-tag class="mr10" v-if="p.deskNo">{{p.deskNo}}-{{p.seatNo}}</el-tag>
+                    b.extJsonObj.sessionType == '1000' ? language == 0 ? '日间场' : 'Day' : language == 0 ? '夜间场' : 'Night'
+                  }} |
+                  {{ 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>
              </div>
@@ -101,8 +107,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 v-if="b.orderType == 2"/>
+              <div v-if="b.orderType == 2" />
              <div v-if="b.orderType == 3||b.orderType == 4">
                <p>{{ b.extJsonObj.packageName }}</p>
              </div>
@@ -118,74 +124,73 @@
            <el-col :lg="6" :md="16" :sm="16" :xs="16">
              <div class="text-right mb20 text-danger">
                <el-countdown
-                    v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')"
+                  v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')"
-                    :value="b.countdown"
+                  :value="b.countdown"
-                    format="mm:ss"
+                  format="mm:ss"
-                    value-style="color:#E60012;font-size:16px;"
+                  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
+                  v-if="(b.orderType == 0||b.orderType == 5)&&b.viewStatus!=0" class="mb10" plain round
-                    size="small" type="success"
+                  size="small" type="success"
-                    @click="Rebook(b)"
+                  @click="Rebook(b)"
                >
                  {{ language == 0 ? '再次预订' : 'Rebook' }}
                </el-button>
                <el-button
-                    class="mb10" plain round size="small" type="primary"
+                  class="mb10" plain round size="small" type="primary"
-                    @click="goDetail(b)"
+                  @click="goDetail(b)"
                >
                  {{ language == 0 ? '详情' : 'Detail' }}
                </el-button>
                <el-button
-                    v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" class="mb10"
+                  v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" class="mb10"
-                    plain round size="small" type="primary" @click="goDetail(b)"
+                  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"
+                  v-if="b.viewStatus==0" class="mb10" plain round size="small"
-                    type="warning"
+                  type="warning"
-                    @click="cancel(b)"
+                  @click="cancel(b)"
                >
                  {{ language == 0 ? '取消订单' : 'Cancel Order' }}
                </el-button>
                <el-button
-                    v-if="b.viewStatus==5" class="mb10" plain round size="small"
+                  v-if="b.viewStatus==5" class="mb10" plain round size="small"
-                    type="" @click="unsubscribe(b)"
+                  type="" @click="unsubscribe(b)"
                >
                  {{ language == 0 ? '退订' : 'Unsubscribe' }}
                </el-button>
              </div>
            </el-col>
          </el-row>
        </div>
      </div>
    </el-card>
-    <div class="pd20"/>
+    <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 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()
@@ -197,7 +202,7 @@ function finish(bill) {
 }
 function getList() {
-  newbilllist({createById: user.userId}).then(res => {
+  newbilllist({ createById: user.userId }).then(res => {
    list.value = res.rows || []
    for (const b of list.value) {
      b.messageObj = JSON.parse(b.message) || {}
@@ -300,28 +305,28 @@ function toInvoice() {
  top: 0;
  font-size: 12px;
  color: #FFFFFF;
  span {
    border-radius: 0px 10px 0px 10px;
    padding: 4px 10px;
  }
  .bg-danger {
    background: #E60012;
  }
  .bg-warning {
    background: #e89f39;
  }
  .bg-pink {
    background: #F740A6;
  }
  .bg-primary {
    background: var(--el-color-primary)
  }
  .bg-blue {
    background: #00a0e9
  }
@@ -332,11 +337,11 @@ function toInvoice() {
  overflow: visible;
  padding: 0 20px 15px;
  border-bottom: 1px solid #e5e5e5;
  .fr {
    margin: -8px 0 0
  }
  h3 {
    display: inline-block;
    font-size: 16px;
@@ -350,32 +355,32 @@ function toInvoice() {
    color: #000000;
    margin: 0 0 10px;
  }
  p {
    margin: 8px 0 0;
    color: #707070;
    font-size: 14px;
  }
  margin: 0 0 20px;
  border: 1px solid #E5E5E5;
  border-radius: 10px;
  position: relative;
  .bbody {
    padding: 0 15px 20px;
  }
  .title {
    background: #F7F7F7;
    border-bottom: 1px solid #E5E5E5;
    span {
      font-size: 14px;
      color: #4C5359;
    }
  }
  .title label {
    border-radius: 5px 0 5px 0;
    font-size: 12px;
@@ -383,19 +388,19 @@ function toInvoice() {
    padding: 4px 10px;
    margin-right: 10px;
  }
  .blueTag {
    background-color: #1e62c8;
  }
  .greenTag {
    background-color: #1EC886;
  }
  .purpleTag {
    background-color: #717bef;
  }
  .orangeTag {
    background-color: #ff8124;
  }
@@ -420,19 +425,19 @@ function toInvoice() {
  right: 10px;
  bottom: 60px;
  white-space: nowrap;
  .warning {
    color: #ff8124;
  }
  .danger {
    color: #da2a2a;
  }
  .gary {
    color: #666;
  }
  .success {
    color: #1EC886;
  }
--- a/src/viewsPc/register/personal.vue
View file @bafb8f2
+++ b/src/viewsPc/register/personal.vue
View file @bafb8f2
@@ -430,7 +430,6 @@ function next() {
      obj.passportUrl = wdsfData.value.passportUrl || ''
    }
    registerSingle(obj).then(res => {
-      debugger
      setToken(res.data.token)
      afterR()
    })
@@ -445,7 +444,7 @@ function next() {
      passportNumber: wdsfData.value.passportNumber,
      picUrl: wdsfData.value.picUrl,
      birth: wdsfData.value.birthday,
-      personId: wdsfData.value.personId,
+      // personId: wdsfData.value.personId,
      username: wdsfData.value.email,
      password: form.value.password,
      ocrFlag: '1'