Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
553fc11c by 杨炀
Options

no message

1 parent 356f5c7e
Inline Side-by-side
Showing 10 changed files with 56 additions and 41 deletions
src/apiPc/match.js
...@@ -112,6 +112,13 @@ export function checkWdsf(query) { ...@@ -112,6 +112,13 @@ export function checkWdsf(query) {
112 params:query 112 params:query
113 }) 113 })
114 } 114 }
115 export function checkWdsfAthletes(query) {
116 return request({
117 url: `/league/wdsf/checkForGroup`,
118 method: 'get',
119 params:query
120 })
121 }
115 export function registerSingle(data) { 122 export function registerSingle(data) {
116 return request({ 123 return request({
117 url: `/pcRegisterSingleAboard`, 124 url: `/pcRegisterSingleAboard`,
......
src/layoutPc/components/AppBottom.vue
...@@ -73,6 +73,9 @@ ...@@ -73,6 +73,9 @@
73 </el-row> 73 </el-row>
74 </div> 74 </div>
75 </div> 75 </div>
76 <el-affix position="bottom" :offset="200">
77 <img class="kf" src="@/assets/logo/kf.png"/>
78 </el-affix>
76 </template> 79 </template>
77 80
78 <script setup> 81 <script setup>
...@@ -83,6 +86,8 @@ const language = useStorage('language', 0) ...@@ -83,6 +86,8 @@ const language = useStorage('language', 0)
83 </script> 86 </script>
84 87
85 <style lang="scss" scoped> 88 <style lang="scss" scoped>
89 .kf{width: 100px;cursor: pointer; animation: pop 2s infinite;}
90
86 .copyright{ font-size: 14px; 91 .copyright{ font-size: 14px;
87 opacity: 0.88; 92 opacity: 0.88;
88 color: #4C5359;} 93 color: #4C5359;}
......
src/layoutPc/components/AppMain.vue
...@@ -5,12 +5,14 @@ ...@@ -5,12 +5,14 @@
5 <!-- <component :is="Component" :key="route.path" />--> 5 <!-- <component :is="Component" :key="route.path" />-->
6 <!-- </keep-alive>--> 6 <!-- </keep-alive>-->
7 <!-- </router-view>--> 7 <!-- </router-view>-->
8
8 </template> 9 </template>
9 10
10 <script setup> 11 <script setup>
11 </script> 12 </script>
12 13
13 <style lang="scss" scoped> 14 <style lang="scss" scoped>
15
14 .app-main { 16 .app-main {
15 /* 50= navbar 50 */ 17 /* 50= navbar 50 */
16 width: 100%; 18 width: 100%;
......
src/viewsPc/booking/component/choseBills.vue
...@@ -58,10 +58,10 @@ const data = reactive({ ...@@ -58,10 +58,10 @@ const data = reactive({
58 loading: false, 58 loading: false,
59 title: '选择开票订单', 59 title: '选择开票订单',
60 query:{ 60 query:{
61 activeId:'', 61 // activeId:'',
62 createById:'', 62 // createById:'',
63 invoiced:'1', 63 // invoiced:'1',
64 // venueId:'' 64 status:1
65 }, 65 },
66 total:0 66 total:0
67 }) 67 })
...@@ -84,8 +84,8 @@ const getList = () => { ...@@ -84,8 +84,8 @@ const getList = () => {
84 loading.value = true 84 loading.value = true
85 getCanInvoiceBills(query.value).then(res=>{ 85 getCanInvoiceBills(query.value).then(res=>{
86 loading.value = false 86 loading.value = false
87 tableData.value = res.data.rows 87 tableData.value = res.rows
88 total.value = res.data.total 88 total.value = res.total
89 89
90 for (var b of tableData.value) { 90 for (var b of tableData.value) {
91 b.messageObj = JSON.parse(b.message) 91 b.messageObj = JSON.parse(b.message)
......
src/viewsPc/home.vue
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
2 <div> 2 <div>
3 <index-Ch v-if="language ==0"/> 3 <index-Ch v-if="language ==0"/>
4 <index-En v-else/> 4 <index-En v-else/>
5
6
7 <div v-if="showgg" class="fixed_gg"> 5 <div v-if="showgg" class="fixed_gg">
8 <!--天气--> 6 <!--天气-->
9 <el-icon class="cclose" @click.stop="showgg=false"><circle-close /></el-icon> 7 <el-icon class="cclose" @click.stop="showgg=false"><circle-close /></el-icon>
...@@ -94,5 +92,4 @@ const popWeather = () => { ...@@ -94,5 +92,4 @@ const popWeather = () => {
94 </script> 92 </script>
95 93
96 <style scoped lang="scss"> 94 <style scoped lang="scss">
97
98 </style> 95 </style>
......
src/viewsPc/match/components/addWdsf.vue
...@@ -110,7 +110,7 @@ import * as match from '@/apiPc/match' ...@@ -110,7 +110,7 @@ import * as match from '@/apiPc/match'
110 import {ElMessage} from 'element-plus' 110 import {ElMessage} from 'element-plus'
111 import _ from 'lodash' 111 import _ from 'lodash'
112 import Vcode from "vue3-puzzle-vcode" 112 import Vcode from "vue3-puzzle-vcode"
113 import {checkWdsf} from "@/apiPc/match"; 113 import {checkWdsf, checkWdsfAthletes} from "@/apiPc/match";
114 import {useStorage} from "@vueuse/core/index"; 114 import {useStorage} from "@vueuse/core/index";
115 115
116 const language = useStorage('language', 0) 116 const language = useStorage('language', 0)
...@@ -209,7 +209,7 @@ watch(show, (value) => { ...@@ -209,7 +209,7 @@ watch(show, (value) => {
209 card.value = '' 209 card.value = ''
210 isCodeTrue.value = false 210 isCodeTrue.value = false
211 form.value = { 211 form.value = {
212 sex: '0' 212 // sex: '0'
213 } 213 }
214 } 214 }
215 nextTick(() => { 215 nextTick(() => {
...@@ -226,8 +226,12 @@ function submitForm() { ...@@ -226,8 +226,12 @@ function submitForm() {
226 // ElMessage.warning('Please upload your photo') 226 // ElMessage.warning('Please upload your photo')
227 // return 227 // return
228 // } 228 // }
229 if (!form.value.sex) {
230 ElMessage.warning(language.value == 0 ?'请选择性别':'Please select your gender')
231 return
232 }
229 if (!form.value.passportUrl||form.value.passportUrl==''||form.value.passportUrl.length==0) { 233 if (!form.value.passportUrl||form.value.passportUrl==''||form.value.passportUrl.length==0) {
230 ElMessage.warning('Please upload passport file') 234 ElMessage.warning(language.value == 0 ?'请上传证件':'Please upload passport file')
231 return 235 return
232 } 236 }
233 if (editgay) { 237 if (editgay) {
...@@ -320,13 +324,19 @@ function codeSuccess(msg) { ...@@ -320,13 +324,19 @@ function codeSuccess(msg) {
320 console.log('验证通过' + msg); 324 console.log('验证通过' + msg);
321 showVcode.value = false 325 showVcode.value = false
322 isCodeTrue.value = true 326 isCodeTrue.value = true
323 checkWdsf({card: card.value}).then(res => { 327 checkWdsfAthletes({card: card.value,groupId:groupId}).then(res => {
328 if (res.data.wdsfFlag==-1) {
329 ElMessage.warning('运动员国籍不符，无法绑定该团体')
330 isCodeTrue.value = false
331 return
332 }
333
324 form.value = res.data 334 form.value = res.data
325 form.value.xing = form.value.surname 335 form.value.xing = form.value.surname
326 form.value.ming = form.value.name 336 form.value.ming = form.value.name
327 form.value.wdsfStatus = res.data.status 337 form.value.wdsfStatus = res.data.status
328 if (!form.value.sex) { 338 if (form.value.sex) {
329 form.value.sex = '0' 339 form.value.sex = res.data.sex
330 } 340 }
331 if (form.value.wdsfFlag == '0') { 341 if (form.value.wdsfFlag == '0') {
332 isCodeTrue.value = false 342 isCodeTrue.value = false
......
src/viewsPc/match/detail_en.vue
...@@ -196,26 +196,19 @@ ...@@ -196,26 +196,19 @@
196 </div> 196 </div>
197 </el-col> 197 </el-col>
198 </el-row> 198 </el-row>
199 <el-row :gutter="20" v-else> 199 <el-row :gutter="20" class="pd20" v-else>
200 <el-col :span="24" v-for="(t,index) in signDoneGroupList" :key="t.id"> 200 <el-col :span="24">
201 <div class="nowteamItem"> 201 <el-table :data="signDoneGroupList">
202 <span>{{ index + 1 }}.</span> 202 <el-table-column :label="language == 0 ? '组别代码' :'EVENT CODE'" min-width="120"/>
203 <el-avatar :size="80" :src="fillImgUrl(t.imgUrl||t.avatar)" :fit="cover"/> 203 <el-table-column :label="language == 0 ?'男运动员':'man name'" min-width="120"/>
204 <div class="info"> 204 <el-table-column :label="language == 0 ?'女运动员':'woman name'" min-width="120"/>
205 <h3 class="name">{{ t.name }}</h3> 205 <el-table-column :label="language == 0 ?'组别':'Group'" min-width="120"/>
206 <p v-if="t.extraInfo"> 206 <el-table-column :label="language == 0 ?'舞种':'Division'" min-width="120"/>
207 <span v-for="(ee,index) in JSON.parse(t.extraInfo)" :key="index" 207 <el-table-column :label="language == 0 ?'国籍':'Representing'" min-width="130"/>
208 v-show="(ee?.type == '0'||ee?.type == '4')&&index<2"> 208 <el-table-column :label="language == 0 ?'参赛队名称':'Team name'" min-width="120"/>
209 {{ ee.value }}&ensp;&ensp; 209 </el-table>
210 </span>
211 </p>
212 </div>
213 <p class="rr"><span>{{ t.renCi }}</span> {{ language==0?'人参赛':'registrants' }}</p>
214 </div>
215 </el-col> 210 </el-col>
216 </el-row> 211 </el-row>
217 <el-empty :image="`/img/order_no.png`" :image-size="228"
218 v-if="(signDoneGroupList==null)||(signDoneGroupList.length==0)" description=""/>
219 </div> 212 </div>
220 <div v-if="menu[4].active==1"> 213 <div v-if="menu[4].active==1">
221 <!--成绩--> 214 <!--成绩-->
...@@ -320,7 +313,7 @@ const data = reactive({ ...@@ -320,7 +313,7 @@ const data = reactive({
320 {name: 'Event details', cn: '赛事详情', active: 1}, 313 {name: 'Event details', cn: '赛事详情', active: 1},
321 {name: 'Event settings', cn: '赛事设项', active: 0}, 314 {name: 'Event settings', cn: '赛事设项', active: 0},
322 {name: 'Schedule', cn: '日程', active: 0}, 315 {name: 'Schedule', cn: '日程', active: 0},
323 {name: 'Participating teams', cn: '参赛队', active: 0}, 316 {name: 'Participating teams', cn: '参赛人员', active: 0},
324 {name: 'Achievement', cn: '成绩', active: 0}, 317 {name: 'Achievement', cn: '成绩', active: 0},
325 {name: 'Notes', cn: '报名须知', active: 0}], 318 {name: 'Notes', cn: '报名须知', active: 0}],
326 menu1: [ 319 menu1: [
......
src/viewsPc/vip/pplist.vue
...@@ -19,6 +19,9 @@ ...@@ -19,6 +19,9 @@
19 <el-col :span="4"> 19 <el-col :span="4">
20 <el-card :body-style="{padding:0}"> 20 <el-card :body-style="{padding:0}">
21 <ul class="meunUl"> 21 <ul class="meunUl">
22 <li>全国
23 <el-tag round type="info">{{ countAll }}</el-tag>
24 </li>
22 <li v-for="r in regionsList" :key="r.id" :class="{'active':r.id==currRegion.id}" @click="changePv(r)">{{ r.cityName }} 25 <li v-for="r in regionsList" :key="r.id" :class="{'active':r.id==currRegion.id}" @click="changePv(r)">{{ r.cityName }}
23 <el-tag round type="info">{{ r.count }}</el-tag> 26 <el-tag round type="info">{{ r.count }}</el-tag>
24 </li> 27 </li>
...@@ -75,6 +78,7 @@ const regionsList = ref([]) ...@@ -75,6 +78,7 @@ const regionsList = ref([])
75 const currRegion = ref(null) 78 const currRegion = ref(null)
76 const examSiteList = ref([]) 79 const examSiteList = ref([])
77 const total = ref(0) 80 const total = ref(0)
81 const countAll = ref(0)
78 const query = ref({ 82 const query = ref({
79 pageSize: 15, 83 pageSize: 15,
80 pageNum: 1, 84 pageNum: 1,
...@@ -100,14 +104,11 @@ const judeId = (val) => { ...@@ -100,14 +104,11 @@ const judeId = (val) => {
100 } 104 }
101 const getRegionsList = () => { 105 const getRegionsList = () => {
102 return getExamRegionsList().then((res) => { 106 return getExamRegionsList().then((res) => {
103 const sum = _.sumBy(res.data, (d) => d.count)
104 res.data.unshift({
105 id: null,
106 cityName: '全国',
107 count: sum
108 })
109 regionsList.value = res.data 107 regionsList.value = res.data
110 currRegion.value = res.data[0] 108 currRegion.value = res.data[0]
109 for(var n of res.data){
110 countAll.value += n.count
111 }
111 }) 112 })
112 } 113 }
113 const getList = () => { 114 const getList = () => {
......
vite.config.js
...@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => { ...@@ -82,7 +82,7 @@ export default defineConfig(({ mode, command }) => {
82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
83 }, 83 },
84 '/dev-api': { 84 '/dev-api': {
85 target: 'http://192.168.1.118:8081/', 85 target: 'http://192.168.1.131:8081/',
86 // target: 'https://dance.itechtop.cn/stage-api', 86 // target: 'https://dance.itechtop.cn/stage-api',
87 // target: 'https://wdsfwuxicenter.com/stage-api', 87 // target: 'https://wdsfwuxicenter.com/stage-api',
88 changeOrigin: true, 88 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!