Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
2a7aa630 by 李婷婷
Options

预定查询

1 parent 00bdea3a
Expand all
Inline Side-by-side
Showing 12 changed files with 145 additions and 25 deletions
src/apiPc/common.js
...@@ -185,4 +185,40 @@ export function queryTicket(qy) { ...@@ -185,4 +185,40 @@ export function queryTicket(qy) {
185 params: qy 185 params: qy
186 }) 186 })
187 } 187 }
188 188 // 酒店
189 export function orderRoomList(qy) {
190 return request({
191 url: `/ota/orderRoom/getReservationRecordList`,
192 method: 'get',
193 params: qy
194 })
195 }
196 // 接送
197 export function orderCarList(qy) {
198 return request({
199 url: `/ota/orderCar/getReservationRecordList`,
200 method: 'get',
201 params: qy
202 })
203 }
204 export function orderMealList(qy) {
205 return request({
206 url: `/ota/orderMeal/getReservationRecordList`,
207 method: 'get',
208 params: qy
209 })
210 }
211 export function orderScenicList(qy) {
212 return request({
213 url: `/ota/orderScenic/getReservationRecordList`,
214 method: 'get',
215 params: qy
216 })
217 }
218 export function orderTicketList(qy) {
219 return request({
220 url: `/ota/orderTicket/getReservationRecordList`,
221 method: 'get',
222 params: qy
223 })
224 }
......
src/viewsPc/booking/dinner.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <div class="box"> 16 <div class="box">
17 <el-row :gutter="20"> 17 <el-row :gutter="20">
18 <el-col v-for="(h,index) in list" :span="12" class="mb20"> 18 <el-col v-for="(h,index) in list" :span="12" class="mb20">
19 <el-card> 19 <el-card>
20 <el-row :gutter="20" align="middle" class="hotel"> 20 <el-row :gutter="20" align="middle" class="hotel">
21 <el-col :span="12"> 21 <el-col :span="12">
22 <el-image :src="fillImgUrl(h.photos?.split(',')[0])" class="w100 as16_9" fit="cover" /> 22 <el-image :src="fillImgUrl(h.photos?.split(',')[0])" class="w100 as16_9" fit="cover" />
...@@ -75,7 +75,7 @@ onMounted(() => { ...@@ -75,7 +75,7 @@ onMounted(() => {
75 function getList() { 75 function getList() {
76 query.value.activityId = route.params.cptId 76 query.value.activityId = route.params.cptId
77 getActivityRestaurantList(query.value).then(res => { 77 getActivityRestaurantList(query.value).then(res => {
78 list.value = res.rows 78 list.value = res.rows.filter(item => item.viewStatus == '1');
79 }) 79 })
80 } 80 }
81 81
......
src/viewsPc/booking/makeUp.vue
...@@ -75,7 +75,7 @@ onMounted(()=>{ ...@@ -75,7 +75,7 @@ onMounted(()=>{
75 function getList() { 75 function getList() {
76 loading.value = true 76 loading.value = true
77 booking.getMakeUpList(query.value).then(res=>{ 77 booking.getMakeUpList(query.value).then(res=>{
78 list.value = res.rows 78 list.value = res.rows.filter(item => item.viewStatus == 1)
79 loading.value = false 79 loading.value = false
80 }).catch(e=>{ 80 }).catch(e=>{
81 loading.value = false 81 loading.value = false
......
src/viewsPc/booking/photography.vue
...@@ -75,7 +75,7 @@ onMounted(()=>{ ...@@ -75,7 +75,7 @@ onMounted(()=>{
75 function getList() { 75 function getList() {
76 loading.value = true 76 loading.value = true
77 booking.getShootList(query.value).then(res=>{ 77 booking.getShootList(query.value).then(res=>{
78 list.value = res.rows 78 list.value = res.rows.filter(item => item.viewStatus == 1)
79 loading.value = false 79 loading.value = false
80 }).catch(e=>{ 80 }).catch(e=>{
81 loading.value = false 81 loading.value = false
......
src/viewsPc/booking/ticket/index.vue
...@@ -159,17 +159,20 @@ ...@@ -159,17 +159,20 @@
159 </div> 159 </div>
160 </div> 160 </div>
161 <div class="select_item_box"> 161 <div class="select_item_box">
162 <div class="select_item"> 162 <div class="select_item-tag">
163 <div 163 <div
164 v-for="it in tickList[selectForm.sessionType]" 164 v-for="it in tickList[selectForm.sessionType]"
165 :key="it.id" 165 :key="it.id"
166 :class="[ 166
167 it.id == selectForm.latstId ? 'tagActive' : 'tag', 167
168 it.isView==0?'forbid':''
169 ]"
170 @click="selectTick(it)" 168 @click="selectTick(it)"
171 > 169 >
172 {{ it.name }} 170 <span v-if="it.viewStatus === '1'" :class="[
171 it.id == selectForm.latstId ? 'tagActive' : 'tag',
172 it.isView==0?'forbid':''
173 ]" >
174 {{ it.name}}
175 </span>
173 </div> 176 </div>
174 <div class="father"> 177 <div class="father">
175 <el-image 178 <el-image
...@@ -665,6 +668,65 @@ getmatchData() ...@@ -665,6 +668,65 @@ getmatchData()
665 cursor: no-drop; 668 cursor: no-drop;
666 } 669 }
667 } 670 }
671 .select_item-tag{
672 display: flex;
673 flex-wrap: wrap;
674 // gap: 10px;
675 user-select: none;
676
677 .tag_t {
678 padding: 1px 15px;
679 font-weight: 400;
680 font-size: 14px;
681 color: #493ceb;
682 border-radius: 6px;
683 border: 1px solid #453dea;
684 margin-left: 5px;
685 }
686
687 .tag {
688 display: flex;
689 padding: 12px 18px;
690 background: #eeeeee;
691 border-radius: 4px;
692 border: 1px solid #29343c;
693 font-size: 14px;
694 color: #4a4a4a;
695 margin-right: 10px;
696 margin-bottom: 10px;
697 cursor: pointer;
698 }
699
700 .tagActive {
701 display: flex;
702 padding: 12px 18px;
703 background: #fff;
704 border-radius: 4px;
705 border: 1px solid #493ceb;
706 font-size: 14px;
707 color: #493ceb;
708 margin-right: 10px;
709 margin-bottom: 10px;
710 cursor: pointer;
711 }
712
713 .tao {
714 border: 1px solid #493ceb;
715 font-size: 14px;
716 color: #493ceb;
717 margin-left: 10px;
718 }
719
720 .tagDisabled {
721 padding: 12px 18px;
722 background: #878787;
723 border-radius: 4px;
724 border: 1px solid #29343c;
725 font-size: 14px;
726 color: #4a4a4a;
727 cursor: no-drop;
728 }
729 }
668 } 730 }
669 731
670 .btn { 732 .btn {
...@@ -871,4 +933,11 @@ getmatchData() ...@@ -871,4 +933,11 @@ getmatchData()
871 } 933 }
872 } 934 }
873 } 935 }
936 .view-status-mark {
937 color: #493ceb; /* 与票档主题色一致 */
938 font-size: 12px; /* 小于票型名称字号，避免突兀 */
939 margin-left: 4px; /* 与名称保持间距 */
940 font-weight: 500;
941
942 }
874 </style> 943 </style>
......
src/viewsPc/booking/travel.vue
...@@ -100,7 +100,7 @@ onMounted(() => { ...@@ -100,7 +100,7 @@ onMounted(() => {
100 function getList() { 100 function getList() {
101 loading.value = true 101 loading.value = true
102 booking.getScenicList(query.value).then(res => { 102 booking.getScenicList(query.value).then(res => {
103 list.value = res.rows 103 list.value = res.rows.filter(item => item.viewStatus == '1');
104 loading.value = false 104 loading.value = false
105 console.log(list.value) 105 console.log(list.value)
106 }).catch(e => { 106 }).catch(e => {
......
src/viewsPc/register/personal.vue
...@@ -86,12 +86,12 @@ ...@@ -86,12 +86,12 @@
86 application of visa invitation letter and purchasing insurance etc.</span> 86 application of visa invitation letter and purchasing insurance etc.</span>
87 </div> 87 </div>
88 </el-form-item> 88 </el-form-item>
89 <el-form-item :label="language==0?'证件号':'Passport number'" required>
90 <el-input v-model="wdsfData.passportNumber" />
91 </el-form-item>
92 <el-form-item :label="language==0?'姓名':'Name'" required> 89 <el-form-item :label="language==0?'姓名':'Name'" required>
93 <el-input v-model.trim="wdsfData.certName" /> 90 <el-input v-model.trim="wdsfData.certName" />
94 </el-form-item> 91 </el-form-item>
92 <el-form-item :label="language==0?'证件号':'Passport number'" required>
93 <el-input v-model="wdsfData.passportNumber" />
94 </el-form-item>
95 <el-form-item :label="language==0?'性别':'Gender'" required> 95 <el-form-item :label="language==0?'性别':'Gender'" required>
96 <el-radio-group v-model="wdsfData.sex"> 96 <el-radio-group v-model="wdsfData.sex">
97 <el-radio value="0">{{ language == 0 ? '女' : 'female' }}</el-radio> 97 <el-radio value="0">{{ language == 0 ? '女' : 'female' }}</el-radio>
...@@ -105,6 +105,9 @@ ...@@ -105,6 +105,9 @@
105 style="width: 100%;" type="date" value-format="YYYY-MM-DD" 105 style="width: 100%;" type="date" value-format="YYYY-MM-DD"
106 /> 106 />
107 </el-form-item> 107 </el-form-item>
108 <el-form-item :label="language==0?'联系方式':'Contact Information'" required>
109 <el-input v-model.trim="wdsfData.phone" />
110 </el-form-item>
108 111
109 <div class="h30" /> 112 <div class="h30" />
110 113
...@@ -372,6 +375,10 @@ function bigNext() { ...@@ -372,6 +375,10 @@ function bigNext() {
372 ElMessage.warning(language.value == 0 ? '请输入姓名' : 'Please enter your name') 375 ElMessage.warning(language.value == 0 ? '请输入姓名' : 'Please enter your name')
373 return 376 return
374 } 377 }
378 if (!wdsfData.value.phone) {
379 ElMessage.warning(language.value == 0 ? '请输入联系方式' : 'Please enter your phone')
380 return
381 }
375 if (user && user.utype == '3') { 382 if (user && user.utype == '3') {
376 const obj = { 383 const obj = {
377 card: form.value.card, 384 card: form.value.card,
...@@ -381,6 +388,7 @@ function bigNext() { ...@@ -381,6 +388,7 @@ function bigNext() {
381 birth: wdsfData.value.birthday, 388 birth: wdsfData.value.birthday,
382 certName: wdsfData.value.certName, 389 certName: wdsfData.value.certName,
383 passportNumber: wdsfData.value.passportNumber, 390 passportNumber: wdsfData.value.passportNumber,
391 phone:wdsfData.value.phone,
384 ocrFlag: '1' 392 ocrFlag: '1'
385 } 393 }
386 if (Array.isArray(wdsfData.value.passportUrl)) { 394 if (Array.isArray(wdsfData.value.passportUrl)) {
...@@ -424,6 +432,7 @@ function next() { ...@@ -424,6 +432,7 @@ function next() {
424 certName: wdsfData.value.certName, 432 certName: wdsfData.value.certName,
425 birth: wdsfData.value.birthday, 433 birth: wdsfData.value.birthday,
426 passportNumber: wdsfData.value.passportNumber, 434 passportNumber: wdsfData.value.passportNumber,
435 phone:wdsfData.value.phone,
427 ocrFlag: '1' 436 ocrFlag: '1'
428 } 437 }
429 if (Array.isArray(wdsfData.value.passportUrl)) { 438 if (Array.isArray(wdsfData.value.passportUrl)) {
...@@ -449,6 +458,7 @@ function next() { ...@@ -449,6 +458,7 @@ function next() {
449 // personId: wdsfData.value.personId, 458 // personId: wdsfData.value.personId,
450 username: wdsfData.value.email, 459 username: wdsfData.value.email,
451 password: form.value.password, 460 password: form.value.password,
461 phone:wdsfData.value.phone,
452 ocrFlag: '1' 462 ocrFlag: '1'
453 } 463 }
454 if (Array.isArray(wdsfData.value.passportUrl)) { 464 if (Array.isArray(wdsfData.value.passportUrl)) {
......
vite.config.js
...@@ -64,35 +64,40 @@ export default defineConfig(({ mode, command }) => { ...@@ -64,35 +64,40 @@ export default defineConfig(({ mode, command }) => {
64 proxy: { 64 proxy: {
65 // https://cn.vitejs.dev/config/#server-proxy 65 // https://cn.vitejs.dev/config/#server-proxy
66 '/dev-api/ztx-train': { 66 '/dev-api/ztx-train': {
67 // target: 'http://192.168.1.118:1896/stage-api', 67 target: 'http://192.168.1.22:8081',
68 target: 'https://wdsfwuxicenter.com/stage-api', 68 // target: 'https://wdsfwuxicenter.com/stage-api',
69 // target: 'https://jijin.wtwuxicenter.com/stage-api',
69 changeOrigin: true, 70 changeOrigin: true,
70 rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '') 71 rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
71 }, 72 },
72 '/dev-api/ztx-match': { 73 '/dev-api/ztx-match': {
73 // target: 'http://192.168.1.118:8081', 74 target: 'http://192.168.1.22:8081',
74 target: 'https://wdsfwuxicenter.com/stage-api', 75 // target: 'https://jijin.wtwuxicenter.com/stage-api',
76 // target: 'https://wdsfwuxicenter.com/stage-api',
75 // target: 'https://wdsfwuxicenter.com/stage-api/', 77 // target: 'https://wdsfwuxicenter.com/stage-api/',
76 changeOrigin: true, 78 changeOrigin: true,
77 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '') 79 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
78 }, 80 },
79 '/dev-api/ztx-webSite': { 81 '/dev-api/ztx-webSite': {
80 // target: 'http://192.168.1.118:8081', 82 target: 'http://192.168.1.22:8081',
81 target: 'https://wdsfwuxicenter.com/stage-api', 83 // target: 'https://wdsfwuxicenter.com/stage-api',
84 // target: 'https://jijin.wtwuxicenter.com/stage-api',
82 changeOrigin: true, 85 changeOrigin: true,
83 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 86 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
84 }, 87 },
85 '/dev-api': { 88 '/dev-api': {
86 // target: 'http://192.168.1.213:8081/', 89 target: 'http://192.168.1.22:8081',
87 // target: 'http://192.168.1.169:8081', 90 // target: 'http://192.168.1.169:8081',
88 // target: 'https://jijin.wtwuxicenter.com/stage-api', 91 // target: 'https://jijin.wtwuxicenter.com/stage-api',
89 target: 'https://wdsfwuxicenter.com/stage-api/', 92 // target: 'https://wdsfwuxicenter.com/stage-api/',
93 // target: 'https://jijin.wtwuxicenter.com/stage-api',
90 changeOrigin: true, 94 changeOrigin: true,
91 rewrite: (p) => p.replace(/^\/dev-api/, '') 95 rewrite: (p) => p.replace(/^\/dev-api/, '')
92 }, 96 },
93 '/ticket': { 97 '/ticket': {
94 // target: 'http://192.168.1.242:8081/', 98 // target: 'https://jijin.wtwuxicenter.com/stage-api',
95 target: 'https://wdsfwuxicenter.com/h5/', 99 target: 'http://192.168.1.22:8081',
100 // target: 'https://wdsfwuxicenter.com/h5/',
96 // target: 'https://ticketh5.wdsfwuxicenter.com/h5/', 101 // target: 'https://ticketh5.wdsfwuxicenter.com/h5/',
97 changeOrigin: true, 102 changeOrigin: true,
98 rewrite: (p) => p.replace(/^\/ticket/, '') 103 rewrite: (p) => p.replace(/^\/ticket/, '')
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!