lingling
/
welfare-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

This commit is contained in:
Yjhon 2022-02-24 18:07:05 +08:00
parent 802e9e18e2 5ec19f31e4
commit cca5552a30
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/mycourse/mycourseList/CentralizedTraining.vue
View File

@ -26,7 +26,7 @@
<a-popconfirm <a-popconfirm
v-if="record.status === 1" v-if="record.status === 1"
slot="actions" slot="actions"
:title="`确定要报名参加${record.name}吗?`" :title="`确定要报名参加${record.trainName}吗?`"
ok-text="添加" ok-text="添加"
cancel-text="取消" cancel-text="取消"
@confirm="handlerJoin(record)" @confirm="handlerJoin(record)"

4
src/views/myhome/index.vue
View File

@ -106,7 +106,7 @@
<a-popconfirm <a-popconfirm
v-if="item.status === 1" v-if="item.status === 1"
slot="actions" slot="actions"
:title="`确定要报名参加${item.name}吗?`" :title="`确定要报名参加${item.trainName}吗?`"
ok-text="添加" ok-text="添加"
cancel-text="取消" cancel-text="取消"
@confirm="handlerJoin(item)" @confirm="handlerJoin(item)"
@ -223,7 +223,7 @@ export default {
}, },
// 集中培训 // 集中培训
getJzpxList () { getJzpxList () {
reqCourseCenterList({ pageSize: 2, pageNum: 1 }).then(res => { reqCourseCenterList({ pageSize: 5, pageNum: 1 }).then(res => {
this.jzpxList = res.rows this.jzpxList = res.rows
}) })
}, },