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 @@ ...@@ -40,7 +40,7 @@
40 <!-- 化妆 --> 40 <!-- 化妆 -->
41 <el-card v-for="(item, index) in list" :key="index" class="result-card" v-if="activeName === '2'"> 41 <el-card v-for="(item, index) in list" :key="index" class="result-card" v-if="activeName === '2'">
42 <p><span class="label">{{ language === 0 ? '商家名称：' : 'Merchant：' }}</span>{{ item.name }}</p> 42 <p><span class="label">{{ language === 0 ? '商家名称：' : 'Merchant：' }}</span>{{ item.name }}</p>
43 <p><span class="label">{{ language === 0 ? '套餐名称：' : 'Package：' }}</span>{{ item.meal?.packageName || '-' }}</p> 43 <p><span class="label">{{ language === 0 ? '套餐名称：' : 'Package：' }}</span>{{ item.maelName || '-' }}</p>
44 <p><span class="label">{{ language === 0 ? '工作室联系人：' : 'Studio Contact：' }}</span>{{ item.contacts }}</p> 44 <p><span class="label">{{ language === 0 ? '工作室联系人：' : 'Studio Contact：' }}</span>{{ item.contacts }}</p>
45 <p><span class="label">{{ language === 0 ? '预定数量：' : 'Quantity：' }}</span>{{ item.num }}</p> 45 <p><span class="label">{{ language === 0 ? '预定数量：' : 'Quantity：' }}</span>{{ item.num }}</p>
46 <p><span class="label">{{ language === 0 ? '预定时间：' : 'Booking Time：' }}</span>{{ item.payDate }}</p> 46 <p><span class="label">{{ language === 0 ? '预定时间：' : 'Booking Time：' }}</span>{{ item.payDate }}</p>
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
52 </p> 52 </p>
53 <p><span class="label">{{ language === 0 ? '终点地：' : 'To：' }}</span>{{ item.resName.split('——')[1] || '-' }}</p> 53 <p><span class="label">{{ language === 0 ? '终点地：' : 'To：' }}</span>{{ item.resName.split('——')[1] || '-' }}</p>
54 <p><span class="label">{{ language === 0 ? '用车日期：' : 'Date：' }}</span>{{ item.revTime }}</p> 54 <p><span class="label">{{ language === 0 ? '用车日期：' : 'Date：' }}</span>{{ item.revTime }}</p>
55 <p><span class="label">{{ language === 0 ? '乘坐人：' : 'Passengers：' }}</span><span v-html="item.person"></span> 55 <p><span class="label">{{ language === 0 ? '乘坐人：' : 'Passengers：' }}</span><span >{{ item.person.replace(/<br\/>/g, ',').replace(/,$/, '') }}</span>
56 </p> 56 </p>
57 </el-card> 57 </el-card>
58 58
......
src/viewsPc/index.vue
...@@ -112,17 +112,19 @@ ...@@ -112,17 +112,19 @@
112 <img v-if="matchData?.logoUrl" :src="fillImgUrl(matchData.logoUrl)" class="bbbg"> 112 <img v-if="matchData?.logoUrl" :src="fillImgUrl(matchData.logoUrl)" class="bbbg">
113 <el-row style="align-items: center"> 113 <el-row style="align-items: center">
114 <el-col :lg="10" :sm="24"> 114 <el-col :lg="10" :sm="24">
115 <div class="bgbg"> 115 <div class="bgbg btn-group">
116 <h1 style="color: #fff">{{ matchData?.name }}</h1> 116 <h1 style="color: #fff">{{ matchData?.name }}</h1>
117 <a class="zn-btn" target="_blank" @click="goGuide">参赛指南 117 <div class="btn-group">
118 <a class="zn-btn ml10" target="_blank" @click="goGuide">参赛指南
118 <el-icon> 119 <el-icon>
119 <download /> 120 <download />
120 </el-icon> 121 </el-icon>
121 </a> 122 </a>
122 <a class="zn-btn ml10 btn-q" @click="reserveSearch">预订查询</a> 123 <a class="zn-btn ml10 btn-q" @click="reserveSearch">预订查询</a>
123 124
124 <a v-show="matchData?.id" class="zn-btn ml10 btn-q mt20" @click="backNumberSearch">背号查询</a> 125 <a v-show="matchData?.id" class="zn-btn ml10 btn-q " @click="backNumberSearch">背号查询</a>
125 <a v-show="matchData?.id" class="zn-btn ml10 btn-q" @click="schSearch">日程查询</a> 126 <a v-show="matchData?.id" class="zn-btn ml10 btn-q" @click="schSearch">日程查询</a>
127 </div>
126 </div> 128 </div>
127 </el-col> 129 </el-col>
128 <el-col :lg="14" :sm="24"> 130 <el-col :lg="14" :sm="24">
......
src/viewsPc/match/components/matchInfo-projectList.vue
...@@ -29,8 +29,8 @@ ...@@ -29,8 +29,8 @@
29 <template #default="scope"> 29 <template #default="scope">
30 30
31 <div v-if="isNational"> 31 <div v-if="isNational">
32 <span v-if="scope.row.ageGroup == '0'" >{{ language==0?'不限制':'Unlimited' }}</span> 32 <span>{{ scope.row.ageGroupStr }}</span>
33 <span v-if="scope.row.ageGroup == '1'" >Juvenile I</span> 33 <!-- <span v-if="scope.row.ageGroup == '1'" >Juvenile I</span>
34 <span v-if="scope.row.ageGroup == '2'" >Juvenile II</span> 34 <span v-if="scope.row.ageGroup == '2'" >Juvenile II</span>
35 <span v-if="scope.row.ageGroup == '3'" >Juv1& II (comb.)</span> 35 <span v-if="scope.row.ageGroup == '3'" >Juv1& II (comb.)</span>
36 <span v-if="scope.row.ageGroup == '4'" >Junior I</span> 36 <span v-if="scope.row.ageGroup == '4'" >Junior I</span>
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
46 <span v-if="scope.row.ageGroup == '11'" >Senior II</span> 46 <span v-if="scope.row.ageGroup == '11'" >Senior II</span>
47 <span v-if="scope.row.ageGroup == '12'" >Senior III</span> 47 <span v-if="scope.row.ageGroup == '12'" >Senior III</span>
48 <span v-if="scope.row.ageGroup == '13'" >Senior IV</span> 48 <span v-if="scope.row.ageGroup == '13'" >Senior IV</span>
49 <span v-if="scope.row.ageGroup == '14'" >Senior V</span> 49 <span v-if="scope.row.ageGroup == '14'" >Senior V</span> -->
50 </div> 50 </div>
51 <div v-else> 51 <div v-else>
52 <div>{{ scope.row.birthPeriod.replace(',',language==0?' 至 ':' to ') }}</div> 52 <div>{{ scope.row.birthPeriod.replace(',',language==0?' 至 ':' to ') }}</div>
......
src/viewsPc/match/components/zu-table.vue
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 <el-table-column :label="language==0?'参赛服务费':'REGISTRATION FEE'" align="center" width="150px" prop=""> 33 <el-table-column :label="language==0?'参赛服务费':'REGISTRATION FEE'" align="center" width="150px" prop="">
34 <template #default="scope"> 34 <template #default="scope">
35 <div class="text-primary"> 35 <div class="text-primary">
36 {{ language==0?'¥':'€' }}{{ scope.row.project.serviceFee }} 36 {{ language==0?'¥':'€' }}{{ scope.row.project.chargeType == '0'?scope.row.project.serviceFee : scope.row.project.serviceFee * scope.row.athletes.length }}
37 </div> 37 </div>
38 </template> 38 </template>
39 </el-table-column> 39 </el-table-column>
......
src/viewsPc/match/pay.vue
...@@ -600,9 +600,31 @@ function getSignList() { ...@@ -600,9 +600,31 @@ function getSignList() {
600 for (var s of signInfoList.value) { 600 for (var s of signInfoList.value) {
601 insuranceFeeTotal.value = insuranceFeeTotal.value + Number(s.insuranceFee) 601 insuranceFeeTotal.value = insuranceFeeTotal.value + Number(s.insuranceFee)
602 } 602 }
603 for (var z of zuTableList.value) { 603 // for (var z of zuTableList.value) {
604 serviceFeeTotal.value = serviceFeeTotal.value + Number(z.project.serviceFee) 604 // serviceFeeTotal.value = serviceFeeTotal.value + Number(z.project.serviceFee)
605 // }
606 for (const z of zuTableList.value) {
607 if (!z.project) {
608 continue;
609 }
610
611 const serviceFee = Number(z.project.serviceFee) || 0;
612
613 const chargeType = String(z.project.chargeType).trim();
614
615 let currentItemFee = 0;
616 if (chargeType === '0') {
617 currentItemFee = serviceFee;
618 } else if (chargeType === '1') {
619 const athletesLength = z.athletes?.length || 0;
620 currentItemFee = serviceFee * athletesLength;
621 } else {
622 currentItemFee = 0;
623 }
624
625 serviceFeeTotal.value += currentItemFee;
605 } 626 }
627 serviceFeeTotal.value = serviceFeeTotal.value.toFixed(2);
606 }).catch(err => { 628 }).catch(err => {
607 console.log(err) 629 console.log(err)
608 if (isLogin.value) { 630 if (isLogin.value) {
......
src/viewsPc/match/signPreview.vue
...@@ -222,9 +222,34 @@ function getSignList() { ...@@ -222,9 +222,34 @@ function getSignList() {
222 for (var s of signInfoList.value) { 222 for (var s of signInfoList.value) {
223 signTotal.value = (Number(signTotal.value) + Number(s.insuranceFee)).toFixed(2) 223 signTotal.value = (Number(signTotal.value) + Number(s.insuranceFee)).toFixed(2)
224 } 224 }
225 for (var z of zuTableList.value) { 225
226 zuTotal.value = (Number(zuTotal.value) + Number(z.project.serviceFee)).toFixed(2) 226 // for (var z of zuTableList.value) {
227 // zuTotal.value = (Number(zuTotal.value) + Number(z.project.serviceFee)).toFixed(2)
228 // }
229
230
231 for (const z of zuTableList.value) {
232 if (!z.project) {
233 continue;
234 }
235
236 const serviceFee = Number(z.project.serviceFee) || 0;
237
238 const chargeType = String(z.project.chargeType).trim();
239
240 let currentItemFee = 0;
241 if (chargeType === '0') {
242 currentItemFee = serviceFee;
243 } else if (chargeType === '1') {
244 const athletesLength = z.athletes?.length || 0;
245 currentItemFee = serviceFee * athletesLength;
246 } else {
247 currentItemFee = 0;
248 }
249
250 zuTotal.value += currentItemFee;
227 } 251 }
252 zuTotal.value = zuTotal.value.toFixed(2);
228 }) 253 })
229 } 254 }
230 255
...@@ -313,7 +338,7 @@ function exportSignList(n) { ...@@ -313,7 +338,7 @@ function exportSignList(n) {
313 if (n == 1) { 338 if (n == 1) {
314 fileName = '参赛人员清单' 339 fileName = '参赛人员清单'
315 } else { 340 } else {
316 fileName = '设项报名清单' 341 fileName = '设项报名清单2'
317 } 342 }
318 proxy.download('/league/sign/exportCn', { 343 proxy.download('/league/sign/exportCn', {
319 ...obj 344 ...obj
...@@ -338,7 +363,7 @@ function exportPdf() { ...@@ -338,7 +363,7 @@ function exportPdf() {
338 } 363 }
339 var fileName 364 var fileName
340 if (language.value == 0) { 365 if (language.value == 0) {
341 fileName = '设项报名清单' 366 fileName = '设项报名清单4'
342 proxy.download('/pdf/exportMySignInfoList', { 367 proxy.download('/pdf/exportMySignInfoList', {
343 ...obj 368 ...obj
344 }, `${fileName}_${new Date().getTime()}.pdf`, {}, 'application/pdf', {}, 'application/pdf') 369 }, `${fileName}_${new Date().getTime()}.pdf`, {}, 'application/pdf', {}, 'application/pdf')
......
vite.config.js
...@@ -64,39 +64,39 @@ export default defineConfig(({ mode, command }) => { ...@@ -64,39 +64,39 @@ 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.128:8081', 67 target: 'http://192.168.1.115:8081',
68 // target: 'https://wdsfwuxicenter.com/stage-api', 68 // target: 'https://wdsfwuxicenter.com/stage-api',
69 target: 'https://jijin.wtwuxicenter.com/stage-api', 69 // target: 'https://jijin.wtwuxicenter.com/stage-api',
70 changeOrigin: true, 70 changeOrigin: true,
71 rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '') 71 rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
72 }, 72 },
73 '/dev-api/ztx-match': { 73 '/dev-api/ztx-match': {
74 // target: 'http://192.168.1.128:8081', 74 target: 'http://192.168.1.115:8081',
75 target: 'https://jijin.wtwuxicenter.com/stage-api', 75 // target: 'https://jijin.wtwuxicenter.com/stage-api',
76 // target: 'https://wdsfwuxicenter.com/stage-api', 76 // target: 'https://wdsfwuxicenter.com/stage-api',
77 // target: 'https://wdsfwuxicenter.com/stage-api/', 77 // target: 'https://wdsfwuxicenter.com/stage-api/',
78 changeOrigin: true, 78 changeOrigin: true,
79 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '') 79 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
80 }, 80 },
81 '/dev-api/ztx-webSite': { 81 '/dev-api/ztx-webSite': {
82 // target: 'http://192.168.1.128:8081', 82 target: 'http://192.168.1.115:8081',
83 // target: 'https://wdsfwuxicenter.com/stage-api', 83 // target: 'https://wdsfwuxicenter.com/stage-api',
84 target: 'https://jijin.wtwuxicenter.com/stage-api', 84 // target: 'https://jijin.wtwuxicenter.com/stage-api',
85 changeOrigin: true, 85 changeOrigin: true,
86 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 86 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
87 }, 87 },
88 '/dev-api': { 88 '/dev-api': {
89 // target: 'http://192.168.1.128:8081', 89 target: 'http://192.168.1.115:8081',
90 // target: 'http://192.168.1.169:8081', 90 // target: 'http://192.168.1.169:8081',
91 target: 'https://jijin.wtwuxicenter.com/stage-api', 91 // target: 'https://jijin.wtwuxicenter.com/stage-api',
92 // target: 'https://wdsfwuxicenter.com/stage-api/', 92 // target: 'https://wdsfwuxicenter.com/stage-api/',
93 // target: 'https://jijin.wtwuxicenter.com/stage-api', 93 // target: 'https://jijin.wtwuxicenter.com/stage-api',
94 changeOrigin: true, 94 changeOrigin: true,
95 rewrite: (p) => p.replace(/^\/dev-api/, '') 95 rewrite: (p) => p.replace(/^\/dev-api/, '')
96 }, 96 },
97 '/ticket': { 97 '/ticket': {
98 target: 'https://jijin.wtwuxicenter.com/stage-api', 98 // target: 'https://jijin.wtwuxicenter.com/stage-api',
99 // target: 'http://192.168.1.128:8081', 99 target: 'http://192.168.1.115:8081',
100 // target: 'https://wdsfwuxicenter.com/h5/', 100 // target: 'https://wdsfwuxicenter.com/h5/',
101 // target: 'https://ticketh5.wdsfwuxicenter.com/h5/', 101 // target: 'https://ticketh5.wdsfwuxicenter.com/h5/',
102 changeOrigin: true, 102 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!