499405d5 by 杨炀

no message

1 parent 0ed93485
...@@ -245,9 +245,14 @@ ...@@ -245,9 +245,14 @@
245 </div> 245 </div>
246 </el-col> 246 </el-col>
247 <el-col :lg="24"> 247 <el-col :lg="24">
248 <el-link class="mt20" v-if="form.viewStatus=='1'||form.viewStatus=='5'" type="primary" @click="exportPdf"><el-icon><Upload /></el-icon> 248 <el-button round class="mt20 btn-lineG" size="large" v-if="form.viewStatus=='1'||form.viewStatus=='5'" type="primary" @click="exportPdf">
249 <el-icon><Upload /></el-icon>
249 {{ language==0?'导出酒店预订单':'Export PDF' }} 250 {{ language==0?'导出酒店预订单':'Export PDF' }}
250 </el-link> 251 </el-button>
252 <el-button round class="mt20 btn-lineG" size="large" v-if="form.viewStatus=='1'||form.viewStatus=='5'" type="primary"
253 @click="exportPdf">
254 {{ language==0?'下载收据':'Upload Invoice' }}
255 </el-button>
251 </el-col> 256 </el-col>
252 </el-row> 257 </el-row>
253 </div> 258 </div>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 <el-col :lg="5" :md="5" :xl="6" :sm="8" :xs="8"> 5 <el-col :lg="5" :md="5" :xl="6" :sm="8" :xs="8">
6 <el-card class="mb20"> 6 <el-card class="mb20">
7 <div :class="language==0?'center-menu':'center-menu en-menu'"> 7 <div :class="language==0?'center-menu':'center-menu en-menu'">
8 <ul v-if="user.utype=='2'"> 8 <ul v-if="user.utype=='2'&&language==0">
9 <li v-for="(m, i) in menus" 9 <li v-for="(m, i) in menus"
10 :key="i" 10 :key="i"
11 :class="{ active: m.isActive }" 11 :class="{ active: m.isActive }"
...@@ -16,7 +16,18 @@ ...@@ -16,7 +16,18 @@
16 </a> 16 </a>
17 </li> 17 </li>
18 </ul> 18 </ul>
19 <ul v-if="user.utype=='1'"> 19 <ul v-if="user.utype=='2'&&language==1">
20 <li v-for="(m, i) in menusEn"
21 :key="i"
22 :class="{ active: m.isActive }"
23 >
24 <a href="javascript:void(0)" @click="toInfo(m,menus)">
25 <img :src="m.isActive ? m.picUrl2 : m.picUrl1">
26 {{m.name }}
27 </a>
28 </li>
29 </ul>
30 <ul v-if="user.utype=='1'&&language==0">
20 <li 31 <li
21 v-for="(m, i) in menusPersonal" 32 v-for="(m, i) in menusPersonal"
22 :key="i" 33 :key="i"
...@@ -28,7 +39,19 @@ ...@@ -28,7 +39,19 @@
28 </a> 39 </a>
29 </li> 40 </li>
30 </ul> 41 </ul>
31 <ul v-if="user.utype=='3'"> 42 <ul v-if="user.utype=='1'&&language==1">
43 <li
44 v-for="(m, i) in menusPersonalEn"
45 :key="i"
46 :class="{ active: m.isActive }"
47 >
48 <a href="javascript:void(0)" @click="toInfo(m,menusPersonal)">
49 <img :src="m.isActive ? m.picUrl2 : m.picUrl1">
50 {{ m.name }}
51 </a>
52 </li>
53 </ul>
54 <ul v-if="user.utype=='3'&&language==0">
32 <li 55 <li
33 v-for="(m, i) in menus3" 56 v-for="(m, i) in menus3"
34 :key="i" 57 :key="i"
...@@ -40,6 +63,18 @@ ...@@ -40,6 +63,18 @@
40 </a> 63 </a>
41 </li> 64 </li>
42 </ul> 65 </ul>
66 <ul v-if="user.utype=='3'&&language==1">
67 <li
68 v-for="(m, i) in menus3En"
69 :key="i"
70 :class="{ active: m.isActive }"
71 >
72 <a href="javascript:void(0)" @click="toInfo(m,menus3)">
73 <img :src="m.isActive ? m.picUrl2 : m.picUrl1">
74 {{ m.name }}
75 </a>
76 </li>
77 </ul>
43 </div> 78 </div>
44 </el-card> 79 </el-card>
45 </el-col> 80 </el-col>
...@@ -129,6 +164,64 @@ const menus = ref([ ...@@ -129,6 +164,64 @@ const menus = ref([
129 isActive: false 164 isActive: false
130 } 165 }
131 ]) 166 ])
167 const menusEn = ref([
168 {
169 name: language.value==0?'基础信息':'Basic Information',
170 routeName: 'myInfo',
171 picUrl1: '/img/nav_26.png',
172 picUrl2: '/img/nav_26_dwn.png',
173 isActive: false
174 },
175 {
176 name: language.value==0?'修改密码':'Change Password',
177 routeName: 'myPassword',
178 picUrl1: '/img/nav_27.png',
179 picUrl2: '/img/nav_27_dwn.png',
180 isActive: false
181 },
182 {
183 name: language.value==0?'团队认证':'Organization Recognition',
184 routeName: 'myCertification',
185 picUrl1: '/img/nav_32.png',
186 picUrl2: '/img/nav_32_dwn.png',
187 isActive: false
188 },
189 {
190 name: language.value==0?'选手管理':'Athlete Management',
191 routeName: 'myMember',
192 picUrl1: '/img/nav_31.png',
193 picUrl2: '/img/nav_31_dwn.png',
194 isActive: false
195 },
196 {
197 name: language.value==0?'我的报名':'My Registration',
198 routeName: 'myMatch',
199 picUrl1: '/img/nav_28.png',
200 picUrl2: '/img/nav_28_dwn.png',
201 isActive: false
202 },
203 {
204 name: language.value==0?'我的预订':'My Reservation',
205 routeName: 'myReservation',
206 picUrl1: '/img/nav_29.png',
207 picUrl2: '/img/nav_29_dwn.png',
208 isActive: false
209 },
210 {
211 name: language.value==0?'票务预订':'Ticket Reservation',
212 routeName: 'seat_order',
213 picUrl1: '/img/c7.png',
214 picUrl2: '/img/c7.png',
215 isActive: false
216 },
217 {
218 name: language.value==0?'系统消息':'System messages',
219 routeName: 'mySms',
220 picUrl1: '/img/nav_30.png',
221 picUrl2: '/img/nav_30_dwn.png',
222 isActive: false
223 }
224 ])
132 const menus3 = ref([ 225 const menus3 = ref([
133 { 226 {
134 name: language.value==0?'基础信息':'Basic Information', 227 name: language.value==0?'基础信息':'Basic Information',
...@@ -166,6 +259,36 @@ const menus3 = ref([ ...@@ -166,6 +259,36 @@ const menus3 = ref([
166 isActive: false 259 isActive: false
167 } 260 }
168 ]) 261 ])
262 const menus3En = ref([
263 {
264 name: language.value==0?'基础信息':'Basic Information',
265 routeName: 'myInfo',
266 picUrl1: '/img/nav_26.png',
267 picUrl2: '/img/nav_26_dwn.png',
268 isActive: false
269 },
270 {
271 name: language.value==0?'修改密码':'Change Password',
272 routeName: 'myPassword',
273 picUrl1: '/img/nav_27.png',
274 picUrl2: '/img/nav_27_dwn.png',
275 isActive: false
276 },
277 {
278 name: language.value==0?'我的预订':'My Reservation',
279 routeName: 'myReservation',
280 picUrl1: '/img/nav_29.png',
281 picUrl2: '/img/nav_29_dwn.png',
282 isActive: false
283 },
284 {
285 name: language.value==0?'票务预订':'Ticket Reservation',
286 routeName: 'seat_order',
287 picUrl1: '/img/c7.png',
288 picUrl2: '/img/c7.png',
289 isActive: false
290 }
291 ])
169 const menusPersonal = ref([ 292 const menusPersonal = ref([
170 { 293 {
171 name: language.value==0?'基础信息':'Basic Information', 294 name: language.value==0?'基础信息':'Basic Information',
...@@ -217,6 +340,50 @@ const menusPersonal = ref([ ...@@ -217,6 +340,50 @@ const menusPersonal = ref([
217 isActive: false 340 isActive: false
218 } 341 }
219 ]) 342 ])
343 const menusPersonalEn = ref([
344 {
345 name: language.value==0?'基础信息':'Basic Information',
346 routeName: 'myInfo',
347 picUrl1: '/img/nav_26.png',
348 picUrl2: '/img/nav_26_dwn.png',
349 isActive: false
350 },
351 {
352 name: language.value==0?'修改密码':'Change Password',
353 routeName: 'myPassword',
354 picUrl1: '/img/nav_27.png',
355 picUrl2: '/img/nav_27_dwn.png',
356 isActive: false
357 },
358 {
359 name: language.value==0?'我的报名':'My Registration',
360 routeName: 'myMatch',
361 picUrl1: '/img/nav_28.png',
362 picUrl2: '/img/nav_28_dwn.png',
363 isActive: false
364 },
365 {
366 name: language.value==0?'我的预订':'My Reservation',
367 routeName: 'myReservation',
368 picUrl1: '/img/nav_29.png',
369 picUrl2: '/img/nav_29_dwn.png',
370 isActive: false
371 },
372 {
373 name: language.value==0?'票务预订':'Ticket Reservation',
374 routeName: 'seat_order',
375 picUrl1: '/img/c7.png',
376 picUrl2: '/img/c7.png',
377 isActive: false
378 },
379 {
380 name: language.value==0?'系统消息':'System messages',
381 routeName: 'mySms',
382 picUrl1: '/img/nav_30.png',
383 picUrl2: '/img/nav_30_dwn.png',
384 isActive: false
385 }
386 ])
220 let currMenu 387 let currMenu
221 onMounted(() => { 388 onMounted(() => {
222 if(!user.utype){ 389 if(!user.utype){
......
...@@ -16,7 +16,42 @@ ...@@ -16,7 +16,42 @@
16 </el-tabs> 16 </el-tabs>
17 <el-empty :image="`/img/order_no.png`" :image-size="228" v-if="list?.length == 0"/> 17 <el-empty :image="`/img/order_no.png`" :image-size="228" v-if="list?.length == 0"/>
18 <div v-if="activeName=='6'" class="pd20"> 18 <div v-if="activeName=='6'" class="pd20">
19 <div v-for="b in list" class="item" v-loading="loading">
20 <div class="title">
21 <label class="orangeTag"> {{ language==0?'票务':'Ticket' }} </label>
22 <span>{{b.orderSn}}</span>
23 </div>
19 24
25 <el-row class="pd20 mt10" justify="space-between" align="middle">
26 <el-col :lg="9" :md="12" :sm="12" :xs="24">
27 <h3 class="m0">{{ b.name }}</h3>
28 <p> {{ language==0? "时间": "Event Date & Time" }}{{
29 b.dateStr
30 }}</p>
31 <p class="common">
32 {{ language==0?"张数":"Location"}}{{ b.ticketNum}}{{ language==0? "张": "tickets" }}
33 </p>
34 </el-col>
35 <el-col :lg="3" :md="6" :sm="6" :xs="6" class="text-center">
36 <span class="text-warning"> {{ b.payType=='2'?'€':'¥' }}
37 <span class="bigMoney">{{b.payAmount}}</span>
38 </span>
39 </el-col>
40 <el-col :lg="6" :md="16" :sm="16" :xs="16">
41 <div class="text-right">
42 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&!b.invoiceId&&b.payType!='2'" @click.stop="gokp(b)">
43 {{ language == 0 ? '开发票' : 'Invoice' }}
44 </el-button>
45 <el-button type="primary" plain round v-if="b.isInvoice == '0'&&b.invoiceId&&b.payType!='2'" @click.stop="editkp(b)">
46 {{ language == 0 ? '重开发票' : 'Rebilling' }}
47 </el-button>
48 <el-button type="primary" plain round v-if="b.invoiceId&&b.paymentType!='3'"
49 @click.stop="showDetail(b)">{{ language == 0 ? '查看发票' : 'Detail' }}
50 </el-button>
51 </div>
52 </el-col>
53 </el-row>
54 </div>
20 </div> 55 </div>
21 <div v-else-if="activeName=='5'" class="pd20"> 56 <div v-else-if="activeName=='5'" class="pd20">
22 <div v-for="b in list" class="item" v-loading="loading"> 57 <div v-for="b in list" class="item" v-loading="loading">
...@@ -118,12 +153,12 @@ ...@@ -118,12 +153,12 @@
118 <el-button type="primary" plain round v-if="b.invoiceId&&b.paymentType!='3'" 153 <el-button type="primary" plain round v-if="b.invoiceId&&b.paymentType!='3'"
119 @click.stop="showDetail(b)">{{ language == 0 ? '查看发票' : 'Detail' }} 154 @click.stop="showDetail(b)">{{ language == 0 ? '查看发票' : 'Detail' }}
120 </el-button> 155 </el-button>
121 <el-button type="primary" v-if="b.isInvoice == '0'&&!b.invoiceId&&b.paymentType=='3'" plain round @click.stop="goSj(b)"> 156 <!-- <el-button type="primary" v-if="b.isInvoice == '0'&&!b.invoiceId&&b.paymentType=='3'" plain round @click.stop="goSj(b)">-->
122 {{ language == 0 ? '开收据' : 'Receipt' }} 157 <!-- {{ language == 0 ? '开收据' : 'Receipt' }}-->
123 </el-button> 158 <!-- </el-button>-->
124 <el-button type="primary" plain round v-if="b.invoiceId&&b.paymentType=='3'" 159 <!-- <el-button type="primary" plain round v-if="b.invoiceId&&b.paymentType=='3'"-->
125 @click.stop="showSJ(b)">{{ language == 0 ? '查看收据' : 'Detail' }} 160 <!-- @click.stop="showSJ(b)">{{ language == 0 ? '查看收据' : 'Detail' }}-->
126 </el-button> 161 <!-- </el-button>-->
127 </div> 162 </div>
128 </el-col> 163 </el-col>
129 </el-row> 164 </el-row>
...@@ -199,7 +234,6 @@ const getList = () => { ...@@ -199,7 +234,6 @@ const getList = () => {
199 }) 234 })
200 }else if(query.value.orderType=='6'){ 235 }else if(query.value.orderType=='6'){
201 login() 236 login()
202 // 用户免登录
203 }else { 237 }else {
204 query.value.invoiced = 1 238 query.value.invoiced = 1
205 getCanInvoiceBills(query.value).then(res=>{ 239 getCanInvoiceBills(query.value).then(res=>{
...@@ -221,7 +255,8 @@ const login = async () => { ...@@ -221,7 +255,8 @@ const login = async () => {
221 }).then((res) => { 255 }).then((res) => {
222 setToken(res.data.token); 256 setToken(res.data.token);
223 getCanInvoiceTicket().then(res=>{ 257 getCanInvoiceTicket().then(res=>{
224 list.value = res.lists 258 loading.value = false
259 list.value = res.data.lists
225 }) 260 })
226 }) 261 })
227 } 262 }
......
...@@ -294,7 +294,7 @@ ...@@ -294,7 +294,7 @@
294 </div> 294 </div>
295 <div class="content flex" v-if="activeName==8"> 295 <div class="content flex" v-if="activeName==8">
296 <label>Download:</label> 296 <label>Download:</label>
297 <div> 297 <div style="word-break: break-all;text-indent: 0">
298 <div> 298 <div>
299 <a target="_blank" class="text-primary" href="/file/2024%20WDSF%20ASIAN%20DANCESPORT%20FESTIVAL%20ENTRY%20GUIDE.pdf"> 299 <a target="_blank" class="text-primary" href="/file/2024%20WDSF%20ASIAN%20DANCESPORT%20FESTIVAL%20ENTRY%20GUIDE.pdf">
300 <el-icon style="position: relative;top: 2px"> 300 <el-icon style="position: relative;top: 2px">
...@@ -319,7 +319,6 @@ ...@@ -319,7 +319,6 @@
319 </el-icon> 319 </el-icon>
320 Schedule-WDSF ASIAN DANCESPORT FESTIVAL 2024.WUXI</a> 320 Schedule-WDSF ASIAN DANCESPORT FESTIVAL 2024.WUXI</a>
321 </div> 321 </div>
322
323 <div> 322 <div>
324 <a target="_blank" class="text-primary" href="/file/COMPETITION%20GUIDE%200520V1.pdf"> 323 <a target="_blank" class="text-primary" href="/file/COMPETITION%20GUIDE%200520V1.pdf">
325 <!-- <a @click="showBuilding" class="text-primary">--> 324 <!-- <a @click="showBuilding" class="text-primary">-->
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 <el-carousel class="forPc" autoplay :interval="2000" height="450px" :autoplay="false" arrow="hover" @change="carouselChange"> 4 <el-carousel class="forPc" autoplay :interval="2000" height="450px" :autoplay="false" arrow="hover" @change="carouselChange">
5 <el-carousel-item style="height: 450px;" v-for="n in maList" :key="n.id"> 5 <el-carousel-item style="height: 450px;" v-for="n in maList" :key="n.id">
6 <div class="bannerItem"> 6 <div class="bannerItem">
7 <div class="h100"> 7 <div class="h100" @click.stop="goMatch(n)">
8 <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)"> 8 <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
9 <img v-else class="bannerImg" src="@/assets/dance/banner.png"> 9 <img v-else class="bannerImg" src="@/assets/dance/banner.png">
10 <div class="box forPc" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;"> 10 <div class="box forPc" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;">
...@@ -30,10 +30,34 @@ ...@@ -30,10 +30,34 @@
30 </template> 30 </template>
31 </van-count-down> 31 </van-count-down>
32 </div> 32 </div>
33 <div class="banner-count bb" v-if="n.timeEnd<0" @click="goMatch(n)"> 33 <div v-if="n.timeEnd<0">
34 <a target="_blank" href="https://wx.vzan.com/live/page/1151815649?v=1720589464698" class="banner-count" v-if="time>0&&n.id=='1778253367748993026'" @click="goMatch(n)">
35 <van-count-down :time="time" format="DD 天 HH 时 mm 分 ss 秒">
36 <template #default="timeData">
37 <div class="block">{{ timeData.days }}
38 <span class="colon"></span>
39 </div>
40
41 <div class="block">{{ timeData.hours }}
42 <span class="colon"></span>
43 </div>
44
45 <div class="block">{{ timeData.minutes }}
46 <span class="colon"></span>
47 </div>
48
49 <div class="block">{{ timeData.seconds }}
50 <span class="colon"></span>
51 </div>
52 </template>
53 </van-count-down>
54 开始直播
55 </a>
56 <div class="banner-count bb" v-else-if="n.timeEnd<0" @click="goMatch(n)">
34 报名已结束 57 报名已结束
35 </div> 58 </div>
36 <div class="banner-count bb" v-if="n.time<=0&&n.timeEnd>=0" @click="goMatch(n)"> 59 </div>
60 <div class="banner-count bb" v-if="n.time<=0 && n.timeEnd>=0" @click="goMatch(n)">
37 开始报名 61 开始报名
38 </div> 62 </div>
39 </div> 63 </div>
...@@ -48,7 +72,6 @@ ...@@ -48,7 +72,6 @@
48 <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)"> 72 <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
49 <img v-else class="bannerImg" src="@/assets/dance/banner.png"> 73 <img v-else class="bannerImg" src="@/assets/dance/banner.png">
50 <div style="position: absolute;left: 0;right: 0;bottom: 0;margin: auto;"> 74 <div style="position: absolute;left: 0;right: 0;bottom: 0;margin: auto;">
51
52 <div class="banner-count" v-if="n.time>0" @click="goMatch(n)"> 75 <div class="banner-count" v-if="n.time>0" @click="goMatch(n)">
53 距离开始还有 76 距离开始还有
54 <van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒"> 77 <van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒">
...@@ -71,9 +94,35 @@ ...@@ -71,9 +94,35 @@
71 </template> 94 </template>
72 </van-count-down> 95 </van-count-down>
73 </div> 96 </div>
74 <div class="banner-count bb" v-else @click="goMatch(n)"> 97 <div v-if="n.timeEnd<0">
98 <a target="_blank" href="https://wx.vzan.com/live/page/1151815649?v=1720589464698" class="banner-count" v-if="time>0&&n.id=='1778253367748993026'" @click="goMatch(n)">
99 <van-count-down :time="time" format="DD 天 HH 时 mm 分 ss 秒">
100 <template #default="timeData">
101 <div class="block">{{ timeData.days }}
102 <span class="colon"></span>
103 </div>
104
105 <div class="block">{{ timeData.hours }}
106 <span class="colon"></span>
107 </div>
108
109 <div class="block">{{ timeData.minutes }}
110 <span class="colon"></span>
111 </div>
112
113 <div class="block">{{ timeData.seconds }}
114 <span class="colon"></span>
115 </div>
116 </template>
117 </van-count-down>
118 开始直播
119 </a>
120 <div class="banner-count bb" v-else-if="n.timeEnd<0" @click="goMatch(n)">
121 报名已结束
122 </div>
123 </div>
124 <div class="banner-count bb" v-if="n.time<=0 && n.timeEnd>=0" @click="goMatch(n)">
75 开始报名 125 开始报名
76 <!-- <el-button class="btn-lineG" style="font-size: 17px;height: 40px" round type="primary">开始报名</el-button>-->
77 </div> 126 </div>
78 </div> 127 </div>
79 </div> 128 </div>
...@@ -427,7 +476,7 @@ onMounted(() => { ...@@ -427,7 +476,7 @@ onMounted(() => {
427 476
428 const init = () => { 477 const init = () => {
429 var today = dayjs().format('YYYY-MM-DD HH:mm:ss') 478 var today = dayjs().format('YYYY-MM-DD HH:mm:ss')
430 time.value = dayjs('2024-07-17 09:00:00').diff(today, 'millisecond') 479 time.value = dayjs('2024-07-17 07:00:00').diff(today, 'millisecond')
431 etime.value = dayjs('2024-07-22 12:00:00').diff(today, 'millisecond') 480 etime.value = dayjs('2024-07-22 12:00:00').diff(today, 'millisecond')
432 getNewsListById( 481 getNewsListById(
433 { 482 {
......
...@@ -4,12 +4,12 @@ ...@@ -4,12 +4,12 @@
4 <el-carousel height="450px" autoplay :interval="2000" class="forPc" :autoplay="false" arrow="hover" @change="carouselChange"> 4 <el-carousel height="450px" autoplay :interval="2000" class="forPc" :autoplay="false" arrow="hover" @change="carouselChange">
5 <el-carousel-item style="height: 450px;" v-for="n in maList" :key="n.id"> 5 <el-carousel-item style="height: 450px;" v-for="n in maList" :key="n.id">
6 <div class="bannerItem"> 6 <div class="bannerItem">
7 <div class="h100"> 7 <div class="h100" @click.stop="goMatch(n)">
8 <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)"> 8 <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
9 <img v-else class="bannerImg" src="@/assets/dance/banner.png"> 9 <img v-else class="bannerImg" src="@/assets/dance/banner.png">
10 <div class="box" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;"> 10 <div class="box" style="position: absolute;top: 0;left: 0;right: 0;margin: auto;">
11 11
12 <div class="banner-count" v-if="n.time>0" @click="goMatch(n)"> 12 <div class="banner-count" v-if="n.time>0" >
13 Countdown 13 Countdown
14 <van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒"> 14 <van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒">
15 <template #default="timeData"> 15 <template #default="timeData">
...@@ -28,9 +28,33 @@ ...@@ -28,9 +28,33 @@
28 </template> 28 </template>
29 </van-count-down> 29 </van-count-down>
30 </div> 30 </div>
31 <div class="banner-count bb" v-if="n.timeEnd<0" @click="goMatch(n)"> 31 <div v-if="n.timeEnd<0">
32 <a target="_blank" href="https://wx.vzan.com/live/page/1151815649?v=1720589464698" class="banner-count" v-if="time>0&&n.id=='1778253367748993026'" @click="goMatch(n)">
33 <van-count-down :time="time" format="DD 天 HH 时 mm 分 ss 秒">
34 <template #default="timeData">
35 <div class="block">{{ timeData.days }}
36 <span class="colon">day</span>
37 </div>
38
39 <div class="block">{{ timeData.hours }}
40 <span class="colon">H</span>
41 </div>
42
43 <div class="block">{{ timeData.minutes }}
44 <span class="colon">M</span>
45 </div>
46
47 <div class="block">{{ timeData.seconds }}
48 <span class="colon">S</span>
49 </div>
50 </template>
51 </van-count-down>
52 Living start
53 </a>
54 <div class="banner-count bb" v-else-if="n.timeEnd<0" @click="goMatch(n)">
32 Registration has ended 55 Registration has ended
33 </div> 56 </div>
57 </div>
34 <div class="banner-count bb" v-if="n.time<=0&&n.timeEnd>=0" @click="goMatch(n)"> 58 <div class="banner-count bb" v-if="n.time<=0&&n.timeEnd>=0" @click="goMatch(n)">
35 REGISTER NOW 59 REGISTER NOW
36 </div> 60 </div>
...@@ -46,33 +70,56 @@ ...@@ -46,33 +70,56 @@
46 <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)"> 70 <img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
47 <img v-else class="bannerImg" src="@/assets/dance/banner.png"> 71 <img v-else class="bannerImg" src="@/assets/dance/banner.png">
48 <div style="position: absolute;left: 0;right: 0;bottom: 0;margin: auto;"> 72 <div style="position: absolute;left: 0;right: 0;bottom: 0;margin: auto;">
49 73 <div class="banner-count" v-if="n.time>0" >
50 <div class="banner-count" v-if="n.time>0" @click="goMatch(n)"> 74 Countdown
51 距离开始还有
52 <van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒"> 75 <van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒">
53 <template #default="timeData"> 76 <template #default="timeData">
54 <div class="block">{{ timeData.days }} 77 <div class="block">{{ timeData.days }}
55 <span class="colon"></span> 78 <span class="colon">Days</span>
79 </div>
80 <div class="block">{{ timeData.hours }}
81 <span class="colon">Hrs</span>
82 </div>
83 <div class="block">{{ timeData.minutes }}
84 <span class="colon">Min</span>
85 </div>
86 <div class="block">{{ timeData.seconds }}
87 <span class="colon">Sec</span>
88 </div>
89 </template>
90 </van-count-down>
91 </div>
92 <div v-if="n.timeEnd<0">
93 <a target="_blank" href="https://wx.vzan.com/live/page/1151815649?v=1720589464698" class="banner-count" v-if="time>0&&n.id=='1778253367748993026'" @click="goMatch(n)">
94 <van-count-down :time="time" format="DD 天 HH 时 mm 分 ss 秒">
95 <template #default="timeData">
96 <div class="block">{{ timeData.days }}
97 <span class="colon">day</span>
56 </div> 98 </div>
57 99
58 <div class="block">{{ timeData.hours }} 100 <div class="block">{{ timeData.hours }}
59 <span class="colon"></span> 101 <span class="colon">H</span>
60 </div> 102 </div>
61 103
62 <div class="block">{{ timeData.minutes }} 104 <div class="block">{{ timeData.minutes }}
63 <span class="colon"></span> 105 <span class="colon">M</span>
64 </div> 106 </div>
65 107
66 <div class="block">{{ timeData.seconds }} 108 <div class="block">{{ timeData.seconds }}
67 <span class="colon"></span> 109 <span class="colon">S</span>
68 </div> 110 </div>
69 </template> 111 </template>
70 </van-count-down> 112 </van-count-down>
113 Living start
114 </a>
115 <div class="banner-count bb" v-else-if="n.timeEnd<0" @click="goMatch(n)">
116 Registration has ended
117 </div>
71 </div> 118 </div>
72 <div class="banner-count bb" v-else @click="goMatch(n)"> 119 <div class="banner-count bb" v-if="n.time<=0&&n.timeEnd>=0" @click="goMatch(n)">
73 REGISTER NOW 120 REGISTER NOW
74 <!-- <el-button class="btn-lineG" style="font-size: 17px;height: 40px" round type="primary">开始报名</el-button>-->
75 </div> 121 </div>
122
76 </div> 123 </div>
77 </div> 124 </div>
78 </div> 125 </div>
...@@ -455,7 +502,7 @@ onMounted(() => { ...@@ -455,7 +502,7 @@ onMounted(() => {
455 const init = () => { 502 const init = () => {
456 var today = dayjs().format('YYYY-MM-DD HH:mm:ss') 503 var today = dayjs().format('YYYY-MM-DD HH:mm:ss')
457 etime.value = dayjs('2024-07-22 12:00:00').diff(today, 'millisecond') 504 etime.value = dayjs('2024-07-22 12:00:00').diff(today, 'millisecond')
458 time.value = dayjs('2024-07-17 09:00:00').diff(today, 'millisecond') 505 time.value = dayjs('2024-07-17 07:00:00').diff(today, 'millisecond')
459 getNewsListById( 506 getNewsListById(
460 { pageSize: 4, 507 { pageSize: 4,
461 pageNum: 1, 508 pageNum: 1,
......
...@@ -440,6 +440,10 @@ function getGroupListByCptId() { ...@@ -440,6 +440,10 @@ function getGroupListByCptId() {
440 } 440 }
441 441
442 function changeMenu(menu, l) { 442 function changeMenu(menu, l) {
443 console.log(matchData.value.leagueId,l.name)
444 if(matchData.value.leagueId=='1778253367748993026' && (l.name=='成绩'||l.name=='Achievement')){
445 window.open('http://www.cdsf.org.cn/h5/sscj.index?matchID=526')
446 }
443 for (const n of menu) { 447 for (const n of menu) {
444 if (n == l) { 448 if (n == l) {
445 n.active = 1 449 n.active = 1
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!