From 599abed702db9fa5dec90b5660ff039acb6eace7 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 24 Nov 2025 18:33:29 +0800
Subject: [PATCH] 1、完成升级赠送价值400元（共40张）平台消费券，每张10元，每次消费只能用一张，消费金额满200元抵一张10元消费券 1、修复分享名片第一次进入是空白 3、修复分红订单不生成问题
---
shop_vue/src/views/branch/activity/index.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/shop_vue/src/views/branch/activity/index.vue b/shop_vue/src/views/branch/activity/index.vue
index b3d0eb2..6d854e6 100644
--- a/shop_vue/src/views/branch/activity/index.vue
+++ b/shop_vue/src/views/branch/activity/index.vue
@@ -9,7 +9,12 @@
<img v-img-url="'image.file_path',scope.row" width="40" height="40" />
</template>
</el-table-column>
- <el-table-column prop="name" label="活动标题" min-width="120"></el-table-column>
+ <el-table-column prop="name" label="活动标题" min-width="120">
+ <template slot-scope="{ row }">
+ <div>{{ row.name }}</div>
+ <el-tag size="small">{{ row.branch.name }}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="category.name" label="活动分类" width="120"></el-table-column>
<el-table-column prop="fee" label="活动费用" width="90"></el-table-column>
<el-table-column prop="limit_num" label="已报人数/总人数" width="120">
@@ -33,7 +38,7 @@
<el-switch v-model="scope.row.status" :active-value="1" :inactive-value="0" active-text="显示" inactive-text="隐藏" :width="55" @change="statusSet($event, scope.row)"></el-switch>
</template>
</el-table-column>
- <el-table-column prop="name" label="操作" width="140">
+ <el-table-column prop="name" label="操作" width="180">
<template slot-scope="scope">
<el-button @click="onDetail(scope.row.activity_id, false)" type="text" size="small">查看</el-button>
<el-button @click="qrcode(scope.row)" type="text" size="small">核销码</el-button>
--
Gitblit v1.9.2