diff --git a/src/api/marketingCard/marketingCard.js b/src/api/marketingCard/marketingCard.js
index 39097c6..30fa01e 100644
--- a/src/api/marketingCard/marketingCard.js
+++ b/src/api/marketingCard/marketingCard.js
@@ -64,6 +64,16 @@ export default {
 	},
 	
 	
+	// 导出
+	exportExcel: function(data) {
+	  return request({
+	    url: '/lpkgiftcard/exportExcel',
+	    method: 'post',
+	    responseType: 'blob', // 表明返回服务器返回的数据类型
+	    data: data,
+	    headers: { 'Content-Type': 'application/json' }
+	  })
+	},
 	
 	
 	// 获取提货卡页面 礼包列表
diff --git a/src/views/commodity/index.vue b/src/views/commodity/index.vue
index 2aac84c..b696c70 100644
--- a/src/views/commodity/index.vue
+++ b/src/views/commodity/index.vue
@@ -196,6 +196,10 @@
 				this.$refs['divadd'].showAdd()
 			},
 
+	doClose() {
+			  this.$store.dispatch('tagsView/delView', this.$route)
+			  this.$router.go(-1)
+			},
 			toRelevancy(row) {
 				this.viewState = 3
 				this.$refs['divadd'].showEdit(row)
diff --git a/src/views/marketingCard/index.vue b/src/views/marketingCard/index.vue
index 42c6db8..cac3751 100644
--- a/src/views/marketingCard/index.vue
+++ b/src/views/marketingCard/index.vue
@@ -200,6 +200,11 @@
 				this.viewState = 2
 				this.$refs['divadd'].showAdd()
 			},
+			
+			doClose() {
+			  this.$store.dispatch('tagsView/delView', this.$route)
+			  this.$router.go(-1)
+			},
 
 			toRelevancy(row) {
 				this.viewState = 3
diff --git a/src/views/marketingCard/pickupCardSet.vue b/src/views/marketingCard/pickupCardSet.vue
index d4b4312..94931a2 100644
--- a/src/views/marketingCard/pickupCardSet.vue
+++ b/src/views/marketingCard/pickupCardSet.vue
@@ -29,12 +29,13 @@
 						</el-form>
 					</div>
 
-					<el-table :data="tableData" border style="width: 100%; margin-top: 20px;">
+					<el-table :data="tableData" border style="width: 100%; margin-top: 20px;"
+						:row-style="{height: '40px'}">
 						<el-table-column label="序号" width="70px" type="index" align="center">
 						</el-table-column>
 						<el-table-column label="操作" width="150px" align="center">
 							<template slot-scope="scope">
-								<el-button type="primary" size="mini" @click="showRow()">
+								<el-button type="primary" size="mini" @click="showRow(scope.row)">
 									明细
 								</el-button>
 							</template>
@@ -59,30 +60,37 @@
 					<div class="tab-header">
 						<el-form :inline="true" :model="listQuery.params" class="demo-form-inline">
 							<el-row :gutter="20">
-								<el-col :span="21">
+								<el-col :span="20">
 									<el-form-item label="卡片序列号">
-											<el-input v-model="listQuery.params.seriaNumber" placeholder="" clearable />
+										<el-input v-model="listQuery.params.number" placeholder="" clearable />
 
 									</el-form-item>
 									<el-form-item label="卡片状态">
-										<el-select v-model="listQuery.params.state" placeholder="请选择"  >
-										 <el-option
-										    v-for="(item,i) in stateList"
-										    :key="i"
-										    :label="item.name"
-										    :value="item.sid">
-										  </el-option>
+										<el-select v-model="listQuery.params.state" placeholder="请选择">
+											<el-option v-for="(item,i) in stateList" :key="i" :label="item.name"
+												:value="item.sid">
+											</el-option>
 										</el-select>
 
 									</el-form-item>
-									<el-button type="primary" @click="getPageList()">查 询</el-button>
+									<el-button type="primary" @click="getPageList2()">查 询</el-button>
 									<el-button type="primary" @click="returnView()">返 回</el-button>
 								</el-col>
+								<el-col :span="2">
+									<el-form-item style="float: right;">
+										<el-button type="primary" @click="exportExcel()">导出Excel</el-button>
+									</el-form-item>
+								</el-col <el-col :span="2">
+								<el-form-item style="float: right;">
+									<el-button type="primary" @click="downloadQR()">下载二维码</el-button>
+								</el-form-item>
+								</el-col>
 							</el-row>
 						</el-form>
 					</div>
 
-					<el-table :data="tableData2" border style="width: 100%; margin-top: 20px;">
+					<el-table :data="tableData2" border style="width: 100%; margin-top: 20px;"
+						:row-style="{height: '40px'}">
 						<el-table-column label="序号" width="70px" type="index" align="center">
 						</el-table-column>
 						<!-- <el-table-column label="操作" width="150px" align="center">
@@ -114,6 +122,11 @@
 				<div class="listconadd">
 
 					<el-card class="box-card">
+						<div class="item">
+							<span class="item_text">区域编码：</span>
+							<el-input v-model="formobj.cardArea" placeholder="" class="item_input"
+								oninput="value=value.replace(/[^0-9]/g,'')" maxlength="2" clearable />
+						</div>
 						<div class="item">
 							<span class="item_text">券卡数量：</span>
 							<el-input v-model="formobj.num" placeholder="" class="item_input"
@@ -129,6 +142,14 @@
 							</el-select>
 						</div>
 
+						<div
+							style="width: 100%;display: flex;flex-direction: row;justify-content: center;margin-top: 20px;">
+							<span
+								style="background: #018AD2; color: #fff;padding: 5px 15px;border-radius: 5px;font-size: 16px;"
+								@click="saveOrUpdate">发行</span>
+						</div>
+
+
 
 					</el-card>
 
@@ -163,36 +184,40 @@
 					current: 1, // 默认开始页面
 					size: 10, // 每页的数据条数
 					params: {
-						sid:"",
-						seriaNumber: '',
+						sid: "",
+						number: '',
 						state: '',
 					},
 				},
-				
+
 				activeName: 'roleList',
 				formobj: {
+					cardArea: "",
 					num: '',
 					bagSid: ""
 				},
 				giftPackList: [],
-				stateList:[
-					{
-						name:"未绑定用户",
-						sid:"2"
+				stateList: [{
+						name: "全部",
+						sid: ""
+					}, {
+						name: "未绑定用户",
+						sid: "2"
 					},
 					{
-						name:"未提货",
-						sid:"3"
+						name: "未提货",
+						sid: "3"
 					},
 					{
-						name:"部分提货",
-						sid:"4"
+						name: "部分提货",
+						sid: "4"
 					},
 					{
-						name:"提货完成",
-						sid:"5"
+						name: "提货完成",
+						sid: "5"
 					}
-				]
+				],
+				recordId: '',
 			}
 		},
 		created() {
@@ -201,7 +226,19 @@
 		methods: {
 
 			handleClick(tab, event) {
-				this.viewState=1
+				this.viewState = 1
+
+				this.listQuery = {
+					total: 0, // 默认数据总数
+					current: 1, // 默认开始页面
+					size: 10, // 每页的数据条数
+					params: {
+						sid: "",
+						number: '',
+						state: '',
+					},
+				}
+
 				if (tab.name == 'addrole') {
 					this.giftBagList()
 				} else {
@@ -231,29 +268,94 @@
 					.then(resp => {
 						console.log('>>>>>>>>>getPageList', resp.data)
 						this.tableData = resp.data.records
-						this.page.total = res.data.total
+						this.page.total = resp.data.total
 					})
 					.catch(() => {})
 			},
-			
-			showRow(){
-				
-				this.viewState=2
+
+			getPageList2() {
 				req.recordDetails(this.listQuery)
 					.then(resp => {
 						console.log('>>>>>>>>>recordDetails', resp.data)
 						this.tableData2 = resp.data.records
-						this.listQuery.total = res.data.total
-						this.viewState=2
+					this.recordId = resp.data.records[0].recordId
+					this.listQuery.total = resp.data.total
 					})
 					.catch(() => {
-						
+
 					})
+
+			},
+
+			showRow(row) {
+				this.listQuery.params.sid = row.sid
+				this.viewState = 2
+				req.recordDetails(this.listQuery)
+					.then(resp => {
 				
+						console.log('>>>>>>>>>recordDetails', resp.data)
+						this.tableData2 = resp.data.records
+					
+					this.recordId = resp.data.records[0].recordId
+					this.listQuery.total = resp.data.total
+					})
+					.catch(() => {
+
+					})
+
+			},
+
+			returnView() {
+				this.tableData2 = []
+				this.viewState = 1
+				this.listQuery = {
+					total: 0, // 默认数据总数
+					current: 1, // 默认开始页面
+					size: 10, // 每页的数据条数
+					params: {
+						sid: "",
+						number: '',
+						state: '',
+					},
+				}
+			},
+
+			exportExcel() {
+
+				const loading = this.$loading({
+					lock: true,
+					text: 'Loading',
+					spinner: 'el-icon-loading',
+					background: 'rgba(0, 0, 0, 0.7)'
+				})
+
+				this.listQuery.params.number = '',
+					this.listQuery.params.state = '',
+
+					req.exportExcel(this.listQuery.params).then((resp) => {
+						loading.close()
+						const blob = new Blob([resp], {
+							type: 'application/vnd.ms-excel'
+						})
+						const fileName = '提货卡明细列表(批次号_' + this.recordId + ').xls'
+						const elink = document.createElement('a')
+						elink.download = fileName
+						elink.style.display = 'nonde'
+						elink.href = URL.createObjectURL(blob)
+						document.body.appendChild(elink)
+						elink.click()
+						URL.revokeObjectURL(elink.href)
+						document.body.removeChild(elink)
+					}).catch(() => {
+						loading.close()
+					})
 			},
-			
-			returnView(){
-					this.viewState=1
+			downloadQR(){
+				this.$message({
+					showClose: true,
+					type: 'success',
+					message: '功能暂未完善...'
+				})
 			},
 			giftBagList() {
 				req.giftBagList()
@@ -289,6 +391,7 @@
 				if (isreload === 'true') this.$emit('reloadlist')
 				this.imgList = []
 				this.formobj = {
+					cardArea: "",
 					num: '',
 					bagSid: ""
 				}
diff --git a/src/views/userInfo/index.vue b/src/views/userInfo/index.vue
index e68af20..1258d61 100644
--- a/src/views/userInfo/index.vue
+++ b/src/views/userInfo/index.vue
@@ -45,7 +45,7 @@
 						<el-table-column prop="realName" label="用户名称" align="center" />
 						<el-table-column prop="nick" label="昵称" align="center" />
 						<el-table-column prop="mobile" label="手机号码" align="center" />
-						<el-table-column prop="bindDate" label="绑定时间" align="center" />
+						<el-table-column prop="createTime" label="创建时间" align="center" />
 						<el-table-column prop="wxMpOpenid" label="OpenId" align="center" />
 					</el-table>
 				</div>