Skip to content

jijin / dance-pc

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

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

2 parents 07827fbc 4d13c8e8
Expand all
Inline Side-by-side
Showing 7 changed files with 81 additions and 57 deletions
src/apiPc/booking.js
...@@ -511,6 +511,22 @@ export function getTicketInfoByActivityId(params) { ...@@ -511,6 +511,22 @@ export function getTicketInfoByActivityId(params) {
511 }) 511 })
512 } 512 }
513 513
514 export function getActivityTypeVoById(params) {
515 return request({
516 url: `/ota/activityType/getActivityTypeVoById`,
517 method: 'get',
518 params
519 })
520 }
521
522 export function getListByAtstId(params) {
523 return request({
524 url: `/ota/activitySeat/getListByAtstId`,
525 method: 'get',
526 params
527 })
528 }
529
514 // 根据赛事ID获取票档 530 // 根据赛事ID获取票档
515 export function getTicketListApi(params) { 531 export function getTicketListApi(params) {
516 return request({ 532 return request({
...@@ -538,6 +554,22 @@ export function listApi(params) { ...@@ -538,6 +554,22 @@ export function listApi(params) {
538 }) 554 })
539 } 555 }
540 556
557 export function getStadiumList(params) {
558 return request({
559 url: `/ota/activityStadium/getStadiumList`,
560 method: 'get',
561 params
562 })
563 }
564
565 export function getActivityTypeVoListByLatsId(params) {
566 return request({
567 url: `/ota/activityType/getActivityTypeVoListByLatsId`,
568 method: 'get',
569 params
570 })
571 }
572
541 // 获取当前用户的观影人列表 573 // 获取当前用户的观影人列表
542 export function customerListApi(params) { 574 export function customerListApi(params) {
543 return request({ 575 return request({
......
src/routerPc/en.js
...@@ -362,7 +362,7 @@ export const constantRoutes = [ ...@@ -362,7 +362,7 @@ export const constantRoutes = [
362 meta: { title: 'Ticket Booking' } 362 meta: { title: 'Ticket Booking' }
363 }, 363 },
364 { 364 {
365 path: 'ticket/:activeId/:latId/:attId', 365 path: 'ticket/:activeId/:latstId',
366 component: () => import('@/viewsPc/booking/ticket/confirmOrder.vue'), 366 component: () => import('@/viewsPc/booking/ticket/confirmOrder.vue'),
367 name: 'confirmOrder', 367 name: 'confirmOrder',
368 meta: { title: 'confirmOrder' } 368 meta: { title: 'confirmOrder' }
......
src/viewsPc/booking/ticket/peopleManage.vue
...@@ -5,17 +5,16 @@ ...@@ -5,17 +5,16 @@
5 {{ languageFormat(language, "新增", "Add") }} 5 {{ languageFormat(language, "新增", "Add") }}
6 </div> 6 </div>
7 <span> 7 <span>
8 {{ languageFormat(language, "观影人管理", "Viewers") }} 8 {{ languageFormat(language, "观影人管理", "Viewers") }}
9 </span> 9 </span>
10 10
11 <span class="fr" style="cursor: pointer" @click="$router.go(-1)">{{ 11 <span class="fr" style="cursor: pointer" @click="$router.go(-1)">
12 language == 0 ? '返回' : 'Back' 12 {{ language == 0 ? '返回' : 'Back' }}
13 }}</span> 13 </span>
14 </div> 14 </div>
15 <div class="content"> 15 <div class="content">
16 <div class="people_box"> 16 <div class="people_box">
17 <div v-for="(it, index) in personnelList" :key="index" class="people_item" 17 <div v-for="(it, index) in personnelList" :key="index" class="people_item">
18 >
19 <div class="name">{{ it.name }}</div> 18 <div class="name">{{ it.name }}</div>
20 <div class="idcard"> 19 <div class="idcard">
21 {{ languageFormat(language, "证件号", "ID number") }}：{{ it.idCard }} 20 {{ languageFormat(language, "证件号", "ID number") }}：{{ it.idCard }}
...@@ -33,33 +32,31 @@ ...@@ -33,33 +32,31 @@
33 center 32 center
34 width="700" 33 width="700"
35 > 34 >
36 <el-form ref="formRef" :model="form" :rules="rules" label-width="100px" size="large" style="margin: 80px"> 35 <el-form
36 ref="formRef" :model="form" :rules="rules" label-width="100px" size="large"
37 style="margin: 80px"
38 >
37 <el-form-item :label="language==0?'姓名':'name'" prop="name" required> 39 <el-form-item :label="language==0?'姓名':'name'" prop="name" required>
38 <el-input v-model="form.name" :placeholder="language==0?'请输入':'Please input'"/> 40 <el-input v-model="form.name" :placeholder="language==0?'请输入':'Please input'" />
39 </el-form-item> 41 </el-form-item>
40 <el-form-item :label="language==0?'证件类型':'ID Type'" prop="idcType" required> 42 <el-form-item :label="language==0?'证件类型':'ID Type'" prop="idcType" required>
41 <el-select v-model="form.idcType" :placeholder="language==0?'请选择':'Please choose'"> 43 <el-select v-model="form.idcType" :placeholder="language==0?'请选择':'Please choose'">
42 <el-option :label="language==0?'身份证':'Identity card'" value="0"/> 44 <el-option :label="language==0?'身份证':'Identity card'" value="0" />
43 <el-option :label="language==0?'护照':'Passport'" value="1"/> 45 <el-option :label="language==0?'护照':'Passport'" value="1" />
44 <el-option :label="language==0?'其他':'Other'" value="2"/> 46 <el-option :label="language==0?'其他':'Other'" value="2" />
45 </el-select> 47 </el-select>
46 </el-form-item> 48 </el-form-item>
47 <el-form-item :label="language==0?'证件号':'ID number'" prop="idCard" required> 49 <el-form-item :label="language==0?'证件号':'ID number'" prop="idCard" required>
48 <el-input v-model="form.idCard" :placeholder="language==0?'请输入证件号':'Please enter the ID after ah'"/> 50 <el-input v-model="form.idCard" :placeholder="language==0?'请输入证件号':'Please enter the ID after ah'" />
49 </el-form-item> 51 </el-form-item>
50 </el-form> 52 </el-form>
51 53
52 <br> 54 <span class="dialog-footer">
53 <br>
54 <span slot="footer" class="dialog-footer">
55 <div style="text-align: center"> 55 <div style="text-align: center">
56 <el-button class="can_pay" @click="show = false">{{ language == 0 ? '取 消' : 'cancel' }}</el-button> 56 <el-button class="can_pay" @click="show = false">{{ language == 0 ? '取 消' : 'cancel' }}</el-button>
57 <el-button class="pay" type="primary" @click="submit">{{ language == 0 ? '确 定' : 'confirm' }}</el-button> 57 <el-button class="pay" type="primary" @click="submit">{{ language == 0 ? '确 定' : 'confirm' }}</el-button>
58 </div> 58 </div>
59 </span> 59 </span>
60 <br>
61 <br>
62 <br>
63 </el-dialog> 60 </el-dialog>
64 </el-card> 61 </el-card>
65 62
...@@ -67,13 +64,14 @@ ...@@ -67,13 +64,14 @@
67 64
68 65
69 <script setup> 66 <script setup>
70 import {ref, computed} from "vue"; 67 import { ref, computed } from 'vue'
71 import {aadCustomer, customerListApi, delCustomer} from '@/apiPc/booking' 68 import { aadCustomer, delCustomer, getMyFriends } from '@/apiPc/booking'
72 import {ElMessage, ElMessageBox} from "element-plus"; 69 import { ElMessage, ElMessageBox } from 'element-plus'
73 import {languageFormat} from "@/viewsPc/seat/utils/language.js"; 70 import { languageFormat } from '@/viewsPc/seat/utils/language.js'
74 import useUserStore from "/@/store/modules/user"; 71 import useUserStore from '/@/store/modules/user'
75 import {useStorage} from "@vueuse/core/index"; 72 import { useStorage } from '@vueuse/core/index'
76 import {triggerLanguage} from '@/utils/ruoyi' 73 import { triggerLanguage } from '@/utils/ruoyi'
74 import { useRoute } from 'vue-router'
77 75
78 const user = computed(() => useUserStore().user) 76 const user = computed(() => useUserStore().user)
79 const useStore = useUserStore() 77 const useStore = useUserStore()
...@@ -85,29 +83,25 @@ const form = ref({}) ...@@ -85,29 +83,25 @@ const form = ref({})
85 const formRef = ref(null) 83 const formRef = ref(null)
86 const rules = ref({ 84 const rules = ref({
87 name: [ 85 name: [
88 {required: true, message: triggerLanguage(language.value, '请输入姓名', 'Please input'), trigger: "blur"}, 86 { required: true, message: triggerLanguage(language.value, '请输入姓名', 'Please input'), trigger: 'blur' }
89 ], 87 ],
90 idCard: [ 88 idCard: [
91 { 89 {
92 required: true, 90 required: true,
93 message: triggerLanguage(language.value, '请输入证件号', 'Please enter the ID after ah'), 91 message: triggerLanguage(language.value, '请输入证件号', 'Please enter the ID after ah'),
94 trigger: "blur" 92 trigger: 'blur'
95 }, 93 }
96 ], 94 ],
97 idcType: [ 95 idcType: [
98 {required: true, message: triggerLanguage(language.value, '请选择证件类型', 'Please choose'), trigger: "blur"}, 96 { required: true, message: triggerLanguage(language.value, '请选择证件类型', 'Please choose'), trigger: 'blur' }
99 ], 97 ]
100 }) 98 })
101 99
102 customerList() 100 customerList()
103 101
104 async function customerList() { 102 async function customerList() {
105 const res = await customerListApi({ 103 const res = await getMyFriends()
106 activeId: route.query.activeId, 104 personnelList.value = res.data
107 attId: route.query.attId,
108 atId: route.query.atId
109 })
110 personnelList.value = res.rows
111 } 105 }
112 106
113 function addPeople() { 107 function addPeople() {
...@@ -125,19 +119,18 @@ function submit() { ...@@ -125,19 +119,18 @@ function submit() {
125 if (valid) { 119 if (valid) {
126 aadCustomer(form.value).then(res => { 120 aadCustomer(form.value).then(res => {
127 if (res.data == -100) { 121 if (res.data == -100) {
128 ElMessageBox.confirm(language.value == 0 ? '该观影人已存在' : "The viewer already exists", language.value == 0 ? '提示' : 'Reminder', { 122 ElMessageBox.confirm(language.value == 0 ? '该观影人已存在' : 'The viewer already exists', language.value == 0 ? '提示' : 'Reminder', {
129 confirmButtonText: language.value == 0 ? '确认' : 'confirm', 123 confirmButtonText: language.value == 0 ? '确认' : 'confirm',
130 cancelButtonText: language.value == 0 ? '取消' : 'cancel', 124 cancelButtonText: language.value == 0 ? '取消' : 'cancel',
131 type: "warning", 125 type: 'warning',
132 draggable: true, 126 draggable: true
133 }) 127 })
134
135 } else if (res.data == -101) { 128 } else if (res.data == -101) {
136 return ElMessageBox.confirm(language.value == 0 ? '该观影人实名认证未通过' : 'The real name authentication of the moviegoer failed', language.value == 0 ? '提示' : 'Reminder', { 129 return ElMessageBox.confirm(language.value == 0 ? '该观影人实名认证未通过' : 'The real name authentication of the moviegoer failed', language.value == 0 ? '提示' : 'Reminder', {
137 confirmButtonText: language.value == 0 ? '确认' : "confirm", 130 confirmButtonText: language.value == 0 ? '确认' : 'confirm',
138 cancelButtonText: language.value == 0 ? '取消' : 'cancel', 131 cancelButtonText: language.value == 0 ? '取消' : 'cancel',
139 type: "warning", 132 type: 'warning',
140 draggable: true, 133 draggable: true
141 }) 134 })
142 } else { 135 } else {
143 show.value = false 136 show.value = false
...@@ -153,23 +146,22 @@ function submit() { ...@@ -153,23 +146,22 @@ function submit() {
153 146
154 async function deletePeople(v) { 147 async function deletePeople(v) {
155 await ElMessageBox.confirm( 148 await ElMessageBox.confirm(
156 languageFormat(language.value, "确认删除该观影人吗？", "Are you sure to delete this viewer?"), 149 languageFormat(language.value, '确认删除该观影人吗？', 'Are you sure to delete this viewer?'),
157 languageFormat(language.value, "提示", "Reminder"), 150 languageFormat(language.value, '提示', 'Reminder'),
158 { 151 {
159 confirmButtonText: languageFormat(language.value, "确认", "confirm"), 152 confirmButtonText: languageFormat(language.value, '确认', 'confirm'),
160 cancelButtonText: languageFormat(language.value, "取消", "cancel"), 153 cancelButtonText: languageFormat(language.value, '取消', 'cancel'),
161 type: "warning", 154 type: 'warning',
162 draggable: true, 155 draggable: true
163 } 156 }
164 ) 157 )
165 .then(async () => { 158 .then(async() => {
166 const res = await delCustomer(v) 159 const res = await delCustomer(v)
167 if (res.code === 200) { 160 if (res.code === 200) {
168 ElMessage.success('删除成功') 161 ElMessage.success('删除成功')
169 await customerList() 162 await customerList()
170 } 163 }
171 }) 164 })
172
173 } 165 }
174 </script> 166 </script>
175 167
......
vite.config.js
...@@ -81,8 +81,8 @@ export default defineConfig(({ mode, command }) => { ...@@ -81,8 +81,8 @@ export default defineConfig(({ mode, command }) => {
81 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 81 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
82 }, 82 },
83 '/dev-api': { 83 '/dev-api': {
84 // target: 'http://192.168.1.118:8081/', 84 target: 'http://192.168.1.118:8081/',
85 target: 'http://192.168.1.243:8081', 85 // target: 'http://192.168.1.243:8081',
86 // target: 'https://jijin.wtwuxicenter.com/stage-api', 86 // target: 'https://jijin.wtwuxicenter.com/stage-api',
87 // target: 'https://wdsfwuxicenter.com/stage-api/', 87 // target: 'https://wdsfwuxicenter.com/stage-api/',
88 changeOrigin: true, 88 changeOrigin: true,
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!