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) {
})
}
export function getActivityTypeVoById(params) {
return request({
url: `/ota/activityType/getActivityTypeVoById`,
method: 'get',
params
})
}
export function getListByAtstId(params) {
return request({
url: `/ota/activitySeat/getListByAtstId`,
method: 'get',
params
})
}
// 根据赛事ID获取票档
export function getTicketListApi(params) {
return request({
......@@ -538,6 +554,22 @@ export function listApi(params) {
})
}
export function getStadiumList(params) {
return request({
url: `/ota/activityStadium/getStadiumList`,
method: 'get',
params
})
}
export function getActivityTypeVoListByLatsId(params) {
return request({
url: `/ota/activityType/getActivityTypeVoListByLatsId`,
method: 'get',
params
})
}
// 获取当前用户的观影人列表
export function customerListApi(params) {
return request({
......
src/routerPc/en.js
......@@ -362,7 +362,7 @@ export const constantRoutes = [
meta: { title: 'Ticket Booking' }
},
{
path: 'ticket/:activeId/:latId/:attId',
path: 'ticket/:activeId/:latstId',
component: () => import('@/viewsPc/booking/ticket/confirmOrder.vue'),
name: 'confirmOrder',
meta: { title: 'confirmOrder' }
......
src/viewsPc/booking/ticket/peopleManage.vue
......@@ -5,17 +5,16 @@
{{ languageFormat(language, "新增", "Add") }}
</div>
<span>
{{ languageFormat(language, "观影人管理", "Viewers") }}
{{ languageFormat(language, "观影人管理", "Viewers") }}
</span>
<span class="fr" style="cursor: pointer" @click="$router.go(-1)">{{
language == 0 ? '返回' : 'Back'
}}</span>
<span class="fr" style="cursor: pointer" @click="$router.go(-1)">
{{ language == 0 ? '返回' : 'Back' }}
</span>
</div>
<div class="content">
<div class="people_box">
<div v-for="(it, index) in personnelList" :key="index" class="people_item"
>
<div v-for="(it, index) in personnelList" :key="index" class="people_item">
<div class="name">{{ it.name }}</div>
<div class="idcard">
{{ languageFormat(language, "证件号", "ID number") }}：{{ it.idCard }}
......@@ -33,33 +32,31 @@
center
width="700"
>
<el-form ref="formRef" :model="form" :rules="rules" label-width="100px" size="large" style="margin: 80px">
<el-form
ref="formRef" :model="form" :rules="rules" label-width="100px" size="large"
style="margin: 80px"
>
<el-form-item :label="language==0?'姓名':'name'" prop="name" required>
<el-input v-model="form.name" :placeholder="language==0?'请输入':'Please input'"/>
<el-input v-model="form.name" :placeholder="language==0?'请输入':'Please input'" />
</el-form-item>
<el-form-item :label="language==0?'证件类型':'ID Type'" prop="idcType" required>
<el-select v-model="form.idcType" :placeholder="language==0?'请选择':'Please choose'">
<el-option :label="language==0?'身份证':'Identity card'" value="0"/>
<el-option :label="language==0?'护照':'Passport'" value="1"/>
<el-option :label="language==0?'其他':'Other'" value="2"/>
<el-option :label="language==0?'身份证':'Identity card'" value="0" />
<el-option :label="language==0?'护照':'Passport'" value="1" />
<el-option :label="language==0?'其他':'Other'" value="2" />
</el-select>
</el-form-item>
<el-form-item :label="language==0?'证件号':'ID number'" prop="idCard" required>
<el-input v-model="form.idCard" :placeholder="language==0?'请输入证件号':'Please enter the ID after ah'"/>
<el-input v-model="form.idCard" :placeholder="language==0?'请输入证件号':'Please enter the ID after ah'" />
</el-form-item>
</el-form>
<br>
<br>
<span slot="footer" class="dialog-footer">
<span class="dialog-footer">
<div style="text-align: center">
<el-button class="can_pay" @click="show = false">{{ language == 0 ? '取 消' : 'cancel' }}</el-button>
<el-button class="pay" type="primary" @click="submit">{{ language == 0 ? '确 定' : 'confirm' }}</el-button>
</div>
</span>
<br>
<br>
<br>
</el-dialog>
</el-card>
......@@ -67,13 +64,14 @@
<script setup>
import {ref, computed} from "vue";
import {aadCustomer, customerListApi, delCustomer} from '@/apiPc/booking'
import {ElMessage, ElMessageBox} from "element-plus";
import {languageFormat} from "@/viewsPc/seat/utils/language.js";
import useUserStore from "/@/store/modules/user";
import {useStorage} from "@vueuse/core/index";
import {triggerLanguage} from '@/utils/ruoyi'
import { ref, computed } from 'vue'
import { aadCustomer, delCustomer, getMyFriends } from '@/apiPc/booking'
import { ElMessage, ElMessageBox } from 'element-plus'
import { languageFormat } from '@/viewsPc/seat/utils/language.js'
import useUserStore from '/@/store/modules/user'
import { useStorage } from '@vueuse/core/index'
import { triggerLanguage } from '@/utils/ruoyi'
import { useRoute } from 'vue-router'
const user = computed(() => useUserStore().user)
const useStore = useUserStore()
......@@ -85,29 +83,25 @@ const form = ref({})
const formRef = ref(null)
const rules = ref({
name: [
{required: true, message: triggerLanguage(language.value, '请输入姓名', 'Please input'), trigger: "blur"},
{ required: true, message: triggerLanguage(language.value, '请输入姓名', 'Please input'), trigger: 'blur' }
],
idCard: [
{
required: true,
message: triggerLanguage(language.value, '请输入证件号', 'Please enter the ID after ah'),
trigger: "blur"
},
trigger: 'blur'
}
],
idcType: [
{required: true, message: triggerLanguage(language.value, '请选择证件类型', 'Please choose'), trigger: "blur"},
],
{ required: true, message: triggerLanguage(language.value, '请选择证件类型', 'Please choose'), trigger: 'blur' }
]
})
customerList()
async function customerList() {
const res = await customerListApi({
activeId: route.query.activeId,
attId: route.query.attId,
atId: route.query.atId
})
personnelList.value = res.rows
const res = await getMyFriends()
personnelList.value = res.data
}
function addPeople() {
......@@ -125,19 +119,18 @@ function submit() {
if (valid) {
aadCustomer(form.value).then(res => {
if (res.data == -100) {
ElMessageBox.confirm(language.value == 0 ? '该观影人已存在' : "The viewer already exists", language.value == 0 ? '提示' : 'Reminder', {
ElMessageBox.confirm(language.value == 0 ? '该观影人已存在' : 'The viewer already exists', language.value == 0 ? '提示' : 'Reminder', {
confirmButtonText: language.value == 0 ? '确认' : 'confirm',
cancelButtonText: language.value == 0 ? '取消' : 'cancel',
type: "warning",
draggable: true,
type: 'warning',
draggable: true
})
} else if (res.data == -101) {
return ElMessageBox.confirm(language.value == 0 ? '该观影人实名认证未通过' : 'The real name authentication of the moviegoer failed', language.value == 0 ? '提示' : 'Reminder', {
confirmButtonText: language.value == 0 ? '确认' : "confirm",
confirmButtonText: language.value == 0 ? '确认' : 'confirm',
cancelButtonText: language.value == 0 ? '取消' : 'cancel',
type: "warning",
draggable: true,
type: 'warning',
draggable: true
})
} else {
show.value = false
......@@ -153,23 +146,22 @@ function submit() {
async function deletePeople(v) {
await ElMessageBox.confirm(
languageFormat(language.value, "确认删除该观影人吗？", "Are you sure to delete this viewer?"),
languageFormat(language.value, "提示", "Reminder"),
{
confirmButtonText: languageFormat(language.value, "确认", "confirm"),
cancelButtonText: languageFormat(language.value, "取消", "cancel"),
type: "warning",
draggable: true,
}
)
.then(async () => {
languageFormat(language.value, '确认删除该观影人吗？', 'Are you sure to delete this viewer?'),
languageFormat(language.value, '提示', 'Reminder'),
{
confirmButtonText: languageFormat(language.value, '确认', 'confirm'),
cancelButtonText: languageFormat(language.value, '取消', 'cancel'),
type: 'warning',
draggable: true
}
)
.then(async() => {
const res = await delCustomer(v)
if (res.code === 200) {
ElMessage.success('删除成功')
await customerList()
}
})
}
</script>
......
vite.config.js
......@@ -81,8 +81,8 @@ export default defineConfig(({ mode, command }) => {
rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
},
'/dev-api': {
// target: 'http://192.168.1.118:8081/',
target: 'http://192.168.1.243:8081',
target: 'http://192.168.1.118:8081/',
// target: 'http://192.168.1.243:8081',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api/',
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!