Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
59b8cfa9 by 杨炀
Options

no message

1 parent 4e57c8c9
Inline Side-by-side
Showing 5 changed files with 39 additions and 35 deletions
src/viewsPc/booking/serverSearch.vue
......@@ -7,8 +7,10 @@
</div>
<div class="pd20">
<div class="topsearch">
<el-input v-if="activeTab==0" placeholder="请输入护照号搜索"/>
<el-input v-else placeholder="请输入姓名搜索"/>
<el-input v-if="activeTab==0" :placeholder="language==0?'请输入护照号搜索':'Please enter passport number to search'"
v-model="query.idCard"/>
<el-input v-else :placeholder="language==0?'请输入姓名搜索':'Please enter name to search'"
v-model="query.name"/>
<el-button class="btn-lineG" type="primary" @click="search">
<el-icon class="mr20">
<Search/>
......@@ -21,17 +23,17 @@
<div :class="activeTab==0?'active':''" @click="activeTab=0">
<img v-show="activeTab!=0" src="@/assets/img/tag01@2x.png"/>
<img v-show="activeTab==0" src="@/assets/img/tag01_dwn@2x.png"/>
{{language==0?'签证服务':''}}
{{language==0?'签证服务':'Visa Services'}}
</div>
<div :class="activeTab==1?'active':''" @click="activeTab=1">
<img v-show="activeTab!=1" src="@/assets/img/tag02@2x.png"/>
<img v-show="activeTab==1" src="@/assets/img/tag02_dwn@2x.png"/>
{{language==0?'酒店预定':''}}
{{language==0?'酒店预定':'Hotel Reservation'}}
</div>
<div :class="activeTab==2?'active':''" @click="activeTab=2">
<img v-show="activeTab!=2" src="@/assets/img/tag03@2x.png"/>
<img v-show="activeTab==2" src="@/assets/img/tag03_dwn@2x.png"/>
{{language==0?'接送服务':''}}
{{language==0?'接送服务':'Pick-up Service'}}
</div>
</div>
<div>
......@@ -62,8 +64,12 @@ const query = ref({
const loading = ref(false)
function search() {
if (!query.value.idCard) {
ElMessage.warning('请输入证件号')
if (!query.value.idCard && activeTab.value == 0) {
ElMessage.warning(language==0?'请输入关键字搜索':'Please enter keyword to search')
return
}
if (!query.value.name && activeTab.value != 0) {
ElMessage.warning(language==0?'请输入关键字搜索':'Please enter keyword to search')
return
}
loading.value = true
......
src/viewsPc/components/homeWeatherBar.vue
......@@ -25,7 +25,7 @@
<el-icon class="mr20">
<Search/>
</el-icon>
服务查询
{{ language ==0?'服务查询':'Service Query' }}
</el-button>
</el-col>
</el-row>
......@@ -39,16 +39,25 @@ import WeatherIcon from '@/viewsPc/components/weatherIcon'
import {getWeather} from "@/apiPc/webSite"
import dayjs from "dayjs"
import router from "@/routerPc/en";
const language = useUserStore().language
const language = ref('0')
const weatherObj = ref({
forecast:[]
})
const week = ['星期日','星期一','星期二','星期三','星期四','星期五','星期六']
const weekEn = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday']
const props = defineProps({
lang: {
type: String,
required: true,
default: '0'
}
})
onMounted(()=>{
if(useUserStore().weather == null){
init()
}
language.value = props.lang
})
function init(){
getWeather().then(res=>{
......
src/viewsPc/index_en.vue
......@@ -85,6 +85,10 @@
</el-carousel>
</div>
<div class="mb30">
<home-weather-bar :lang="1"/>
</div>
<div class="box">
<HomeQuick :match-id="matchData?.id" :cpt-name="matchData?.name"/>
</div>
......@@ -159,30 +163,12 @@
<el-card>
<el-row :gutter="20">
<el-col :lg="8">
<a class="liveImgbox" target="_blank" href="https://wx.vzan.com/live/page/1151815649?v=1720589464698">
<div class="livetimecount" v-if="time>0">
<van-count-down :time="time" format="DD 天 HH 时 mm 分 ss 秒">
<template #default="timeData">
<div class="block">{{ timeData.days }}
</div>
<span class="colon">day</span>
<div class="block">{{ timeData.hours }}
</div>
<span class="colon">:</span>
<div class="block">{{ timeData.minutes }}
</div>
<span class="colon">:</span>
<div class="block">{{ timeData.seconds }}
</div>
<span class="colon">start</span>
</template>
</van-count-down>
<a class="liveImgbox" @click="goNewsDetail(n)">
<div class="imgBox">
<img :src="fillImgUrl_webSite(livelist[0]?.picUrl)">
</div>
<!-- <i class="ii" v-else-if="etime>0&&time<=0">Living</i>-->
<!-- <i class="livetimecount" v-if="etime<=0">End</i>-->
<div class="imgBox"><img src="/img/111.jpeg"/></div>
<h3 class="esp">
WUXI 2024 WDSF ASIAN DANCESPORT FESTIVAL
{{ livelist[0]?.name }}
</h3>
</a>
</el-col>
......@@ -318,6 +304,9 @@ import { Autoplay, Navigation } from 'swiper'
import 'swiper/css'
import {dayjs, ElMessage} from 'element-plus'
import * as match from "@/apiPc/match";
import HomeWeatherBar from "@/viewsPc/components/homeWeatherBar";
import {rankList} from '@/assets/js/data'
const modules = [Autoplay, Navigation]
const navigationPic = ref({
......
src/viewsPc/news/index.vue
......@@ -41,8 +41,8 @@
</el-card>
<div class="indexTitle">
<h3 class="leftboderTT">舞蹈动态</h3>
<a class="more" @click="goList(query2.sortId,'舞蹈动态')">MORE</a>
<h3 class="leftboderTT">新闻动态</h3>
<a class="more" @click="goList(query2.sortId,'新闻动态')">MORE</a>
</div>
<el-row class="newsflex mb20">
<el-col
......
vite.config.js
......@@ -81,11 +81,11 @@ 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.118:8081/',
// target: 'http://192.168.1.131:8081/',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'http://124.70.181.90:1880/stage-api',
// target: 'https://wdsfwuxicenter.com/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!