no message

杨炀
Showing 7 changed files with 52 additions and 28 deletions
src/layoutPc/components/AppBottom.vue
src/layoutPc/components/AppHeader.vue
src/layoutPc/components/AppTop.vue
src/viewsPc/booking/hotel.vue
src/viewsPc/components/homeQuick.vue
src/viewsPc/match/components/quick-row.vue
src/viewsPc/match/detail_en.vue
--- a/src/layoutPc/components/AppBottom.vue
View file @09282c6
+++ b/src/layoutPc/components/AppBottom.vue
View file @09282c6
@@ -60,13 +60,12 @@
        <img class="kf" src="@/assets/logo/btn01.png"/>
        <div class="text-center mt10">在线客服</div>
      </div>
-      <div @click="goHelpZH">
+<!--      <div @click="goHelpZH">-->
-<!--        <a target="_blank" href="https://wdsfwuxicenter.com/stage-api/fs/file/操作指引.zip">-->
+<!--        <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 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">
@@ -113,7 +112,9 @@ const goHelpZH = () => {
 .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;
    padding: 10px 8px;text-align: center;cursor: pointer;
-    div:first-child{border-bottom: 0.5px solid #eee;padding: 0 0 10px;margin-bottom: 10px}
+    div:first-child{border-bottom: 0.5px solid #eee;
+      //padding: 0 0 10px;margin-bottom: 10px;
+    }
    div:hover{.gradient-text{font-weight: bold;}}
  }
 }
--- a/src/layoutPc/components/AppHeader.vue
View file @09282c6
+++ b/src/layoutPc/components/AppHeader.vue
View file @09282c6
@@ -16,7 +16,7 @@
        <el-menu-item index="/match/list">{{ language==0?'赛事服务':'REGISTRATION' }}</el-menu-item>
        <el-menu-item index="/saiC">{{ language==0?'竞赛日程':'COMPETITIONS' }}</el-menu-item>
        <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item>
-        <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item>
+<!--        <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item>-->
        <el-menu-item index="/about/wuDao">{{ language==0?'关于我们':'CONTACT & MORE' }}</el-menu-item>
        <!--        <el-sub-menu index="/about">-->
@@ -35,7 +35,7 @@
        <el-menu-item index="/match/list">{{ language==0?'赛事服务':'REGISTRATION' }}</el-menu-item>
        <el-menu-item index="/saiC">{{ language==0?'竞赛日程':'COMPETITIONS' }}</el-menu-item>
        <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item>
-        <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item>
+<!--        <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item>-->
        <el-menu-item index="/about/wuDao">{{ language==0?'关于我们':'CONTACT & MORE' }}</el-menu-item>
        <!--        <el-sub-menu index="/about">-->
@@ -117,7 +117,7 @@
      <el-menu-item index="/match/list">赛事服务</el-menu-item>
      <el-menu-item index="/saiC">竞赛日程</el-menu-item>
      <el-menu-item index="/meta">媒体中心</el-menu-item>
-      <el-menu-item index="/guide">参赛指南</el-menu-item>
+<!--      <el-menu-item index="/guide">参赛指南</el-menu-item>-->
      <el-menu-item index="/about/wuDao">关于我们</el-menu-item>
      <el-menu-item v-if="isLogin" index="/center/myPassword">个人中心</el-menu-item>
    </el-menu>
--- a/src/layoutPc/components/AppTop.vue
View file @09282c6
+++ b/src/layoutPc/components/AppTop.vue
View file @09282c6
@@ -56,7 +56,7 @@
      <el-menu-item index="/match/list/0">大赛报名</el-menu-item>
      <el-menu-item index="/saiC">赛程安排</el-menu-item>
      <el-menu-item index="/meta">媒体中心</el-menu-item>
-      <el-menu-item index="/guide">参赛指南</el-menu-item>
+<!--      <el-menu-item index="/guide">参赛指南</el-menu-item>-->
      <el-sub-menu index="/about">
        <template #title>关于我们</template>
        <el-menu-item index="/about/wuDao">舞蹈节</el-menu-item>
--- a/src/viewsPc/booking/hotel.vue
View file @09282c6
+++ b/src/viewsPc/booking/hotel.vue
View file @09282c6
@@ -61,6 +61,7 @@
  import {useRouter,useRoute} from "vue-router";
  import {useStorage} from "@vueuse/core/index";
  import useUserStore from "@/store/modules/user";
+  import {ElMessageBox} from "element-plus";
  const router = useRouter()
  const route = useRoute()
  const user = useUserStore().user
@@ -93,16 +94,24 @@
      useStore().setVisitor()
      return
    }
-    router.push({
+    //todo 是否为会议酒店
-      name:'hotelDetail',
+    ElMessageBox.confirm('该酒店为会议酒店，是否继续预定','',{
-      params:{
+      cancelButtonText: language.value==1?'Close ':'关闭',
-        hotelId:item.hotelId,
+      confirmButtonText: language.value==1?'Continue to book':'继续预订',
-      },
+      type: 'warning',
-      query:{
+    }).then((res) => {
-        id:item.id
+      router.push({
-      }
+        name:'hotelDetail',
+        params:{
+          hotelId:item.hotelId,
+        },
+        query:{
+          id:item.id
+        }
+      })
    })
  }
 </script>
--- a/src/viewsPc/components/homeQuick.vue
View file @09282c6
+++ b/src/viewsPc/components/homeQuick.vue
View file @09282c6
@@ -11,7 +11,7 @@
        <div class="item" @click="popRemark(2)"><img src="@/assets/dance/btn03.png">接送服务</div>
      </el-col>
      <el-col :sm="12" :lg="6" :xs="12">
-        <div class="item" @click="goAbout"><img src="@/assets/dance/btn04.png">场馆介绍</div>
+        <div class="item" @click="goAbout"><img src="@/assets/dance/btn04.png">场地介绍</div>
      </el-col>
 <!--      <el-col :sm="12" :lg="4" :xs="12">-->
 <!--        <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">赛事直播</div>-->
@@ -125,10 +125,16 @@ function popRemark(type) {
    building()
    return
  }
  if(type == '0'){
    // 签证
-    applyInvitation()
+    if(language.value === 0){
-    return
+      ElMessage.warning('请切换英文页面办理，仅英文页面可以点击')
+      return
+    } else {
+      applyInvitation()
+      return
+    }
  }
  if ((form.value.isJdView == 0 && type == '1')
--- a/src/viewsPc/match/components/quick-row.vue
View file @09282c6
+++ b/src/viewsPc/match/components/quick-row.vue
View file @09282c6
@@ -22,7 +22,7 @@
      <el-col :lg="4" :md="7" :sm="11" :xs="11">
        <div class="funcBtn" @click="goAbout">
          <img src="@/assets/dance/btn04.png"/>
-          <h4>场馆介绍</h4>
+          <h4>场地介绍</h4>
        </div>
      </el-col>
      <el-col :lg="4" :md="7" :sm="11" :xs="11">
@@ -141,6 +141,11 @@ function popRemark(type) {
    })
  }
+  if (type === 0 && language.value === 0) { //签证服务
+    ElMessage.warning('请切换英文页面办理，仅英文页面可以点击')
+    return
+  }
  if (!form.value) {
    building()
    return
@@ -151,7 +156,6 @@ function popRemark(type) {
    || (form.value.isFoodView == 0 && type == '3')
    || (form.value.isMealView == 0 && type == '4')
    || (form.value.isPhotoView == 0 && type == '5')
-    || (form.value.isTicket == 0 && type == '0')
  ) {
    building()
    return
--- a/src/viewsPc/match/detail_en.vue
View file @09282c6
+++ b/src/viewsPc/match/detail_en.vue
View file @09282c6
@@ -187,9 +187,13 @@
      <!--      只联赛有-->
 <!--    邀请函  @click="applyInvitation"-->
-      <quick-row :match-id="matchId"/>
+<!--      <quick-row :match-id="matchId"/>-->
+      <el-row>
+        <el-col></el-col>
+        <el-col></el-col>
+      </el-row>
    </div>
    <affix-invitation ref="dialogInvitationRef"/>
    <div style="height: 50px"></div>