From 4e0e36178d82ed486d8cec2c8f52ca96d715cc12 Mon Sep 17 00:00:00 2001
From: liyaozhi <lzhflash@163.com>
Date: Thu, 30 Oct 2025 19:16:05 +0800
Subject: [PATCH] 1、活动增加促销商品(完成后端) 2、修复小程序端活动相册下载不了的问题; 3、修复小程序端活动详情定位问题; 4、修复小程序端报名时免费的也弹出支付弹窗的问题; 5、修复分会后台活动核销码下载问题。

---
 shop_vue/src/views/branch/activity/index.vue |   19 +++++++++++++++++--
 1 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/shop_vue/src/views/branch/activity/index.vue b/shop_vue/src/views/branch/activity/index.vue
index 940d67f..b3d0eb2 100644
--- a/shop_vue/src/views/branch/activity/index.vue
+++ b/shop_vue/src/views/branch/activity/index.vue
@@ -36,6 +36,7 @@
         <el-table-column prop="name" label="操作" width="140">
           <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>
             <el-button @click="onDetail(scope.row.activity_id, true)" type="text" size="small">编辑</el-button>
             <el-button @click="onDelete(scope.row)" type="text" size="small">删除</el-button>
           </template>
@@ -57,15 +58,19 @@
     </div>
     <!-- 活动详情 -->
     <Detail ref="activityDetail" :open="open_detail" @getList="getTableList" @close="closeDrawerDetail"></Detail>
+    <!-- 核销码 -->
+    <Qrcode :open='isQrcode' :code_id='code_id' @close="closeQrcode"></Qrcode>
   </div>
 </template>
 
 <script>
 import BranchApi from '@/api/branch.js';
 import Detail from './drawer/detail.vue';
+import Qrcode from './dialog/Qrcode.vue';
 export default {
   components: {
-    Detail
+    Detail,
+    Qrcode
   },
   data() {
     return {
@@ -89,6 +94,8 @@
       curPage: 1,
       tagTypeData: ['info', '', 'success'],
       open_detail: false,
+      isQrcode: false,
+      code_id: '',
     };
   },
   created() {
@@ -195,7 +202,15 @@
 
     tagType(e) {
       return this.tagTypeData[e];
-    }
+    },
+
+    qrcode(row){
+      this.code_id = row.activity_id;
+      this.isQrcode = true;
+    },
+    closeQrcode(){
+      this.isQrcode = false;
+    },
   }
 };
 </script>

--
Gitblit v1.9.2