Skip to content

杨炀 / dance-pc

Go to a project
Toggle navigation
Toggle navigation pinning
bbfbaae8 by 杨炀
Options

Merge branch 'prod' into order 

# Conflicts:
#	vite.config.js
2 parents 1615689e daf0e98f
Inline Side-by-side
Showing 7 changed files with 28 additions and 10 deletions
src/viewsPc/center/myMember.vue
...@@ -193,6 +193,8 @@ function delperson(p) { ...@@ -193,6 +193,8 @@ function delperson(p) {
193 cancelButtonText: c, 193 cancelButtonText: c,
194 type: 'warning' 194 type: 'warning'
195 }).then(() => { 195 }).then(() => {
196
197 // This user has registered for the event and cannot be deleted.
196 match.delPerson(p.id).then(res => { 198 match.delPerson(p.id).then(res => {
197 ElMessage.success(msg) 199 ElMessage.success(msg)
198 getList(groupId.value) 200 getList(groupId.value)
......
src/viewsPc/guide/index.vue
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
96 96
97 <div class="content" v-if="activeName==8"> 97 <div class="content" v-if="activeName==8">
98 <label>点击下载：</label> 98 <label>点击下载：</label>
99 <!-- <a target="_blank" class="text-primary" href="/file/COMPETITION_GUIDE_0511V1.pdf">--> 99 <a target="_blank" class="text-primary" href="/file/COMPETITION%20GUIDE%200520V1.pdf">
100 <a @click="showBuilding" class="text-primary"> 100 <!-- <a @click="showBuilding" class="text-primary">-->
101 <el-icon style="position: relative;top: 2px"><download/></el-icon> 101 <el-icon style="position: relative;top: 2px"><download/></el-icon>
102 2024 WDSF亚洲体育舞蹈节参赛指南 102 2024 WDSF亚洲体育舞蹈节参赛指南
103 </a> 103 </a>
...@@ -200,8 +200,8 @@ ...@@ -200,8 +200,8 @@
200 <div class="content" v-if="activeName==71"><el-empty description="no data"></el-empty></div> 200 <div class="content" v-if="activeName==71"><el-empty description="no data"></el-empty></div>
201 <div class="content" v-if="activeName==8"> 201 <div class="content" v-if="activeName==8">
202 <label>Download：</label> 202 <label>Download：</label>
203 <!-- <a target="_blank" class="text-primary" href="/file/COMPETITION_GUIDE_0511V1.pdf">--> 203 <a target="_blank" class="text-primary" href="/file/COMPETITION%20GUIDE%200520V1.pdf">
204 <a @click="showBuilding" class="text-primary"> 204 <!-- <a @click="showBuilding" class="text-primary">-->
205 <el-icon style="position: relative;top: 2px"><download/></el-icon> 205 <el-icon style="position: relative;top: 2px"><download/></el-icon>
206 2024 WDSF ASIAN DANCESPORT FESTIVAL COMPETITION GUIDE 206 2024 WDSF ASIAN DANCESPORT FESTIVAL COMPETITION GUIDE
207 </a> 207 </a>
......
src/viewsPc/match/chooseProject.vue
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
39 <el-button type="primary" plain @click="switchPerson">{{language==0?'切换':'Switch'}}</el-button> 39 <el-button type="primary" plain @click="switchPerson">{{language==0?'切换':'Switch'}}</el-button>
40 </div> 40 </div>
41 <div class="tip"> 41 <div class="tip">
42 <span v-if="language==0">*如果您参加个人项目，或给其它组合/选手进行报名，请点击切换按钮重新选择人员</span> 42 <span v-if="language==0">*如果您参加个人项目，或给其他组合/选手进行报名，请点击切换按钮重新选择人员</span>
43 <span v-else>*If you are participating in an individual event, or if you are signing up for another group/competitor, please click the Switch button to re-select the team.</span> 43 <span v-else>*If you would like to register individual competitions for yourself or other couples/athletes, please click "Switch" button to re-select persons concerned.</span>
44 </div> 44 </div>
45 </div> 45 </div>
46 </div> 46 </div>
......
src/viewsPc/match/components/matchInfo-projectList.vue
...@@ -43,7 +43,11 @@ ...@@ -43,7 +43,11 @@
43 </div> 43 </div>
44 <div v-else> 44 <div v-else>
45 <div>{{ scope.row.birthPeriod.replace(',',language==0?' 至 ':' to ') }}</div> 45 <div>{{ scope.row.birthPeriod.replace(',',language==0?' 至 ':' to ') }}</div>
46 <div>{{scope.row.birthPeriodSecond?.replace(',',language==0?' 至 ':' to ')}}</div> 46 <div v-if="scope.row.birthPeriodSecond">{{scope.row.birthPeriodSecond?.replace(',',language==0?' 至 ':' to ')}}</div>
47 <div v-if="scope.row.birthPeriodThird">{{scope.row.birthPeriodThird?.replace(',',language==0?' 至 ':' to ')}}</div>
48 <div v-if="scope.row.birthPeriodFourth">{{scope.row.birthPeriodFourth?.replace(',',language==0?' 至 ':' to ')}}</div>
49 <div v-if="scope.row.birthPeriodFifth">{{scope.row.birthPeriodFifth?.replace(',',language==0?' 至 ':' to ')}}</div>
50 <div v-if="scope.row.birthPeriodSixth">{{scope.row.birthPeriodSixth?.replace(',',language==0?' 至 ':' to ')}}</div>
47 </div> 51 </div>
48 </template> 52 </template>
49 </el-table-column> 53 </el-table-column>
......
src/viewsPc/match/pay.vue
...@@ -116,8 +116,10 @@ ...@@ -116,8 +116,10 @@
116 </el-col> 116 </el-col>
117 <el-col :lg="12" v-if="Number(form.totalFee)>0"> 117 <el-col :lg="12" v-if="Number(form.totalFee)>0">
118 <div class="priceb" v-if="form.payStatus=='0'">{{ language==0?'待支付金额':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div> 118 <div class="priceb" v-if="form.payStatus=='0'">{{ language==0?'待支付金额':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
119 <div class="priceb" v-if="form.payStatus=='1'">{{ language==0?'已支付金额':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div> 119 <div class="priceb" v-else-if="form.payStatus=='1'">{{ language==0?'线下支付待核销':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
120 <div class="priceb" v-if="form.payStatus=='5'">{{ language==0?'已退款':'Refunded' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div> 120 <div class="priceb" v-else-if="form.payStatus=='3'">{{ language==0?'已支付金额':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
121 <div class="priceb" v-else-if="form.payStatus=='5'">{{ language==0?'已退款':'Refunded' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
122 <div class="priceb" v-else>{{ language==0?'费用总计':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
121 </el-col> 123 </el-col>
122 </el-row> 124 </el-row>
123 </el-card> 125 </el-card>
......
vite.config.js
...@@ -65,19 +65,29 @@ export default defineConfig(({ mode, command }) => { ...@@ -65,19 +65,29 @@ export default defineConfig(({ mode, command }) => {
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://123.60.96.243:1896/stage-api', 67 // target: 'http://123.60.96.243:1896/stage-api',
68 target: 'http://192.168.1.25:8686', 68 target: 'https://jijin.wtwuxicenter.com/stage-api',
69 changeOrigin: true, 69 changeOrigin: true,
70 rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '') 70 rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
71 }, 71 },
72 '/dev-api/ztx-match': { 72 '/dev-api/ztx-match': {
73 <<<<<<< HEAD
73 // target: 'http://192.168.1.118:8083', 74 // target: 'http://192.168.1.118:8083',
74 target: 'https://jijin.wtwuxicenter.com/stage-api', 75 target: 'https://jijin.wtwuxicenter.com/stage-api',
76 =======
77 target: 'https://jijin.wtwuxicenter.com/stage-api',
78 // target: 'http://192.168.1.132:8081',
79 >>>>>>> prod
75 changeOrigin: true, 80 changeOrigin: true,
76 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '') 81 rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
77 }, 82 },
78 '/dev-api/ztx-webSite': { 83 '/dev-api/ztx-webSite': {
84 <<<<<<< HEAD
79 target: 'https://jijin.wtwuxicenter.com/stage-api', 85 target: 'https://jijin.wtwuxicenter.com/stage-api',
80 // target: 'http://192.168.1.118:8081/', 86 // target: 'http://192.168.1.118:8081/',
87 =======
88 // target: 'https://dance.itechtop.cn/stage-api',
89 target: 'https://jijin.wtwuxicenter.com/stage-api',
90 >>>>>>> prod
81 changeOrigin: true, 91 changeOrigin: true,
82 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '') 92 rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
83 }, 93 },
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!