Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2025-05-26 59c91b82ba76aa44da67eee508214343de431275

Merge remote-tracking branch 'origin/dev' into dev

 manager/src/api/activity.js

@@ -55,3 +55,10 @@
    data:params,
  })
}
export const activityMembersPage = (params) => {
  return service({
    url: "/activity/activityMembersPage",
    method: "GET",
    params:params,
  })
}

 manager/src/views/activity/index.vue

@@ -118,6 +118,9 @@
          </Button>
          <Button type="info" size="small" style="margin-right: 5px" @click="openEdit(row)">编辑标签</Button>
          <Button type="error" size="small" style="margin-right: 5px" @click="delById(row)">删除</Button>
          <Button type="info" size="small" style="margin-right: 5px" @click="openMembersModal(row)">
            报名人员列表
          </Button>
        </template>
      </Table>
      <Row type="flex" justify="end" class="mt_10">
@@ -251,13 +254,44 @@
        </div>
      </Modal>


      <Modal
        v-model="membersModelShow"
        :title="membersModelTitle"
        @close="membersModelClose()"
        width="1000">
        <Table
          :loading="membersLoading"
          border
          :columns="membersColumns"
          :data="membersList"
          ref="table"
        >
        </Table>
        <Row type="flex" justify="end" class="mt_10">
          <Page
            :current="memberForm.pageNumber"
            :total="memberTotal"
            :page-size="memberForm.pageSize"
            @on-change="memberChangePage"
            @on-page-size-change="memberChangePageSize"
            :page-size-opts="[10, 20, 50]"
            size="small"
            show-total
            show-elevator
            show-sizer
          ></Page>
        </Row>
      </Modal>


    </card>
  </div>
</template>
<script>
import JsonExcel from "vue-json-excel";

import {getActivityList,addActivity,editActivity,delActivityById,activityChangeStatus,activityChangeRecommend} from "@/api/activity.js"
import {getActivityList,addActivity,editActivity,delActivityById,activityChangeStatus,activityChangeRecommend,activityMembersPage} from "@/api/activity.js"
import {uploadFileByLmk,delByKey,getUrl} from "@/api/common.js"


@@ -289,6 +323,60 @@
          value: '选择文件封面'
        },
      ],
      membersLoading:false, //参加活动人员表单
      membersModelTitle:'',
      membersModelShow:false,
      membersList:[],
      membersColumns: [
        {
          type: 'selection',
          width: 60,
          align: 'center'
        },
        {
          title:'用户名',
          key: 'username',
          minWidth: 60,
          tooltip: true,
        },
        {
          title:'昵称',
          key: 'nickName',
          minWidth: 60,
          tooltip: true,
        },
        {
          title:'性别',
          key: 'sex',
          tooltip: true,
          render: (h, params) => {
            const sexText = params.row.sex === 1 ? '男' : '女';
            return h('span', sexText);
          }
        },
        {
          title:'地址',
          key: 'region',
          minWidth: 60,
          tooltip: true,
        },
        {
          title:'状态',
          key: 'disabled',
          tooltip: true,
          render: (h, params) => {
            const sexText = params.row.disabled === true ? '禁用' : '正常';
            return h('span', sexText);
          }
        },
      ],
      memberForm:{
        id:'',
        pageNumber: 1, // 当前页数
        pageSize: 10, // 页面大小
      },
      memberTotal:0,

      coverType:'',
      //查询活动列表请求参数
      searchForm:{
@@ -300,6 +388,9 @@
        pageNumber: 1, // 当前页数
        pageSize: 10, // 页面大小
      },



      //活动列表表头
      columns: [
        {
@@ -455,6 +546,26 @@
    this.init();
  },
  methods:{
    activityMembersPage(){
      this.membersLoading = true;
      activityMembersPage(this.memberForm).then(res =>{
        this.membersLoading = false;
        if (res.code === 200){
          this.membersList = res.data;
          this.memberTotal = res.total;
        }
      });
    },
    openMembersModal(row){
      this.memberForm.id = row.id
      this.membersModelTitle = "报名人员"
      this.membersModelShow = true;
      this.activityMembersPage();
    },
    membersModelClose(){
      this.membersModelShow = false;
    },

    changeRecommend(row,recommend){
      const form = {
        ...this.activityFrom
@@ -729,6 +840,16 @@
      this.searchForm.pageSize = v;
      this.getActivityList()
    },
    memberChangePage(v){
      this.memberForm.pageNumber = v
      this.activityMembersPage();
    },
    // 修改size
    memberChangePageSize(v){
      this.memberForm.pageNumber = 1;
      this.memberForm.pageSize = v;
      this.activityMembersPage();
    },
    handleImageError(){

    },