Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
09282c61 by 杨炀
Options

no message

1 parent e92b11a3
Inline Side-by-side
Showing 7 changed files with 41 additions and 17 deletions
src/layoutPc/components/AppBottom.vue
...@@ -60,13 +60,12 @@ ...@@ -60,13 +60,12 @@
60 <img class="kf" src="@/assets/logo/btn01.png"/> 60 <img class="kf" src="@/assets/logo/btn01.png"/>
61 <div class="text-center mt10">在线客服</div> 61 <div class="text-center mt10">在线客服</div>
62 </div> 62 </div>
63 <div @click="goHelpZH"> 63 <!-- <div @click="goHelpZH">-->
64 <!-- <a target="_blank" href="https://wdsfwuxicenter.com/stage-api/fs/file/操作指引.zip">--> 64 <!-- <a>-->
65 <a> 65 <!-- <img class="kf" src="@/assets/logo/btn02.png"/>-->
66 <img class="kf" src="@/assets/logo/btn02.png"/> 66 <!-- <div class="text-center mt10">参赛指南</div>-->
67 <div class="text-center mt10">参赛指南</div> 67 <!-- </a>-->
68 </a> 68 <!-- </div>-->
69 </div>
70 </div> 69 </div>
71 <div class="mlb" v-else> 70 <div class="mlb" v-else>
72 <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"> 71 <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 = () => { ...@@ -113,7 +112,9 @@ const goHelpZH = () => {
113 .fixed-right{position: fixed;right: 0;top: 65%;z-index: 9; 112 .fixed-right{position: fixed;right: 0;top: 65%;z-index: 9;
114 .mlb{background: #fff;border-radius: 10px 0 0 10px;box-shadow: 0 2px 8px #aaa; 113 .mlb{background: #fff;border-radius: 10px 0 0 10px;box-shadow: 0 2px 8px #aaa;
115 padding: 10px 8px;text-align: center;cursor: pointer; 114 padding: 10px 8px;text-align: center;cursor: pointer;
116 div:first-child{border-bottom: 0.5px solid #eee;padding: 0 0 10px;margin-bottom: 10px} 115 div:first-child{border-bottom: 0.5px solid #eee;
116 //padding: 0 0 10px;margin-bottom: 10px;
117 }
117 div:hover{.gradient-text{font-weight: bold;}} 118 div:hover{.gradient-text{font-weight: bold;}}
118 } 119 }
119 } 120 }
......
src/layoutPc/components/AppHeader.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <el-menu-item index="/match/list">{{ language==0?'赛事服务':'REGISTRATION' }}</el-menu-item> 16 <el-menu-item index="/match/list">{{ language==0?'赛事服务':'REGISTRATION' }}</el-menu-item>
17 <el-menu-item index="/saiC">{{ language==0?'竞赛日程':'COMPETITIONS' }}</el-menu-item> 17 <el-menu-item index="/saiC">{{ language==0?'竞赛日程':'COMPETITIONS' }}</el-menu-item>
18 <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item> 18 <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item>
19 <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item> 19 <!-- <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item>-->
20 <el-menu-item index="/about/wuDao">{{ language==0?'关于我们':'CONTACT & MORE' }}</el-menu-item> 20 <el-menu-item index="/about/wuDao">{{ language==0?'关于我们':'CONTACT & MORE' }}</el-menu-item>
21 21
22 <!-- <el-sub-menu index="/about">--> 22 <!-- <el-sub-menu index="/about">-->
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 <el-menu-item index="/match/list">{{ language==0?'赛事服务':'REGISTRATION' }}</el-menu-item> 35 <el-menu-item index="/match/list">{{ language==0?'赛事服务':'REGISTRATION' }}</el-menu-item>
36 <el-menu-item index="/saiC">{{ language==0?'竞赛日程':'COMPETITIONS' }}</el-menu-item> 36 <el-menu-item index="/saiC">{{ language==0?'竞赛日程':'COMPETITIONS' }}</el-menu-item>
37 <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item> 37 <el-menu-item index="/meta">{{ language==0?'媒体中心':'MEDIA' }}</el-menu-item>
38 <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item> 38 <!-- <el-menu-item index="/guide">{{ language==0?'参赛指南':'GUIDELINE' }}</el-menu-item>-->
39 <el-menu-item index="/about/wuDao">{{ language==0?'关于我们':'CONTACT & MORE' }}</el-menu-item> 39 <el-menu-item index="/about/wuDao">{{ language==0?'关于我们':'CONTACT & MORE' }}</el-menu-item>
40 40
41 <!-- <el-sub-menu index="/about">--> 41 <!-- <el-sub-menu index="/about">-->
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
117 <el-menu-item index="/match/list">赛事服务</el-menu-item> 117 <el-menu-item index="/match/list">赛事服务</el-menu-item>
118 <el-menu-item index="/saiC">竞赛日程</el-menu-item> 118 <el-menu-item index="/saiC">竞赛日程</el-menu-item>
119 <el-menu-item index="/meta">媒体中心</el-menu-item> 119 <el-menu-item index="/meta">媒体中心</el-menu-item>
120 <el-menu-item index="/guide">参赛指南</el-menu-item> 120 <!-- <el-menu-item index="/guide">参赛指南</el-menu-item>-->
121 <el-menu-item index="/about/wuDao">关于我们</el-menu-item> 121 <el-menu-item index="/about/wuDao">关于我们</el-menu-item>
122 <el-menu-item v-if="isLogin" index="/center/myPassword">个人中心</el-menu-item> 122 <el-menu-item v-if="isLogin" index="/center/myPassword">个人中心</el-menu-item>
123 </el-menu> 123 </el-menu>
......
src/layoutPc/components/AppTop.vue
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 <el-menu-item index="/match/list/0">大赛报名</el-menu-item> 56 <el-menu-item index="/match/list/0">大赛报名</el-menu-item>
57 <el-menu-item index="/saiC">赛程安排</el-menu-item> 57 <el-menu-item index="/saiC">赛程安排</el-menu-item>
58 <el-menu-item index="/meta">媒体中心</el-menu-item> 58 <el-menu-item index="/meta">媒体中心</el-menu-item>
59 <el-menu-item index="/guide">参赛指南</el-menu-item> 59 <!-- <el-menu-item index="/guide">参赛指南</el-menu-item>-->
60 <el-sub-menu index="/about"> 60 <el-sub-menu index="/about">
61 <template #title>关于我们</template> 61 <template #title>关于我们</template>
62 <el-menu-item index="/about/wuDao">舞蹈节</el-menu-item> 62 <el-menu-item index="/about/wuDao">舞蹈节</el-menu-item>
......
src/viewsPc/booking/hotel.vue
...@@ -61,6 +61,7 @@ ...@@ -61,6 +61,7 @@
61 import {useRouter,useRoute} from "vue-router"; 61 import {useRouter,useRoute} from "vue-router";
62 import {useStorage} from "@vueuse/core/index"; 62 import {useStorage} from "@vueuse/core/index";
63 import useUserStore from "@/store/modules/user"; 63 import useUserStore from "@/store/modules/user";
64 import {ElMessageBox} from "element-plus";
64 const router = useRouter() 65 const router = useRouter()
65 const route = useRoute() 66 const route = useRoute()
66 const user = useUserStore().user 67 const user = useUserStore().user
...@@ -93,6 +94,12 @@ ...@@ -93,6 +94,12 @@
93 useStore().setVisitor() 94 useStore().setVisitor()
94 return 95 return
95 } 96 }
97 //todo 是否为会议酒店
98 ElMessageBox.confirm('该酒店为会议酒店，是否继续预定','',{
99 cancelButtonText: language.value==1?'Close ':'关闭',
100 confirmButtonText: language.value==1?'Continue to book':'继续预订',
101 type: 'warning',
102 }).then((res) => {
96 router.push({ 103 router.push({
97 name:'hotelDetail', 104 name:'hotelDetail',
98 params:{ 105 params:{
...@@ -101,8 +108,10 @@ ...@@ -101,8 +108,10 @@
101 query:{ 108 query:{
102 id:item.id 109 id:item.id
103 } 110 }
104
105 }) 111 })
112 })
113
114
106 } 115 }
107 </script> 116 </script>
108 117
......
src/viewsPc/components/homeQuick.vue
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 <div class="item" @click="popRemark(2)"><img src="@/assets/dance/btn03.png">接送服务</div> 11 <div class="item" @click="popRemark(2)"><img src="@/assets/dance/btn03.png">接送服务</div>
12 </el-col> 12 </el-col>
13 <el-col :sm="12" :lg="6" :xs="12"> 13 <el-col :sm="12" :lg="6" :xs="12">
14 <div class="item" @click="goAbout"><img src="@/assets/dance/btn04.png">场馆介绍</div> 14 <div class="item" @click="goAbout"><img src="@/assets/dance/btn04.png">场地介绍</div>
15 </el-col> 15 </el-col>
16 <!-- <el-col :sm="12" :lg="4" :xs="12">--> 16 <!-- <el-col :sm="12" :lg="4" :xs="12">-->
17 <!-- <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">赛事直播</div>--> 17 <!-- <div class="item" @click="liveClick"><img src="@/assets/dance/btn05.png">赛事直播</div>-->
...@@ -125,11 +125,17 @@ function popRemark(type) { ...@@ -125,11 +125,17 @@ function popRemark(type) {
125 building() 125 building()
126 return 126 return
127 } 127 }
128
128 if(type == '0'){ 129 if(type == '0'){
129 // 签证 130 // 签证
131 if(language.value === 0){
132 ElMessage.warning('请切换英文页面办理，仅英文页面可以点击')
133 return
134 } else {
130 applyInvitation() 135 applyInvitation()
131 return 136 return
132 } 137 }
138 }
133 139
134 if ((form.value.isJdView == 0 && type == '1') 140 if ((form.value.isJdView == 0 && type == '1')
135 || (form.value.isCarView == 0 && type == '2') 141 || (form.value.isCarView == 0 && type == '2')
......
src/viewsPc/match/components/quick-row.vue
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 <el-col :lg="4" :md="7" :sm="11" :xs="11"> 22 <el-col :lg="4" :md="7" :sm="11" :xs="11">
23 <div class="funcBtn" @click="goAbout"> 23 <div class="funcBtn" @click="goAbout">
24 <img src="@/assets/dance/btn04.png"/> 24 <img src="@/assets/dance/btn04.png"/>
25 <h4>场馆介绍</h4> 25 <h4>场地介绍</h4>
26 </div> 26 </div>
27 </el-col> 27 </el-col>
28 <el-col :lg="4" :md="7" :sm="11" :xs="11"> 28 <el-col :lg="4" :md="7" :sm="11" :xs="11">
...@@ -141,6 +141,11 @@ function popRemark(type) { ...@@ -141,6 +141,11 @@ function popRemark(type) {
141 }) 141 })
142 } 142 }
143 143
144 if (type === 0 && language.value === 0) { //签证服务
145 ElMessage.warning('请切换英文页面办理，仅英文页面可以点击')
146 return
147 }
148
144 if (!form.value) { 149 if (!form.value) {
145 building() 150 building()
146 return 151 return
...@@ -151,7 +156,6 @@ function popRemark(type) { ...@@ -151,7 +156,6 @@ function popRemark(type) {
151 || (form.value.isFoodView == 0 && type == '3') 156 || (form.value.isFoodView == 0 && type == '3')
152 || (form.value.isMealView == 0 && type == '4') 157 || (form.value.isMealView == 0 && type == '4')
153 || (form.value.isPhotoView == 0 && type == '5') 158 || (form.value.isPhotoView == 0 && type == '5')
154 || (form.value.isTicket == 0 && type == '0')
155 ) { 159 ) {
156 building() 160 building()
157 return 161 return
......
src/viewsPc/match/detail_en.vue
...@@ -187,7 +187,11 @@ ...@@ -187,7 +187,11 @@
187 187
188 <!-- 只联赛有--> 188 <!-- 只联赛有-->
189 <!-- 邀请函 @click="applyInvitation"--> 189 <!-- 邀请函 @click="applyInvitation"-->
190 <quick-row :match-id="matchId"/> 190 <!-- <quick-row :match-id="matchId"/>-->
191 <el-row>
192 <el-col></el-col>
193 <el-col></el-col>
194 </el-row>
191 </div> 195 </div>
192 196
193 197
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!