Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
8cdfd2c8 by 华明祺
Options

Merge branch 'dev' of https://code.itechtop.cn/yangyang/dance-pc into dev

2 parents d2bdf28e 126485c3
Inline Side-by-side
Showing 7 changed files with 137 additions and 69 deletions
src/apiPc/webSite.js
......@@ -81,7 +81,12 @@ export function getCptsorts() {
method: 'get'
})
}
export function getRank() {
return request({
url: `/ztx/note/medalTable`,
method: 'get'
})
}
// 根据id查新闻列表
export function getNewsListById(query) {
return request({
......
src/viewsPc/booking/car.vue
......@@ -14,37 +14,38 @@
</div>
</div>
<div v-loading="loading" class="box">
<div v-for="(h,index) in list" :key="index">
<el-row :gutter="20" align="middle" class="w100">
<el-col :span="4">
<div class="index">{{ language == 0 ? '路线' : 'Route' }}{{ index + 1 }}
</div>
</el-col>
<el-col :span="6">
<p class="esp">{{ h.checkIn }}</p>
</el-col>
<el-col :span="4" class="text-center">
<img class="mauto w40px" src="@/assets/booking/wf.png"/>
</el-col>
<el-col :span="6">
<p class="esp ">{{ h.checkOut }}</p>
</el-col>
<el-col :span="2">
<div v-if="language==0" class="price">¥
<span>{{h.upPrice}}</span>
</div>
<div v-else class="price">
€
<span>{{h.upPriceEn}}</span>
</div>
</el-col>
<el-col :span="2">
<el-button class="btn-lineG w100" round type="primary" @click="goOrder(h)">
{{ language == 0 ? '我要预订' : 'Select' }}
</el-button>
</el-col>
</el-row>
<div v-for="(h,index) in list" :key="index" class="routeItem">
<el-row :gutter="20" align="middle" class="w100">
<el-col :lg="2" :sm="6">
<div class="index">{{ language == 0 ? '路线' : 'Route' }}{{ index + 1 }}
</div>
</el-col>
<el-col :lg="6" >
<p class="esp text-center">{{ h.checkIn }}</p>
</el-col>
<el-col :lg="4" :sm="6" class="text-center">
<img class="mauto w40px" src="@/assets/booking/wf.png"/>
</el-col>
<el-col :lg="6" >
<p class="esp text-center">{{ h.checkOut }}</p>
</el-col>
<el-col :lg="3" :sm="12">
<div v-if="language==0" class="price">
¥
<span>{{ h.upPrice }}</span>
</div>
<div v-else class="price">
€
<span>{{ h.upPriceEn }}</span>
</div>
</el-col>
<el-col :lg="3" :sm="12">
<el-button class="btn-lineG w100" round type="primary" @click="goOrder(h)">
{{ language == 0 ? '我要预订' : 'Select' }}
</el-button>
</el-col>
</el-row>
</div>
<el-empty v-show="!loading&&list.length==0" :image="`/img/order_no.png`" :image-size="228" description=""/>
......@@ -275,15 +276,7 @@ function goOrder(item, car) {
}
}
.price {
color: #FF8124;
font-size: 24px;
span {
font-size: 36px;
font-family: "DIN Alternate"
}
}
.bg-lineg {
margin: auto;
......@@ -304,5 +297,15 @@ function goOrder(item, car) {
}
}
}
.routeItem{background: #fff;border-radius: 10px;margin: 0 0 20px;padding: 10px 20px;box-shadow: 0 0 6px #eee;
.price {
color: #FF8124;
font-size: 24px;
span {
font-size: 36px;
font-family: "DIN Alternate"
}
}
}
</style>
......
src/viewsPc/index.vue
......@@ -152,18 +152,18 @@
</el-col>
<el-col :sm="24" :lg="12">
<div class="indexTitle">
<h3 class="leftboderTT">奖牌榜（2023）</h3>
<h3 class="leftboderTT">奖牌榜</h3>
<a class="more" href="#/saiC">MORE</a>
</div>
<!--历史排名-->
<el-card :body-style="{'padding':'10px 20px 18px'}">
<el-table stripe :data="rankList">
<el-table stripe :data="rank">
<el-table-column label="名次" align="center" width="50" type="index">
<template #default="scope">
<span v-if="scope.row.index == 1" style="color:#F8A617">{{ scope.row.index }}</span>
<span v-else-if="scope.row.index == 2" style="color:#778B92">{{ scope.row.index }}</span>
<span v-else-if="scope.row.index == 3" style="color:#7F2D00">{{ scope.row.index }}</span>
<span v-else>{{ scope.row.index }}</span>
<span v-if="scope.row.mingCi == 1" style="color:#F8A617">{{ scope.row.mingCi }}</span>
<span v-else-if="scope.row.mingCi == 2" style="color:#778B92">{{ scope.row.mingCi }}</span>
<span v-else-if="scope.row.mingCi == 3" style="color:#7F2D00">{{ scope.row.mingCi }}</span>
<span v-else>{{ scope.row.mingCi }}</span>
</template>
</el-table-column>
......@@ -171,13 +171,13 @@
<template #default="scope">
<div>
<span :class="`flag-icon flag-icon-${scope.row.code}`"></span>
{{ scope.row.gj }}
{{ scope.row.countryName }}
</div>
</template>
</el-table-column>
<el-table-column label="组合" align="center">
<template #default="scope">
<div class="text-primary esp">{{ scope.row.name }}</div>
<div class="text-primary esp">{{ scope.row.zuHe }}</div>
</template>
</el-table-column>
<el-table-column width="60">
......@@ -404,7 +404,7 @@ import HomeQuick from '@/viewsPc/components/homeQuick'
import HomeCalendar from '@/viewsPc/components/homeCalendar'
import {ref, nextTick, onMounted, watch} from 'vue'
import {getCurrentInstance} from '@vue/runtime-core'
import {getHomePage, getNewsListById, getNewsList} from '@/apiPc/webSite'
import {getHomePage, getNewsListById, getNewsList, getRank} from '@/apiPc/webSite'
import {useRouter} from 'vue-router'
import {rankList} from '@/assets/js/data'
import _ from 'lodash'
......@@ -433,6 +433,7 @@ const personList = ref([
{ name: 'Dallas Leslie Williams', pp: '记分长 澳大利亚', src: '/img/6.png' }
])
const activeNews = ref(0)
const rank = ref([])
const banners = ref([])
const newest = ref([])
const newest2 = ref([])
......@@ -456,6 +457,9 @@ const init = () => {
var today = dayjs().format('YYYY-MM-DD HH:mm:ss')
time.value = dayjs('2024-07-17 07:00:00').diff(today, 'millisecond')
etime.value = dayjs('2024-07-22 12:00:00').diff(today, 'millisecond')
getRank().then(res=>{
rank.value = res.data.slice(0,6)
})
getNewsListById({
pageSize: time.value>0? 3:4,
pageNum: 1,
......
src/viewsPc/index_en.vue
......@@ -128,31 +128,31 @@
</el-col>
<el-col :sm="24" :lg="12">
<div class="indexTitle">
<h3 class="leftboderTT">MEDAL LIST（2023）</h3>
<a class="more" href="#/saiC">MORE</a>
<h3 class="leftboderTT">MEDAL LIST</h3>
<!-- <a class="more" href="#/saiC">MORE</a>-->
</div>
<!--历史排名-->
<el-card :body-style="{'padding':'10px 20px 18px'}">
<el-table stripe :data="rankList">
<el-table stripe :data="rank">
<el-table-column label="RANK" align="center" width="80" type="index">
<template #default="scope">
<span v-if="scope.row.index == 1" style="color:#F8A617">{{ scope.row.index }}</span>
<span v-else-if="scope.row.index == 2" style="color:#778B92">{{ scope.row.index }}</span>
<span v-else-if="scope.row.index == 3" style="color:#7F2D00">{{ scope.row.index }}</span>
<span v-else>{{ scope.row.index }}</span>
<span v-if="scope.row.mingCi == 1" style="color:#F8A617">{{ scope.row.mingCi }}</span>
<span v-else-if="scope.row.mingCi == 2" style="color:#778B92">{{ scope.row.mingCi }}</span>
<span v-else-if="scope.row.mingCi == 3" style="color:#7F2D00">{{ scope.row.mingCi }}</span>
<span v-else>{{ scope.row.mingCi }}</span>
</template>
</el-table-column>
<el-table-column label="COUNTRY">
<template #default="scope">
<div>
<span :class="`flag-icon flag-icon-${scope.row.code}`"></span>
{{ scope.row.en_gj }}
{{ scope.row.countryShortName }}
</div>
</template>
</el-table-column>
<el-table-column label="COUPLE" align="center">
<template #default="scope">
<div class="text-primary esp">{{ scope.row.name }}</div>
<div class="text-primary esp">{{ scope.row.zuHe }}</div>
</template>
</el-table-column>
<el-table-column width="50">
......@@ -376,7 +376,7 @@
<script setup>
import { ref, nextTick, onMounted, watch } from 'vue'
import { getCurrentInstance } from '@vue/runtime-core'
import { getNewsListById, getNewsList,getWeather} from '@/apiPc/webSite'
import {getNewsListById, getNewsList, getWeather, getRank} from '@/apiPc/webSite'
import { useRouter } from 'vue-router'
import _ from 'lodash'
import HomeQuick from '@/viewsPc/components/homeQuick'
......@@ -408,6 +408,7 @@ const personList = ref([
])
const activeNews = ref(0)
const banners = ref([])
const rank = ref([])
const newest = ref([])
const newest2 = ref([])
const news = ref([])
......@@ -433,6 +434,9 @@ const init = () => {
var today = dayjs().format('YYYY-MM-DD HH:mm:ss')
etime.value = dayjs('2024-07-22 12:00:00').diff(today, 'millisecond')
time.value = dayjs('2024-07-17 07:00:00').diff(today, 'millisecond')
getRank().then(res=>{
rank.value = res.data
})
getNewsListById(
{ pageSize: 4,
pageNum: 1,
......
src/viewsPc/register/personal.vue
......@@ -275,9 +275,7 @@ function verifyCode() {
function codeSuccess(msg) {
isShow.value = false
console.log('old', isCodeTrue.value)
isCodeTrue.value += 1
console.log('new', isCodeTrue.value)
if (isCodeTrue.value == 1) {
checkWdsf({card: form.value.card}).then(res => {
wdsfData.value = res.data
......@@ -397,8 +395,6 @@ function next() {
}
registerSingle(obj).then(res => {
setToken(res.data.token)
console.log(matchId.value)
afterR()
})
}
......@@ -423,7 +419,6 @@ function next() {
}
loginSingle(obj).then(res => {
setToken(res.data.token)
console.log(matchId.value)
afterR()
}).catch(err => {
......@@ -460,13 +455,12 @@ function forgetPassword(account) {
useUserStore().setReLogin({account: account, active: 2})
}
const ocrSuccess = (res) => {
wdsfData.value.passportUrl = res.data.url
if(res.code==200){
if (res.code == 200) {
wdsfData.value.passportUrl = res.data.url
wdsfData.value.passportNumber = res.data.code
wdsfData.value.birthday = res.data.birth?.slice(0, 10)
wdsfData.value.sex = res.data.sex
} else if(res.code==500){
} else if (res.code == 500) {
ElMessage.warning(res.msg)
}
}
......
src/viewsPc/saiC/index.vue
......@@ -33,7 +33,57 @@
</el-col>
</el-row>
</el-card>
<el-card class="mt20 mb20">
<el-table stripe :data="rank">
<el-table-column label="名次" align="center" type="index">
<template #default="scope">
<span v-if="scope.row.mingCi == 1" style="color:#F8A617">{{ scope.row.mingCi }}</span>
<span v-else-if="scope.row.mingCi == 2" style="color:#778B92">{{ scope.row.mingCi }}</span>
<span v-else-if="scope.row.mingCi == 3" style="color:#7F2D00">{{ scope.row.mingCi }}</span>
<span v-else>{{ scope.row.mingCi }}</span>
</template>
</el-table-column>
<el-table-column label="国家" prop="name">
<template #default="scope">
<div>
<span :class="`flag-icon flag-icon-${scope.row.code}`"></span>
{{ scope.row.countryName }}
</div>
</template>
</el-table-column>
<el-table-column label="组合" align="center">
<template #default="scope">
<div class="text-primary esp">{{ scope.row.zuHe }}</div>
</template>
</el-table-column>
<el-table-column min-width="60">
<template #header>
<img class="mauto" src="@/assets/dance/1.png">
</template>
<template #default="scope">
<div class="text-warning text-center">{{ scope.row.jin }}</div>
</template>
</el-table-column>
<el-table-column min-width="60">
<template #header>
<img class="mauto" src="@/assets/dance/2.png">
</template>
<template #default="scope">
<div class="text-blue text-center">{{ scope.row.yin }}</div>
</template>
</el-table-column>
<el-table-column min-width="60">
<template #header>
<img class="mauto" src="@/assets/dance/3.png">
</template>
<template #default="scope">
<div class="text-primary text-center">{{ scope.row.tong }}</div>
</template>
</el-table-column>
</el-table>
</el-card>
<el-card class="mt20 mb20" v-for="(n,index) in cjList" hidden>
<div class="leftboderTT">{{ language==0?n.title:n.en_title }}</div>
<div v-for="(m,jndex) in n.list">
......@@ -79,12 +129,14 @@ import { dayjs } from 'element-plus'
const router = useRouter()
import {useStorage} from "@vueuse/core/index";
import {getIndexScheduleList} from "@/apiPc/common";
import {getRank} from '@/apiPc/webSite'
import {useRouter} from "vue-router";
const language = useStorage('language', 0)
const years = ref([])
const currYear = ref(null)
const ztxPlanList = ref([])
const planList = ref([])
const rank = ref([])
const schList = ref([])
const loading = ref(false)
const currentDate = ref(dayjs('2024-07-17').toDate())
......@@ -94,6 +146,12 @@ const query = ref({
})
getScheduleList()
getRankList()
function getRankList() {
getRank().then(res=>{
rank.value = res.data
})
}
function getScheduleList() {
loading.value = true
query.value.currentDate = dayjs(query.value.currentDate).format('YYYY-MM-DD')
......
vite.config.js
......@@ -81,8 +81,8 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
},
'/dev-api': {
target: 'http://192.168.1.118:8081/',
// target: 'http://192.168.1.253:8081',
// target: 'http://192.168.1.118:8081/',
target: 'http://192.168.1.253:8081',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api/',
changeOrigin: true,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!