From 301c445f16a1e9bacbc1aa27591d3c30898d4138 Mon Sep 17 00:00:00 2001
From: liuyang <396235408@qq.com>
Date: Thu, 28 May 2020 17:25:50 +0800
Subject: [PATCH] 1

---
 src/pages/activity/ActivityPlan.vue | 34 ++++++++++++++---------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
index 6c08fd5..705d7de 100644
--- a/src/pages/activity/ActivityPlan.vue
+++ b/src/pages/activity/ActivityPlan.vue
@@ -64,14 +64,10 @@
                @on-row-dblclick="showDetail"
                :columns="columns1"
                :data="data">
-            <!-- <template slot-scope="{row}" slot="qrCodeAction">
-                <img :src="require('../../../static/img/qrCode-init.png')" @click="show(row)"
+            <template slot-scope="{row}" slot="qrCodeAction">
+                <img :src="require('../../../static/img/qrCode-init.png')" @click="navigateCode(row)"
                      class="table-img-qr-code"/>
-            </template> -->
-            <!-- <router-link slot-scope="{row}" slot="action"
-                :to="{path:'/shop/increase/manager/staff',query:{storeId:row.id}}">
-                <Button ghost class="router-btn"> 门店导购管理</Button>
-            </router-link> -->
+            </template>
             <template slot="action" slot-scope="{row}">
               <i-col span="12">
                 <Button ghost class="router-btn" 
@@ -271,17 +267,18 @@ export default {
         },
         {
           title: "活动码",
-          key: "activityCode",
-          render (h, p) {
-            return h(
-              "Button",
-              {
-                props: { type: "primary", size: "small" },
-                on: { click: () => _this.navigateCode(p.row) }
-              },
-              "查看详情"
-            );
-          }
+          slot: 'qrCodeAction',
+          className: 'table-width-80',
+          // render (h, p) {
+          //   return h(
+          //     "Button",
+          //     {
+          //       props: { type: "primary", size: "small" },
+          //       on: { click: () => _this.navigateCode(p.row) }
+          //     },
+          //     "查看详情"
+          //   );
+          // }
         },
         {
           title: "活动状态",
@@ -496,6 +493,7 @@ export default {
     },
     // 下载二维码
     download: function (index) {
+      debugger
       let fileName = index.name + "-门店码";
       http.downloadImg({
           url: index.qrCodeAction