From c1e567ddda7f65651179a8a73ca849b07b066b14 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 19 六月 2025 19:58:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager/src/views/activity/index.vue | 139 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 138 insertions(+), 1 deletions(-)
diff --git a/manager/src/views/activity/index.vue b/manager/src/views/activity/index.vue
index b1f49f2..26a2c42 100644
--- a/manager/src/views/activity/index.vue
+++ b/manager/src/views/activity/index.vue
@@ -136,6 +136,11 @@
<Button
type="info"
size="small"
+ @click="detail(row)"
+ >璇︽儏</Button>
+ <Button
+ type="info"
+ size="small"
@click="openEdit(row)"
>缂栬緫</Button>
<Button
@@ -336,6 +341,82 @@
</Row>
</Modal>
+ <Modal
+ v-model="infoModelShow"
+ :title="modelTitle"
+ @on-cancel="infoModelClose"
+ width="800"
+ :mask-closable="false"
+ >
+ <div class="detail-container">
+ <Row :gutter="16">
+ <Col span="12">
+ <div class="detail-item">
+ <label>娲诲姩鍚嶇О锛�</label>
+ <span>{{ activityInfo.activityName || '-' }}</span>
+ </div>
+ </Col>
+ <Col span="12">
+ <div class="detail-item">
+ <label>娲诲姩绫诲瀷锛�</label>
+ <span>{{activityInfo.activityType === 'online' ? '绾夸笂':'绾夸笅'}}</span>
+ </div>
+ </Col>
+ <Col span="12">
+ <div class="detail-item">
+ <label>鎶ュ悕鏃堕棿娈碉細</label>
+ <span>{{ activityInfo.reportStartTime }} - {{ activityInfo.reportEndTime }}</span>
+ </div>
+ </Col>
+ <Col span="12">
+ <div class="detail-item">
+ <label>娲诲姩鏃堕棿娈碉細</label>
+ <span>{{ activityInfo.startTime }} - {{ activityInfo.endTime }}</span>
+ </div>
+ </Col>
+
+ <Col span="24" v-if="coverType === '杈撳叆鏂囧瓧灏侀潰'">
+ <div class="detail-item">
+ <label>灏侀潰鏂囧瓧锛�</label>
+ <span>{{ activityInfo.cover || '-' }}</span>
+ </div>
+ </Col>
+ <Col span="24" v-if="coverType === '閫夋嫨鏂囦欢灏侀潰'">
+ <div class="detail-item">
+ <label>涓婁紶灏侀潰锛�</label>
+ <span>{{ activityInfo.cover }}</span>
+ </div>
+ </Col>
+ <Col span="12">
+ <div class="detail-item">
+ <label>浜烘暟闄愬埗锛�</label>
+ <span>{{ activityInfo.limitUserNum || '鏃犻檺鍒�' }}</span>
+ </div>
+ </Col>
+ <Col span="12">
+ <div class="detail-item">
+ <label>娲诲姩鍦扮偣锛�</label>
+ <span>{{ activityInfo.activityLocation || '-' }}</span>
+ </div>
+ </Col>
+ <Col span="24">
+ <div class="detail-item">
+ <label>娲诲姩鍐呭锛�</label>
+ <div
+ class="activity-content"
+ v-html="activityInfo.activityContent || '鏃犲唴瀹�'"
+ ></div>
+ </div>
+ </Col>
+ </Row>
+ </div>
+
+ <div slot="footer">
+ <Button @click="infoModelClose">鍏抽棴</Button>
+ </div>
+ </Modal>
+
+
<!-- 鍥剧墖棰勮妯℃�佹 -->
<Modal v-model="previewVisible" title="鍥剧墖棰勮" footer-hide>
<img :src="previewImageUrl" style="width: 100%">
@@ -361,6 +442,8 @@
components: {Editor},
data() {
return {
+ infoModelShow:false,
+
loading: false,
membersLoading: false,
submitLoading: false,
@@ -397,6 +480,24 @@
// 娲诲姩琛ㄥ崟
activityFrom: {
+ id: '',
+ activityName: '',
+ activityType: '',
+ reportTime: [],
+ time: [],
+ activityContent: '',
+ cover: '',
+ coverType: '',
+ status: '',
+ reportStartTime: '',
+ reportEndTime: '',
+ startTime: '',
+ endTime: '',
+ recommend: false,
+ limitUserNum: 0,
+ activityLocation: '',
+ },
+ activityInfo: {
id: '',
activityName: '',
activityType: '',
@@ -645,6 +746,11 @@
this.init()
},
methods: {
+ detail(row){
+ this.modelTitle = '娲诲姩璇︽儏'
+ this.infoModelShow = true
+ this.activityInfo = row
+ },
// 鑾峰彇瀵屾枃鏈紪杈戝櫒鐨勫唴瀹�
getReason(content) {
this.activityFrom.activityContent = content
@@ -757,7 +863,9 @@
this.coverType = row.coverType === 'text' ? '杈撳叆鏂囧瓧灏侀潰' : '閫夋嫨鏂囦欢灏侀潰'
})
},
-
+ infoModelClose(){
+ this.infoModelShow = false
+ },
// 鍏抽棴妯℃�佹
modelClose() {
this.modelShow = false
@@ -1183,4 +1291,33 @@
margin-top: 4px;
}
}
+.detail-container {
+ padding: 16px;
+}
+
+.detail-item {
+ margin-bottom: 18px;
+ line-height: 1.5;
+
+ label {
+ display: inline-block;
+ width: 100px;
+ color: #666;
+ font-weight: bold;
+ vertical-align: top;
+ }
+
+ span {
+ display: inline-block;
+ width: calc(100% - 110px);
+ }
+}
+
+.activity-content {
+ border: 1px solid #dcdee2;
+ border-radius: 4px;
+ padding: 12px;
+ min-height: 100px;
+ margin-top: 8px;
+}
</style>
--
Gitblit v1.8.0