Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
ee471d6c by zhangmeng
Options

Merge remote-tracking branch 'origin/dev' into dev

2 parents c9c806eb 8554f824
Inline Side-by-side
Showing 8 changed files with 323 additions and 24 deletions
public/img/fp.svg
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg fill="#bec3c6" t="1720521921471" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8890" width="30" height="30" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M775.1168 100.9664H272.4352c-70.4512 0-127.5392 57.088-127.5392 127.5392v610.048c0 35.8912 38.8608 58.368 69.9904 40.4992l108.544-62.3616a46.7456 46.7456 0 0 1 54.3744 5.632L493.056 925.184a46.67904 46.67904 0 0 0 62.1056 0.0512l116.3776-103.5264a46.72512 46.72512 0 0 1 54.5792-5.4272l106.24 62.0032c31.1296 18.176 70.2464-4.3008 70.2464-40.3456V228.5056c0.0512-70.4-57.0368-127.5392-127.488-127.5392z m-133.9392 448.0512a29.8496 29.8496 0 1 1 0 59.6992h-87.5008v53.8624a29.8496 29.8496 0 1 1-59.6992 0V608.768h-87.552a29.8496 29.8496 0 1 1 0-59.6992h87.5008v-36.4544H406.4256a29.8496 29.8496 0 1 1 0-59.6992h58.9312l-77.312-122.5216a29.9008 29.9008 0 0 1 9.3184-41.216 29.9008 29.9008 0 0 1 41.216 9.3184l84.736 134.2464L609.024 296.96c8.8064-13.9264 27.2896-18.1248 41.216-9.3184 13.9264 8.8064 18.1248 27.2896 9.3184 41.216l-78.336 123.9552h59.9552a29.8496 29.8496 0 1 1 0 59.6992h-87.5008v36.4544h87.5008z" p-id="8891"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1721122207833" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5858" width="30" height="30" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M736.00512 30.72c84.83328 0 153.6 68.76672 153.6 153.6v773.13536a25.6 25.6 0 0 1-41.55392 20.0192l-115.65056-92.19072a51.2 51.2 0 0 0-63.83104 0l-125.29152 99.87584a51.2 51.2 0 0 1-63.83104 0l-125.29152-99.87584a51.2 51.2 0 0 0-63.82592 0l-115.65056 92.19072a25.6 25.6 0 0 1-41.55904-20.0192V184.32C133.12 99.48672 201.88672 30.72 286.72 30.72h449.28512z m-36.79232 528.01536h-375.7056a38.07744 38.07744 0 1 0 0 76.16h375.7056a38.07744 38.07744 0 1 0 0-76.16z m0-228.46464h-375.7056a38.07744 38.07744 0 1 0 0 76.15488h375.7056a38.07744 38.07744 0 1 0 0-76.15488z" fill="#c6cacd" p-id="5859"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
......
public/img/fp_dwn.svg
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg fill="#ffffff" t="1720521921471" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8890" width="30" height="30" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M775.1168 100.9664H272.4352c-70.4512 0-127.5392 57.088-127.5392 127.5392v610.048c0 35.8912 38.8608 58.368 69.9904 40.4992l108.544-62.3616a46.7456 46.7456 0 0 1 54.3744 5.632L493.056 925.184a46.67904 46.67904 0 0 0 62.1056 0.0512l116.3776-103.5264a46.72512 46.72512 0 0 1 54.5792-5.4272l106.24 62.0032c31.1296 18.176 70.2464-4.3008 70.2464-40.3456V228.5056c0.0512-70.4-57.0368-127.5392-127.488-127.5392z m-133.9392 448.0512a29.8496 29.8496 0 1 1 0 59.6992h-87.5008v53.8624a29.8496 29.8496 0 1 1-59.6992 0V608.768h-87.552a29.8496 29.8496 0 1 1 0-59.6992h87.5008v-36.4544H406.4256a29.8496 29.8496 0 1 1 0-59.6992h58.9312l-77.312-122.5216a29.9008 29.9008 0 0 1 9.3184-41.216 29.9008 29.9008 0 0 1 41.216 9.3184l84.736 134.2464L609.024 296.96c8.8064-13.9264 27.2896-18.1248 41.216-9.3184 13.9264 8.8064 18.1248 27.2896 9.3184 41.216l-78.336 123.9552h59.9552a29.8496 29.8496 0 1 1 0 59.6992h-87.5008v36.4544h87.5008z" p-id="8891"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1721122207833" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5858" width="30" height="30" xmlns:xlink="http://www.w3.org/1999/xlink"><path d="M736.00512 30.72c84.83328 0 153.6 68.76672 153.6 153.6v773.13536a25.6 25.6 0 0 1-41.55392 20.0192l-115.65056-92.19072a51.2 51.2 0 0 0-63.83104 0l-125.29152 99.87584a51.2 51.2 0 0 1-63.83104 0l-125.29152-99.87584a51.2 51.2 0 0 0-63.82592 0l-115.65056 92.19072a25.6 25.6 0 0 1-41.55904-20.0192V184.32C133.12 99.48672 201.88672 30.72 286.72 30.72h449.28512z m-36.79232 528.01536h-375.7056a38.07744 38.07744 0 1 0 0 76.16h375.7056a38.07744 38.07744 0 1 0 0-76.16z m0-228.46464h-375.7056a38.07744 38.07744 0 1 0 0 76.15488h375.7056a38.07744 38.07744 0 1 0 0-76.15488z" fill="#ffffff" p-id="5859"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
......
src/apiPc/common.js
...@@ -126,6 +126,33 @@ export function getTeamBackNumber(qy) { ...@@ -126,6 +126,33 @@ export function getTeamBackNumber(qy) {
126 params: qy 126 params: qy
127 }) 127 })
128 } 128 }
129 129 export function getTeamBackNumberPre(qy) {
130 return request({
131 url: `/league/backNumber/teamQueryPre`,
132 method: 'get',
133 params: qy
134 })
135 }
136 export function getqySchedule(qy) {
137 return request({
138 url: `/league/schedule/querySchedule`,
139 method: 'get',
140 params: qy
141 })
142 }
143 export function getqySchedule2(qy) {
144 return request({
145 url: `/league/schedule/querySchedule2`,
146 method: 'get',
147 params: qy
148 })
149 }
150 export function getquerySchedule2Pre(qy) {
151 return request({
152 url: `/league/schedule/querySchedule2Pre`,
153 method: 'get',
154 params: qy
155 })
156 }
130 157
131 158
......
src/viewsPc/components/querybackNumber.vue
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
5 close-icon="CircleClose" destroy-on-close 5 close-icon="CircleClose" destroy-on-close
6 width="460px" 6 width="460px"
7 > 7 >
8 <div style="min-height: 300px"> 8 <div style="min-height: 300px" v-loading="loading">
9 9
10 <div v-if="!type||type==''"> 10 <div v-if="!type||type==''">
11 <div @click="type='0'" class="rItem">个人查询</div> 11 <div @click="type='0'" class="rItem">{{ language==0?'个人查询':'Personal Query' }}</div>
12 <div @click="type='1'" class="rItem">团队查询</div> 12 <div @click="type='1'" class="rItem">{{ language==0?'团队查询':'Team Query' }}</div>
13 </div> 13 </div>
14 14
15 <div v-if="type=='0'"> 15 <div v-if="type=='0'">
...@@ -59,8 +59,15 @@ ...@@ -59,8 +59,15 @@
59 {{language == 0 ? '查询' : 'Search' }} 59 {{language == 0 ? '查询' : 'Search' }}
60 </el-button> 60 </el-button>
61 </div> 61 </div>
62 <span class="tip">*模糊查询</span> 62 <span class="tip">*{{ language == 0 ?'模糊查询':'Fuzzy query' }}</span>
63 63 <div class="text-danger text-center" v-if="showGroupList">{{ language == 0 ?'找到多个团体':'Found multiple teams' }}</div>
64 <div class="groupList" v-if="showGroupList">
65 <ul>
66 <li v-for="(item, index) in groupList" @click="showDetail(item)" :key="index">{{item}}
67 <el-icon class="fr"><ArrowRight /></el-icon>
68 </li>
69 </ul>
70 </div>
64 <div v-if="teamlist.length>0" class="temell mt20"> 71 <div v-if="teamlist.length>0" class="temell mt20">
65 <el-collapse v-model="activeNames" accordion> 72 <el-collapse v-model="activeNames" accordion>
66 <el-collapse-item :name="index" :title="team[0][0].groupName" v-for="(team,index) in teamlist" :key="index"> 73 <el-collapse-item :name="index" :title="team[0][0].groupName" v-for="(team,index) in teamlist" :key="index">
...@@ -75,9 +82,6 @@ ...@@ -75,9 +82,6 @@
75 </el-collapse-item> 82 </el-collapse-item>
76 </el-collapse> 83 </el-collapse>
77 </div> 84 </div>
78 <div v-else>
79 <el-empty/>
80 </div>
81 </div> 85 </div>
82 </div> 86 </div>
83 </el-dialog> 87 </el-dialog>
...@@ -86,18 +90,21 @@ ...@@ -86,18 +90,21 @@
86 <script setup> 90 <script setup>
87 import {ref} from "vue"; 91 import {ref} from "vue";
88 import {ElMessage} from "element-plus"; 92 import {ElMessage} from "element-plus";
89 import {getBackNumber,getTeamBackNumber} from "@/apiPc/common"; 93 import {getBackNumber, getTeamBackNumber, getTeamBackNumberPre} from "@/apiPc/common";
90 import {useStorage} from "@vueuse/core/index"; 94 import {useStorage} from "@vueuse/core/index";
91 95
92 const language = useStorage('language', 0) 96 const language = useStorage('language', 0)
93 const show = ref(false) 97 const show = ref(false)
94 // const form = ref({}) 98 // const form = ref({})
95 const list = ref([]) 99 const list = ref([])
100 const loading = ref(false)
101 const groupList = ref([])
96 const teamlist = ref([]) 102 const teamlist = ref([])
97 const query = ref('') 103 const query = ref('')
98 const query2 = ref('') 104 const query2 = ref('')
99 const type = ref('') 105 const type = ref('')
100 const activeNames = ref(0) 106 const activeNames = ref(0)
107 const showGroupList = ref(false)
101 const search = () => { 108 const search = () => {
102 if (!query.value) { 109 if (!query.value) {
103 ElMessage.warning(language.value == 0 ? '请输入会员号/姓名' : 'Please enter WDSF MIN / Name') 110 ElMessage.warning(language.value == 0 ? '请输入会员号/姓名' : 'Please enter WDSF MIN / Name')
...@@ -115,29 +122,50 @@ const search = () => { ...@@ -115,29 +122,50 @@ const search = () => {
115 122
116 } 123 }
117 const searchTeam = () => { 124 const searchTeam = () => {
125 teamlist.value = []
118 if (!query2.value||query2.value.length < 2) { 126 if (!query2.value||query2.value.length < 2) {
119 ElMessage.warning(language.value == 0 ? '请输入代表队名称至少两字符' : 'Enter the representing team name,At least two characters') 127 ElMessage.warning(language.value == 0 ? '请输入代表队名称至少两字符' : 'Enter the representing team name,At least two characters')
120 return 128 return
121 } 129 }
122 getTeamBackNumber({query: query2.value}).then(res => { 130 loading.value = true
131 getTeamBackNumberPre({query: query2.value}).then(res => {
132 loading.value = false
123 if (!res.data||res.data.length==0) { 133 if (!res.data||res.data.length==0) {
124 teamlist.value = [] 134 groupList.value = []
125 //提示 '未找到结果，请重新查询' 135 //提示 '未找到结果，请重新查询'
126 ElMessage.warning(language.value == 0 ? '未找到结果，请重新查询' : 'No result') 136 ElMessage.warning(language.value == 0 ? '未找到结果，请重新查询' : 'No result')
127 return 137 return
128 } 138 }
129 teamlist.value = res.data 139 groupList.value = res.data
140 if(groupList.value.length==1){
141 showDetail(groupList.value[0])
142 }
143 if(groupList.value.length>1){
144 showGroupList.value = true
145 }
146
130 }) 147 })
131 } 148 }
132 const open = (param) => { 149 const open = (param) => {
133 show.value = true 150 show.value = true
134 list.value = [] 151 list.value = []
152 teamlist.value = []
153 groupList.value = []
135 query.value = '' 154 query.value = ''
136 type.value = '' 155 type.value = ''
137 } 156 }
138 defineExpose({ 157 defineExpose({
139 open 158 open
140 }) 159 })
160 function showDetail(name) {
161 query2.value = name
162 showGroupList.value = false
163 loading.value = true
164 getTeamBackNumber({query: name}).then(res => {
165 loading.value = false
166 teamlist.value = res.data
167 })
168 }
141 </script> 169 </script>
142 170
143 <style scoped lang="scss"> 171 <style scoped lang="scss">
...@@ -189,4 +217,7 @@ defineExpose({ ...@@ -189,4 +217,7 @@ defineExpose({
189 .fontsize14{font-size: 14px;} 217 .fontsize14{font-size: 14px;}
190 } 218 }
191 } 219 }
220 .groupList{max-height: 70vh;overflow: auto;border: 1px solid #e1e1e1;margin-top: 10px;
221 li{padding: 10px;border-bottom: 1px solid #e1e1e1;cursor: pointer;}
222 }
192 </style> 223 </style>
......
src/viewsPc/components/schSearch.vue 0 → 100644
1 <template>
2 <el-dialog
3 v-model="show" :close-on-click-modal="false" :title="language==0?'日程查询':'Schedule inquiry'" append-to-body
4 center class="pcloginpop"
5 close-icon="CircleClose" destroy-on-close
6 width="460px"
7 >
8 <div style="min-height: 300px" v-loading="loading">
9
10 <div v-if="!type||type==''">
11 <div @click="type='0'" class="rItem">{{ language==0?'按项目查询':'Query by project' }}</div>
12 <div @click="type='1'" class="rItem">{{ language==0?'按团队查询':'Query by team' }}</div>
13 </div>
14
15 <div v-if="type=='0'">
16 <div class="flex mt30">
17 <el-input :placeholder="language==0?'输入项目/ 项目编号查询':'Enter project name or code to Query'" v-model="query" clearable
18 @enter="search" @blur="search" @empty="search"/>
19 <el-button @click="search" class="btn-lineG" style="color: #fff">{{
20 language == 0 ? '查询' : 'Search'
21 }}
22 </el-button>
23 </div>
24
25 <div v-if="list.length>0" class="mt30">
26 <el-timeline>
27 <el-timeline-item placement="top"
28 v-for="(form, index) in list" :key="index"
29 :timestamp="form.date + ' ' + form.timeStr"
30 >
31 <div class="text-primary">{{ form.projectName }}</div>
32 <div>{{form.danceType}}</div>
33 <div>{{form.address}}</div>
34 <div></div>
35 </el-timeline-item>
36 </el-timeline>
37 </div>
38 <div v-else>
39 <el-empty/>
40 </div>
41 </div>
42 <div v-if="type=='1'">
43 <div class="flex mt20">
44 <el-input :placeholder="language==0?'请输入代表队名称至少两字符':'Enter the representing team name,At least two characters'"
45 v-model="query2" clearable
46 @enter="searchTeam" @blur="searchTeam" @empty="searchTeam"/>
47 <el-button @click="searchTeam" class="btn-lineG" style="color: #fff">
48 {{language == 0 ? '查询' : 'Search' }}
49 </el-button>
50 </div>
51 <span class="tip">*{{ language == 0 ?'模糊查询':'Fuzzy query' }}</span>
52 <div class="text-danger text-center" v-if="showGroupList">{{ language == 0 ?'找到多个团体':'Found multiple teams' }}</div>
53 <div class="groupList" v-if="showGroupList">
54 <ul>
55 <li v-for="(item, index) in groupList" @click="showDetail(item)" :key="index">{{item}}
56 <el-icon class="fr"><ArrowRight /></el-icon>
57 </li>
58 </ul>
59 </div>
60 <div v-if="teamlist.length>0" class="temell mt20">
61 <el-collapse accordion>
62 <el-collapse-item :name="index" :title="team[0].title" v-for="(team,index) in teamlist" :key="index">
63 <el-timeline>
64 <el-timeline-item placement="top"
65 v-for="(form, index) in team" :key="index"
66 :timestamp="form.date + ' ' + form.timeStr"
67 >
68 <div class="text-primary">{{ form.projectName }}</div>
69 <div>{{form.danceType}}</div>
70 <div>{{form.address}}</div>
71 <div></div>
72 </el-timeline-item>
73 </el-timeline>
74 </el-collapse-item>
75 </el-collapse>
76 </div>
77 </div>
78 </div>
79 </el-dialog>
80 </template>
81
82 <script setup>
83 import {ref} from "vue";
84 import {ElMessage} from "element-plus";
85 import {
86 getquerySchedule2Pre,
87 getqySchedule,
88 getqySchedule2,
89 getTeamBackNumber,
90 getTeamBackNumberPre
91 } from "@/apiPc/common";
92 import {useStorage} from "@vueuse/core/index";
93
94 const language = useStorage('language', 0)
95 const show = ref(false)
96 // const form = ref({})
97 const list = ref([])
98 const loading = ref(false)
99 const groupList = ref([])
100 const teamlist = ref([])
101 const query = ref('')
102 const query2 = ref('')
103 const type = ref('')
104 const showGroupList = ref(false)
105 const search = () => {
106 if (!query.value) {
107 ElMessage.warning(language.value == 0 ? '请输入搜索关键词' : 'Enter project name or code to Query')
108 return
109 }
110 getqySchedule({projectName: query.value}).then(res => {
111 if (!res.data||res.data.length==0) {
112 list.value = []
113 //提示 '未找到结果，请重新查询'
114 ElMessage.warning(language.value == 0 ? '未找到结果，请重新查询' : 'No result')
115 return
116 }
117 list.value = res.data
118 })
119
120 }
121 const searchTeam = () => {
122 teamlist.value = []
123 if (!query2.value||query2.value.length < 2) {
124 ElMessage.warning(language.value == 0 ? '请输入代表队名称至少两字符' : 'Enter the representing team name,At least two characters')
125 return
126 }
127 loading.value = true
128 getquerySchedule2Pre({groupName: query2.value}).then(res => {
129 loading.value = false
130 if (!res.data||res.data.length==0) {
131 groupList.value = []
132 //提示 '未找到结果，请重新查询'
133 ElMessage.warning(language.value == 0 ? '未找到结果，请重新查询' : 'No result')
134 return
135 }
136 groupList.value = res.data
137 if(groupList.value.length==1){
138 showDetail(groupList.value[0])
139 }
140 if(groupList.value.length>1){
141 showGroupList.value = true
142 }
143
144 })
145 }
146 const open = (param) => {
147 show.value = true
148 list.value = []
149 teamlist.value = []
150 groupList.value = []
151 query.value = ''
152 type.value = ''
153 loading.value = false
154 }
155 defineExpose({
156 open
157 })
158 function showDetail(name) {
159 query2.value = name
160 showGroupList.value = false
161 loading.value = true
162 getqySchedule2({groupName: name}).then(res => {
163 loading.value = false
164 teamlist.value = res.data
165 })
166 }
167 </script>
168
169 <style scoped lang="scss">
170 .tip{font-size: 12px;margin: 4px 0 0;display: inline-block;}
171 .rItem{
172 height: 130px;
173 cursor: pointer;border: 1px solid #e1e1e1;border-radius: 4px;
174 width: 350px;text-align: center;line-height: 130px;
175 padding: 1px; font-size: 30px;color: #fff;
176 margin: 20px auto;background:linear-gradient(90deg, #8623FC, #453DEA);
177 &:hover{
178 background:linear-gradient(90deg, #453DEA, #8623FC);
179 box-shadow: 0 4px 10px #453DEA;border: none;
180 }
181 }
182 .nowteamItem {
183 width: 100%;border: 1px solid #c8c5ff; margin-top: 20px;
184 position: relative;border-radius: 4px;padding: 0 0 20px;
185 background: #FFFFFF;
186 box-sizing: border-box;
187
188 .info {
189 .nowName {
190 font-family: "DIN Alternate";
191 font-size: 60px;
192 font-weight: bold;
193 overflow: hidden;
194 display: block;
195 margin: 10px;
196 }
197
198 label {
199 text-align: right;
200 font-size: 14px;
201 padding-left: 7%
202 }
203
204 div {
205 font-size: 14px;
206 color: #333;
207 margin: 6px 0 0;
208 }
209 }
210 }
211 .temell {
212 .nowteamItem{padding: 10px;margin: 0 0 10px;
213 .nowName{font-size: 15px;font-weight: bold;margin-right: 10px}
214 .text-bold{font-weight: bold;}
215 .fontsize14{font-size: 14px;}
216 }
217 }
218 .groupList{max-height: 70vh;overflow: auto;border: 1px solid #e1e1e1;margin-top: 10px;
219 li{padding: 10px;border-bottom: 1px solid #e1e1e1;cursor: pointer;}
220 }
221 </style>
src/viewsPc/home.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <index-Ch v-if="language ==0" @pop="openMaster" @pickup="openPickup" @backNumber="openBackNumber"/> 3 <index-Ch v-if="language ==0" @pop="openMaster" @pickup="openPickup" @backNumber="openBackNumber" @schSearch="openSchSearch"/>
4 <index-En v-else @pop="openMaster" @pickup="openPickup" @backNumber="openBackNumber"/> 4 <index-En v-else @pop="openMaster" @pickup="openPickup" @backNumber="openBackNumber" @schSearch="openSchSearch"/>
5 <div v-if="showgg" class="fixed_gg"> 5 <div v-if="showgg" class="fixed_gg">
6 <!--天气--> 6 <!--天气-->
7 <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>
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
65 <dialog-master-class ref="masterClassRef"/> 65 <dialog-master-class ref="masterClassRef"/>
66 <pick-up ref="pickupRef"></pick-up> 66 <pick-up ref="pickupRef"></pick-up>
67 <back-number ref="backNumberRef"></back-number> 67 <back-number ref="backNumberRef"></back-number>
68 <sch-search ref="schSearchRef"></sch-search>
68 </div> 69 </div>
69 70
70 </template> 71 </template>
...@@ -76,6 +77,7 @@ import WeatherIcon from '@/viewsPc/components/weatherIcon' ...@@ -76,6 +77,7 @@ import WeatherIcon from '@/viewsPc/components/weatherIcon'
76 import DialogMasterClass from '@/viewsPc/components/masterClass' 77 import DialogMasterClass from '@/viewsPc/components/masterClass'
77 import PickUp from '@/viewsPc/components/pickup' 78 import PickUp from '@/viewsPc/components/pickup'
78 import BackNumber from '@/viewsPc/components/querybackNumber' 79 import BackNumber from '@/viewsPc/components/querybackNumber'
80 import SchSearch from '@/viewsPc/components/schSearch'
79 import {useStorage} from "@vueuse/core/index"; 81 import {useStorage} from "@vueuse/core/index";
80 import {ref} from "vue"; 82 import {ref} from "vue";
81 import {getWeather} from "@/apiPc/webSite"; 83 import {getWeather} from "@/apiPc/webSite";
...@@ -126,6 +128,14 @@ const openBackNumber = (params) => { ...@@ -126,6 +128,14 @@ const openBackNumber = (params) => {
126 } 128 }
127 proxy.$refs['backNumberRef'].open(obj) 129 proxy.$refs['backNumberRef'].open(obj)
128 } 130 }
131 const openSchSearch = (params) => {
132 console.log(params)
133 const obj = {
134 title:'日程查询',
135 cptId:params.cptId
136 }
137 proxy.$refs['schSearchRef'].open(obj)
138 }
129 </script> 139 </script>
130 140
131 <style scoped lang="scss"> 141 <style scoped lang="scss">
......
src/viewsPc/index.vue
...@@ -145,6 +145,7 @@ ...@@ -145,6 +145,7 @@
145 </a> 145 </a>
146 <!-- <a class="zn-btn ml20 btn-q forPc" v-show="matchData?.id=='1778253367748993026'" @click="popMaster">青少年公益课报名</a>--> 146 <!-- <a class="zn-btn ml20 btn-q forPc" v-show="matchData?.id=='1778253367748993026'" @click="popMaster">青少年公益课报名</a>-->
147 <a class="zn-btn ml20 btn-q" v-show="matchData?.id=='1778253367748993026'" @click="backNumberSearch">背号查询</a> 147 <a class="zn-btn ml20 btn-q" v-show="matchData?.id=='1778253367748993026'" @click="backNumberSearch">背号查询</a>
148 <a class="zn-btn ml20 btn-q" v-show="matchData?.id=='1778253367748993026'" @click="schSearch">日程查询</a>
148 </div> 149 </div>
149 </el-col> 150 </el-col>
150 <el-col :sm="24" :lg="14"> 151 <el-col :sm="24" :lg="14">
...@@ -445,7 +446,7 @@ const navigationPic = ref({ ...@@ -445,7 +446,7 @@ const navigationPic = ref({
445 }) 446 })
446 const router = useRouter() 447 const router = useRouter()
447 const {proxy} = getCurrentInstance() 448 const {proxy} = getCurrentInstance()
448 const emit = defineEmits(['pop','pickup','backNumber']) 449 const emit = defineEmits(['pop','pickup','backNumber','schSearch'])
449 const time = ref(0) 450 const time = ref(0)
450 const etime = ref(0) 451 const etime = ref(0)
451 const personList = ref([ 452 const personList = ref([
...@@ -579,6 +580,12 @@ const backNumberSearch = () => { ...@@ -579,6 +580,12 @@ const backNumberSearch = () => {
579 } 580 }
580 emit('backNumber',params) 581 emit('backNumber',params)
581 } 582 }
583 const schSearch = () => {
584 var params = {
585 cptId:matchData.value.id
586 }
587 emit('schSearch',params)
588 }
582 const handlePickup=()=>{ 589 const handlePickup=()=>{
583 const params={ 590 const params={
584 cptId :matchData.value.id 591 cptId :matchData.value.id
......
src/viewsPc/index_en.vue
...@@ -143,10 +143,7 @@ ...@@ -143,10 +143,7 @@
143 <!-- Junior &Youth Camp REGISTER<el-icon><Edit /></el-icon>--> 143 <!-- Junior &Youth Camp REGISTER<el-icon><Edit /></el-icon>-->
144 <!-- </a>--> 144 <!-- </a>-->
145 <a class="zn-btn ml20 btn-q" v-show="matchData?.id=='1778253367748993026'" @click="backNumberSearch">Back Number</a> 145 <a class="zn-btn ml20 btn-q" v-show="matchData?.id=='1778253367748993026'" @click="backNumberSearch">Back Number</a>
146 <!-- <div>--> 146 <a class="zn-btn ml20 btn-q" v-show="matchData?.id=='1778253367748993026'" @click="schSearchSearch">Schedule Inquiry</a>
147 <!-- <a class=" ding" style="font-size: 15px;margin-top: 10px" @click="handlePickup">Pick-up/drop-off service-->
148 <!-- </a>-->
149 <!-- </div>-->
150 147
151 </div> 148 </div>
152 149
...@@ -466,7 +463,7 @@ const navigationPic = ref({ ...@@ -466,7 +463,7 @@ const navigationPic = ref({
466 }) 463 })
467 const router = useRouter() 464 const router = useRouter()
468 const { proxy } = getCurrentInstance() 465 const { proxy } = getCurrentInstance()
469 const emit = defineEmits(['pop','backNumber']) 466 const emit = defineEmits(['pop','backNumber','schSearch'])
470 const time = ref(0) 467 const time = ref(0)
471 const etime = ref(0) 468 const etime = ref(0)
472 469
...@@ -599,6 +596,12 @@ const backNumberSearch = () => { ...@@ -599,6 +596,12 @@ const backNumberSearch = () => {
599 } 596 }
600 emit('backNumber',params) 597 emit('backNumber',params)
601 } 598 }
599 const schSearchSearch = () => {
600 var params = {
601 cptId:matchData.value.id
602 }
603 emit('schSearch',params)
604 }
602 const handlePickup=()=>{ 605 const handlePickup=()=>{
603 const params={ 606 const params={
604 cptId :matchData.value.id 607 cptId :matchData.value.id
...@@ -624,7 +627,7 @@ const handlePickup=()=>{ ...@@ -624,7 +627,7 @@ const handlePickup=()=>{
624 } 627 }
625 border-radius: 15px; 628 border-radius: 15px;
626 .zn-btn{background: #FFFFFF;text-transform: uppercase; 629 .zn-btn{background: #FFFFFF;text-transform: uppercase;
627 font-size: 18px; width: fit-content; 630 font-size: 16px; width: fit-content; margin: 5px 5px 5px 0;
628 color: #453DEA; 631 color: #453DEA;
629 border-radius: 23px;padding: 10px 20px;display: inline-flex;align-items: center;} 632 border-radius: 23px;padding: 10px 20px;display: inline-flex;align-items: center;}
630 .item{box-shadow: 0px 0px 21px 0px rgba(41,23,101,0.14);margin: 40px 0 0; 633 .item{box-shadow: 0px 0px 21px 0px rgba(41,23,101,0.14);margin: 40px 0 0;
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!