Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
eb66d52f by yyx
Options

Merge branch 'order' of https://code.itechtop.cn/yangyang/dance-pc into order

2 parents 5f110a84 c9a21ddf
Expand all
Inline Side-by-side
Showing 28 changed files with 335 additions and 117 deletions
src/apiPc/common.js
...@@ -47,6 +47,7 @@ export function newbilllist(query) { ...@@ -47,6 +47,7 @@ export function newbilllist(query) {
47 params: query 47 params: query
48 }) 48 })
49 } 49 }
50
50 export function vistorRegister(data) { 51 export function vistorRegister(data) {
51 return request({ 52 return request({
52 url: `/pcSimpleRegister`, 53 url: `/pcSimpleRegister`,
...@@ -68,3 +69,41 @@ export function upgradeTeam(data) { ...@@ -68,3 +69,41 @@ export function upgradeTeam(data) {
68 data: data 69 data: data
69 }) 70 })
70 } 71 }
72
73 export function submitMasterApply(data) {
74 return request({
75 url: `/league/courseUser`,
76 method: 'post',
77 data: data
78 })
79 }
80 export function masterClassList(query) {
81 return request({
82 // url: `/league/courseItem/list`,
83 url: `/league/courseItem/getCoursrItemByCourseId`,
84 method: 'get',
85 params: query
86 })
87 }
88 export function getByCard(query) {
89 return request({
90 url: `/league/courseUser/getByCard`,
91 method: 'get',
92 params: query
93 })
94 }
95 export function getMasterApply(query) {
96 return request({
97 url: `/league/courseUser/getCourseByUser`,
98 method: 'get',
99 params: query
100 })
101 }
102 export function delByCard(card) {
103 return request({
104 url: `/league/courseUser/delByCard?card=${card}`,
105 method: 'delete'
106 })
107 }
108
109
......
src/assets/js/data.js
...@@ -286,7 +286,7 @@ export const rankList = [ ...@@ -286,7 +286,7 @@ export const rankList = [
286 tong: '0' 286 tong: '0'
287 }, 287 },
288 { 288 {
289 index: '2', 289 index: '1',
290 code: 'md', 290 code: 'md',
291 name: 'Alexey Glukhov - Anastasia Glazunova', 291 name: 'Alexey Glukhov - Anastasia Glazunova',
292 gj: '摩尔多瓦共和国', 292 gj: '摩尔多瓦共和国',
...@@ -296,7 +296,7 @@ export const rankList = [ ...@@ -296,7 +296,7 @@ export const rankList = [
296 tong: '0' 296 tong: '0'
297 }, 297 },
298 { 298 {
299 index: '3', 299 index: '1',
300 code: 'de', 300 code: 'de',
301 name: 'Marius-Andrei Balan - Khrystyna Moshenska', 301 name: 'Marius-Andrei Balan - Khrystyna Moshenska',
302 gj: '德国', 302 gj: '德国',
......
src/routerPc/en.js
...@@ -440,12 +440,24 @@ export const constantRoutes = [ ...@@ -440,12 +440,24 @@ export const constantRoutes = [
440 meta: { title: 'pay' } 440 meta: { title: 'pay' }
441 }, 441 },
442 { 442 {
443 path: 'payticket',
444 component: () => import('@/viewsPc/booking/payticket'),
445 name: 'payticket',
446 meta: { title: '票务' }
447 },
448 {
443 path: 'payOk', 449 path: 'payOk',
444 component: () => import('@/viewsPc/booking/payOk'), 450 component: () => import('@/viewsPc/booking/payOk'),
445 name: 'bookingPayOk', 451 name: 'bookingPayOk',
446 meta: { title: 'payOk' } 452 meta: { title: 'payOk' }
447 }, 453 },
448 { 454 {
455 path: 'payticketOk',
456 component: () => import('@/viewsPc/booking/payticketOk'),
457 name: 'payticketOk',
458 meta: { title: '票务-paypal' }
459 },
460 {
449 path: 'invoice', 461 path: 'invoice',
450 component: () => import('@/viewsPc/booking/invoicing'), 462 component: () => import('@/viewsPc/booking/invoicing'),
451 name: 'invoice', 463 name: 'invoice',
......
src/viewsPc/booking/car.vue
...@@ -47,8 +47,8 @@ ...@@ -47,8 +47,8 @@
47 <h3 class="name flex">{{ r.carType }} 47 <h3 class="name flex">{{ r.carType }}
48 <div class="tagbox"> 48 <div class="tagbox">
49 <span class="tag">{{r.carColor}}</span> 49 <span class="tag">{{r.carColor}}</span>
50 <span class="tag" v-show="r.checkOut==1">可送车</span> 50 <span class="tag" v-show="r.checkOut==1">{{ language==0?'可送车':'drop-off' }}</span>
51 <span class="tag" v-show="r.checkIn==1">可接车</span> 51 <span class="tag" v-show="r.checkIn==1">{{ language==0?'可接车':'pick-up' }}</span>
52 </div> 52 </div>
53 </h3> 53 </h3>
54 <div class="text-gray mt20"> 54 <div class="text-gray mt20">
......
src/viewsPc/booking/carOrder.vue
...@@ -217,6 +217,7 @@ onMounted(() => { ...@@ -217,6 +217,7 @@ onMounted(() => {
217 function changeUseType(e) { 217 function changeUseType(e) {
218 console.log(form.value.useType) 218 console.log(form.value.useType)
219 changecarNum() 219 changecarNum()
220 console.log(form.value)
220 } 221 }
221 222
222 function changecarNum(e) { 223 function changecarNum(e) {
...@@ -251,8 +252,9 @@ function initDays() { ...@@ -251,8 +252,9 @@ function initDays() {
251 } 252 }
252 function disabledDate(date) { 253 function disabledDate(date) {
253 // const today = dayjs().format('YYYY-MM-DD') 254 // const today = dayjs().format('YYYY-MM-DD')
254 if (form.value.carStart) { 255 if (lform.value.carStart) {
255 return date.getTime() > dayjs(form.value.carStart).valueOf() 256 return (date.getTime() < dayjs(lform.value.carStart).valueOf())||(date.getTime() > dayjs(lform.value.carEnd).valueOf())
257
256 } 258 }
257 return true 259 return true
258 } 260 }
......
src/viewsPc/booking/dinnerDetail.vue
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
3 <div class="box"> 3 <div class="box">
4 <el-card class="mt30" v-loading="loading"> 4 <el-card class="mt30" v-loading="loading">
5 <el-row v-if="form" class="hotel" align="middle" :gutter="20"> 5 <el-row v-if="form" class="hotel" align="middle" :gutter="20">
6 <!-- <el-col :span="6">--> 6
7 <!-- <img class="w100" :src="fillImgUrl(form.photos?.split(',')[0])"/>--> 7 <el-col :lg="16" :sm="24">
8 <!-- </el-col>-->
9 <el-col :span="16">
10 <h3 class="esp flex">{{ form?.name }} 8 <h3 class="esp flex">{{ form?.name }}
11 </h3> 9 </h3>
12 10
...@@ -18,25 +16,18 @@ ...@@ -18,25 +16,18 @@
18 {{ form?.addName }} 16 {{ form?.addName }}
19 </p> 17 </p>
20 </el-col> 18 </el-col>
19 <el-col :lg="8" :sm="24">
20 <el-carousel height="120px">
21 <el-carousel-item v-for="item in form.photos?.split(',')" :key="item">
22 <el-image class="w100 h100" fit="contain" :src="fillImgUrl(item)"/>
23 </el-carousel-item>
24 </el-carousel>
25 </el-col>
21 </el-row> 26 </el-row>
22 <el-empty v-else :image="`/img/order_no.png`" :image-size="228" description=""/> 27 <el-empty v-else :image="`/img/order_no.png`" :image-size="228" description=""/>
23 </el-card> 28 </el-card>
24 29
25 <div class="mt30"> 30 <div class="mt30">
26 <el-row :gutter="20">
27 <el-col :span="10">
28 <div class="imgbox hotelImg">
29 <el-image :src="fillImgUrl(form?.photos?.split(',')[0])" fit="cover" :preview-src-list="form?.photos?.split(',')"/>
30 </div>
31 </el-col>
32 <el-col :span="14">
33 <el-row class="h100" :gutter="20">
34 <el-col :span="8" v-for="(p,index) in form?.photos?.split(',').slice(1,7)" style="height: calc(50% - 10px)">
35 <div class="imgbox hotelImg"><el-image :src="fillImgUrl(p)" fit="cover" :preview-src-list="form?.photos?.split(',')"/></div>
36 </el-col>
37 </el-row>
38 </el-col>
39 </el-row>
40 </div> 31 </div>
41 32
42 <el-card class="mt30 mb60"> 33 <el-card class="mt30 mb60">
...@@ -57,8 +48,8 @@ ...@@ -57,8 +48,8 @@
57 <h3 class="name">{{ r.name }}<span class="text-primary">({{ r.categoryName }})</span></h3> 48 <h3 class="name">{{ r.name }}<span class="text-primary">({{ r.categoryName }})</span></h3>
58 <el-row :gutter="10"> 49 <el-row :gutter="10">
59 <el-col :span="24"> 50 <el-col :span="24">
60 <p>{{ language==0?'配送时间':'Delivery time' }}：{{ r.psStart }}~{{ r.psEnd }}</p> 51 <p>{{ language == 0 ? '配送时间' : 'Delivery time' }}：{{ r.psStart }}~{{ r.psEnd }}</p>
61 <p>{{ language==0?'配送地址':'Delivery address' }}：{{ r.address }}</p> 52 <p>{{ language == 0 ? '配送地址' : 'Delivery address' }}：{{ r.address }}</p>
62 </el-col> 53 </el-col>
63 </el-row> 54 </el-row>
64 </el-col> 55 </el-col>
...@@ -83,11 +74,9 @@ ...@@ -83,11 +74,9 @@
83 </template> 74 </template>
84 75
85 <script setup> 76 <script setup>
86 import {useRouter} from "vue-router"; 77 import {useRouter, useRoute} from "vue-router";
87 import {ref, reactive, onMounted} from "vue"; 78 import {ref, onMounted} from "vue";
88 import {useRoute} from "vue-router"; 79 import {getMenuById} from "@/apiPc/booking"
89 import {getHotelById, getMenuById} from "@/apiPc/booking"
90
91 import {useStorage} from "@vueuse/core/index"; 80 import {useStorage} from "@vueuse/core/index";
92 import useUserStore from "@/store/modules/user"; 81 import useUserStore from "@/store/modules/user";
93 import {fillImgUrl} from "@/utils/ruoyi"; 82 import {fillImgUrl} from "@/utils/ruoyi";
...@@ -98,7 +87,7 @@ const router = useRouter() ...@@ -98,7 +87,7 @@ const router = useRouter()
98 const route = useRoute() 87 const route = useRoute()
99 const form = ref({}) 88 const form = ref({})
100 const query = ref({ 89 const query = ref({
101 larId: route.query.id 90 larId: route.params.id
102 }) 91 })
103 const loading = ref(false) 92 const loading = ref(false)
104 const roomList = ref([]) 93 const roomList = ref([])
...@@ -106,11 +95,13 @@ const map = ref(null) ...@@ -106,11 +95,13 @@ const map = ref(null)
106 onMounted(() => { 95 onMounted(() => {
107 form.value = JSON.parse(decodeURIComponent(route.query.detail)) 96 form.value = JSON.parse(decodeURIComponent(route.query.detail))
108 getData() 97 getData()
98
109 }) 99 })
110 100
111 function getData() { 101 function getData() {
112 loading.value = true 102 loading.value = true
113 query.value.hotelId = route.query.id 103 query.value.hotelId = route.query.id
104 console.log(query.value)
114 getMenuById(query.value).then(res => { 105 getMenuById(query.value).then(res => {
115 loading.value = false 106 loading.value = false
116 roomList.value = res.rows 107 roomList.value = res.rows
...@@ -118,7 +109,7 @@ function getData() { ...@@ -118,7 +109,7 @@ function getData() {
118 var arr = [] 109 var arr = []
119 m.photosList = [] 110 m.photosList = []
120 arr = m.photos?.split(',') 111 arr = m.photos?.split(',')
121 for (var a of arr){ 112 for (var a of arr) {
122 m.photosList.push(fillImgUrl(a)) 113 m.photosList.push(fillImgUrl(a))
123 } 114 }
124 m.num = 0 115 m.num = 0
...@@ -135,7 +126,7 @@ function getData() { ...@@ -135,7 +126,7 @@ function getData() {
135 126
136 function goOrder(n) { 127 function goOrder(n) {
137 if (!user) { 128 if (!user) {
138 useUserStore().setReLogin() 129 useUserStore().setVisitor()
139 return 130 return
140 } 131 }
141 router.push({ 132 router.push({
......
src/viewsPc/booking/foodOrder.vue
...@@ -113,6 +113,7 @@ const canOrderNum = ref(0) ...@@ -113,6 +113,7 @@ const canOrderNum = ref(0)
113 const form = ref({ 113 const form = ref({
114 num: 1, 114 num: 1,
115 phone: user.phonenumber||'', 115 phone: user.phonenumber||'',
116 total:0
116 }) 117 })
117 const rzRange = ref([]) 118 const rzRange = ref([])
118 const rzUserArr = ref([]) 119 const rzUserArr = ref([])
...@@ -126,11 +127,7 @@ onMounted(() => { ...@@ -126,11 +127,7 @@ onMounted(() => {
126 food.value = JSON.parse(decodeURIComponent(route.query.food)) 127 food.value = JSON.parse(decodeURIComponent(route.query.food))
127 form.value = food.value 128 form.value = food.value
128 restaurant.value = JSON.parse(decodeURIComponent(route.query.restaurant)) 129 restaurant.value = JSON.parse(decodeURIComponent(route.query.restaurant))
129 if(language.value == 0){ 130 form.value.total = 0
130 form.value.total = food.value.foodPrice
131 } else {
132 form.value.total = food.value.foodPriceEn
133 }
134 console.log(food.value,restaurant.value) 131 console.log(food.value,restaurant.value)
135 initDays() 132 initDays()
136 const today = dayjs() 133 const today = dayjs()
...@@ -242,6 +239,7 @@ function submit() { ...@@ -242,6 +239,7 @@ function submit() {
242 form.value.foodsList.push(obj) 239 form.value.foodsList.push(obj)
243 form.value.activeId = restaurant.value.activityId 240 form.value.activeId = restaurant.value.activityId
244 form.value.larId = restaurant.value.id 241 form.value.larId = restaurant.value.id
242 form.value.orderName=restaurant.value.name
245 // 提交确认 243 // 提交确认
246 ElMessageBox.confirm(language.value == 0 ? '确认提交订单吗？' : 'Confirm to submit the order?', { 244 ElMessageBox.confirm(language.value == 0 ? '确认提交订单吗？' : 'Confirm to submit the order?', {
247 confirmButtonText: language.value == 0 ? '确定' : 'Confirm', 245 confirmButtonText: language.value == 0 ? '确定' : 'Confirm',
......
src/viewsPc/booking/hotelDetail.vue
...@@ -241,9 +241,12 @@ function initMap() { ...@@ -241,9 +241,12 @@ function initMap() {
241 } 241 }
242 242
243 function goOrder(room) { 243 function goOrder(room) {
244 checkRoomPayByUserId(room.hotelId).then(res=>{ 244 ElMessageBox.confirm(language.value == 0 ? '你当前选择的入住时间为'+hotTime.value[0]+'至'+hotTime.value[1]+'，是否确定？':'Your current check-in time is'+hotTime.value[0]+'~'+hotTime.value[1]+'Are you sure?',{type:'warning'}).then({
245 if(res.data == -100){ 245
246 ElMessageBox.confirm( 246 }).then(()=>{
247 checkRoomPayByUserId(room.hotelId).then(res=>{
248 if(res.data == -100){
249 ElMessageBox.confirm(
247 language.value == 0 ?'你有未支付的酒店订单，是否前往个人中心查看':'You already have an unpaid hotel order, do you want to go to the personal center to check it?', 250 language.value == 0 ?'你有未支付的酒店订单，是否前往个人中心查看':'You already have an unpaid hotel order, do you want to go to the personal center to check it?',
248 language.value==0?'提示':'Warning', 251 language.value==0?'提示':'Warning',
249 { 252 {
...@@ -251,21 +254,24 @@ function goOrder(room) { ...@@ -251,21 +254,24 @@ function goOrder(room) {
251 // cancelButtonText: language.value==1?'Continue to book':'继续预订', 254 // cancelButtonText: language.value==1?'Continue to book':'继续预订',
252 type: 'warning', 255 type: 'warning',
253 } 256 }
254 ).then((res) => { 257 ).then((res) => {
255 console.log(res) 258 console.log(res)
256 router.push({ 259 router.push({
257 name:'myReservation', 260 name:'myReservation',
261 })
258 }) 262 })
259 }) 263 // .catch((res) => {
260 // .catch((res) => { 264 // console.log(res)
261 // console.log(res) 265 // goNext(room)
262 // goNext(room) 266 // })
263 // }) 267 return
264 return 268 }
265 } 269 goNext(room)
266 goNext(room) 270 })
267 }) 271 })
268 272
273
274
269 } 275 }
270 function goNext(room) { 276 function goNext(room) {
271 router.push({ 277 router.push({
......
src/viewsPc/booking/payticketOk.vue 0 → 100644
1 <template>
2 <div>
3 <div class="box">
4 <el-card class="mb60 mt30" v-loading="loading">
5 <div class="text-center mt30">
6 <el-icon color="#32B16C" size="80">
7 <SuccessFilled/>
8 </el-icon>
9 <p class="text-success mb20">{{ language == 0 ? '支付成功' : 'successfully!' }}</p>
10
11 <el-button type="primary" class="btn-lineG mb60" @click="goBillDetail" round>
12 {{ language == 0 ? '返回订单详情' : 'Return order details' }}
13 </el-button>
14 </div>
15 </el-card>
16 </div>
17 </div>
18 </template>
19
20 <script setup>
21 import {ref} from "vue";
22 import {useRoute, useRouter} from "vue-router";
23 import {onMounted} from "@vue/runtime-core";
24 import {callbackPalPay} from "@/apiPc/booking";
25 import {useStorage} from "@vueuse/core/index";
26
27 const route = useRoute()
28 const router = useRouter()
29 const language= useStorage('language',0)
30 const orderId = ref(route.query.orderId)
31 const type = ref('')
32 const loading = ref(false)
33
34 onMounted(() => {
35 var code = decodeURIComponent(orderId.value)
36 console.log(code)
37 loading.value = true
38 callbackPalPay(code).then(res => {
39 loading.value = false
40 type.value = res.data.orderType
41 })
42 })
43
44 function goBillDetail() {
45 router.push({
46 name: 'bookingPay',
47 query: {
48 orderId: route.query.orderId,
49 orderType: type.value
50 }
51 })
52 }
53 </script>
54
55 <style scoped lang="scss">
56
57 </style>
src/viewsPc/center/index.vue
...@@ -110,8 +110,8 @@ const menus = ref([ ...@@ -110,8 +110,8 @@ const menus = ref([
110 { 110 {
111 name: language.value==0?'票务预订':'Ticket Reservation', 111 name: language.value==0?'票务预订':'Ticket Reservation',
112 routeName: 'seat_order', 112 routeName: 'seat_order',
113 picUrl1: '/img/nav_29.png', 113 picUrl1: '/img/c7.png',
114 picUrl2: '/img/nav_29_dwn.png', 114 picUrl2: '/img/c7.png',
115 isActive: false 115 isActive: false
116 }, 116 },
117 { 117 {
...@@ -143,6 +143,13 @@ const menus3 = ref([ ...@@ -143,6 +143,13 @@ const menus3 = ref([
143 picUrl1: '/img/nav_29.png', 143 picUrl1: '/img/nav_29.png',
144 picUrl2: '/img/nav_29_dwn.png', 144 picUrl2: '/img/nav_29_dwn.png',
145 isActive: false 145 isActive: false
146 },
147 {
148 name: language.value==0?'票务预订':'Ticket Reservation',
149 routeName: 'seat_order',
150 picUrl1: '/img/c7.png',
151 picUrl2: '/img/c7.png',
152 isActive: false
146 } 153 }
147 ]) 154 ])
148 const menusPersonal = ref([ 155 const menusPersonal = ref([
...@@ -174,6 +181,13 @@ const menusPersonal = ref([ ...@@ -174,6 +181,13 @@ const menusPersonal = ref([
174 picUrl2: '/img/nav_29_dwn.png', 181 picUrl2: '/img/nav_29_dwn.png',
175 isActive: false 182 isActive: false
176 }, 183 },
184 {
185 name: language.value==0?'票务预订':'Ticket Reservation',
186 routeName: 'seat_order',
187 picUrl1: '/img/c7.png',
188 picUrl2: '/img/c7.png',
189 isActive: false
190 },
177 { 191 {
178 name: language.value==0?'系统消息':'System messages', 192 name: language.value==0?'系统消息':'System messages',
179 routeName: 'mySms', 193 routeName: 'mySms',
......
src/viewsPc/center/myInfo.vue
...@@ -50,7 +50,8 @@ ...@@ -50,7 +50,8 @@
50 <el-input v-model="myform.passportNumber"/> 50 <el-input v-model="myform.passportNumber"/>
51 </el-form-item> 51 </el-form-item>
52 <el-form-item :label="language==0?'有效证件':'Valid Passport'" required v-if="user.utype=='1'"> 52 <el-form-item :label="language==0?'有效证件':'Valid Passport'" required v-if="user.utype=='1'">
53 <file-upload v-model="myform.passportUrl" :limit="1" :is-show-tip="false" :button-text="'Upload'"/> 53 <image-upload v-model="myform.passportUrl" :limit="1" :is-show-tip="false"
54 :button-text="language==0?'上传':'Upload'"/>
54 </el-form-item> 55 </el-form-item>
55 <el-form-item :label="language==0?'WDSF会员号':'WDSF MIN'" prop="wdsfMin" v-if="user.utype=='1'"> 56 <el-form-item :label="language==0?'WDSF会员号':'WDSF MIN'" prop="wdsfMin" v-if="user.utype=='1'">
56 {{myform.wdsfMin}} 57 {{myform.wdsfMin}}
......
src/viewsPc/center/myReservation.vue
...@@ -90,16 +90,16 @@ ...@@ -90,16 +90,16 @@
90 </div> 90 </div>
91 91
92 <div class="text-right"> 92 <div class="text-right">
93 <el-button v-if="b.orderType == 0&&b.viewStatus!=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" size="small" @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" size="small" @click="goDetail(b)">
96 {{ language==0?'详情':'Detail' }}</el-button> 96 {{ language==0?'详情':'Detail' }}</el-button>
97 <el-button v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" @click="goDetail(b)" 97 <el-button v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" @click="goDetail(b)"
98 class="mb10" plain round type="primary" > 98 class="mb10" plain round type="primary" size="small" >
99 {{ language==0?'支付':'Pay' }}</el-button> 99 {{ language==0?'支付':'Pay' }}</el-button>
100 <el-button v-if="b.viewStatus==0" @click="cancel(b)" class="mb10" plain round type="warning" > 100 <el-button v-if="b.viewStatus==0" @click="cancel(b)" class="mb10" plain round type="warning" size="small" >
101 {{ language==0?'取消订单':'Cancel Order' }}</el-button> 101 {{ language==0?'取消订单':'Cancel Order' }}</el-button>
102 <el-button v-if="b.viewStatus==5" @click="unsubscribe(b)" class="mb10" plain round type="" > 102 <el-button v-if="b.viewStatus==5" @click="unsubscribe(b)" class="mb10" plain round type="" size="small" >
103 {{ language==0?'退订':'Unsubscribe' }}</el-button> 103 {{ language==0?'退订':'Unsubscribe' }}</el-button>
104 </div> 104 </div>
105 </el-col> 105 </el-col>
......
src/viewsPc/components/homeQuick.vue
...@@ -97,12 +97,12 @@ function building() { ...@@ -97,12 +97,12 @@ function building() {
97 return 97 return
98 } 98 }
99 function popRemark(type){ 99 function popRemark(type){
100 // debugger
100 if(!form.value){ 101 if(!form.value){
101 building() 102 building()
102 return 103 return
103 } 104 }
104 if((form.value.isJdView == 0&&type=='1') || (form.value.isCarView == 0&&type=='2') || (form.value.isFoodView == 0&&type=='3') || (form.value.isMealView == 0&&type=='4') || (type=='5'&&form.value.isPhotoView == 0)){ 105 if((form.value.isJdView == 0&&type=='1') || (form.value.isCarView == 0&&type=='2') || (form.value.isFoodView == 0&&type=='3') || (form.value.isMealView == 0&&type=='4') || (type=='5'&&form.value.isPhotoView == 0)){
105 //type == '0'
106 building() 106 building()
107 return 107 return
108 } 108 }
......
src/viewsPc/home.vue
1 <template> 1 <template>
2 <div> 2 <div>
3 <index-Ch v-if="language ==0"/> 3 <index-Ch v-if="language ==0" @pop="openMaster"/>
4 <index-En v-else/> 4 <index-En v-else @pop="openMaster"/>
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>
...@@ -59,6 +59,8 @@ ...@@ -59,6 +59,8 @@
59 </div> 59 </div>
60 </el-dialog> 60 </el-dialog>
61 </div> 61 </div>
62
63 <dialog-master-class ref="masterClassRef"/>
62 </div> 64 </div>
63 65
64 </template> 66 </template>
...@@ -67,10 +69,12 @@ ...@@ -67,10 +69,12 @@
67 import IndexCh from '/src/viewsPc/index' 69 import IndexCh from '/src/viewsPc/index'
68 import IndexEn from '/src/viewsPc/index_en' 70 import IndexEn from '/src/viewsPc/index_en'
69 import WeatherIcon from '@/viewsPc/components/weatherIcon' 71 import WeatherIcon from '@/viewsPc/components/weatherIcon'
70 72 import DialogMasterClass from '@/viewsPc/components/masterClass'
71 import {useStorage} from "@vueuse/core/index"; 73 import {useStorage} from "@vueuse/core/index";
72 import {ref} from "vue"; 74 import {ref} from "vue";
73 import {getWeather} from "@/apiPc/webSite"; 75 import {getWeather} from "@/apiPc/webSite";
76 import {getCurrentInstance} from "@vue/runtime-core";
77 const {proxy} = getCurrentInstance()
74 const showgg = ref(true) 78 const showgg = ref(true)
75 79
76 const language = useStorage('language', 0) 80 const language = useStorage('language', 0)
...@@ -91,7 +95,14 @@ function init(){ ...@@ -91,7 +95,14 @@ function init(){
91 const popWeather = () => { 95 const popWeather = () => {
92 weatherdialog.value = true 96 weatherdialog.value = true
93 } 97 }
94 98 const openMaster = (params) => {
99 console.log(params)
100 var obj = {
101 title:'大师课申请',
102 cptId:params.cptId
103 }
104 proxy.$refs['masterClassRef'].open(obj)
105 }
95 </script> 106 </script>
96 107
97 <style scoped lang="scss"> 108 <style scoped lang="scss">
......
src/viewsPc/index.vue
...@@ -93,6 +93,8 @@ ...@@ -93,6 +93,8 @@
93 <download/> 93 <download/>
94 </el-icon> 94 </el-icon>
95 </a> 95 </a>
96 <!-- <el-button type="primary" @click="popMaster">青少年公益课</el-button>-->
97 <a class="zn-btn ml20 btn-q" @click="popMaster">青少年公益课</a>
96 </div> 98 </div>
97 </el-col> 99 </el-col>
98 <el-col :sm="24" :lg="14"> 100 <el-col :sm="24" :lg="14">
...@@ -359,7 +361,7 @@ import HomeQuick from '@/viewsPc/components/homeQuick' ...@@ -359,7 +361,7 @@ import HomeQuick from '@/viewsPc/components/homeQuick'
359 import HomeCalendar from '@/viewsPc/components/homeCalendar' 361 import HomeCalendar from '@/viewsPc/components/homeCalendar'
360 import {ref, nextTick, onMounted, watch} from 'vue' 362 import {ref, nextTick, onMounted, watch} from 'vue'
361 import {getCurrentInstance} from '@vue/runtime-core' 363 import {getCurrentInstance} from '@vue/runtime-core'
362 import {getHomePage, getNewsListById, getNewsList, getWeather} from '@/apiPc/webSite' 364 import {getHomePage, getNewsListById, getNewsList} from '@/apiPc/webSite'
363 import {useRouter} from 'vue-router' 365 import {useRouter} from 'vue-router'
364 import {rankList} from '@/assets/js/data' 366 import {rankList} from '@/assets/js/data'
365 import _ from 'lodash' 367 import _ from 'lodash'
...@@ -375,14 +377,7 @@ const navigationPic = ref({ ...@@ -375,14 +377,7 @@ const navigationPic = ref({
375 }) 377 })
376 const router = useRouter() 378 const router = useRouter()
377 const {proxy} = getCurrentInstance() 379 const {proxy} = getCurrentInstance()
378 const bannerVideo = ref(null) 380 const emit = defineEmits(['pop'])
379 const isPlay = ref(false)
380 const canPrev = ref(false)
381 const canNext = ref(false)
382 const activeRankName = ref(0)
383 const weatherObj = ref({
384 forecast:[]
385 })
386 const time = ref(0) 381 const time = ref(0)
387 const personList = ref([ 382 const personList = ref([
388 { name: 'Wolfgang Eliasch', pp: '拉丁舞裁判长 奥地利', src: '/img/1.png' }, 383 { name: 'Wolfgang Eliasch', pp: '拉丁舞裁判长 奥地利', src: '/img/1.png' },
...@@ -400,12 +395,10 @@ const news = ref([]) ...@@ -400,12 +395,10 @@ const news = ref([])
400 const notice = ref([]) 395 const notice = ref([])
401 const display = ref([]) 396 const display = ref([])
402 const scores = ref([]) 397 const scores = ref([])
403 const nowscores = ref([])
404 const livelist = ref([]) 398 const livelist = ref([])
405 const matchData = ref({}) 399 const matchData = ref({})
406 const maList = ref([]) 400 const maList = ref([])
407 const loading = ref(false) 401 const loading = ref(false)
408 const weatherdialog = ref(false)
409 const picList = ref([]) 402 const picList = ref([])
410 403
411 onMounted(() => { 404 onMounted(() => {
...@@ -491,9 +484,6 @@ const goMatch = (n) => { ...@@ -491,9 +484,6 @@ const goMatch = (n) => {
491 path: `/match/list/${n.id}` 484 path: `/match/list/${n.id}`
492 }) 485 })
493 } 486 }
494 const popWeather = () => {
495 weatherdialog.value = true
496 }
497 487
498 const goGuide = () => { 488 const goGuide = () => {
499 router.push({ 489 router.push({
...@@ -503,6 +493,13 @@ const goGuide = () => { ...@@ -503,6 +493,13 @@ const goGuide = () => {
503 } 493 }
504 }) 494 })
505 } 495 }
496 const popMaster = () => {
497 var params = {
498 cptId:matchData.value.id
499 }
500 emit('pop',params)
501 }
502
506 </script> 503 </script>
507 504
508 <style scoped lang="scss"> 505 <style scoped lang="scss">
...@@ -945,4 +942,32 @@ const goGuide = () => { ...@@ -945,4 +942,32 @@ const goGuide = () => {
945 } 942 }
946 } 943 }
947 } 944 }
945 :deep(.btn-q) {
946 //background: #FFFFFF;
947 //font-size: 18px;
948 //color: #453DEA;
949 //border-radius: 23px;
950 //padding: 10px 20px;
951 //display: inline-flex;
952 //align-items: center;
953
954 padding: 20px 40px;
955 font-size: 20px;
956 align-items: center;
957 overflow: hidden;
958 background: url(/src/assets/dance/time_bg.png) no-repeat center !important;
959 background-size: 100% 100%;
960 bottom: 40%;
961 display: flex;
962 flex-wrap: nowrap;
963 color: #fff !important;
964 box-sizing: inherit;
965 }
966
967 .btn-q:hover{
968 box-shadow: 0 0 20px #453DEA;
969 border-radius: 100px;
970 background: linear-gradient(-90deg, #8623FC, #453DEA) !important;
971 }
972
948 </style> 973 </style>
......
src/viewsPc/index_en.vue
...@@ -85,10 +85,15 @@ ...@@ -85,10 +85,15 @@
85 <el-col :sm="24" :lg="10"> 85 <el-col :sm="24" :lg="10">
86 <div class="bgbg"> 86 <div class="bgbg">
87 <h1 style="color: #fff">{{matchData?.name}}</h1> 87 <h1 style="color: #fff">{{matchData?.name}}</h1>
88 <a class="zn-btn" @click="goGuide"> 88 <div>
89 GUIDELINE 89 <a class="zn-btn" @click="goGuide">
90 <el-icon><download /></el-icon> 90 GUIDELINE
91 </a> 91 <el-icon><download /></el-icon>
92 </a>
93 <a class="zn-btn ml20 btn-q " @click="popMaster">Junior &Youth Camp <el-icon><Edit /></el-icon>
94 </a>
95 </div>
96
92 </div> 97 </div>
93 </el-col> 98 </el-col>
94 <el-col :sm="24" :lg="14"> 99 <el-col :sm="24" :lg="14">
...@@ -385,6 +390,7 @@ const navigationPic = ref({ ...@@ -385,6 +390,7 @@ const navigationPic = ref({
385 }) 390 })
386 const router = useRouter() 391 const router = useRouter()
387 const { proxy } = getCurrentInstance() 392 const { proxy } = getCurrentInstance()
393 const emit = defineEmits(['pop'])
388 const time = ref(0) 394 const time = ref(0)
389 395
390 const personList = ref([ 396 const personList = ref([
...@@ -498,6 +504,12 @@ const goGuide = () => { ...@@ -498,6 +504,12 @@ const goGuide = () => {
498 } 504 }
499 }) 505 })
500 } 506 }
507 const popMaster = () => {
508 var params = {
509 cptId:matchData.value.id
510 }
511 emit('pop',params)
512 }
501 </script> 513 </script>
502 514
503 <style scoped lang="scss"> 515 <style scoped lang="scss">
...@@ -516,7 +528,7 @@ const goGuide = () => { ...@@ -516,7 +528,7 @@ const goGuide = () => {
516 p{margin: 0;height: 40px;line-height: 20px;display: flex;align-items: center;} 528 p{margin: 0;height: 40px;line-height: 20px;display: flex;align-items: center;}
517 } 529 }
518 border-radius: 15px; 530 border-radius: 15px;
519 .zn-btn{background: #FFFFFF; 531 .zn-btn{background: #FFFFFF;text-transform: uppercase;
520 font-size: 18px; width: fit-content; 532 font-size: 18px; width: fit-content;
521 color: #453DEA; 533 color: #453DEA;
522 border-radius: 23px;padding: 10px 20px;display: inline-flex;align-items: center;} 534 border-radius: 23px;padding: 10px 20px;display: inline-flex;align-items: center;}
...@@ -797,4 +809,31 @@ const goGuide = () => { ...@@ -797,4 +809,31 @@ const goGuide = () => {
797 h1{text-align: center} 809 h1{text-align: center}
798 } 810 }
799 } 811 }
812 :deep(.btn-q) {
813 //background: #FFFFFF;
814 //font-size: 18px;
815 //color: #453DEA;
816 //border-radius: 23px;
817 //padding: 10px 20px;
818 //display: inline-flex;
819 //align-items: center;
820
821 padding: 20px 40px;
822 font-size: 20px;
823 align-items: center;
824 overflow: hidden;
825 background: url(/src/assets/dance/time_bg.png) no-repeat center !important;
826 background-size: 100% 100%;
827 bottom: 40%;
828 display: flex;
829 flex-wrap: nowrap;
830 color: #fff !important;
831 box-sizing: inherit;
832 }
833
834 .btn-q:hover{
835 box-shadow: 0 0 20px #453DEA;
836 border-radius: 100px;
837 background: linear-gradient(-90deg, #8623FC, #453DEA) !important;
838 }
800 </style> 839 </style>
......
src/viewsPc/match/chooseCoach.vue
...@@ -317,13 +317,26 @@ function goNext() { ...@@ -317,13 +317,26 @@ function goNext() {
317 // 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')
318 // return 318 // return
319 // } 319 // }
320 if((personAllList.value.coaches.length>0 && form.value.coachs?.toString().length == 0)&& 320 // (personAllList.value.coaches.length>=0 && form.value.coachs?.toString().length == 0)&&
321 (personAllList.value.teamDoctors.length>0 && form.value.doctor?.toString().length == 0)&& 321 // (personAllList.value.teamDoctors.length>=0 && form.value.doctor?.toString().length == 0)&&
322 (personAllList.value.translators.length>0 && form.value.translator?.toString().length == 0)&& 322 // (personAllList.value.translators.length>=0 && form.value.translator?.toString().length == 0)&&
323 (personAllList.value.others.length>0 && form.value.other?.toString().length == 0)&& 323 // (personAllList.value.others.length>=0 && form.value.other?.toString().length == 0)&&
324 (personAllList.value.officials.length>0 && form.value.official?.toString().length == 0)&& 324 // (personAllList.value.officials.length>=0 && form.value.official?.toString().length == 0)&&
325 (personAllList.value.leaders.length>0 && form.value.leader?.toString().length == 0) 325 // (personAllList.value.leaders.length>=0 && form.value.leader?.toString().length == 0)
326 ){ 326
327 if((personAllList.value.coaches.length>0 ||
328 personAllList.value.teamDoctors.length>0||
329 personAllList.value.translators.length>0||
330 personAllList.value.others.length>0||
331 personAllList.value.officials.length>0 ||
332 personAllList.value.leaders.length>0
333 )&&(form.value.coachs?.toString().length == 0&&
334 form.value.leader?.toString().length == 0&&
335 form.value.other?.toString().length == 0&&
336 form.value.doctor?.toString().length == 0&&
337 form.value.translator?.toString().length == 0&&
338 form.value.official?.toString().length == 0)
339 ){
327 ElMessageBox.confirm(language.value==0?'您已添加随行人员，但尚未选中，是否进行下一步？':'You have added a follower, but have not selected, do you want to continue?', { 340 ElMessageBox.confirm(language.value==0?'您已添加随行人员，但尚未选中，是否进行下一步？':'You have added a follower, but have not selected, do you want to continue?', {
328 confirmButtonText: language.value==0?'下一步':'Next', 341 confirmButtonText: language.value==0?'下一步':'Next',
329 cancelButtonText: language.value==0?'取消':'Cancel', 342 cancelButtonText: language.value==0?'取消':'Cancel',
......
src/viewsPc/match/chooseSportsman.vue
...@@ -617,8 +617,11 @@ function removeCurproject() { ...@@ -617,8 +617,11 @@ function removeCurproject() {
617 function checkTwo(a,b) { 617 function checkTwo(a,b) {
618 match.checkMate({per1Id:a.id,per2Id:b.id,cptId:matchId.value}).then(res=>{ 618 match.checkMate({per1Id:a.id,per2Id:b.id,cptId:matchId.value}).then(res=>{
619 if(!res.data){ 619 if(!res.data){
620 // ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple') 620 if(isNational.value){
621 ElMessage.warning(language.value == 0 ? `${a.realName} 已经和其他人组成舞伴，无法报名,请重新选择`:`${a.realName} has already formed a dancer with another person, cannot sign up: please select again`) 621 ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple')
622 } else {
623 ElMessage.warning(language.value == 0 ? `${a.realName}/${b.realName} 已经和其他人组成舞伴，无法报名,请重新选择`:`${a.realName}/${b.realName} has already formed a dancer with another person, cannot sign up: please select again`)
624 }
622 } 625 }
623 }) 626 })
624 } 627 }
......
src/viewsPc/match/components/addCoach.vue
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 <el-input v-model="form.idcCode" @blur="giveBirthDay" :disabled="editgay&&form.idcType=='0'"/> 35 <el-input v-model="form.idcCode" @blur="giveBirthDay" :disabled="editgay&&form.idcType=='0'"/>
36 </el-form-item> 36 </el-form-item>
37 <el-form-item :label="language==0?'有效证件':'Valid Passport'" :required="form.idcType!='0'"> 37 <el-form-item :label="language==0?'有效证件':'Valid Passport'" :required="form.idcType!='0'">
38 <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" /> 38 <image-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" />
39 <span class="tip">*请上传有效证件扫描件</span> 39 <span class="tip">*请上传有效证件扫描件</span>
40 </el-form-item> 40 </el-form-item>
41 <el-form-item :label="language==0?'性别':'Gender'" prop="sex"> 41 <el-form-item :label="language==0?'性别':'Gender'" prop="sex">
......
src/viewsPc/match/components/addCoach_en.vue
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 </el-select> 56 </el-select>
57 </el-form-item> 57 </el-form-item>
58 <el-form-item :label="language==0?'有效证件':'Valid Passport'" required> 58 <el-form-item :label="language==0?'有效证件':'Valid Passport'" required>
59 <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" 59 <image-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false"
60 :button-text="language==0?'上传':'Upload'"/> 60 :button-text="language==0?'上传':'Upload'"/>
61 <div class="tip"> 61 <div class="tip">
62 <span v-if="language==0">请上传有效身份证件扫描件，用于核实身份信息、申请签证邀请函及购买保险等</span> 62 <span v-if="language==0">请上传有效身份证件扫描件，用于核实身份信息、申请签证邀请函及购买保险等</span>
......
src/viewsPc/match/components/addWdsf.vue
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
70 </el-radio-group> 70 </el-radio-group>
71 </el-form-item> 71 </el-form-item>
72 72
73 <el-form-item :label="language==0?'出生日期':'Date of Birth'"> 73 <el-form-item :label="language==0?'出生日期':'Date of Birth'" required>
74 <el-date-picker 74 <el-date-picker
75 v-model="form.birth" 75 v-model="form.birth"
76 style="width: 100%;" 76 style="width: 100%;"
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 /> 78 />
79 </el-form-item> 79 </el-form-item>
80 <el-form-item :label="language==0?'有效证件':'Valid Passport'" required> 80 <el-form-item :label="language==0?'有效证件':'Valid Passport'" required>
81 <file-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false" 81 <image-upload v-model="form.passportUrl" :limit="1" :is-show-tip="false"
82 :button-text="language==0?'上传':'Upload'"/> 82 :button-text="language==0?'上传':'Upload'"/>
83 <div class="tip"> 83 <div class="tip">
84 <span v-if="language==0">请上传有效身份证件扫描件，用于核实身份信息、申请签证邀请函及购买保险等 </span> 84 <span v-if="language==0">请上传有效身份证件扫描件，用于核实身份信息、申请签证邀请函及购买保险等 </span>
...@@ -88,7 +88,7 @@ ...@@ -88,7 +88,7 @@
88 </div> 88 </div>
89 89
90 </el-form-item> 90 </el-form-item>
91 <el-form-item :label="language==0?'证件号':'Passport number'"> 91 <el-form-item :label="language==0?'证件号':'Passport number'" required>
92 <el-input v-model="form.passportNumber"/> 92 <el-input v-model="form.passportNumber"/>
93 </el-form-item> 93 </el-form-item>
94 94
...@@ -218,10 +218,14 @@ watch(show, (value) => { ...@@ -218,10 +218,14 @@ watch(show, (value) => {
218 }) 218 })
219 219
220 function submitForm() { 220 function submitForm() {
221 // if (!form.value.passportNumber) { 221 if (!form.value.passportNumber) {
222 // ElMessage.warning('Please fill in your passport number') 222 ElMessage.warning(language.value == 0 ?'请输入你的证件号':'Please fill in your passport number')
223 // return 223 return
224 // } 224 }
225 if (!form.value.birth) {
226 ElMessage.warning(language.value == 0 ?'请输入你的出生日期':'Please fill in your birthday')
227 return
228 }
225 // if (!form.value.picUrl) { 229 // if (!form.value.picUrl) {
226 // ElMessage.warning('Please upload your photo') 230 // ElMessage.warning('Please upload your photo')
227 // return 231 // return
...@@ -246,10 +250,6 @@ function submitForm() { ...@@ -246,10 +250,6 @@ function submitForm() {
246 emit('submitForm') 250 emit('submitForm')
247 }) 251 })
248 } else { 252 } else {
249 // if (!form.value.birth) {
250 // ElMessage.warning('Please fill in your birthday')
251 // return
252 // }
253 if (Array.isArray(form.value.passportUrl)) { 253 if (Array.isArray(form.value.passportUrl)) {
254 form.value.passportUrl = form.value.passportUrl[0].url 254 form.value.passportUrl = form.value.passportUrl[0].url
255 } 255 }
......
src/viewsPc/match/components/allSportsmanListForPersonal.vue
...@@ -234,7 +234,11 @@ function handleSelectionChange(val) { ...@@ -234,7 +234,11 @@ function handleSelectionChange(val) {
234 function checkTwo(a,b) { 234 function checkTwo(a,b) {
235 match.checkMate({per1Id:a.id,per2Id:b.id,cptId:matchId}).then(res=>{ 235 match.checkMate({per1Id:a.id,per2Id:b.id,cptId:matchId}).then(res=>{
236 if(!res.data){ 236 if(!res.data){
237 ElMessage.warning(language.value == 0 ? `${a.realName} 已经和其他人组成舞伴，无法报名:请重新选择`:`${a.realName} has already formed a dancer with another person, cannot sign up: please select again`) 237 if(isNational.value){
238 ElMessage.warning(language.value == 0 ? '他们不是固定组合':'They\'re not a couple')
239 } else {
240 ElMessage.warning(language.value == 0 ? `${a.realName} 已经和其他人组成舞伴，无法报名:请重新选择`:`${a.realName} has already formed a dancer with another person, cannot sign up: please select again`)
241 }
238 proxy.$refs['allSportmenTable'].clearSelection() 242 proxy.$refs['allSportmenTable'].clearSelection()
239 } 243 }
240 }) 244 })
......
src/viewsPc/register/personal.vue
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
72 </el-radio-group> 72 </el-radio-group>
73 </el-form-item> 73 </el-form-item>
74 <el-form-item :label="language==0?'有效证件':'Valid Passport'" required> 74 <el-form-item :label="language==0?'有效证件':'Valid Passport'" required>
75 <file-upload v-model="wdsfData.passportUrl" :limit="1" :is-show-tip="false" 75 <image-upload v-model="wdsfData.passportUrl" :limit="1" :is-show-tip="false"
76 :button-text="language==0?'上传':'Upload'"/> 76 :button-text="language==0?'上传':'Upload'"/>
77 <div class="tip"> 77 <div class="tip">
78 <span v-if="language==0">请上传有效身份证件扫描件，用于核实身份信息、申请签证邀请函及购买保险等</span> 78 <span v-if="language==0">请上传有效身份证件扫描件，用于核实身份信息、申请签证邀请函及购买保险等</span>
...@@ -80,11 +80,11 @@ ...@@ -80,11 +80,11 @@
80 application of visa invitation letter and purchasing insurance etc.</span> 80 application of visa invitation letter and purchasing insurance etc.</span>
81 </div> 81 </div>
82 </el-form-item> 82 </el-form-item>
83 <el-form-item :label="language==0?'证件号':'Passport number'"> 83 <el-form-item :label="language==0?'证件号':'Passport number'" required>
84 <el-input v-model="wdsfData.passportNumber"/> 84 <el-input v-model="wdsfData.passportNumber"/>
85 </el-form-item> 85 </el-form-item>
86 86
87 <el-form-item :label="language==0?'出生日期':'Date of Birth'"> 87 <el-form-item :label="language==0?'出生日期':'Date of Birth'" required>
88 <el-date-picker 88 <el-date-picker
89 v-model="wdsfData.birthday" 89 v-model="wdsfData.birthday"
90 style="width: 100%;" 90 style="width: 100%;"
...@@ -317,10 +317,14 @@ function goBack() { ...@@ -317,10 +317,14 @@ function goBack() {
317 router.go(-1) 317 router.go(-1)
318 } 318 }
319 function bigNext(){ 319 function bigNext(){
320 // if (!wdsfData.value.passportNumber) { 320 if (!wdsfData.value.passportNumber) {
321 // ElMessage.warning(language.value == 0 ?'请填写护照号':'Please fill in your passport number') 321 ElMessage.warning(language.value == 0 ?'请填写护照号':'Please fill in your passport number')
322 // return 322 return
323 // } 323 }
324 if (!wdsfData.value.birthday) {
325 ElMessage.warning(language.value == 0 ?'请填写出生年月':'Please fill in your birthday')
326 return
327 }
324 328
325 if (!wdsfData.value.passportUrl) { 329 if (!wdsfData.value.passportUrl) {
326 ElMessage.warning(language.value == 0 ? '请上传护照文件' : 'Please upload your passport file') 330 ElMessage.warning(language.value == 0 ? '请上传护照文件' : 'Please upload your passport file')
......
vite.config.js
...@@ -83,7 +83,6 @@ export default defineConfig(({ mode, command }) => { ...@@ -83,7 +83,6 @@ 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',
87 target: 'https://jijin.wtwuxicenter.com/stage-api', 86 target: 'https://jijin.wtwuxicenter.com/stage-api',
88 changeOrigin: true, 87 changeOrigin: true,
89 rewrite: (p) => p.replace(/^\/dev-api/, '') 88 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!