From d36b2905ad243427185e9fcc6f933282c8c0a04a Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Wed, 10 Jun 2020 15:44:30 +0800
Subject: [PATCH 1/4] 1

---
 src/pages/activity/ActivityPlan.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
index 7d1e0ff..e018ff9 100644
--- a/src/pages/activity/ActivityPlan.vue
+++ b/src/pages/activity/ActivityPlan.vue
@@ -261,14 +261,14 @@ export default {
           title: "添加好友数",
           key: "addFriendNum",
           render (h, params) {
-            return h("span", (params.row.friends || 0) + "人");
+            return h("span", (params.row.friendCount || 0) + "人");
           }
         },
         {
           title: "参与活动客户数",
           key: "joinActivityClientNum",
           render (h, params) {
-            return h("span", (params.row.friends || 0) + "人");
+            return h("span", (params.row.customerCount || 0) + "人");
           }
         },
         {

From a918718c1a8a82b8e51468dba6edcdd2b8f426d1 Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Wed, 10 Jun 2020 15:59:45 +0800
Subject: [PATCH 2/4] 1

---
 src/pages/activity/ActivityPlan.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/activity/ActivityPlan.vue b/src/pages/activity/ActivityPlan.vue
index e018ff9..909e129 100644
--- a/src/pages/activity/ActivityPlan.vue
+++ b/src/pages/activity/ActivityPlan.vue
@@ -264,13 +264,13 @@ export default {
             return h("span", (params.row.friendCount || 0) + "人");
           }
         },
-        {
-          title: "参与活动客户数",
-          key: "joinActivityClientNum",
-          render (h, params) {
-            return h("span", (params.row.customerCount || 0) + "人");
-          }
-        },
+        // {
+        //   title: "参与活动客户数",
+        //   key: "joinActivityClientNum",
+        //   render (h, params) {
+        //     return h("span", (params.row.customerCount || 0) + "人");
+        //   }
+        // },
         {
           title: "活动码",
           slot: "qrCodeAction",

From 2d1e40687d7adf168ff0015f16d3feeb3b984f9e Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Wed, 10 Jun 2020 16:43:37 +0800
Subject: [PATCH 3/4] 1

---
 src/pages/activity/ActivityCode.vue | 111 ++++++++++++++++++++--------
 1 file changed, 82 insertions(+), 29 deletions(-)

diff --git a/src/pages/activity/ActivityCode.vue b/src/pages/activity/ActivityCode.vue
index 221095f..b0eaa06 100644
--- a/src/pages/activity/ActivityCode.vue
+++ b/src/pages/activity/ActivityCode.vue
@@ -1,33 +1,58 @@
 <template>
   <div class="activity_code">
-    <Table :loading="loading" border :columns="columns" :data="data">
-      <template slot-scope="{row}" slot="qrCodeAction">
-        <img :src="require('../../../static/img/qrCode-init.png')" @click="show(row)"
-              class="table-img-qr-code"/>
+    <Table :loading="loading"
+           border
+           :columns="columns"
+           :data="data">
+      <template slot-scope="{row}"
+                slot="qrCodeAction">
+        <img :src="require('../../../static/img/qrCode-init.png')"
+             @click="showQrcode(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 slot-scope="{row}"
+                   slot="action"
+                   :to="{path:'/shop/increase/manager/staff',query:{storeId:row.id}}">
+        <Button class="router-btn"> 门店导购管理</Button>
       </router-link>
     </Table>
-    <Page
-      :total="totalSize"
-      :current="pageNum"
-      :page-size="pageSize"
-      show-elevator
-      show-total
-      placement="top"
-      @on-change="handlePage"
-      class-name="ks-page"
-    ></Page>
+    <Page :total="totalSize"
+          :current="pageNum"
+          :page-size="pageSize"
+          show-elevator
+          show-total
+          placement="top"
+          @on-change="handlePage"
+          class-name="ks-page"></Page>
+
+    <!-- 预览二维码 -->
+    <Modal v-model="isShow"
+           :title="showStoreName"
+           :footer-hide="true"
+           width="230"
+           class-name="vertical-center-modal"
+           @on-ok="ok">
+      <div slot="header">
+        <p></p>
+      </div>
+      <p>{{this.showStoreName}}</p>
+      <img :src="qrCodeImage"
+           style="width:200px;height:200px;" />
+      <div style="text-align: center;">
+        <Button ghost
+                type="primary"
+                @click="download(rowData)">下载</Button>
+      </div>
+    </Modal>
   </div>
 </template>
 
 <script>
 import { activityCodeList } from "../../services/ActivityManager/ActivityManager";
+import http from '../../services/store/IncreaseStoreManager';
 export default {
   name: "ActivityCode",
-  data() {
+  data () {
     let _this = this;
     return {
       loading: false,
@@ -36,6 +61,10 @@ export default {
       pageSize: 10,
       data: [],
       instanceId: 0,
+      isShow: false,
+      showStoreName: "",
+      qrCodeImage: "",
+      rowData: {},
       columns: [
         {
           width: 80,
@@ -52,28 +81,28 @@ export default {
         {
           title: "所属零售公司",
           key: "organizational.name",
-          render(h, params) {
+          render (h, params) {
             return h("span", params.row["organizational"]["name"]);
           },
         },
         {
           title: "零售公司编号",
           key: "organizational.code",
-          render(h, params) {
+          render (h, params) {
             return h("span", params.row["organizational"]["code"]);
           },
         },
         {
           title: "店铺名称",
           key: "store.name",
-          render(h, params) {
+          render (h, params) {
             return h("span", params.row["store"]["name"]);
           },
         },
         {
           title: "店铺编号",
           key: "store.code",
-          render(h, params) {
+          render (h, params) {
             return h("span", params.row["store"]["code"]);
           },
         },
@@ -135,19 +164,37 @@ export default {
       ],
     };
   },
-  created() {
+  created () {
     this.instanceId = this.$route.query.instanceId;
     this.load();
   },
   methods: {
-    handlePage(value) {
+    ok: function () {
+      this.isShow = false;
+    },
+    cancel: function () {
+      this.isShow = false;
+    },
+    handlePage (value) {
       this.pageNum = value;
       this.load();
     },
-    showQrcode(row) {
+    showQrcode (row) {
       console.log(row);
+      this.isShow = true;
+      this.showStoreName = row.store.name;
+      this.qrCodeImage = row.qrCode;
+      this.rowData = row;
+    },
+    download: function (row) {
+      let fileName = row.store.name + "-活动码";
+      http.downloadImg({
+        url: row.qrCode
+      }, fileName, function (/*data*/) {
+
+      })
     },
-    load(params = {}) {
+    load (params = {}) {
       let _this = this;
       this.loading = true;
       params.pageSize = this.pageSize;
@@ -164,7 +211,13 @@ export default {
 </script>
 
 <style>
-  .table-width-80 {
-        width: 80px !important;
-    }
+.table-width-80 {
+  width: 80px !important;
+}
+.table-img-qr-code {
+  margin-left: 5px;
+  margin-top: 5px;
+  width: 30px;
+  height: 30px;
+}
 </style>

From 5d1fbfec60ca480054e97e9e9177da552dfa5846 Mon Sep 17 00:00:00 2001
From: zhenghuang <236220500@qq.com>
Date: Wed, 10 Jun 2020 17:04:24 +0800
Subject: [PATCH 4/4] 1

---
 src/pages/activity/ActivityCode.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/activity/ActivityCode.vue b/src/pages/activity/ActivityCode.vue
index b0eaa06..205cbea 100644
--- a/src/pages/activity/ActivityCode.vue
+++ b/src/pages/activity/ActivityCode.vue
@@ -12,7 +12,7 @@
       </template>
       <router-link slot-scope="{row}"
                    slot="action"
-                   :to="{path:'/shop/increase/manager/staff',query:{storeId:row.id}}">
+                   :to="{path:'/shop/increase/manager/staff',query:{storeId:row.store.id}}">
         <Button class="router-btn"> 门店导购管理</Button>
       </router-link>
     </Table>