Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
1d7e0d59 by zhangmeng
Options

Merge branch 'bug-order' into order

2 parents d54f3680 44202dbd
Inline Side-by-side
Showing 13 changed files with 86 additions and 60 deletions
src/layoutPc/components/AppHeader.vue
...@@ -216,6 +216,7 @@ const logout = () => { ...@@ -216,6 +216,7 @@ const logout = () => {
216 return useUserStore().logOut() 216 return useUserStore().logOut()
217 }).then(() => { 217 }).then(() => {
218 isLogin.value = true 218 isLogin.value = true
219 router.push('/')
219 location.reload() 220 location.reload()
220 }) 221 })
221 } 222 }
......
src/viewsPc/booking/hotelDetail.vue
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
69 :disabled-date="disabledDateRZ" 69 :disabled-date="disabledDateRZ"
70 :placeholder="language==0?'选择日期':'Select date'" 70 :placeholder="language==0?'选择日期':'Select date'"
71 format="YYYY-MM-DD" 71 format="YYYY-MM-DD"
72 :clearable="false"
72 value-format="YYYY-MM-DD"/> 73 value-format="YYYY-MM-DD"/>
73 </span> 74 </span>
74 </li> 75 </li>
...@@ -107,7 +108,7 @@ ...@@ -107,7 +108,7 @@
107 </el-button> 108 </el-button>
108 109
109 110
110 <el-button v-else :disabled="!r.useCount" class="btn-lineG w100" :class="{'forbid':!r.useCount}" round type="pri mary" @click="goOrder(r)">Select</el-button> 111 <el-button v-else style="color: #fff" :disabled="!r.useCount" class="btn-lineG w100" :class="{'forbid':!r.useCount}" round type="pri mary" @click="goOrder(r)">Select</el-button>
111 <!-- <div class="text-center text-primary mt10 fontsize14 pointer" v-if="language == 0">--> 112 <!-- <div class="text-center text-primary mt10 fontsize14 pointer" v-if="language == 0">-->
112 <!-- 剩余 {{(r.roomCount - (r.useCount||0)).toFixed()}} 间--> 113 <!-- 剩余 {{(r.roomCount - (r.useCount||0)).toFixed()}} 间-->
113 <!-- </div>--> 114 <!-- </div>-->
...@@ -161,20 +162,24 @@ onMounted(() => { ...@@ -161,20 +162,24 @@ onMounted(() => {
161 formTime.value = null 162 formTime.value = null
162 }).finally(()=>{ 163 }).finally(()=>{
163 console.log(formTime.value) 164 console.log(formTime.value)
165 getDateTime()
166
167 getData()
168 })
169
170 })
171
172 function getDateTime(){
164 if (formTime.value){ 173 if (formTime.value){
165 if (dayjs().isBefore(dayjs(formTime.value.hqStart))){ 174 if (dayjs().isBefore(dayjs(formTime.value.hqStart))){
166 hotTime.value[0]=dayjs(formTime.value.hqStart).format('YYYY-MM-DD') 175 hotTime.value[0]=dayjs(formTime.value.hqStart).format('YYYY-MM-DD')
167 hotTime.value[1]=dayjs(formTime.value.hqEnd).add(1,'day').format('YYYY-MM-DD') 176 hotTime.value[1]=dayjs(formTime.value.hqStart).add(1,'day').format('YYYY-MM-DD')
168 } else{ 177 } else{
169 hotTime.value[0]=dayjs().format('YYYY-MM-DD') 178 hotTime.value[0]=dayjs().format('YYYY-MM-DD')
170 hotTime.value[1]=dayjs().add(1,'day').format('YYYY-MM-DD') 179 hotTime.value[1]=dayjs().add(1,'day').format('YYYY-MM-DD')
171 } 180 }
172 } 181 }
173 182 }
174 getData()
175 })
176
177 })
178 183
179 function getData() { 184 function getData() {
180 loading.value = true 185 loading.value = true
...@@ -278,13 +283,12 @@ function goNext(room) { ...@@ -278,13 +283,12 @@ function goNext(room) {
278 }) 283 })
279 } 284 }
280 285
281 function getDaysBetween(e){ 286 function getDaysBetween(){
282 console.log(hotTime.value)
283 if (hotTime.value && hotTime.value.length==2){ 287 if (hotTime.value && hotTime.value.length==2){
284 const d1=dayjs(hotTime.value[0]).format('YYYY-MM-DD') 288 const d1=dayjs(hotTime.value[0]).format('YYYY-MM-DD')
285 const d2=dayjs(hotTime.value[1]).format('YYYY-MM-DD') 289 const d2=dayjs(hotTime.value[1]).format('YYYY-MM-DD')
286 if (d1==d2){ 290 if (d1==d2){
287 hotTime.value=[] 291 getDateTime()
288 return proxy.$modal.msgError(language.value==0?'入住时间跨度需要大于一天':'The duration of the stay must be more than one day.') 292 return proxy.$modal.msgError(language.value==0?'入住时间跨度需要大于一天':'The duration of the stay must be more than one day.')
289 }else{ 293 }else{
290 getData() 294 getData()
...@@ -292,19 +296,18 @@ function getDaysBetween(e){ ...@@ -292,19 +296,18 @@ function getDaysBetween(e){
292 } 296 }
293 } 297 }
294 298
295 // function disabledDateRZ(date) { 299 function disabledDateRZ(date) {
296 // //判读今天大与form.value.hqStart 300 //判读今天大与form.value.hqStart
297 // console.log(date) 301 if (formTime.value.hqStart) {
298 // if (formTime.value.hqStart) { 302 const today = dayjs().format('YYYY-MM-DD')
299 // const today = dayjs().format('YYYY-MM-DD') 303 if (formTime.value.hqStart < today) {
300 // if (formTime.value.hqStart < today) { 304 return !((date.getTime() >= dayjs(today).valueOf())&&(date.getTime() <= dayjs(formTime.value.hqEnd).valueOf()))
301 // return !((date.getTime() >= dayjs(today).valueOf())&&(date.getTime() <= dayjs(formTime.value.hqEnd).valueOf())) 305 } else {
302 // } else { 306 return !((date.getTime() >= dayjs(formTime.value.hqStart).valueOf())&&(date.getTime() <= dayjs(formTime.value.hqEnd).valueOf()))
303 // return !((date.getTime() >= dayjs(formTime.value.hqStart).valueOf())&&(date.getTime() <= dayjs(formTime.value.hqEnd).valueOf())) 307 }
304 // } 308 }
305 // } 309 // return true
306 // // return true 310 }
307 // }
308 311
309 function goMap() { 312 function goMap() {
310 return 313 return
...@@ -451,7 +454,14 @@ function goMap() { ...@@ -451,7 +454,14 @@ function goMap() {
451 .oddmb:nth-child(2){margin-bottom: 20px;} 454 .oddmb:nth-child(2){margin-bottom: 20px;}
452 .forbid{ 455 .forbid{
453 cursor:not-allowed !important; 456 cursor:not-allowed !important;
454 color: #a8abb2; 457 color: #a8abb2 !important;
455 filter:grayscale(1); 458 //filter:grayscale(1);
459 background: #fff;
460 div{
461 color: #a8abb2 !important;
462 }
463 }
464 .forbid:hover{
465 box-shadow:none;
456 } 466 }
457 </style> 467 </style>
......
src/viewsPc/booking/hotelOrder.vue
...@@ -329,6 +329,7 @@ function getDaysBetween(e) { ...@@ -329,6 +329,7 @@ function getDaysBetween(e) {
329 // console.log('入住时间arr', e, rzRange.value) 329 // console.log('入住时间arr', e, rzRange.value)
330 // console.log(e) 330 // console.log(e)
331 // console.log(Date.parse(rzRange.value[0])) 331 // console.log(Date.parse(rzRange.value[0]))
332 form.value.roomNum=0
332 var d1 = Date.parse(rzRange.value?rzRange.value[0]:null) 333 var d1 = Date.parse(rzRange.value?rzRange.value[0]:null)
333 var d2 = Date.parse(rzRange.value?rzRange.value[1]:null) 334 var d2 = Date.parse(rzRange.value?rzRange.value[1]:null)
334 if (d1 == d2) { 335 if (d1 == d2) {
......
src/viewsPc/center/myMember.vue
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <el-card class="mb20"> 2 <el-card class="mb20">
3 <div class="funcBtns"> 3 <div class="funcBtns">
4 <el-button type="primary" @click="addMember">{{ language==0?'添加选手':'Add Player'}}</el-button> 4 <el-button type="primary" @click="addMember">{{ language==0?'添加选手':'Add Player'}}</el-button>
5 <el-button type="primary" v-if="group.type!='4'" plain @click="importSportman">{{ language==0?'导入选手':'Import Player' }}</el-button> 5 <!-- <el-button type="primary" v-if="group.type!='4'" plain @click="importSportman">{{ language==0?'导入选手':'Import Player' }}</el-button>-->
6 </div> 6 </div>
7 <div class="from-Card"> 7 <div class="from-Card">
8 <el-form :inline="true" :model="query" class="mt20" :label-width="language==0?60:80" size="small"> 8 <el-form :inline="true" :model="query" class="mt20" :label-width="language==0?60:80" size="small">
......
src/viewsPc/center/myReservation.vue
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
90 </div> 90 </div>
91 91
92 <div class="text-right"> 92 <div class="text-right">
93 <el-button v-if="b.orderType == 0" class="mb10" plain round type="success" @click="Rebook(b)"> 93 <el-button v-if="b.orderType == 0&&b.viewStatus!=0" class="mb10" plain round type="success" @click="Rebook(b)">
94 {{ language==0?'再次预订':'Rebook' }}</el-button> 94 {{ language==0?'再次预订':'Rebook' }}</el-button>
95 <el-button class="mb10" plain round type="primary" @click="goDetail(b)"> 95 <el-button class="mb10" plain round type="primary" @click="goDetail(b)">
96 {{ language==0?'详情':'Detail' }}</el-button> 96 {{ language==0?'详情':'Detail' }}</el-button>
...@@ -120,6 +120,8 @@ import useUserStore from "@/store/modules/user"; ...@@ -120,6 +120,8 @@ import useUserStore from "@/store/modules/user";
120 import dayjs from 'dayjs' 120 import dayjs from 'dayjs'
121 import {cancelOrder2,cancelOrder} from "/@/apiPc/booking"; 121 import {cancelOrder2,cancelOrder} from "/@/apiPc/booking";
122 122
123 import {ElMessage} from "element-plus";
124
123 const router = useRouter() 125 const router = useRouter()
124 const language= useStorage('language',0) 126 const language= useStorage('language',0)
125 const list = ref([]) 127 const list = ref([])
......
src/viewsPc/match/chooseCoach.vue
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
79 </div> 79 </div>
80 <div class="card-header" v-else> 80 <div class="card-header" v-else>
81 <img src="@/assets/sign/gl.png"/> 81 <img src="@/assets/sign/gl.png"/>
82 管理 82 {{ language==0?'管理':'Manager' }}
83 </div> 83 </div>
84 </template> 84 </template>
85 <div class="chooseForm"> 85 <div class="chooseForm">
...@@ -313,17 +313,16 @@ function geren() { ...@@ -313,17 +313,16 @@ function geren() {
313 } 313 }
314 314
315 function goNext() { 315 function goNext() {
316 console.log(personAllList.value.teamDoctors,form.value)
317 // if ((form.value.coachs.length < 1) && (form.value.leader.length < 1)) { 316 // if ((form.value.coachs.length < 1) && (form.value.leader.length < 1)) {
318 // ElMessage.warning(language.value==0?'至少选一个教练或领队':'Coach/Team Leader, select at least one') 317 // ElMessage.warning(language.value==0?'至少选一个教练或领队':'Coach/Team Leader, select at least one')
319 // return 318 // return
320 // } 319 // }
321 if((personAllList.value.coaches.length>=0 && form.value.coachs?.toString().length == 0)&& 320 if((personAllList.value.coaches.length>0 && form.value.coachs?.toString().length == 0)&&
322 (personAllList.value.teamDoctors.length>=0 && form.value.doctor?.toString().length == 0)&& 321 (personAllList.value.teamDoctors.length>0 && form.value.doctor?.toString().length == 0)&&
323 (personAllList.value.translators.length>=0 && form.value.translator?.toString().length == 0)&& 322 (personAllList.value.translators.length>0 && form.value.translator?.toString().length == 0)&&
324 (personAllList.value.others.length>=0 && form.value.other?.toString().length == 0)&& 323 (personAllList.value.others.length>0 && form.value.other?.toString().length == 0)&&
325 (personAllList.value.officials.length>=0 && form.value.official?.toString().length == 0)&& 324 (personAllList.value.officials.length>0 && form.value.official?.toString().length == 0)&&
326 (personAllList.value.leaders.length>=0 && form.value.leader?.toString().length == 0) 325 (personAllList.value.leaders.length>0 && form.value.leader?.toString().length == 0)
327 ){ 326 ){
328 ElMessageBox.confirm(language.value==0?'您已添加随行人员，但尚未选中，是否进行下一步？':'You have added a follower, but have not selected, do you want to continue?', { 327 ElMessageBox.confirm(language.value==0?'您已添加随行人员，但尚未选中，是否进行下一步？':'You have added a follower, but have not selected, do you want to continue?', {
329 confirmButtonText: language.value==0?'下一步':'Next', 328 confirmButtonText: language.value==0?'下一步':'Next',
...@@ -360,7 +359,8 @@ function next() { ...@@ -360,7 +359,8 @@ function next() {
360 name: 'chooseProject', 359 name: 'chooseProject',
361 query: { 360 query: {
362 matchId: matchId, 361 matchId: matchId,
363 isNational:isNational.value 362 isNational:isNational.value,
363 languageSource:languageSource.value
364 } 364 }
365 }) 365 })
366 }) 366 })
...@@ -374,7 +374,8 @@ function next() { ...@@ -374,7 +374,8 @@ function next() {
374 matchId: matchId, 374 matchId: matchId,
375 groupId: groupId.value, 375 groupId: groupId.value,
376 signType: signType.value, 376 signType: signType.value,
377 isNational:isNational.value 377 isNational:isNational.value,
378 languageSource:languageSource.value
378 } 379 }
379 }) 380 })
380 }) 381 })
...@@ -388,6 +389,7 @@ function goPrev() { ...@@ -388,6 +389,7 @@ function goPrev() {
388 query: { 389 query: {
389 matchId: matchId, 390 matchId: matchId,
390 groupId: groupId.value, 391 groupId: groupId.value,
392 languageSource:languageSource.value,
391 isNational: false 393 isNational: false
392 } 394 }
393 }) 395 })
...@@ -397,6 +399,7 @@ function goPrev() { ...@@ -397,6 +399,7 @@ function goPrev() {
397 query: { 399 query: {
398 matchId: matchId, 400 matchId: matchId,
399 groupId: groupId.value, 401 groupId: groupId.value,
402 languageSource:languageSource.value,
400 isNational:isNational.value 403 isNational:isNational.value
401 } 404 }
402 }) 405 })
......
src/viewsPc/match/chooseProject.vue
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
133 </div> 133 </div>
134 </template> 134 </template>
135 </el-table-column> 135 </el-table-column>
136 <el-table-column label="Actions"> 136 <el-table-column :label="language==0?'操作':'Actions'">
137 <template #default="scope"> 137 <template #default="scope">
138 <a class="text-primary pd10" @click="delperson(scope.row)"> 138 <a class="text-primary pd10" @click="delperson(scope.row)">
139 {{ language == 0 ? '删除' : 'Delete' }} 139 {{ language == 0 ? '删除' : 'Delete' }}
......
src/viewsPc/match/chooseSportsman.vue
...@@ -79,9 +79,11 @@ ...@@ -79,9 +79,11 @@
79 <div class="panel border"> 79 <div class="panel border">
80 <div class="panel-header "> 80 <div class="panel-header ">
81 <h3 class="panel-title" v-if="language==0">可参与报名的项目 81 <h3 class="panel-title" v-if="language==0">可参与报名的项目
82 <span>已报项目在下方查看</span> 82 <span class="text-danger" v-if="signInfoList.length>0">已报项目在下方查看</span>
83 </h3>
84 <h3 class="panel-title" v-else>Search Events
85 <span class="text-danger" v-if="signInfoList.length>0">Slide down to view reported projects</span>
83 </h3> 86 </h3>
84 <h3 class="panel-title" v-else>Search Events</h3>
85 <div class="fr"> 87 <div class="fr">
86 <el-input size="small" v-model="projectQuery.name" :prefix-icon="Search" 88 <el-input size="small" v-model="projectQuery.name" :prefix-icon="Search"
87 @change="getProjectList" 89 @change="getProjectList"
...@@ -239,7 +241,8 @@ const data = reactive({ ...@@ -239,7 +241,8 @@ const data = reactive({
239 projectQuery: {}, tableType: 1, 241 projectQuery: {}, tableType: 1,
240 currProjectId: '', 242 currProjectId: '',
241 openTour: false, 243 openTour: false,
242 isNational: false 244 isNational: false,
245 languageSource:''
243 }) 246 })
244 const { 247 const {
245 activeTeam, 248 activeTeam,
...@@ -267,7 +270,7 @@ const { ...@@ -267,7 +270,7 @@ const {
267 tableType, 270 tableType,
268 zuQuery, 271 zuQuery,
269 openTour, currProjectId, 272 openTour, currProjectId,
270 tourCurrent, isNational 273 tourCurrent, isNational,languageSource
271 } = toRefs(data) 274 } = toRefs(data)
272 const nextButtonProps = ref({}) 275 const nextButtonProps = ref({})
273 const matchId = ref(route.query.matchId) 276 const matchId = ref(route.query.matchId)
...@@ -281,8 +284,6 @@ onMounted(() => { ...@@ -281,8 +284,6 @@ onMounted(() => {
281 // openTour.value = true 284 // openTour.value = true
282 }) 285 })
283 286
284 let chargeFlag
285
286 function getAthletesList() { 287 function getAthletesList() {
287 // athletesList.value 288 // athletesList.value
288 match.getGroupPersonList({label: '0'}, groupId.value).then(res => { 289 match.getGroupPersonList({label: '0'}, groupId.value).then(res => {
...@@ -303,7 +304,6 @@ function getMatch(id) { ...@@ -303,7 +304,6 @@ function getMatch(id) {
303 match.getMatchById({ 304 match.getMatchById({
304 id: id 305 id: id
305 }).then(res => { 306 }).then(res => {
306 chargeFlag = res.data.chargeFlag
307 noPhotoCanSign.value = res.data.noPhotoCanSign 307 noPhotoCanSign.value = res.data.noPhotoCanSign
308 coachOrLeaderFlag.value = res.data.coachOrLeaderFlag 308 coachOrLeaderFlag.value = res.data.coachOrLeaderFlag
309 extraform.value = JSON.parse(res.data.participantsInfo) 309 extraform.value = JSON.parse(res.data.participantsInfo)
...@@ -385,7 +385,8 @@ function goPrev() { ...@@ -385,7 +385,8 @@ function goPrev() {
385 router.push({ 385 router.push({
386 name: `chooseCoach`, 386 name: `chooseCoach`,
387 query: { 387 query: {
388 matchId: matchId.value 388 matchId: matchId.value,
389 languageSource: route.query.languageSource
389 } 390 }
390 }) 391 })
391 } 392 }
...@@ -871,6 +872,6 @@ watch(choosedchoosed, (newVal, oldVal) => { ...@@ -871,6 +872,6 @@ watch(choosedchoosed, (newVal, oldVal) => {
871 :deep(.el-select__tags-text){color: #000;font-size: 14px;} 872 :deep(.el-select__tags-text){color: #000;font-size: 14px;}
872 .po-right{position: absolute;right: 0;} 873 .po-right{position: absolute;right: 0;}
873 .panel h3.panel-title{ 874 .panel h3.panel-title{
874 span{ color: #999;font-size: 13px;} 875 span{font-size: 13px;}
875 } 876 }
876 </style> 877 </style>
......
src/viewsPc/match/components/matchInfo.vue
...@@ -9,13 +9,17 @@ ...@@ -9,13 +9,17 @@
9 <div class="indexTitle" v-if="form.languageSource!='100'"><h3 class="leftboderTT">报名须知</h3></div> 9 <div class="indexTitle" v-if="form.languageSource!='100'"><h3 class="leftboderTT">报名须知</h3></div>
10 <div class="xzbox" v-if="form.languageSource!='100'"> 10 <div class="xzbox" v-if="form.languageSource!='100'">
11 <div v-html="form.signKnow"></div> 11 <div v-html="form.signKnow"></div>
12 <el-link v-if="form.signKnowUrl" type="primary" :href="fillImgUrl(JSON.parse(form.signKnowUrl)[0]?.url)" target="_blank"> 12 <div v-if="form.signKnowUrl">
13 <el-link v-for="(item,index) in JSON.parse(form.signKnowUrl)" type="primary"
14 :href="fillImgUrl(item.url)" target="_blank">
13 <el-icon :size="20"> 15 <el-icon :size="20">
14 <Download /> 16 <Download />
15 </el-icon> 17 </el-icon>
16 {{ JSON.parse(form.signKnowUrl)[0]?.name }} 18 {{ item.name }}
17 </el-link> 19 </el-link>
18 </div> 20 </div>
21
22 </div>
19 <!-- <div class="indexTitle"><h3 class="leftboderTT">免责声明</h3></div>--> 23 <!-- <div class="indexTitle"><h3 class="leftboderTT">免责声明</h3></div>-->
20 <!-- <div class="xzbox">--> 24 <!-- <div class="xzbox">-->
21 <!-- <el-link v-if="form.disclaimerUrl" type="primary" :href="fillImgUrl(JSON.parse(form.disclaimerUrl)[0]?.url)" target="_blank">--> 25 <!-- <el-link v-if="form.disclaimerUrl" type="primary" :href="fillImgUrl(JSON.parse(form.disclaimerUrl)[0]?.url)" target="_blank">-->
......
src/viewsPc/match/components/teamSignStep.vue
1 <template> 1 <template>
2 <el-steps :active="activeStep" align-center> 2 <el-steps :active="activeStep" align-center>
3 <el-step :title="language==0?'团队信息':'Team Information'" /> 3 <el-step :title="language==0?'团队信息':'Team Information'" />
4 <el-step :title="language==0?'教练/领队/其他':'Coach/Team Head of team/Other'" /> 4 <el-step :title="language==0?'教练/领队/其他':'Coach/Head Of Team/Other'" />
5 <el-step :title="language==0?'选手报名':'Participant Registration'" /> 5 <el-step :title="language==0?'选手报名':'Participant Registration'" />
6 <el-step :title="language==0?'提交审核':'Submit for review'" /> 6 <el-step :title="language==0?'提交审核':'Submit For Review'" />
7 </el-steps> 7 </el-steps>
8 </template> 8 </template>
9 9
......
src/viewsPc/match/detail.vue
...@@ -140,15 +140,17 @@ ...@@ -140,15 +140,17 @@
140 <div v-if="menu[5].active==1" class="pd20"> 140 <div v-if="menu[5].active==1" class="pd20">
141 <div class="xzbox"> 141 <div class="xzbox">
142 <div v-html="matchData.signKnow"></div> 142 <div v-html="matchData.signKnow"></div>
143 <el-link v-if="matchData.signKnowUrl" type="primary" 143 <div v-if="matchData.signKnowUrl">{{JSON.parse(matchData.signKnowUrl)}}
144 :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank"> 144 <el-link v-for="(item,index) in JSON.parse(matchData.signKnowUrl)" type="primary"
145 :href="fillImgUrl(item.url)" target="_blank">
145 <el-icon :size="20"> 146 <el-icon :size="20">
146 <Download/> 147 <Download />
147 </el-icon> 148 </el-icon>
148 {{ JSON.parse(matchData.signKnowUrl)[0]?.name }} 149 {{ item.name }}
149 </el-link> 150 </el-link>
150 </div> 151 </div>
151 </div> 152 </div>
153 </div>
152 </el-card> 154 </el-card>
153 <div style="height: 20px"></div> 155 <div style="height: 20px"></div>
154 156
......
src/viewsPc/match/detail_en.vue
...@@ -241,15 +241,17 @@ ...@@ -241,15 +241,17 @@
241 <div v-if="menu[5].active==1" class="pd20"> 241 <div v-if="menu[5].active==1" class="pd20">
242 <div class="xzbox"> 242 <div class="xzbox">
243 <div v-html="matchData.signKnow"></div> 243 <div v-html="matchData.signKnow"></div>
244 <el-link v-if="matchData.signKnowUrl" type="primary" 244 <div v-if="matchData.signKnowUrl">
245 :href="fillImgUrl(JSON.parse(matchData.signKnowUrl)[0]?.url)" target="_blank"> 245 <el-link v-for="(item,index) in JSON.parse(matchData.signKnowUrl)" type="primary"
246 :href="fillImgUrl(item.url)" target="_blank">
246 <el-icon :size="20"> 247 <el-icon :size="20">
247 <Download/> 248 <Download />
248 </el-icon> 249 </el-icon>
249 {{ JSON.parse(matchData.signKnowUrl)[0]?.name }} 250 {{ item.name }}
250 </el-link> 251 </el-link>
251 </div> 252 </div>
252 </div> 253 </div>
254 </div>
253 </el-card> 255 </el-card>
254 <div style="height: 20px"></div> 256 <div style="height: 20px"></div>
255 257
......
vite.config.js
...@@ -83,8 +83,8 @@ export default defineConfig(({ mode, command }) => { ...@@ -83,8 +83,8 @@ export default defineConfig(({ mode, command }) => {
83 }, 83 },
84 '/dev-api': { 84 '/dev-api': {
85 // target: 'http://192.168.1.118:8081/', 85 // target: 'http://192.168.1.118:8081/',
86 // target: 'https://jijin.wtwuxicenter.com/stage-api',
86 target: 'https://jijin.wtwuxicenter.com/stage-api', 87 target: 'https://jijin.wtwuxicenter.com/stage-api',
87 // target: 'https://wdsfwuxicenter.com/stage-api',
88 changeOrigin: true, 88 changeOrigin: true,
89 rewrite: (p) => p.replace(/^\/dev-api/, '') 89 rewrite: (p) => p.replace(/^\/dev-api/, '')
90 } 90 }
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!