From df60073f4fb06ea2d16984635e0714bae8a1f8e9 Mon Sep 17 00:00:00 2001
From: quanwei <419654421@qq.com>
Date: Mon, 22 Dec 2025 18:03:35 +0800
Subject: [PATCH] 1.在总后台首页装修增加了活动专区和智能匹配 模块 2.目前活动专区获取的是发布需求最新的数据,智能匹配是用户没登录前也是获取发布需求最新数据,登录后会根据用户发布的需求,通过分类匹配到对应的数据 3.修复缴纳保证金报错 4.修复发布需求报错

---
 shop_vue/src/views/branch/activity/index.vue |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/shop_vue/src/views/branch/activity/index.vue b/shop_vue/src/views/branch/activity/index.vue
index 940d67f..fae916b 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,9 +38,10 @@
                 <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>
             <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 +63,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 +99,8 @@
       curPage: 1,
       tagTypeData: ['info', '', 'success'],
       open_detail: false,
+      isQrcode: false,
+      code_id: '',
     };
   },
   created() {
@@ -160,9 +172,9 @@
         })
         .then(() => {
           self.loading = true;
-          BranchApi.delete(
+          BranchApi.deleteActivity(
             {
-              activity_id: e
+              activity_id: e.activity_id
             },
             true
           )
@@ -195,7 +207,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