690bff48 by 杨炀

no message

1 parent df7cedb8
...@@ -82,7 +82,7 @@ const menus = ref([ ...@@ -82,7 +82,7 @@ const menus = ref([
82 isActive: false 82 isActive: false
83 }, 83 },
84 { 84 {
85 name: language.value==0?'我的报名':'My Eegistration', 85 name: language.value==0?'我的报名':'My Registration',
86 routeName: 'myMatch', 86 routeName: 'myMatch',
87 picUrl1: '/img/nav_28.png', 87 picUrl1: '/img/nav_28.png',
88 picUrl2: '/img/nav_28_dwn.png', 88 picUrl2: '/img/nav_28_dwn.png',
......
...@@ -21,8 +21,8 @@ ...@@ -21,8 +21,8 @@
21 <div @click="editPerson" style="width: 50%;text-align: center;"> 21 <div @click="editPerson" style="width: 50%;text-align: center;">
22 <el-avatar fit="cover" v-if="form.picUrl" :size="60" :src="fillImgUrl(form.picUrl)"/> 22 <el-avatar fit="cover" v-if="form.picUrl" :size="60" :src="fillImgUrl(form.picUrl)"/>
23 <div v-else> 23 <div v-else>
24 <el-avatar fit="cover" v-if="form.sex == 0" :size="60" src="@/assets/img/head1.png"/> 24 <el-avatar fit="cover" v-if="form.sex == 0" :size="60" src="/img/head1.png"/>
25 <el-avatar fit="cover" v-if="form.sex == 1" :size="60" src="@/assets/img/head0.png"/> 25 <el-avatar fit="cover" v-if="form.sex == 1" :size="60" src="/img/head0.png"/>
26 </div> 26 </div>
27 <div class="text-center mt10"> 27 <div class="text-center mt10">
28 <span>{{ form.realName }}</span> 28 <span>{{ form.realName }}</span>
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
37 <el-checkbox :label="form.danceMate.id"> 37 <el-checkbox :label="form.danceMate.id">
38 <div> 38 <div>
39 <el-avatar fit="cover" v-if="form.danceMate.sex == 0" :size="60" 39 <el-avatar fit="cover" v-if="form.danceMate.sex == 0" :size="60"
40 src="@/assets/img/head1.png"/> 40 src="/img/head1.png"/>
41 <el-avatar fit="cover" v-if="form.danceMate.sex == 1" :size="60" 41 <el-avatar fit="cover" v-if="form.danceMate.sex == 1" :size="60"
42 src="@/assets/img/head0.png"/> 42 src="/img/head0.png"/>
43 <div class="text-center mt10" @click="editMate(form.danceMate)"> 43 <div class="text-center mt10" @click="editMate(form.danceMate)">
44 <span>{{ form.danceMate.realName }}</span> 44 <span>{{ form.danceMate.realName }}</span>
45 <el-icon @click.stop="editMate(form.danceMate)"> 45 <el-icon @click.stop="editMate(form.danceMate)">
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 {{ c.code }}:{{ c.name }} 84 {{ c.code }}:{{ c.name }}
85 <div>{{ c.danceTypeDetailStr }}</div> 85 <div>{{ c.danceTypeDetailStr }}</div>
86 </div> 86 </div>
87 <div class="text-primary">{{ language == 0 ? '¥' : '' }}{{ c.serviceFee }}</div> 87 <div class="text-primary">{{ language == 0 ? '¥' : '' }}{{ c.serviceFee }}</div>
88 </div> 88 </div>
89 </el-checkbox> 89 </el-checkbox>
90 </el-checkbox-group> 90 </el-checkbox-group>
......
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
78 {{ c.code }}:{{ c.name }} 78 {{ c.code }}:{{ c.name }}
79 <div>{{ c.danceTypeDetailStr }}</div> 79 <div>{{ c.danceTypeDetailStr }}</div>
80 </div> 80 </div>
81 <div class="text-primary">{{ language==0?'¥':'' }}{{ c.serviceFee }}</div> 81 <div class="text-primary">{{ language==0?'¥':'' }}{{ c.serviceFee }}</div>
82 </div> 82 </div>
83 </el-checkbox> 83 </el-checkbox>
84 </el-checkbox-group> 84 </el-checkbox-group>
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
80 </el-dialog> 80 </el-dialog>
81 81
82 <addCoach ref="dialogAddCoach" @submitForm="getList"/> 82 <addCoach ref="dialogAddCoach" @submitForm="getList"/>
83 <Import ref="dialogImportProps" @uploadSuccess='getList'/> 83 <Import ref="dialogImportProps" @uploadSuccess="getList"/>
84 </template> 84 </template>
85 85
86 <script setup> 86 <script setup>
......
...@@ -25,7 +25,7 @@ import { ElMessage, ElMessageBox } from 'element-plus' ...@@ -25,7 +25,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
25 25
26 const { proxy } = getCurrentInstance() 26 const { proxy } = getCurrentInstance()
27 import useUserStore from '@/store/modules/user' 27 import useUserStore from '@/store/modules/user'
28 const emit = defineEmits(['submitForm']) 28 const emit = defineEmits(['uploadSuccess'])
29 import cache from "@/plugins/cache" 29 import cache from "@/plugins/cache"
30 const language = ref(cache.local.get('language') || 0) 30 const language = ref(cache.local.get('language') || 0)
31 const action = ref('') 31 const action = ref('')
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
55 <td>{{ p.danceTypeDetailStr }}</td> 55 <td>{{ p.danceTypeDetailStr }}</td>
56 <td>{{ p.playTypeStr }}</td> 56 <td>{{ p.playTypeStr }}</td>
57 <td>{{ p.birthPeriod }}</td> 57 <td>{{ p.birthPeriod }}</td>
58 <td>{{ language==0?'¥':'' }}{{ p.serviceFee }}</td> 58 <td>{{ language==0?'¥':'' }}{{ p.serviceFee }}</td>
59 </tr> 59 </tr>
60 </table> 60 </table>
61 </div> 61 </div>
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
122 <td>{{ p.danceTypeDetailStr }}</td> 122 <td>{{ p.danceTypeDetailStr }}</td>
123 <td>{{ p.playTypeStr }}</td> 123 <td>{{ p.playTypeStr }}</td>
124 <td>{{ p.birthPeriod }}</td> 124 <td>{{ p.birthPeriod }}</td>
125 <td>{{ language==0?'¥':'' }}{{ p.serviceFee }}</td> 125 <td>{{ language==0?'¥':'' }}{{ p.serviceFee }}</td>
126 </tr> 126 </tr>
127 </table> 127 </table>
128 </div> 128 </div>
......
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
51 </el-table-column> 51 </el-table-column>
52 <el-table-column :fixed="hasAction?false:'right'" min-width="100" :label="language==0?'保险费':'Premium'" prop="insuranceFee"> 52 <el-table-column :fixed="hasAction?false:'right'" min-width="100" :label="language==0?'保险费':'Premium'" prop="insuranceFee">
53 <template #default="scope"> 53 <template #default="scope">
54 <span class="text-primary">{{ language==0?'¥':'' }}{{ scope.row.insuranceFee }}</span> 54 <span class="text-primary">{{ language==0?'¥':'' }}{{ scope.row.insuranceFee }}</span>
55 </template> 55 </template>
56 </el-table-column> 56 </el-table-column>
57 <!-- 补充信息--> 57 <!-- 补充信息-->
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
79 <div> 79 <div>
80 {{ language==0?'总人数':'Count' }}: <span class="mr20">{{ list.length }}</span> 80 {{ language==0?'总人数':'Count' }}: <span class="mr20">{{ list.length }}</span>
81 81
82 {{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'' }}{{ total }}</span> 82 {{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'' }}{{ total }}</span>
83 </div> 83 </div>
84 </div> 84 </div>
85 85
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
16 <el-table-column :label="language==0?'报名费':'Registration Fee'" width="120px" prop=""> 16 <el-table-column :label="language==0?'报名费':'Registration Fee'" width="120px" prop="">
17 <template #default="scope"> 17 <template #default="scope">
18 <div class="text-primary"> 18 <div class="text-primary">
19 {{ language==0?'¥':'' }}{{ scope.row.project.serviceFee }} 19 {{ language==0?'¥':'' }}{{ scope.row.project.serviceFee }}
20 </div> 20 </div>
21 </template> 21 </template>
22 </el-table-column> 22 </el-table-column>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
33 <div> 33 <div>
34 {{ language==0?'总报项数':'Count' }}: <span class="mr20">{{ list.length }}</span> 34 {{ language==0?'总报项数':'Count' }}: <span class="mr20">{{ list.length }}</span>
35 35
36 {{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'' }}{{ total }}</span> 36 {{ language==0?'金额小计':'Amount' }}: <span>{{ language==0?'¥':'' }}{{ total }}</span>
37 </div> 37 </div>
38 </div> 38 </div>
39 </template> 39 </template>
......
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
81 <td>{{ p.danceTypeDetailStr }}</td> 81 <td>{{ p.danceTypeDetailStr }}</td>
82 <td>{{ p.playTypeStr }}</td> 82 <td>{{ p.playTypeStr }}</td>
83 <td>{{ p.birthPeriod }}</td> 83 <td>{{ p.birthPeriod }}</td>
84 <td>{{ language==0?'¥':'' }}{{ p.serviceFee }}</td> 84 <td>{{ language==0?'¥':'' }}{{ p.serviceFee }}</td>
85 </tr> 85 </tr>
86 </table> 86 </table>
87 </div> 87 </div>
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
84 <td>{{ p.danceTypeDetailStr }}</td> 84 <td>{{ p.danceTypeDetailStr }}</td>
85 <td>{{ p.playTypeStr }}</td> 85 <td>{{ p.playTypeStr }}</td>
86 <td>{{ p.birthPeriod }}</td> 86 <td>{{ p.birthPeriod }}</td>
87 <td>{{ language==0?'¥':'' }}{{ p.serviceFee }}</td> 87 <td>{{ language==0?'¥':'' }}{{ p.serviceFee }}</td>
88 </tr> 88 </tr>
89 </table> 89 </table>
90 </div> 90 </div>
......
...@@ -51,9 +51,9 @@ ...@@ -51,9 +51,9 @@
51 <el-row class="priceBar"> 51 <el-row class="priceBar">
52 <el-col :lg="24" :xs="24"> 52 <el-col :lg="24" :xs="24">
53 <div class="flex"> 53 <div class="flex">
54 <div class="item" v-if="signInfoList?.length>0"><label>{{ language==0?'报名费':'Registration Fee' }}:</label><span>{{ language==0?'¥':'' }}{{serviceFeeTotal}}</span></div> 54 <div class="item" v-if="signInfoList?.length>0"><label>{{ language==0?'报名费':'Registration Fee' }}:</label><span>{{ language==0?'¥':'' }}{{serviceFeeTotal}}</span></div>
55 <div class="item" v-if="zuTableList?.length>0"><label>{{ language==0?'保险费':'Insurance Fee' }}:</label><span>{{ language==0?'¥':'' }}{{insuranceFeeTotal}}</span></div> 55 <div class="item" v-if="zuTableList?.length>0"><label>{{ language==0?'保险费':'Insurance Fee' }}:</label><span>{{ language==0?'¥':'' }}{{insuranceFeeTotal}}</span></div>
56 <div class="item"><label>{{ language==0?'费用总计':'Total Cost' }}:</label><span class="size26">{{ language==0?'¥':'' }}{{form.totalFee}}</span></div> 56 <div class="item"><label>{{ language==0?'费用总计':'Total Cost' }}:</label><span class="size26">{{ language==0?'¥':'' }}{{form.totalFee}}</span></div>
57 </div> 57 </div>
58 </el-col> 58 </el-col>
59 </el-row> 59 </el-row>
...@@ -86,8 +86,8 @@ ...@@ -86,8 +86,8 @@
86 </div> 86 </div>
87 </el-col> 87 </el-col>
88 <el-col :lg="12"> 88 <el-col :lg="12">
89 <div class="priceb" v-if="form.payStatus=='0'">{{ language==0?'待支付金额':'Amount Due' }}:<span class="price">{{ language==0?'¥':'' }}{{ Number(totalFee).toFixed(2) }}</span></div> 89 <div class="priceb" v-if="form.payStatus=='0'">{{ language==0?'待支付金额':'Amount Due' }}:<span class="price">{{ language==0?'¥':'' }}{{ Number(totalFee).toFixed(2) }}</span></div>
90 <div class="priceb" v-if="form.payStatus=='1'">{{ language==0?'已支付金额':'Amount Due' }}:<span class="price">{{ language==0?'¥':'' }}{{ Number(totalFee).toFixed(2) }}</span></div> 90 <div class="priceb" v-if="form.payStatus=='1'">{{ language==0?'已支付金额':'Amount Due' }}:<span class="price">{{ language==0?'¥':'' }}{{ Number(totalFee).toFixed(2) }}</span></div>
91 </el-col> 91 </el-col>
92 </el-row> 92 </el-row>
93 </el-card> 93 </el-card>
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
189 <tr> 189 <tr>
190 <th>{{ language==0?'付款金额':'Payment Amount' }}</th> 190 <th>{{ language==0?'付款金额':'Payment Amount' }}</th>
191 <td> 191 <td>
192 {{ language==0?'¥':'' }}{{ totalFee }} 192 {{ language==0?'¥':'' }}{{ totalFee }}
193 <div class="text-gray">{{ language==0?'请按照指定金额进行打款':'Please make the payment according to the specified amount' }}</div> 193 <div class="text-gray">{{ language==0?'请按照指定金额进行打款':'Please make the payment according to the specified amount' }}</div>
194 </td> 194 </td>
195 </tr> 195 </tr>
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
253 <div class="text-center"> 253 <div class="text-center">
254 <el-icon color="#32B16C" size="80"><SuccessFilled /></el-icon> 254 <el-icon color="#32B16C" size="80"><SuccessFilled /></el-icon>
255 <p class="text-success">{{ language==0?'支付成功':'successful!' }}</p> 255 <p class="text-success">{{ language==0?'支付成功':'successful!' }}</p>
256 <h3 class="wePrice">{{ language==0?'¥':'' }}{{form.totalFee}}</h3> 256 <h3 class="wePrice">{{ language==0?'¥':'' }}{{form.totalFee}}</h3>
257 </div> 257 </div>
258 </el-card> 258 </el-card>
259 <el-card class="mb60" v-if="form.payStatus == '1' && form.curPayType=='2'"> 259 <el-card class="mb60" v-if="form.payStatus == '1' && form.curPayType=='2'">
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
261 <div class="text-center"> 261 <div class="text-center">
262 <el-icon color="#32B16C" size="80"><SuccessFilled /></el-icon> 262 <el-icon color="#32B16C" size="80"><SuccessFilled /></el-icon>
263 <p class="text-success">{{ language==0?'支付成功':'successful!' }}</p> 263 <p class="text-success">{{ language==0?'支付成功':'successful!' }}</p>
264 <h3 class="wePrice">{{ language==0?'¥':'' }}{{form.totalFee}}</h3> 264 <h3 class="wePrice">{{ language==0?'¥':'' }}{{form.totalFee}}</h3>
265 <span v-if="language==0" class="text-danger size12">*您可以在上传汇款单完成后,与联系人进行电话确认。具体缴费结果,可以在个人中心-我的报名中查看进度</span> 265 <span v-if="language==0" class="text-danger size12">*您可以在上传汇款单完成后,与联系人进行电话确认。具体缴费结果,可以在个人中心-我的报名中查看进度</span>
266 <span v-else class="text-danger size12">*You can confirm with the contact person by phone after uploading the remittance form. The specific payment results can be viewed in the My Registration section of the personal center to check the progress</span> 266 <span v-else class="text-danger size12">*You can confirm with the contact person by phone after uploading the remittance form. The specific payment results can be viewed in the My Registration section of the personal center to check the progress</span>
267 267
......
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
66 <el-row class="priceBar"> 66 <el-row class="priceBar">
67 <el-col :lg="16" :xs="24" class="pd20"> 67 <el-col :lg="16" :xs="24" class="pd20">
68 <div class="flex"> 68 <div class="flex">
69 <div class="item"><label>{{ language==0?'报名费':'Registration Fee' }}:</label><span>{{ language==0?'¥':'' }}{{form.cptRegistrationFee?.totalFee}}</span></div> 69 <div class="item"><label>{{ language==0?'报名费':'Registration Fee' }}:</label><span>{{ language==0?'¥':'' }}{{form.cptRegistrationFee?.totalFee}}</span></div>
70 <div class="item"><label>{{ language==0?'保险费':'Insurance Fee' }}:</label><span>{{ language==0?'¥':'' }}{{form.cptInsuranceFee?.totalFee}}</span></div> 70 <div class="item"><label>{{ language==0?'保险费':'Insurance Fee' }}:</label><span>{{ language==0?'¥':'' }}{{form.cptInsuranceFee?.totalFee}}</span></div>
71 <div class="item"><label>{{ language==0?'费用总计':'Total Cost' }}:</label><span>{{ language==0?'¥':'' }}{{form.totalFee}}</span></div> 71 <div class="item"><label>{{ language==0?'费用总计':'Total Cost' }}:</label><span>{{ language==0?'¥':'' }}{{form.totalFee}}</span></div>
72 </div> 72 </div>
73 </el-col> 73 </el-col>
74 <el-col :lg="8" :xs="24" class="text-right pd20"> 74 <el-col :lg="8" :xs="24" class="text-right pd20">
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div> 2 <div>
3 <div class="mt30 mb60"> 3 <div class="mt30 mb60">
4 <div class="box"> 4 <div class="box">
5 <personal-step :active-step="activeStep"/> 5 <personal-step v-if="matchId!=0" :active-step="activeStep"/>
6 <div class="mt20"></div> 6 <div class="mt20"></div>
7 <div> 7 <div>
8 <el-card style="min-height: 50vh"> 8 <el-card style="min-height: 50vh">
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!