Skip to content

jijin / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
d4b1f9db by 李婷婷
Options

费用

1 parent cdb9930d
Inline Side-by-side
Showing 7 changed files with 74 additions and 25 deletions
src/viewsPc/components/bookingSearch.vue
......@@ -40,7 +40,7 @@
<!-- 化妆 -->
<el-card v-for="(item, index) in list" :key="index" class="result-card" v-if="activeName === '2'">
<p><span class="label">{{ language === 0 ? '商家名称：' : 'Merchant：' }}</span>{{ item.name }}</p>
<p><span class="label">{{ language === 0 ? '套餐名称：' : 'Package：' }}</span>{{ item.meal?.packageName || '-' }}</p>
<p><span class="label">{{ language === 0 ? '套餐名称：' : 'Package：' }}</span>{{ item.maelName || '-' }}</p>
<p><span class="label">{{ language === 0 ? '工作室联系人：' : 'Studio Contact：' }}</span>{{ item.contacts }}</p>
<p><span class="label">{{ language === 0 ? '预定数量：' : 'Quantity：' }}</span>{{ item.num }}</p>
<p><span class="label">{{ language === 0 ? '预定时间：' : 'Booking Time：' }}</span>{{ item.payDate }}</p>
......@@ -52,7 +52,7 @@
</p>
<p><span class="label">{{ language === 0 ? '终点地：' : 'To：' }}</span>{{ item.resName.split('——')[1] || '-' }}</p>
<p><span class="label">{{ language === 0 ? '用车日期：' : 'Date：' }}</span>{{ item.revTime }}</p>
<p><span class="label">{{ language === 0 ? '乘坐人：' : 'Passengers：' }}</span><span v-html="item.person"></span>
<p><span class="label">{{ language === 0 ? '乘坐人：' : 'Passengers：' }}</span><span >{{ item.person.replace(/<br\/>/g, ',').replace(/,$/, '') }}</span>
</p>
</el-card>
......
src/viewsPc/index.vue
......@@ -112,17 +112,19 @@
<img v-if="matchData?.logoUrl" :src="fillImgUrl(matchData.logoUrl)" class="bbbg">
<el-row style="align-items: center">
<el-col :lg="10" :sm="24">
<div class="bgbg">
<div class="bgbg btn-group">
<h1 style="color: #fff">{{ matchData?.name }}</h1>
<a class="zn-btn" target="_blank" @click="goGuide">参赛指南
<div class="btn-group">
<a class="zn-btn ml10" target="_blank" @click="goGuide">参赛指南
<el-icon>
<download />
</el-icon>
</a>
<a class="zn-btn ml10 btn-q" @click="reserveSearch">预订查询</a>
<a v-show="matchData?.id" class="zn-btn ml10 btn-q mt20" @click="backNumberSearch">背号查询</a>
<a v-show="matchData?.id" class="zn-btn ml10 btn-q " @click="backNumberSearch">背号查询</a>
<a v-show="matchData?.id" class="zn-btn ml10 btn-q" @click="schSearch">日程查询</a>
</div>
</div>
</el-col>
<el-col :lg="14" :sm="24">
......
src/viewsPc/match/components/matchInfo-projectList.vue
......@@ -29,8 +29,8 @@
<template #default="scope">
<div v-if="isNational">
<span v-if="scope.row.ageGroup == '0'" >{{ language==0?'不限制':'Unlimited' }}</span>
<span v-if="scope.row.ageGroup == '1'" >Juvenile I</span>
<span>{{ scope.row.ageGroupStr }}</span>
<!-- <span v-if="scope.row.ageGroup == '1'" >Juvenile I</span>
<span v-if="scope.row.ageGroup == '2'" >Juvenile II</span>
<span v-if="scope.row.ageGroup == '3'" >Juv1& II (comb.)</span>
<span v-if="scope.row.ageGroup == '4'" >Junior I</span>
......@@ -46,7 +46,7 @@
<span v-if="scope.row.ageGroup == '11'" >Senior II</span>
<span v-if="scope.row.ageGroup == '12'" >Senior III</span>
<span v-if="scope.row.ageGroup == '13'" >Senior IV</span>
<span v-if="scope.row.ageGroup == '14'" >Senior V</span>
<span v-if="scope.row.ageGroup == '14'" >Senior V</span> -->
</div>
<div v-else>
<div>{{ scope.row.birthPeriod.replace(',',language==0?' 至 ':' to ') }}</div>
......
src/viewsPc/match/components/zu-table.vue
......@@ -33,7 +33,7 @@
<el-table-column :label="language==0?'参赛服务费':'REGISTRATION FEE'" align="center" width="150px" prop="">
<template #default="scope">
<div class="text-primary">
{{ language==0?'¥':'€' }}{{ scope.row.project.serviceFee }}
{{ language==0?'¥':'€' }}{{ scope.row.project.chargeType == '0'?scope.row.project.serviceFee : scope.row.project.serviceFee * scope.row.athletes.length }}
</div>
</template>
</el-table-column>
......
src/viewsPc/match/pay.vue
......@@ -600,9 +600,31 @@ function getSignList() {
for (var s of signInfoList.value) {
insuranceFeeTotal.value = insuranceFeeTotal.value + Number(s.insuranceFee)
}
for (var z of zuTableList.value) {
serviceFeeTotal.value = serviceFeeTotal.value + Number(z.project.serviceFee)
// for (var z of zuTableList.value) {
// serviceFeeTotal.value = serviceFeeTotal.value + Number(z.project.serviceFee)
// }
for (const z of zuTableList.value) {
if (!z.project) {
continue;
}
const serviceFee = Number(z.project.serviceFee) || 0;
const chargeType = String(z.project.chargeType).trim();
let currentItemFee = 0;
if (chargeType === '0') {
currentItemFee = serviceFee;
} else if (chargeType === '1') {
const athletesLength = z.athletes?.length || 0;
currentItemFee = serviceFee * athletesLength;
} else {
currentItemFee = 0;
}
serviceFeeTotal.value += currentItemFee;
}
serviceFeeTotal.value = serviceFeeTotal.value.toFixed(2);
}).catch(err => {
console.log(err)
if (isLogin.value) {
......
src/viewsPc/match/signPreview.vue
......@@ -222,9 +222,34 @@ function getSignList() {
for (var s of signInfoList.value) {
signTotal.value = (Number(signTotal.value) + Number(s.insuranceFee)).toFixed(2)
}
for (var z of zuTableList.value) {
zuTotal.value = (Number(zuTotal.value) + Number(z.project.serviceFee)).toFixed(2)
// for (var z of zuTableList.value) {
// zuTotal.value = (Number(zuTotal.value) + Number(z.project.serviceFee)).toFixed(2)
// }
for (const z of zuTableList.value) {
if (!z.project) {
continue;
}
const serviceFee = Number(z.project.serviceFee) || 0;
const chargeType = String(z.project.chargeType).trim();
let currentItemFee = 0;
if (chargeType === '0') {
currentItemFee = serviceFee;
} else if (chargeType === '1') {
const athletesLength = z.athletes?.length || 0;
currentItemFee = serviceFee * athletesLength;
} else {
currentItemFee = 0;
}
zuTotal.value += currentItemFee;
}
zuTotal.value = zuTotal.value.toFixed(2);
})
}
......@@ -313,7 +338,7 @@ function exportSignList(n) {
if (n == 1) {
fileName = '参赛人员清单'
} else {
fileName = '设项报名清单'
fileName = '设项报名清单2'
}
proxy.download('/league/sign/exportCn', {
...obj
......@@ -338,7 +363,7 @@ function exportPdf() {
}
var fileName
if (language.value == 0) {
fileName = '设项报名清单'
fileName = '设项报名清单4'
proxy.download('/pdf/exportMySignInfoList', {
...obj
}, `${fileName}_${new Date().getTime()}.pdf`, {}, 'application/pdf', {}, 'application/pdf')
......
vite.config.js
......@@ -64,39 +64,39 @@ export default defineConfig(({ mode, command }) => {
proxy: {
// https://cn.vitejs.dev/config/#server-proxy
'/dev-api/ztx-train': {
// target: 'http://192.168.1.128:8081',
target: 'http://192.168.1.115:8081',
// target: 'https://wdsfwuxicenter.com/stage-api',
target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
},
'/dev-api/ztx-match': {
// target: 'http://192.168.1.128:8081',
target: 'https://jijin.wtwuxicenter.com/stage-api',
target: 'http://192.168.1.115:8081',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api/',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
},
'/dev-api/ztx-webSite': {
// target: 'http://192.168.1.128:8081',
target: 'http://192.168.1.115:8081',
// target: 'https://wdsfwuxicenter.com/stage-api',
target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
},
'/dev-api': {
// target: 'http://192.168.1.128:8081',
target: 'http://192.168.1.115:8081',
// target: 'http://192.168.1.169:8081',
target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'https://wdsfwuxicenter.com/stage-api/',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api/, '')
},
'/ticket': {
target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'http://192.168.1.128:8081',
// target: 'https://jijin.wtwuxicenter.com/stage-api',
target: 'http://192.168.1.115:8081',
// target: 'https://wdsfwuxicenter.com/h5/',
// target: 'https://ticketh5.wdsfwuxicenter.com/h5/',
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!