no message

华明祺
Showing 8 changed files with 439 additions and 174 deletions
package.json
src/layoutPc/components/AppBottom.vue
src/viewsPc/booking/hotel.vue
src/viewsPc/booking/hotelDetail.vue
src/viewsPc/components/homeQuick.vue
src/viewsPc/components/orderRemark.vue
src/viewsPc/index.vue
src/viewsPc/match/components/affix-invitation.vue
--- a/package.json
View file @e3f4681
+++ b/package.json
View file @e3f4681
@@ -15,7 +15,8 @@
    "@element-plus/icons-vue": "2.0.10",
    "@videojs-player/vue": "^1.0.0",
    "@vueup/vue-quill": "1.1.1",
-    "@vueuse/core": "^10.1.2",
+    "@vueuse/core": "^13.4.0",
+    "@vueuse/router": "^13.4.0",
    "axios": "0.27.2",
    "crypto-js": "^4.1.1",
    "echarts": "5.4.0",
--- a/src/layoutPc/components/AppBottom.vue
View file @e3f4681
+++ b/src/layoutPc/components/AppBottom.vue
View file @e3f4681
@@ -32,7 +32,9 @@
        <el-col :span="14">
          <ul>
            <li>Postal code：214000</li>
-            <li>Address：100 meters northeast of the intersection of Hefeng Road and Qingshu, the Taihu Lake New Town, Wuxi, Jiangsu</li>
+            <li>Address：100 meters northeast of the intersection of Hefeng Road and Qingshu, the Taihu Lake New Town,
+              Wuxi, Jiangsu
+            </li>
          </ul>
        </el-col>
        <el-col :span="6">
@@ -62,16 +64,19 @@
          <div class="text-center mt10">周边活动</div>
        </a>
      </div>
-      <div onclick="window.open('https://ykf-weixin01.7moor.com/wapchat.html?accessId=6c500b60-02c6-11ef-9a4d-85cd5dacc5bf&fromUrl=&urlTitle=&language=ZHCN','_blank','height=700px,width=700px,top=50,left=0,toolbar=no,menubar=no,scrollbars=no, resizable=no,location=no, status=no')" title="客服" >
+      <div
+          style="display: none" title="客服"
+          onclick="window.open('https://ykf-weixin01.7moor.com/wapchat.html?accessId=6c500b60-02c6-11ef-9a4d-85cd5dacc5bf&fromUrl=&urlTitle=&language=ZHCN','_blank','height=700px,width=700px,top=50,left=0,toolbar=no,menubar=no,scrollbars=no, resizable=no,location=no, status=no')"
+      >
        <img class="kf" src="@/assets/logo/btn01.png"/>
        <div class="text-center mt10">在线客服</div>
      </div>
-<!--      <div @click="goHelpZH">-->
+      <!--      <div @click="goHelpZH">-->
-<!--        <a>-->
+      <!--        <a>-->
-<!--          <img class="kf" src="@/assets/logo/btn02.png"/>-->
+      <!--          <img class="kf" src="@/assets/logo/btn02.png"/>-->
-<!--          <div class="text-center mt10">周边活动</div>-->
+      <!--          <div class="text-center mt10">周边活动</div>-->
-<!--        </a>-->
+      <!--        </a>-->
-<!--      </div>-->
+      <!--      </div>-->
    </div>
    <div class="mlb" v-else>
      <div @click="goAround" class="mb10 pb5">
@@ -80,14 +85,16 @@
          <div class="text-center mt10">ACTIVITIES</div>
        </a>
      </div>
-      <div onclick="window.open('https://ykf-weixin01.7moor.com/wapchat.html?accessId=707daf80-02c6-11ef-9a4d-85cd5dacc5bf&fromUrl=&urlTitle=&language=EN','_blank','height=700px,width=700px,top=100,left=150,toolbar=no,menubar=no,scrollbars=no, resizable=no,location=no, status=no')" title="Live Chat">
+      <div
+          onclick="window.open('https://ykf-weixin01.7moor.com/wapchat.html?accessId=707daf80-02c6-11ef-9a4d-85cd5dacc5bf&fromUrl=&urlTitle=&language=EN','_blank','height=700px,width=700px,top=100,left=150,toolbar=no,menubar=no,scrollbars=no, resizable=no,location=no, status=no')"
+          title="Live Chat">
        <img class="kf" src="@/assets/logo/btn01.png"/>
        <div class="text-center ">LIVE CHAT</div>
      </div>
-<!--      <div @click="goHelp">-->
+      <!--      <div @click="goHelp">-->
-<!--        <img class="kf" src="@/assets/logo/btn02.png"/>-->
+      <!--        <img class="kf" src="@/assets/logo/btn02.png"/>-->
-<!--        <div class="text-center uppercase">Video Guide</div>-->
+      <!--        <div class="text-center uppercase">Video Guide</div>-->
-<!--      </div>-->
+      <!--      </div>-->
    </div>
  </div>
 </template>
@@ -96,13 +103,14 @@
 import {useStorage} from "@vueuse/core/index";
 import {useRouter} from "vue-router";
 import {ElMessage} from "element-plus";
 const router = useRouter()
 const language = useStorage('language', 0)
 const goHelp = () => {
  router.push({
    path: `/news/list/20000100`,
-    query:{
+    query: {
-      kindName: language.value===0?'操作指引':'Video Guide'
+      kindName: language.value === 0 ? '操作指引' : 'Video Guide'
    }
  })
 }
@@ -111,63 +119,144 @@ const goHelpZH = () => {
  router.push({
    name: 'guide',
    query: {
-        index:8
+      index: 8
    }
  })
 }
 const goAround = () => {
  //周边活动
-  router.push({path: `/about/wuDao`,query: {activeIndex: '2'}})
+  router.push({path: `/about/wuDao`, query: {activeIndex: '2'}})
 }
 </script>
 <style lang="scss" scoped>
-.kf{width: 45px;margin: auto;height: auto;
+.kf {
+  width: 45px;
+  margin: auto;
+  height: auto;
  //animation: pop 2s infinite;
 }
-.fixed-right{position: fixed;right: 0;top: 65%;z-index: 9;
-  .mlb{background: #fff;border-radius: 10px 0 0 10px;box-shadow: 0 2px 8px #aaa;
+.fixed-right {
-    padding: 10px 8px;text-align: center;cursor: pointer;
+  position: fixed;
-    div{text-transform: uppercase;}
+  right: 0;
-    div:first-child{border-bottom: 0.5px solid #eee;
+  top: 65%;
+  z-index: 9;
+  .mlb {
+    background: #fff;
+    border-radius: 10px 0 0 10px;
+    box-shadow: 0 2px 8px #aaa;
+    padding: 10px 8px;
+    text-align: center;
+    cursor: pointer;
+    div {
+      text-transform: uppercase;
+    }
+    div:first-child {
+      border-bottom: 0.5px solid #eee;
      //padding: 0 0 10px;margin-bottom: 10px;
    }
-    div:hover{.gradient-text{font-weight: bold;}}
+    div:hover {
+      .gradient-text {
+        font-weight: bold;
+      }
+    }
  }
 }
-.copyright{font-size: 14px;opacity: 0.88;color: #4C5359;}
-.footAll{background: #E0E3E5;;padding: 36px 0 5px;
+.copyright {
-  p{font-size: 14px;opacity: 0.88;color: #4C5359;}
+  font-size: 14px;
-  ul{list-style: none;
+  opacity: 0.88;
-    li{line-height: 30px;font-size: 14px;opacity: 0.88;color: #4C5359;
+  color: #4C5359;
-      a{margin-left: 15px;
+}
-        &:hover{text-decoration: underline;}
+.footAll {
+  background: #E0E3E5;;
+  padding: 36px 0 5px;
+  p {
+    font-size: 14px;
+    opacity: 0.88;
+    color: #4C5359;
+  }
+  ul {
+    list-style: none;
+    li {
+      line-height: 30px;
+      font-size: 14px;
+      opacity: 0.88;
+      color: #4C5359;
+      a {
+        margin-left: 15px;
+        &:hover {
+          text-decoration: underline;
+        }
      }
    }
  }
-  img{height: 80px;}
+  img {
+    height: 80px;
+  }
 }
 .gradient-text {
  font-family: FZJunHeiS-B-GB;
-  font-weight: 600;font-size: 17px;
+  font-weight: 600;
+  font-size: 17px;
  background: linear-gradient(0deg, #8226FC 0%, #483BEB 100%);
  -webkit-background-clip: text;
  -webkit-text-fill-color: transparent;
 }
 @media (max-width: 500px) {
-  .forWei{display: none;}
+  .forWei {
-    .footAll{padding:10px 0;
+    display: none;
+  }
+  .footAll {
+    padding: 10px 0;
    ul {
      li {
-          font-size: 10px;line-height: 1.4;
+        font-size: 10px;
+        line-height: 1.4;
      }
    }
-      img{height: 60px;}
-      p{font-size: 10px;line-height: 1.4;}
+    img {
-      .copyright{font-size: 10px;line-height: 1.4;}
+      height: 60px;
+    }
+    p {
+      font-size: 10px;
+      line-height: 1.4;
+    }
+    .copyright {
+      font-size: 10px;
+      line-height: 1.4;
+    }
  }
 }
-.ffoot{display: inline-flex;
-  img{width: 20px;height: 20px;display: inline-block;position: relative;top: 4px;margin-right: 4px;}
+.ffoot {
+  display: inline-flex;
+  img {
+    width: 20px;
+    height: 20px;
+    display: inline-block;
+    position: relative;
+    top: 4px;
+    margin-right: 4px;
+  }
 }
 </style>
--- a/src/viewsPc/booking/hotel.vue
View file @e3f4681
+++ b/src/viewsPc/booking/hotel.vue
View file @e3f4681
 <template>
-<div>
+  <div>
    <div class="banner">
      <img v-if="language==0" src="@/assets/booking/jd_text_c.png">
      <img v-else src="@/assets/booking/jd_text_e.png">
@@ -9,7 +9,8 @@
        <el-input :placeholder="language==0?'请输入关键字搜索':'Search'" v-model="query.name" class="no-border">
        </el-input>
        <el-button size="large" type="primary" class="btn-lineG" icon="search" @click="getList">
-        {{ language==0?'搜索':'Search' }}</el-button>
+          {{ language == 0 ? '搜索' : 'Search' }}
+        </el-button>
      </div>
    </div>
@@ -25,146 +26,268 @@
                </div>
              </el-col>
              <el-col :lg="12" :md="12">
-              <h3 class="esp">{{h.name}}</h3>
+                <h3 class="esp">{{ h.name }}</h3>
                <div class="starBox">
                  <img v-for="i in Number(h.starLevel||0)" src="@/assets/booking/star.png">
                </div>
                <div class="tagbox esp">
-                <span v-for="(t,index) in h.label?.split('，')" v-show="index<4">{{t}}</span>
+                  <span v-for="(t,index) in h.label?.split('，')" v-show="index<4">{{ t }}</span>
-                <a v-show="h.label?.split('，').length>4">{{ language==0?'更多':'MORE' }} ></a>
+                  <a v-show="h.label?.split('，').length>4">{{ language == 0 ? '更多' : 'MORE' }} ></a>
                </div>
                <p class="esp addr mt20">
-                <el-icon size="16" style="position: relative;top: 2px" color="#929AA0"><LocationFilled /></el-icon>
+                  <el-icon size="16" style="position: relative;top: 2px" color="#929AA0">
-                {{h.address}}
+                    <LocationFilled/>
+                  </el-icon>
+                  {{ h.address }}
                </p>
              </el-col>
              <el-col :lg="4" :md="4" class="text-right">
-              <div class="price">{{ language==0?'¥':'$' }}<span>{{ h.price }}</span>
+                <div class="price">{{ language == 0 ? '¥' : '$' }}<span>{{ h.price }}</span>
                  <i v-if="language==0">起</i>
                </div>
-              <el-button class="w200px blackBtn" round type="primary" >{{ language==0?'立即预订':'Select' }} ⇀</el-button>
+                <el-button class="w200px blackBtn" round type="primary">{{ language == 0 ? '立即预订' : 'Select' }} ⇀
+                </el-button>
              </el-col>
            </el-row>
          </el-card>
        </el-col>
      </el-row>
-    <el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228"  description="" />
+      <el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description=""/>
      <div style="height: 50px"></div>
    </div>
-</div>
+  </div>
 </template>
 <script setup>
-  import {onMounted} from "@vue/runtime-core"
+import * as booking from "@/apiPc/booking"
-  import * as booking from "@/apiPc/booking"
+import {useRouter, useRoute} from "vue-router";
-  import {useRouter,useRoute} from "vue-router";
+import {useStorage} from "@vueuse/core";
-  import {useStorage} from "@vueuse/core/index";
+import useUserStore from "@/store/modules/user";
-  import useUserStore from "@/store/modules/user";
+import {ElMessageBox} from "element-plus";
-  import {ElMessageBox} from "element-plus";
+import {useRouteQuery} from '@vueuse/router'
-  const router = useRouter()
+import {onMounted} from "vue";
-  const route = useRoute()
-  const user = useUserStore().user
+const router = useRouter()
-  const useStore = useUserStore
+const route = useRoute()
-  const language= useStorage('language',0)
-  const query = ref({
+const useStore = useUserStore()
-    name:''
+const user = useStore.user
-  })
-  const cptId = ref('')
+const flag = useRouteQuery('flag')
-  const list = ref([])
-  const loading = ref(false)
+const language = useStorage('language', 0)
-  onMounted(()=>{
+const query = ref({
+  name: ''
+})
+const cptId = ref('')
+const list = ref([])
+const loading = ref(false)
+onMounted(() => {
  query.value.activityId = route.params.cptId
  getList()
-  })
+})
-  function getList() {
+function getList() {
  loading.value = true
-    booking.getHotelList(query.value).then(res=>{
+  booking.getHotelList(Object.assign({
+    meeting: flag.value,
+  },query.value)).then(res => {
    list.value = res.rows
    loading.value = false
    console.log(list.value)
-    }).catch(e=>{
+  }).catch(e => {
    loading.value = false
  })
-  }
+}
-  function goDetail(item) {
-    if(!user){
+function goDetail(item) {
-      useStore().setVisitor()
+  if (!user) {
+    useStore.setVisitor()
    return
  }
-    if(item.meeting=='1'){
+  if (item.meeting == '1') {
-      ElMessageBox.confirm( item.meetText,'',{
+    ElMessageBox.confirm(item.meetText, '', {
-        cancelButtonText: language.value==1?'Close ':'关闭',
+      cancelButtonText: language.value == 1 ? 'Close ' : '关闭',
-        confirmButtonText: language.value==1?'Continue to book':'继续预订',
+      confirmButtonText: language.value == 1 ? 'Continue to book' : '继续预订',
      type: 'warning',
    }).then((res) => {
      router.push({
-          name:'hotelDetail',
+        name: 'hotelDetail',
-          params:{
+        params: {
-            hotelId:item.hotelId,
+          hotelId: item.hotelId,
        },
-          query:{
+        query: {
-            id:item.id
+          id: item.id
        }
      })
    })
  } else {
    router.push({
-        name:'hotelDetail',
+      name: 'hotelDetail',
-        params:{
+      params: {
-          hotelId:item.hotelId,
+        hotelId: item.hotelId,
      },
-        query:{
+      query: {
-          id:item.id
+        id: item.id
      }
    })
  }
-  }
+}
 </script>
 <style scoped lang="scss">
-  .hotel{
+.hotel {
-    h3{margin: 0 0 10px;}
+  h3 {
-    img.w100{object-fit: cover;aspect-ratio: 16/9}
+    margin: 0 0 10px;
-    .addr{font-size: 14px;color: #929AA0;font-weight: 400;margin: 0 0 10px;}
+  }
-    .price{margin: 0 0 8px;
-      color: #FF8124;font-size: 18px;
+  img.w100 {
-      span{font-size: 36px;margin: 0 8px;font-family: 'DINAlternate-Bold';font-weight: 600;}
+    object-fit: cover;
-      i{font-style: normal;color: #929AA0;}
+    aspect-ratio: 16/9
-    }
+  }
-    .blackBtn{background: #000;border: #000;}
-  }
+  .addr {
-  .banner{height: 140px;background-size: cover;text-align: center;
+    font-size: 14px;
-    background: url("@/assets/booking/jd_bg.png") center;display: flex;align-items: center;
+    color: #929AA0;
+    font-weight: 400;
+    margin: 0 0 10px;
+  }
+  .price {
+    margin: 0 0 8px;
+    color: #FF8124;
+    font-size: 18px;
+    span {
+      font-size: 36px;
+      margin: 0 8px;
+      font-family: 'DINAlternate-Bold';
+      font-weight: 600;
+    }
+    i {
+      font-style: normal;
+      color: #929AA0;
+    }
+  }
+  .blackBtn {
+    background: #000;
+    border: #000;
+  }
+}
+.banner {
+  height: 140px;
+  background-size: cover;
+  text-align: center;
+  background: url("@/assets/booking/jd_bg.png") center;
+  display: flex;
+  align-items: center;
  justify-content: center;
-    img{display: block;margin:-30px auto 0;width: auto;}
+  img {
+    display: block;
+    margin: -30px auto 0;
+    width: auto;
+  }
+}
+.searchBar {
+  position: relative;
+  top: -30px;
+  background: #FFFFFF;
+  display: flex;
+  padding: 20px;
+  border-radius: 10px;
+}
+.no-border {
+  border: none;
+  background: #F5F7F9;
+  :deep(.el-input__wrapper) {
+    border: none;
+    box-shadow: none;
+    background: #F5F7F9;
  }
-  .searchBar{position: relative;top: -30px;
+}
-    background: #FFFFFF;display: flex;padding: 20px;
-    border-radius: 10px;}
+.imgbox {
-  .no-border{border: none;background: #F5F7F9;
+  width: 100%;
-    :deep(.el-input__wrapper){border: none;box-shadow: none;background: #F5F7F9;}
+  height: 100%;
+  position: relative;
+  img {
+    width: 100%;
+    height: 100%;
  }
-  .imgbox {width: 100%;height: 100%;position: relative;
-    img{width: 100%;height: 100%;}
+  .starBox {
-    .starBox{position: absolute;bottom: 0;right: 0;background: rgba(0,0,0,0.4);padding: 10px 15px 3px;}
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    background: rgba(0, 0, 0, 0.4);
+    padding: 10px 15px 3px;
  }
-  .po-r-b{}
+}
-  .starBox{
+.po-r-b {
+}
+.starBox {
  border-radius: 14px 0 0 0;
-    img{display: inline-block;margin-right: 4px;width: 24px;}
+  img {
+    display: inline-block;
+    margin-right: 4px;
+    width: 24px;
+  }
+}
+.tagbox {
+  margin: 10px 0;
+  a {
+    color: #AFB5B9;
+    font-size: 12px;
+  }
+  span {
+    border-radius: 13px;
+    font-size: 12px;
+    padding: 3px 10px;
+    margin-right: 10px;
+    font-weight: 400;
+  }
+  span:nth-child(4n) {
+    background: rgba(50, 177, 108, 0.2);
+    color: rgba(50, 177, 108, 1);
  }
-  .tagbox{margin: 10px 0;
-    a{color: #AFB5B9;font-size: 12px;}
+  span:nth-child(4n+1) {
-    span{border-radius: 13px;font-size: 12px;padding: 3px 10px;margin-right:10px;font-weight: 400;}
+    background: rgba(243, 152, 0, 0.2);
-    span:nth-child(4n){background: rgba(50, 177, 108, 0.2);color: rgba(50, 177, 108, 1);}
+    color: rgba(243, 152, 0, 1);
-    span:nth-child(4n+1){background:rgba(243, 152, 0, 0.2);color: rgba(243, 152, 0, 1);}
+  }
-    span:nth-child(4n+2){background: rgba(0, 160, 233, 0.2);color: rgba(0, 160, 233, 1);}
-    span:nth-child(4n+3){background: rgba(247, 64, 166, 0.2);color:rgba(247, 64, 166, 1);}
+  span:nth-child(4n+2) {
+    background: rgba(0, 160, 233, 0.2);
+    color: rgba(0, 160, 233, 1);
  }
-  @media screen and (max-width: 768px) {
-    .hotel h3{margin: 20px 0 10px; font-size: 18px;}
+  span:nth-child(4n+3) {
+    background: rgba(247, 64, 166, 0.2);
+    color: rgba(247, 64, 166, 1);
+  }
+}
+@media screen and (max-width: 768px) {
+  .hotel h3 {
+    margin: 20px 0 10px;
+    font-size: 18px;
  }
+}
 </style>
--- a/src/viewsPc/booking/hotelDetail.vue
View file @e3f4681
+++ b/src/viewsPc/booking/hotelDetail.vue
View file @e3f4681
@@ -92,6 +92,8 @@
          <div v-if="labelObj.tv==1"><img src="@/assets/img/svg/tag18@2x.png"/>{{ language==0 ?'电视': 'tv' }}</div>
          <div v-if="labelObj.hours==1"><img src="@/assets/img/svg/tag19@2x.png"/>{{ language==0 ?'24小时前台': '24Hours Available' }}</div>
          <div v-if="labelObj.breakfast==1"><img src="@/assets/img/svg/tag20@2x.png"/>{{ language==0 ?'早餐': 'breakfast' }}</div>
+          <div v-if="labelObj.ntatorium==1"><img src="@/assets/img/svg/tag21@2x.png"/>{{ language==0 ?'泳池': 'ntatorium' }}</div>
+          <div v-if="labelObj.gymnasium==1"><img src="@/assets/img/svg/tag22@2x.png"/>{{ language==0 ?'健身房': 'gymnasium' }}</div>
        </div>
      </el-card>
--- a/src/viewsPc/components/homeQuick.vue
View file @e3f4681
+++ b/src/viewsPc/components/homeQuick.vue
View file @e3f4681
@@ -16,12 +16,12 @@
      <el-col :sm="12" :lg="4" :xs="12">
        <div class="item" @click="goMedia"><img src="@/assets/dance/btn07.png">媒体注册</div>
      </el-col>
-<!--      <el-col :sm="12" :lg="4" :xs="12">-->
+      <!--      <el-col :sm="12" :lg="4" :xs="12">-->
-<!--        <div class="item" @click="goAround"><img src="@/assets/dance/btn06.png">周边活动</div>-->
+      <!--        <div class="item" @click="goAround"><img src="@/assets/dance/btn06.png">周边活动</div>-->
-<!--      </el-col>-->
+      <!--      </el-col>-->
-<!--      <el-col :sm="12" :lg="4" :xs="12">-->
+      <!--      <el-col :sm="12" :lg="4" :xs="12">-->
-<!--        <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">赛事直播</div>-->
+      <!--        <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">赛事直播</div>-->
-<!--      </el-col>-->
+      <!--      </el-col>-->
    </el-row>
  </div>
  <div class="itemBox_en" v-else>
@@ -41,18 +41,18 @@
      <el-col :sm="12" :lg="4" :xs="12">
        <div class="item" @click="goMedia"><img src="@/assets/dance/btn07.png">Media Registration</div>
      </el-col>
-<!--      <el-col :sm="12" :lg="4" :xs="12">-->
+      <!--      <el-col :sm="12" :lg="4" :xs="12">-->
-<!--        <div class="item" @click="goAround"><img src="@/assets/dance/btn06.png">Around Activity</div>-->
+      <!--        <div class="item" @click="goAround"><img src="@/assets/dance/btn06.png">Around Activity</div>-->
-<!--      </el-col>-->
+      <!--      </el-col>-->
      <!--      <el-col :sm="12" :lg="4" :xs="12">-->
-<!--        <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">live streaming</div>-->
+      <!--        <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">live streaming</div>-->
-<!--      </el-col>-->
+      <!--      </el-col>-->
    </el-row>
  </div>
  <order-remark ref="orderRemarkRef" @submit="goBooking"/>
  <affix-invitation ref="dialogInvitationRef"/>
-<!--  媒体注册-->
+  <!--  媒体注册-->
  <media-register ref="mediaRegisterRef"/>
 </template>
@@ -99,16 +99,16 @@ watch(matchId, (val) => {
      form.value = null
    })
-    match.getInfoByCptId({ cptId:props.matchId }).then((res) => {
+    match.getInfoByCptId({cptId: props.matchId}).then((res) => {
      liveData.value = res.data || {}
    })
  }
 })
 const liveClick = () => {
-  if (liveData.value.videoStatus=="1") {
+  if (liveData.value.videoStatus == "1") {
-    if(language.value==0){
+    if (language.value == 0) {
      window.open(liveData.value.videoUrlCn)
    } else {
@@ -124,7 +124,7 @@ const goAbout = () => {
 }
 const goAround = () => {
  //周边活动
-  router.push({path: `/about/wuDao`,query: {activeIndex: '2'}})
+  router.push({path: `/about/wuDao`, query: {activeIndex: '2'}})
 }
 onMounted(() => {
@@ -135,6 +135,7 @@ function building() {
  ElMessage.warning(language.value == 0 ? '感谢您对本次比赛的关注，该服务暂无可预订信息，敬请期待。' : 'Thank you for your attention to this competition. The service is currently unavailable for booking. Please stay tuned.')
  return
 }
 function applyInvitation() {
  var obj = {
    title: language.value == 0 ? '邀请函申请' : 'Visa Invitation Letter ',
@@ -142,13 +143,18 @@ function applyInvitation() {
  }
  proxy.$refs['dialogInvitationRef'].open(obj)
 }
 const user = useUserStore().user
 function goMedia() {
+  proxy.$modal.msgWarning(language.value == 0 ? '暂未开放' :'Not yet open')
+  return;
  //如果没登录
  if (!user) {
    ElMessage({
      type: 'warning',
-      message: language.value == 0 ? '请先登录' : 'Please log in first',
+      message: language.value == 0 ? '请先登录' : 'Please login first',
    })
    return
  }
@@ -162,16 +168,16 @@ function popRemark(type) {
    return
  }
-  if(type == '0'){
+  if (type == '0') {
    // 签证
-    if(language.value === 0){
+    if (language.value === 0) {
      ElMessage.warning('请切换英文页面办理')
      return
    } else {
      if (!user) {
        ElMessage({
          type: 'warning',
-          message: language.value == 0 ? '请先登录' : 'Please log in first',
+          message: language.value == 0 ? '请先登录' : 'Please login first',
        })
        return
      }
@@ -200,7 +206,7 @@ function popRemark(type) {
  proxy.$refs['orderRemarkRef'].open(params)
 }
-function goBooking(n) {
+function goBooking(n, f) {
  switch (n) {
    case 10:
      // 票务
@@ -213,7 +219,7 @@ function goBooking(n) {
      break;
    case 1:
      //酒店
-      router.push({path: `/booking/hotel/${props.matchId}`})
+      router.push({path: `/booking/hotel/${props.matchId}`, query: {flag: f}})
      break;
    case 2:
      //车辆
@@ -236,29 +242,43 @@ function goBooking(n) {
 </script>
 <style scoped lang="scss">
-.itemBox,.itemBox_en {
+.itemBox, .itemBox_en {
-  padding: 20px;background: #fff;box-shadow: 0 0 46px 0 rgba(1,16,64,0.08);
+  padding: 20px;
+  background: #fff;
+  box-shadow: 0 0 46px 0 rgba(1, 16, 64, 0.08);
  border-radius: 20px;
 }
-:deep(.el-col){ max-width: 20%;flex: 0 0 20%;}
+:deep(.el-col) {
+  max-width: 20%;
+  flex: 0 0 20%;
+}
 .item {
  //box-shadow: 0px 0px 21px 0px rgba(41, 23, 101, 0.14);
  padding: 10px 0;
  display: flex;
-  align-items: center;justify-content: center;
+  align-items: center;
+  justify-content: center;
  font-size: 20px;
  background: url("@/assets/dance/btn_bg.png") no-repeat left #FFFFFF;
  background-size: 100% 100%;
-  border-radius: 15px;gap: 10px;
+  border-radius: 15px;
+  gap: 10px;
-  img {object-fit: contain;
+  img {
-   width: 75px;height: 75px;
+    object-fit: contain;
+    width: 75px;
+    height: 75px;
  }
 }
 .itemBox_en .item {
-  flex-direction: column;text-align: center;text-transform: uppercase;
+  flex-direction: column;
-height: 100%;
+  text-align: center;
+  text-transform: uppercase;
+  height: 100%;
  img {
    position: relative;
    transition: all 0.2s;
@@ -278,11 +298,23 @@ height: 100%;
 }
 @media screen and (max-width: 768px) {
-  .itemBox,.itemBox_en{padding: 0 20px 0}
+  .itemBox, .itemBox_en {
-  .item{font-size: 16px;height: auto !important;
+    padding: 0 20px 0
-    padding: 15px 0;margin: 10px 0;
+  }
-    img{width: 50px;height: 50px}
+  .item {
+    font-size: 16px;
+    height: auto !important;
+    padding: 15px 0;
+    margin: 10px 0;
+    img {
+      width: 50px;
+      height: 50px
+    }
+  }
+  :deep(.el-col) {
+    max-width: 50%;
+    flex: 0 0 50%;
  }
-  :deep(.el-col){ max-width: 50%;flex: 0 0 50%;}
 }
 </style>
--- a/src/viewsPc/components/orderRemark.vue
View file @e3f4681
+++ b/src/viewsPc/components/orderRemark.vue
View file @e3f4681
 <template>
- <el-dialog :title="title"  v-model="show" width="400px" @close="close">
+ <el-dialog :title="title" v-model="show" @close="close">
   <div>
     <h2 class="text-warning text-center" v-if="cptName">{{cptName}}</h2>
@@ -9,6 +9,15 @@
     <div v-if="type==4" class="plr20" v-html="form.reserveDesMeal"></div>
     <div v-if="type==5" class="plr20" v-html="form.reserveDesPhoto"></div>
     <div v-if="type==10" class="plr20" v-html="form.reserveDesTitck"></div>
+     <el-row v-if="type==1" justify="center">
+       <el-radio-group v-model="hotelType">
+         <el-radio label="0">{{language==0?'运动队酒店':'Team Hotel Reservation'}}</el-radio>
+         <el-radio label="1">{{language==0?'执委大会酒店':'Conference Hotel Reservation'}}</el-radio>
+       </el-radio-group>
+     </el-row>
   </div>
       <template #footer>
         <div class="dialog-footer text-center">
@@ -31,6 +40,8 @@ const title = ref('')
 const cptName = ref('')
 const show = ref(false)
 const form = ref({})
+const hotelType= ref('1')
 let matchId = ''
 let type = ''
 const open = (params) => {
@@ -64,7 +75,7 @@ function ok() {
  // if(!user){
  //   useUserStore().setVisitor()
  // } else {
-    emit('submit', type)
+    emit('submit', type, hotelType.value)
  // }
 }
 </script>
--- a/src/viewsPc/index.vue
View file @e3f4681
+++ b/src/viewsPc/index.vue
View file @e3f4681
--- a/src/viewsPc/match/components/affix-invitation.vue
View file @e3f4681
+++ b/src/viewsPc/match/components/affix-invitation.vue
View file @e3f4681
 <template>
  <el-dialog
-      v-model="show" :title="title" width="600px" append-to-body close-icon="CircleClose" center
+      v-model="show" :title="title" append-to-body close-icon="CircleClose" center
      :close-on-click-modal="false" class="pcloginpop"
      destroy-on-close
  >
@@ -24,7 +24,7 @@
      <el-form :model="form" :rules="rules" ref="iformRef" label-position="top" v-else>
        <el-form-item :label="language==0?'申请人类别':'Applicant Type'" required prop="applicatType">
          <el-select v-model="form.applicatType">
-            <el-option label="MNA" value="1"/>
+            <el-option label="MNA/Team" value="1"/>
            <el-option label="Technical Officials" value="2"/>
            <el-option label="WT Staff" value="3"/>
            <el-option label="Supplier" value="4"/>
@@ -38,6 +38,11 @@
            <el-option :label="language==0?'TE/PU(外办)邀请函':'TE/PU Invitation'" value="2"/>
          </el-select>
        </el-form-item>
+        <el-form-item v-if="form.invitationType=='2'" label="Proof of Employment" required prop="invitationFile">
+          <el-text type="danger">Proof of Employment(Note: This document must be issued by the invitee’s association and must bear an official stamp or signature.)</el-text>
+          <br/>
+          <file-upload v-model="form.invitationFile" :is-show-tip="false" :limit="1"></file-upload>
+        </el-form-item>
        <el-form-item :label="language==0?'是否需要中文邀请函':'Do you need a Chinese invitation？'" required prop="chinese">
          <el-radio-group v-model="form.chinese">
            <el-radio :value="1">{{ language == 0 ? '是' : 'Yes' }}</el-radio>
@@ -46,18 +51,19 @@
        </el-form-item>
        <!--        一般信息-->
-        <el-form-item :label="language==0?'国家/地区协会名':'MNA Name'" :required="form.applicatType!=2"
+        <el-form-item :label="language==0?'国家/地区协会名':'MNA/Team Name'" :required="form.applicatType==1"
                      prop="associationCode">
          <el-select v-model="form.associationCode" filterable>
            <el-option v-for="item in mnaList" :key="item.code" :label="language==0?item.nameCn:item.nameEn"
                       :value="item.code"/>
          </el-select>
        </el-form-item>
-        <el-form-item :label="language==0?'国家/地区协会地址':'MNA Address'" :required="form.applicatType!=2"
+        <el-form-item :label="language==0?'国家/地区协会地址':'MNA/Team Address'" :required="form.applicatType==1"
                      prop="associationAddress">
          <el-input v-model="form.associationAddress"/>
        </el-form-item>
        <el-form-item :label="language==0?'邮箱':'Contact Email'" required prop="email">
+          <el-text type="danger">Note: Notifications from the organizing committee will be sent to this email address.</el-text>
          <el-input v-model="form.email" type="email">
            <template #append>
              <el-button @click="sendEmail" v-loading="codeloading">
@@ -95,7 +101,8 @@
        <!--上传护照，多张-->
        <div class="cptVisaInfoBosTable">
          <el-form-item :label="language==0?'有效证件':'Passport Copy'" required>
-            <ImageUpload v-model="form.passportCopy" :is-show-tip="false" :limit="100"
+            <el-text type="danger">Please ensure that the uploaded passport image is clear, complete, and free from glare or reflections.</el-text>
+            <ImageUpload v-model="form.passportCopy" :is-show-tip="false" :limit="20"
                         :action="'/league/visa/getPersonInfoFromCert/3'"
                         paramName="pic" list-type="text" :show-file-list="false"
                         :button-text="language==0?'上传':'Upload'" @response="getPassportInfo"
@@ -230,7 +237,6 @@
              </el-table-column>
            </el-table>
          </div>
        </div>
        <!--        补充材料-->
        <el-form-item :label="language==0?'补充材料':'Additional Documents'" prop="files">
@@ -266,7 +272,8 @@ const {proxy} = getCurrentInstance()
 const language = useStorage('language', 0)
 const form = ref({
  gender: '0',
-  cptVisaInfoBos: []
+  cptVisaInfoBos: [],
+  email: user?.email,
 })
 const show = ref(false)
 const codeloading = ref(false)
@@ -294,7 +301,7 @@ const open = (params) => {
  form.value.cptId = params.cptId
  getCountryList()
  getMNAList()
-  getVisa()
+  // getVisa()
 }
 defineExpose({open})