Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
bffd51b5 by 杨炀
Options

Merge branch 'prod' into dev 

# Conflicts:
#	src/viewsPc/match/detail_en.vue
2 parents ca5ba54b db8f8433
Inline Side-by-side
Showing 7 changed files with 90 additions and 9 deletions
src/layoutPc/components/AppHeader.vue
......@@ -324,7 +324,7 @@ function getCode() {
.ropenbtn{padding: 10px;display: none;
img{ width: 50px;}
img{ width: 44px;}
}
:deep(.el-input){height: 100%}
......
src/layoutPc/components/AppTop.vue
......@@ -257,7 +257,7 @@ function getCode() {
.ropenbtn{padding: 10px;display: none;
img{ width: 50px;}
img{ width: 44px;}
}
:deep(.el-input){height: 100%}
......
src/viewsPc/index.vue
<template>
<div>
<div class="banner">
<el-carousel height="450px" :autoplay="false" arrow="hover" @change="carouselChange">
<el-carousel class="forPc" height="450px" :autoplay="false" arrow="hover" @change="carouselChange">
<el-carousel-item style="height: 450px;" v-for="n in maList" :key="n.id">
<div class="bannerItem">
<div class="h100">
......@@ -40,6 +40,45 @@
</div>
</el-carousel-item>
</el-carousel>
<el-carousel class="forWei" height="160px" :autoplay="false" arrow="hover" @change="carouselChange">
<el-carousel-item style="height: 160px;" v-for="n in maList" :key="n.id">
<div class="bannerItem" style="height:100%">
<div class="h100" style="position: relative">
<img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
<img v-else class="bannerImg" src="@/assets/dance/banner.png">
<div style="position: absolute;left: 0;right: 0;bottom: 0;margin: auto;">
<div class="banner-count" v-if="n.time>0" @click="goMatch(n)">
距离开始还有
<van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒">
<template #default="timeData">
<div class="block">{{ timeData.days }}
<span class="colon">天</span>
</div>
：
<div class="block">{{ timeData.hours }}
<span class="colon">时</span>
</div>
：
<div class="block">{{ timeData.minutes }}
<span class="colon">分</span>
</div>
：
<div class="block">{{ timeData.seconds }}
<span class="colon">秒</span>
</div>
</template>
</van-count-down>
</div>
<div class="banner-count bb" v-else @click="goMatch(n)">
开始报名
<!-- <el-button class="btn-lineG" style="font-size: 17px;height: 40px" round type="primary">开始报名</el-button>-->
</div>
</div>
</div>
</div>
</el-carousel-item>
</el-carousel>
</div>
<div class="box zn-bg">
......@@ -885,7 +924,8 @@ const goGuide = () => {
}
.bannerItem .banner-count {
flex-direction: column;
transform: scale(0.8);
transform: scale(0.5);
width: auto;
left: 0;
right: 0;
......
src/viewsPc/index_en.vue
<template>
<div>
<div class="banner">
<el-carousel height="450px" :autoplay="false" arrow="hover" @change="carouselChange">
<el-carousel height="450px" class="forPc" :autoplay="false" arrow="hover" @change="carouselChange">
<el-carousel-item style="height: 450px;" v-for="n in maList" :key="n.id">
<div class="bannerItem">
<div class="h100">
......@@ -37,6 +37,45 @@
</div>
</el-carousel-item>
</el-carousel>
<el-carousel class="forWei" height="160px" :autoplay="false" arrow="hover" @change="carouselChange">
<el-carousel-item style="height: 160px;" v-for="n in maList" :key="n.id">
<div class="bannerItem" style="height:100%">
<div class="h100" style="position: relative">
<img v-if="n.bgImgUrl" class="bannerImg" :src="fillImgUrl(n.bgImgUrl)">
<img v-else class="bannerImg" src="@/assets/dance/banner.png">
<div style="position: absolute;left: 0;right: 0;bottom: 0;margin: auto;">
<div class="banner-count" v-if="n.time>0" @click="goMatch(n)">
距离开始还有
<van-count-down :time="n.time" format="DD 天 HH 时 mm 分 ss 秒">
<template #default="timeData">
<div class="block">{{ timeData.days }}
<span class="colon">天</span>
</div>
：
<div class="block">{{ timeData.hours }}
<span class="colon">时</span>
</div>
：
<div class="block">{{ timeData.minutes }}
<span class="colon">分</span>
</div>
：
<div class="block">{{ timeData.seconds }}
<span class="colon">秒</span>
</div>
</template>
</van-count-down>
</div>
<div class="banner-count bb" v-else @click="goMatch(n)">
开始报名
<!-- <el-button class="btn-lineG" style="font-size: 17px;height: 40px" round type="primary">开始报名</el-button>-->
</div>
</div>
</div>
</div>
</el-carousel-item>
</el-carousel>
</div>
<div class="box zn-bg">
......@@ -749,7 +788,8 @@ const goGuide = () => {
display: none;
}
.bannerItem .banner-count{flex-direction: column;
transform: scale(0.8); left: 0;
transform: scale(0.5); width: auto;
left: 0;
right: 0;
.van-count-down{margin: 30px 0 0;}
}
......
src/viewsPc/match/components/allSportsmanList.vue
......@@ -38,7 +38,7 @@
<el-table ref="allSportmenTable" v-loading="loading" :data="tableData" height="60vh"
@selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" :label="language==0?'选择':'Selection'" :selectable="selectable"/>-->
<el-table-column align="center" type="index" :label="language==0?'序号':'Index'" width="60" :selectable="selectable"/>
<el-table-column align="center" type="index" :label="language==0?'序号':'Index'" width="70" :selectable="selectable"/>
<el-table-column v-if="isNational" :label="language==0?'WDSF 会员号':'WDSF MIN'" prop="wdsfMin" width="100"/>
<el-table-column align="center" :label="language==0?'姓氏':'Surname'" prop="xing" min-width="100"/>
<el-table-column align="center" :label="language==0?'名':'Name'" prop="ming" min-width="100"/>
......
src/viewsPc/match/detail_en.vue
......@@ -226,6 +226,7 @@
<div v-else>
<el-empty :image="`/img/order_no.png`" :image-size="228" description=""/>
</div>
</div>
<div v-if="menu[4].active==1">
<!--成绩-->
......
vite.config.js
......@@ -82,8 +82,8 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
},
'/dev-api': {
target: 'http://192.168.1.131:8081/',
// target: 'https://dance.itechtop.cn/stage-api',
// target: 'http://192.168.1.118:8081/',
target: 'https://dance.itechtop.cn/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!