From 59c91b82ba76aa44da67eee508214343de431275 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 26 五月 2025 18:11:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager/src/views/activity/index.vue | 123 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 122 insertions(+), 1 deletions(-)
diff --git a/manager/src/views/activity/index.vue b/manager/src/views/activity/index.vue
index aad5a26..b6799f6 100644
--- a/manager/src/views/activity/index.vue
+++ b/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(){
},
--
Gitblit v1.8.0