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 @@ ...@@ -7,8 +7,10 @@
7 </div> 7 </div>
8 <div class="pd20"> 8 <div class="pd20">
9 <div class="topsearch"> 9 <div class="topsearch">
10 <el-input v-if="activeTab==0" placeholder="请输入护照号搜索"/> 10 <el-input v-if="activeTab==0" :placeholder="language==0?'请输入护照号搜索':'Please enter passport number to search'"
11 <el-input v-else placeholder="请输入姓名搜索"/> 11 v-model="query.idCard"/>
12 <el-input v-else :placeholder="language==0?'请输入姓名搜索':'Please enter name to search'"
13 v-model="query.name"/>
12 <el-button class="btn-lineG" type="primary" @click="search"> 14 <el-button class="btn-lineG" type="primary" @click="search">
13 <el-icon class="mr20"> 15 <el-icon class="mr20">
14 <Search/> 16 <Search/>
...@@ -21,17 +23,17 @@ ...@@ -21,17 +23,17 @@
21 <div :class="activeTab==0?'active':''" @click="activeTab=0"> 23 <div :class="activeTab==0?'active':''" @click="activeTab=0">
22 <img v-show="activeTab!=0" src="@/assets/img/tag01@2x.png"/> 24 <img v-show="activeTab!=0" src="@/assets/img/tag01@2x.png"/>
23 <img v-show="activeTab==0" src="@/assets/img/tag01_dwn@2x.png"/> 25 <img v-show="activeTab==0" src="@/assets/img/tag01_dwn@2x.png"/>
24 {{language==0?'签证服务':''}} 26 {{language==0?'签证服务':'Visa Services'}}
25 </div> 27 </div>
26 <div :class="activeTab==1?'active':''" @click="activeTab=1"> 28 <div :class="activeTab==1?'active':''" @click="activeTab=1">
27 <img v-show="activeTab!=1" src="@/assets/img/tag02@2x.png"/> 29 <img v-show="activeTab!=1" src="@/assets/img/tag02@2x.png"/>
28 <img v-show="activeTab==1" src="@/assets/img/tag02_dwn@2x.png"/> 30 <img v-show="activeTab==1" src="@/assets/img/tag02_dwn@2x.png"/>
29 {{language==0?'酒店预定':''}} 31 {{language==0?'酒店预定':'Hotel Reservation'}}
30 </div> 32 </div>
31 <div :class="activeTab==2?'active':''" @click="activeTab=2"> 33 <div :class="activeTab==2?'active':''" @click="activeTab=2">
32 <img v-show="activeTab!=2" src="@/assets/img/tag03@2x.png"/> 34 <img v-show="activeTab!=2" src="@/assets/img/tag03@2x.png"/>
33 <img v-show="activeTab==2" src="@/assets/img/tag03_dwn@2x.png"/> 35 <img v-show="activeTab==2" src="@/assets/img/tag03_dwn@2x.png"/>
34 {{language==0?'接送服务':''}} 36 {{language==0?'接送服务':'Pick-up Service'}}
35 </div> 37 </div>
36 </div> 38 </div>
37 <div> 39 <div>
...@@ -62,8 +64,12 @@ const query = ref({ ...@@ -62,8 +64,12 @@ const query = ref({
62 const loading = ref(false) 64 const loading = ref(false)
63 65
64 function search() { 66 function search() {
65 if (!query.value.idCard) { 67 if (!query.value.idCard && activeTab.value == 0) {
66 ElMessage.warning('请输入证件号') 68 ElMessage.warning(language==0?'请输入关键字搜索':'Please enter keyword to search')
69 return
70 }
71 if (!query.value.name && activeTab.value != 0) {
72 ElMessage.warning(language==0?'请输入关键字搜索':'Please enter keyword to search')
67 return 73 return
68 } 74 }
69 loading.value = true 75 loading.value = true
......
src/viewsPc/components/homeWeatherBar.vue
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
25 <el-icon class="mr20"> 25 <el-icon class="mr20">
26 <Search/> 26 <Search/>
27 </el-icon> 27 </el-icon>
28 服务查询 28 {{ language ==0?'服务查询':'Service Query' }}
29 </el-button> 29 </el-button>
30 </el-col> 30 </el-col>
31 </el-row> 31 </el-row>
...@@ -39,16 +39,25 @@ import WeatherIcon from '@/viewsPc/components/weatherIcon' ...@@ -39,16 +39,25 @@ import WeatherIcon from '@/viewsPc/components/weatherIcon'
39 import {getWeather} from "@/apiPc/webSite" 39 import {getWeather} from "@/apiPc/webSite"
40 import dayjs from "dayjs" 40 import dayjs from "dayjs"
41 import router from "@/routerPc/en"; 41 import router from "@/routerPc/en";
42 const language = useUserStore().language 42 const language = ref('0')
43 const weatherObj = ref({ 43 const weatherObj = ref({
44 forecast:[] 44 forecast:[]
45 }) 45 })
46 const week = ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'] 46 const week = ['星期日','星期一','星期二','星期三','星期四','星期五','星期六']
47 const weekEn = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday'] 47 const weekEn = ['Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday']
48 const props = defineProps({
49 lang: {
50 type: String,
51 required: true,
52 default: '0'
53 }
54 })
55
48 onMounted(()=>{ 56 onMounted(()=>{
49 if(useUserStore().weather == null){ 57 if(useUserStore().weather == null){
50 init() 58 init()
51 } 59 }
60 language.value = props.lang
52 }) 61 })
53 function init(){ 62 function init(){
54 getWeather().then(res=>{ 63 getWeather().then(res=>{
......
src/viewsPc/index_en.vue
...@@ -85,6 +85,10 @@ ...@@ -85,6 +85,10 @@
85 </el-carousel> 85 </el-carousel>
86 </div> 86 </div>
87 87
88 <div class="mb30">
89 <home-weather-bar :lang="1"/>
90 </div>
91
88 <div class="box"> 92 <div class="box">
89 <HomeQuick :match-id="matchData?.id" :cpt-name="matchData?.name"/> 93 <HomeQuick :match-id="matchData?.id" :cpt-name="matchData?.name"/>
90 </div> 94 </div>
...@@ -159,30 +163,12 @@ ...@@ -159,30 +163,12 @@
159 <el-card> 163 <el-card>
160 <el-row :gutter="20"> 164 <el-row :gutter="20">
161 <el-col :lg="8"> 165 <el-col :lg="8">
162 <a class="liveImgbox" target="_blank" href="https://wx.vzan.com/live/page/1151815649?v=1720589464698"> 166 <a class="liveImgbox" @click="goNewsDetail(n)">
163 <div class="livetimecount" v-if="time>0"> 167 <div class="imgBox">
164 <van-count-down :time="time" format="DD 天 HH 时 mm 分 ss 秒"> 168 <img :src="fillImgUrl_webSite(livelist[0]?.picUrl)">
165 <template #default="timeData">
166 <div class="block">{{ timeData.days }}
167 </div>
168 <span class="colon">day</span>
169 <div class="block">{{ timeData.hours }}
170 </div>
171 <span class="colon">:</span>
172 <div class="block">{{ timeData.minutes }}
173 </div>
174 <span class="colon">:</span>
175 <div class="block">{{ timeData.seconds }}
176 </div>
177 <span class="colon">start</span>
178 </template>
179 </van-count-down>
180 </div> 169 </div>
181 <!-- <i class="ii" v-else-if="etime>0&&time<=0">Living</i>-->
182 <!-- <i class="livetimecount" v-if="etime<=0">End</i>-->
183 <div class="imgBox"><img src="/img/111.jpeg"/></div>
184 <h3 class="esp"> 170 <h3 class="esp">
185 WUXI 2024 WDSF ASIAN DANCESPORT FESTIVAL 171 {{ livelist[0]?.name }}
186 </h3> 172 </h3>
187 </a> 173 </a>
188 </el-col> 174 </el-col>
...@@ -318,6 +304,9 @@ import { Autoplay, Navigation } from 'swiper' ...@@ -318,6 +304,9 @@ import { Autoplay, Navigation } from 'swiper'
318 import 'swiper/css' 304 import 'swiper/css'
319 import {dayjs, ElMessage} from 'element-plus' 305 import {dayjs, ElMessage} from 'element-plus'
320 import * as match from "@/apiPc/match"; 306 import * as match from "@/apiPc/match";
307 import HomeWeatherBar from "@/viewsPc/components/homeWeatherBar";
308
309
321 import {rankList} from '@/assets/js/data' 310 import {rankList} from '@/assets/js/data'
322 const modules = [Autoplay, Navigation] 311 const modules = [Autoplay, Navigation]
323 const navigationPic = ref({ 312 const navigationPic = ref({
......
src/viewsPc/news/index.vue
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
41 </el-card> 41 </el-card>
42 42
43 <div class="indexTitle"> 43 <div class="indexTitle">
44 <h3 class="leftboderTT">舞蹈动态</h3> 44 <h3 class="leftboderTT">新闻动态</h3>
45 <a class="more" @click="goList(query2.sortId,'舞蹈动态')">MORE</a> 45 <a class="more" @click="goList(query2.sortId,'新闻动态')">MORE</a>
46 </div> 46 </div>
47 <el-row class="newsflex mb20"> 47 <el-row class="newsflex mb20">
48 <el-col 48 <el-col
......
vite.config.js
...@@ -81,11 +81,11 @@ export default defineConfig(({ mode, command }) => { ...@@ -81,11 +81,11 @@ export default defineConfig(({ mode, command }) => {
81 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 81 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
82 }, 82 },
83 '/dev-api': { 83 '/dev-api': {
84 target: 'http://192.168.1.118:8081/', 84 // target: 'http://192.168.1.118:8081/',
85 // target: 'http://192.168.1.131:8081/', 85 // target: 'http://192.168.1.131:8081/',
86 // target: 'https://jijin.wtwuxicenter.com/stage-api', 86 // target: 'https://jijin.wtwuxicenter.com/stage-api',
87 // target: 'http://124.70.181.90:1880/stage-api', 87 // target: 'http://124.70.181.90:1880/stage-api',
88 // target: 'https://wdsfwuxicenter.com/stage-api/', 88 target: 'https://wdsfwuxicenter.com/stage-api/',
89 changeOrigin: true, 89 changeOrigin: true,
90 rewrite: (p) => p.replace(/^\/dev-api/, '') 90 rewrite: (p) => p.replace(/^\/dev-api/, '')
91 }, 91 },
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!