购票状态的相关调整

华明祺
Showing 3 changed files with 57 additions and 57 deletions
src/viewsPc/booking/ticket/confirmOrder.vue
src/viewsPc/booking/ticket/index.vue
vite.config.js
--- a/src/viewsPc/booking/ticket/confirmOrder.vue
View file @14224f9
+++ b/src/viewsPc/booking/ticket/confirmOrder.vue
View file @14224f9
@@ -12,8 +12,8 @@
              <div class="name">{{ TickForm.name }}</div>
              <div class="address">{{ TickForm.address }}</div>
            </div>
            <div class="ticket_info mb20">
              <div class="tit_box">
                <div class="line" />
@@ -21,12 +21,12 @@
                  {{ languageFormat(language, "订票信息", "Ticket Info") }}
                </div>
              </div>
              <div class="form">
                <el-form ref="formRef" :model="orderForm" :rules="rules" label-width="140px">
                  <div v-if="TickForm2.ticketType == '1'">
                    <el-form-item :label="language == 0 ? '桌号' : 'Table'">
                      <!--                      <el-popover :width="400" placement="right" trigger="hover">-->
                      <!--                        <template #reference>-->
                      <!--                          <div class="text-primary underline pointer" @click="showImg">-->
@@ -39,7 +39,7 @@
                      <!--                        />-->
                      <!--                      </el-popover>-->
                      <!--                      -->
                      <el-radio-group v-model="currDesk">
                        <el-radio-button
                          v-for="(it, index) in deskList" :key="index" :disabled="it.status!=0" :label="it.deskNo"
@@ -105,7 +105,7 @@
              </div>
            </div>
          </el-col>
          <el-col :lg="8" class="right">
            <div class="tit_box">
              <div class="line" />
@@ -113,7 +113,7 @@
                {{ languageFormat(language, "订单明细", "Order summary") }}
              </div>
            </div>
            <div class="detail">
              <div class="detail_top">
                <div class="time">
@@ -148,14 +148,14 @@
                  <span v-else>{{ language == 0 ? '夜间场' : 'Night' }}</span>
                  ｜ {{ TickForm2.ticketName }}
                </div>
                <div v-if="TickForm2.ticketType=='0'" class="address">{{
                  language == 0 ? '剩余数量' : 'Remaining Quantity'
                }}： {{ leftCount }}
                </div>
              </div>
            </div>
            <!--            场馆布局图-->
            <div style="margin-top: 30px">
              <el-image
@@ -256,7 +256,7 @@ onMounted(() => {
  tickImg.value = route.query.tickImg
  customerList()
  getDetail()
  getActivityTypeVoById({
    id: route.params.latstId
  }).then((res) => {
@@ -292,12 +292,12 @@ function changeGroup(e) {
    }).then(res => {
      if (res.data.length > 0) {
        const names = _.map(res.data, (d) => d.name).join(',')
        ElMessage({
          message: language.value == 0 ? `${names} 已购买该票` : 'The user has purchased the ticket',
          type: 'error'
        })
        _.each(res.data, (d) => {
          _.remove(orderForm.value.customerIds, (c) => c == d.id)
          _.find(personnelList.value, (p) => p.id == d.id).disabled = true
@@ -319,7 +319,7 @@ async function paymentHandle() {
    useStore().setVisitor()
    return
  }
  if (TickForm2.value.ticketType == '1') {
    if (currSeat.value.length == 0) {
      ElMessage({
@@ -336,9 +336,9 @@ async function paymentHandle() {
      return
    }
  }
  await formRef.value.validate()
  await ElMessageBox.confirm(language.value == 0 ? '确认提交订单吗？' : 'Confirm to submit the order?', {
    confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
    cancelButtonText: language.value == 0 ? '取消' : 'Cancel',
@@ -359,7 +359,7 @@ async function paymentHandle() {
          seatNo: tempSeat.seatNo
        })
      })
      const res = await submitOrderTicket({
        activeId: orderForm.value.activeId,
        orderName: TickForm2.value.ticketTypeName,
@@ -406,7 +406,7 @@ async function paymentHandle() {
    } catch (e) {
      ElMessage.error(language.value == 0 ? '下单失败,' : 'Order failure')
    } finally {
    }
  })
 }
@@ -450,7 +450,7 @@ div {
  //padding: 20px 0;
  width: 1200px;
  margin: 20px auto;
  .tag_t {
    padding: 1px 10px;
    font-weight: 400;
@@ -460,7 +460,7 @@ div {
    border: 1px solid #453dea;
    margin-left: 5px;
  }
  .title {
    padding: 11px;
    text-align: center;
@@ -468,18 +468,18 @@ div {
    font-size: 18px;
    color: #ffffff;
  }
  .content {
    background-color: #fff;
  }
  .line {
    width: 4px;
    height: 18px;
    background: linear-gradient(180deg, #493ceb 0%, #8623fc 100%);
    border-radius: 4px;
  }
  .left {
    .info {
      background: rgba(69, 61, 234, 0.04);
@@ -487,54 +487,54 @@ div {
      border: 1px solid #d3d1f6;
      padding: 20px 0 28px 33px;
      margin-bottom: 20px;
      .name {
        font-weight: 500;
        font-size: 18px;
        color: #000000;
        margin-bottom: 20px;
      }
      .address {
        font-weight: 400;
        font-size: 14px;
        color: #929aa0;
      }
    }
    .ticket_info {
      .tit_box {
        display: flex;
        align-items: center;
        gap: 10px;
        margin-bottom: 14px;
        .txt {
          font-weight: bold;
          font-size: 16px;
          color: #493ceb;
        }
      }
      .form {
        min-height: 464px;
        padding: 20px 60px;
        border-radius: 5px;
        border: 1px solid #dcdfe6;
        .p_box {
          display: flex;
          width: 100%;
          gap: 10px;
          max-width: 400px;
          .people {
            width: 100%;
            background: #fbfcfd;
            border-radius: 2px;
            border: 1px solid #dcdfe6;
            padding: 0 14px;
            .prople_item {
              display: flex;
              justify-content: space-between;
@@ -543,30 +543,30 @@ div {
              border-bottom: 1px solid #dcdfe6;
              width: 100%;
              position: relative;
              &:last-child {
                border: none;
              }
              .name {
                font-size: 16px;
                //color: #929aa0;
                margin-bottom: 20px;
                .tag_t {
                  position: absolute;
                  right: 30px;
                  padding: 8px;
                }
              }
              .idcard {
                font-size: 10px;
                color: #929aa0;
              }
            }
          }
          .btn {
            width: 90px;
            height: 40px;
@@ -585,30 +585,30 @@ div {
      }
    }
  }
  .right {
    .tit_box {
      display: flex;
      align-items: center;
      gap: 10px;
      margin-bottom: 20px;
      .txt {
        font-weight: bold;
        font-size: 16px;
        color: #493ceb;
      }
    }
    .detail {
      padding: 15px 26px;
      border-radius: 5px;
      border: 1px solid #dcdfe6;
      .detail_top {
        padding-bottom: 13px;
        border-bottom: 1px solid #dcdfe6;
        .time {
          font-weight: 500;
          font-size: 20px;
@@ -616,13 +616,13 @@ div {
          line-height: 25px;
          margin-bottom: 8px;
        }
        .ticket {
          font-size: 16px;
          color: #2d373f;
        }
      }
      .detail_center {
        margin-top: 14px;
        display: flex;
@@ -630,26 +630,26 @@ div {
        padding-bottom: 13px;
        border-bottom: 1px solid #dcdfe6;
        gap: 8px;
        .ticket {
          font-size: 16px;
          color: #2d373f;
        }
      }
      .detail_b {
        display: flex;
        justify-content: space-between;
        align-items: center;
        margin-top: 16px;
        .sum_txt {
          font-weight: 600;
          font-size: 18px;
          color: #2d373f;
          line-height: 25px;
        }
        .price_num {
          font-weight: 600;
          font-size: 36px;
@@ -659,7 +659,7 @@ div {
      }
    }
  }
  .footer {
    display: flex;
    justify-content: space-between;
@@ -669,20 +669,20 @@ div {
    box-shadow: 0px 0px 46px 0px rgba(1, 16, 64, 0.08);
    margin-top: 9px;
    padding: 0 30px;
    .label {
      font-size: 16px;
      color: #7b7f83;
      line-height: 22px;
    }
    .value {
      font-size: 22px;
      color: #ff8124;
      line-height: 30px;
      font-weight: 600;
    }
    .pay {
      width: 200px;
      height: 40px;
@@ -696,7 +696,7 @@ div {
      cursor: pointer;
      user-select: none;
    }
    .goBack {
      width: 200px;
      height: 40px;
--- a/src/viewsPc/booking/ticket/index.vue
View file @14224f9
+++ b/src/viewsPc/booking/ticket/index.vue
View file @14224f9
--- a/vite.config.js
View file @14224f9
+++ b/vite.config.js
View file @14224f9
@@ -64,8 +64,8 @@ export default defineConfig(({ mode, command }) => {
      proxy: {
        // https://cn.vitejs.dev/config/#server-proxy
        '/dev-api/ztx-train': {
-          // target: 'http://192.168.1.118:1896/stage-api',
+          target: 'http://192.168.1.118:1896/stage-api',
-          target: 'https://jijin.wtwuxicenter.com/stage-api',
+          // target: 'https://jijin.wtwuxicenter.com/stage-api',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
        },
@@ -77,15 +77,15 @@ export default defineConfig(({ mode, command }) => {
          rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
        },
        '/dev-api/ztx-webSite': {
-          // target: 'http://192.168.1.118:8081',
+          target: 'http://192.168.1.118:8081',
-          target: 'https://jijin.wtwuxicenter.com/stage-api',
+          // target: 'https://jijin.wtwuxicenter.com/stage-api',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
        },
        '/dev-api': {
          // target: 'http://192.168.1.213:8081/',
-          // target: 'http://192.168.1.118:8081',
+          target: 'http://192.168.1.118:8081',
-          target: 'https://jijin.wtwuxicenter.com/stage-api',
+          // target: 'https://jijin.wtwuxicenter.com/stage-api',
          // target: 'https://wdsfwuxicenter.com/stage-api/',
          changeOrigin: true,
          rewrite: (p) => p.replace(/^\/dev-api/, '')