From 5a80a60227011398c8fe306d4adcdd09297d21e2 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期四, 23 十月 2025 18:04:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/send_coupon' into send_coupon

---
 manager/src/views/member/list/index.vue |   41 +++++++++++++++++++++++++++++++++++++++--
 1 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index fae9bd4..49fa45c 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -6,6 +6,9 @@
           <Form-item label="浼氬憳鍚嶇О" prop="username">
             <Input type="text" v-model="searchForm.username" placeholder="璇疯緭鍏ヤ細鍛樺悕绉�" clearable style="width: 200px" />
           </Form-item>
+          <Form-item label="浼氬憳id" prop="memberId">
+            <Input type="text" v-model="searchForm.memberId" placeholder="璇疯緭鍏ヤ細鍛榠d" clearable style="width: 200px" />
+          </Form-item>
 
           <Form-item label="浼氬憳鏄电О" prop="nickName">
             <Input type="text" v-model="searchForm.nickName" placeholder="璇疯緭鍏ヤ細鍛樻樀绉�" clearable style="width: 200px" />
@@ -23,8 +26,9 @@
           <Button @click="handleSearch" class="search-btn" type="primary" icon="ios-search">鎼滅储</Button>
         </Form>
       </Row>
-      <Row class="operation padding-row" v-if="!selectedMember">
-        <Button @click="addMember" type="primary">娣诲姞浼氬憳</Button>
+      <Row class="operation padding-row" >
+        <Button @click="addMember" v-if="!selectedMember" type="primary">娣诲姞浼氬憳</Button>
+        <Button @click="exportExcel" type="primary">瀵煎嚭excel</Button>
       </Row>
 
       <Table :loading="loading" border :columns="columns" class="mt_10" :data="data" ref="table"></Table>
@@ -118,6 +122,7 @@
 import * as RegExp from "@/libs/RegExp.js";
 import { getTags } from "@/api/tag.js";
 import { detailById } from "@/api/memberCustomerTag.js"
+import {exportMemberListData} from "@/api/member.js";
 
 export default {
   name: "member",
@@ -170,6 +175,11 @@
       ruleValidate: {}, //淇敼楠岃瘉
       columns: [
         {
+          title: "浼氬憳id",
+          key: "id",
+          tooltip: true,
+        },
+        {
           title: "浼氬憳鍚嶇О",
           key: "username",
           tooltip: true,
@@ -208,6 +218,11 @@
               params.row.point == void 0 ? "0" : params.row.point
             );
           },
+        },
+        {
+          title: "缁戝畾搴楅摵",
+          key: "bindStoreName",
+          tooltip: true,
         },
         {
           title: "鎿嶄綔",
@@ -400,6 +415,28 @@
       this.searchForm.pageNumber = 1;
       this.searchForm.pageSize = 10;
       this.getData();
+    },    // 鎼滅储
+    exportExcel() {
+      API_Member.exportMemberListData(this.searchForm).then(res =>{
+        const blob = new Blob([res], {
+          type: "application/vnd.ms-excel;charset=utf-8",
+        });
+        //瀵逛簬<a>鏍囩锛屽彧鏈� Firefox 鍜� Chrome锛堝唴鏍革級 鏀寔 download 灞炴��
+        //IE10浠ヤ笂鏀寔blob浣嗘槸渚濈劧涓嶆敮鎸乨ownload
+        if ("download" in document.createElement("a")) {
+          //鏀寔a鏍囩download鐨勬祻瑙堝櫒
+          const link = document.createElement("a"); //鍒涘缓a鏍囩
+          link.download = "浼氬憳鍒楄〃.xlsx"; //a鏍囩娣诲姞灞炴��
+          link.style.display = "none";
+          link.href = URL.createObjectURL(blob);
+          document.body.appendChild(link);
+          link.click(); //鎵ц涓嬭浇
+          URL.revokeObjectURL(link.href); //閲婃斁url
+          document.body.removeChild(link); //閲婃斁鏍囩
+        } else {
+          navigator.msSaveBlob(blob, fileName);
+        }
+      })
     },
     //鏌ョ湅璇︽儏淇敼
     editPerm(val) {

--
Gitblit v1.8.0