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) {
cancelButtonText: c,
type: 'warning'
}).then(() => {
// This user has registered for the event and cannot be deleted.
match.delPerson(p.id).then(res => {
ElMessage.success(msg)
getList(groupId.value)
......
src/viewsPc/guide/index.vue
......@@ -96,8 +96,8 @@
<div class="content" v-if="activeName==8">
<label>点击下载：</label>
<!-- <a target="_blank" class="text-primary" href="/file/COMPETITION_GUIDE_0511V1.pdf">-->
<a @click="showBuilding" class="text-primary">
<a target="_blank" class="text-primary" href="/file/COMPETITION%20GUIDE%200520V1.pdf">
<!-- <a @click="showBuilding" class="text-primary">-->
<el-icon style="position: relative;top: 2px"><download/></el-icon>
2024 WDSF亚洲体育舞蹈节参赛指南
</a>
......@@ -200,8 +200,8 @@
<div class="content" v-if="activeName==71"><el-empty description="no data"></el-empty></div>
<div class="content" v-if="activeName==8">
<label>Download：</label>
<!-- <a target="_blank" class="text-primary" href="/file/COMPETITION_GUIDE_0511V1.pdf">-->
<a @click="showBuilding" class="text-primary">
<a target="_blank" class="text-primary" href="/file/COMPETITION%20GUIDE%200520V1.pdf">
<!-- <a @click="showBuilding" class="text-primary">-->
<el-icon style="position: relative;top: 2px"><download/></el-icon>
2024 WDSF ASIAN DANCESPORT FESTIVAL COMPETITION GUIDE
</a>
......
src/viewsPc/match/chooseProject.vue
......@@ -39,8 +39,8 @@
<el-button type="primary" plain @click="switchPerson">{{language==0?'切换':'Switch'}}</el-button>
</div>
<div class="tip">
<span v-if="language==0">*如果您参加个人项目，或给其它组合/选手进行报名，请点击切换按钮重新选择人员</span>
<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>
<span v-if="language==0">*如果您参加个人项目，或给其他组合/选手进行报名，请点击切换按钮重新选择人员</span>
<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>
</div>
</div>
</div>
......
src/viewsPc/match/components/matchInfo-projectList.vue
......@@ -43,7 +43,11 @@
</div>
<div v-else>
<div>{{ scope.row.birthPeriod.replace(',',language==0?' 至 ':' to ') }}</div>
<div>{{scope.row.birthPeriodSecond?.replace(',',language==0?' 至 ':' to ')}}</div>
<div v-if="scope.row.birthPeriodSecond">{{scope.row.birthPeriodSecond?.replace(',',language==0?' 至 ':' to ')}}</div>
<div v-if="scope.row.birthPeriodThird">{{scope.row.birthPeriodThird?.replace(',',language==0?' 至 ':' to ')}}</div>
<div v-if="scope.row.birthPeriodFourth">{{scope.row.birthPeriodFourth?.replace(',',language==0?' 至 ':' to ')}}</div>
<div v-if="scope.row.birthPeriodFifth">{{scope.row.birthPeriodFifth?.replace(',',language==0?' 至 ':' to ')}}</div>
<div v-if="scope.row.birthPeriodSixth">{{scope.row.birthPeriodSixth?.replace(',',language==0?' 至 ':' to ')}}</div>
</div>
</template>
</el-table-column>
......
src/viewsPc/match/pay.vue
......@@ -116,8 +116,10 @@
</el-col>
<el-col :lg="12" v-if="Number(form.totalFee)>0">
<div class="priceb" v-if="form.payStatus=='0'">{{ language==0?'待支付金额':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
<div class="priceb" v-if="form.payStatus=='1'">{{ language==0?'已支付金额':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
<div class="priceb" v-if="form.payStatus=='5'">{{ language==0?'已退款':'Refunded' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
<div class="priceb" v-else-if="form.payStatus=='1'">{{ language==0?'线下支付待核销':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
<div class="priceb" v-else-if="form.payStatus=='3'">{{ language==0?'已支付金额':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
<div class="priceb" v-else-if="form.payStatus=='5'">{{ language==0?'已退款':'Refunded' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
<div class="priceb" v-else>{{ language==0?'费用总计':'Amount Due' }}：<span class="price">{{ language==0?'¥':'€' }}{{ Number(totalFee).toFixed(2) }}</span></div>
</el-col>
</el-row>
</el-card>
......
vite.config.js
......@@ -65,19 +65,29 @@ export default defineConfig(({ mode, command }) => {
// https://cn.vitejs.dev/config/#server-proxy
'/dev-api/ztx-train': {
// target: 'http://123.60.96.243:1896/stage-api',
target: 'http://192.168.1.25:8686',
target: 'https://jijin.wtwuxicenter.com/stage-api',
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-train/, '')
},
'/dev-api/ztx-match': {
<<<<<<< HEAD
// target: 'http://192.168.1.118:8083',
target: 'https://jijin.wtwuxicenter.com/stage-api',
=======
target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'http://192.168.1.132:8081',
>>>>>>> prod
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-match/, '')
},
'/dev-api/ztx-webSite': {
<<<<<<< HEAD
target: 'https://jijin.wtwuxicenter.com/stage-api',
// target: 'http://192.168.1.118:8081/',
=======
// target: 'https://dance.itechtop.cn/stage-api',
target: 'https://jijin.wtwuxicenter.com/stage-api',
>>>>>>> prod
changeOrigin: true,
rewrite: (p) => p.replace(/^\/dev-api\/ztx-webSite/, '')
},
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!