diff --git a/.env.development b/.env.development
index b295f10..6b724c6 100644
--- a/.env.development
+++ b/.env.development
@@ -8,5 +8,5 @@ VUE_APP_BASE_API = '/api'
 # VUE_APP_URL = "http://jianguan.yyundong.com/shgfapi"
 
 
-VUE_APP_URL = "http://192.168.0.103:7201"
+VUE_APP_URL = "http://192.168.2.109:7201"
 ##VUE_APP_URL = "http://8.130.39.13:8112"
diff --git a/src/api/commodity/commodity.js b/src/api/commodity/commodity.js
index e69de29..09a1be0 100644
--- a/src/api/commodity/commodity.js
+++ b/src/api/commodity/commodity.js
@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+export default {
+	
+	// 获取商品列表
+	goodsListPage: function(data) {
+		return request({
+			url: '/lpkgoods/goodsListPage',
+			method: 'post',
+			data: data
+		});
+	},
+	
+	// 新增、保存商品
+	saveGoods: function(data) {
+		return request({
+			url: '/lpkgoods/saveGoods',
+			method: 'post',
+			data: data
+		});
+	},
+	
+	// 初始化商品
+	goodsInit: function(data) {
+		return request({
+			url: '/lpkgoods/goodsInit/'+data,
+			method: 'get'
+		});
+	},
+	
+	// 删除商品
+	deleteGoods: function(data) {
+		return request({
+			url: '/lpkgoods/deleteGoods/'+data,
+			method: 'delete'
+		});
+	},
+	
+	
+}
+
diff --git a/src/api/marketingCard/marketingCard.js b/src/api/marketingCard/marketingCard.js
new file mode 100644
index 0000000..b9dafb1
--- /dev/null
+++ b/src/api/marketingCard/marketingCard.js
@@ -0,0 +1,58 @@
+import request from '@/utils/request'
+
+export default {
+	
+	// 礼包设置
+	
+	// 获取礼包列表
+	giftBagListPage: function(data) {
+		return request({
+			url: '/lpkgiftbag/giftBagListPage',
+			method: 'post',
+			data: data
+		});
+	},
+	
+	//  礼包选择商品时，返回的商品列表
+	getGoods: function(data) {
+		return request({
+			url: '/lpkgoods/getGoods',
+			method: 'post',
+			data: data
+		});
+	},
+	
+	
+	// 新增、保存礼包
+	saveGiftBag: function(data) {
+		return request({
+			url: '/lpkgiftbag/saveGiftBag',
+			method: 'post',
+			data: data
+		});
+	},
+	
+	// 初始化礼包
+	giftBagInit: function(data) {
+		return request({
+			url: '/lpkgiftbag/giftBagInit/'+data,
+			method: 'get'
+		});
+	},
+
+
+
+	
+	//  提货卡设置
+	
+	// 获取提货卡页面 礼包列表
+	giftBagList: function(data) {
+		return request({
+			url: '/lpkgiftbag/giftBagList',
+			method: 'get',
+			data: data
+		});
+	},
+	
+}
+
diff --git a/src/api/pickupPoint/pickupPoint.js b/src/api/pickupPoint/pickupPoint.js
new file mode 100644
index 0000000..6d6fbd1
--- /dev/null
+++ b/src/api/pickupPoint/pickupPoint.js
@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+export default {
+	
+	// 获取提货点列表
+	storeListPage: function(data) {
+		return request({
+			url: '/lpkstore/storeListPage',
+			method: 'post',
+			data: data
+		});
+	},
+	
+	// 新增、保存提货点
+	saveStore: function(data) {
+		return request({
+			url: '/lpkstore/saveStore',
+			method: 'post',
+			data: data
+		});
+	},
+	
+	// 初始化提货点
+	storeInit: function(data) {
+		return request({
+			url: '/lpkstore/storeInit/'+data,
+			method: 'get'
+		});
+	},
+	
+	// 删除提货点
+	deleteStore: function(data) {
+		return request({
+			url: '/lpkstore/deleteStore/'+data,
+			method: 'delete'
+		});
+	},
+	
+	
+}
+
diff --git a/src/api/portal/Upload.js b/src/api/portal/Upload.js
index 76bd232..4d83396 100644
--- a/src/api/portal/Upload.js
+++ b/src/api/portal/Upload.js
@@ -4,7 +4,7 @@ import qs from 'qs'
 const base = process.env.VUE_APP_URL
 
 // 文件上传接口
-export const uploadFile = '/api/file/upload'
+export const uploadFile = process.env.VUE_APP_BASE_API + '/file/upload'
 // export const uploadFile = process.env.VUE_APP_BASE_API + '/customer/file/upload'
 
 
diff --git a/src/components/uploadFile/upload_yanchejianchaTuBiao.vue b/src/components/uploadFile/upload_yanchejianchaTuBiao.vue
index a3b9a45..6ff9c71 100644
--- a/src/components/uploadFile/upload_yanchejianchaTuBiao.vue
+++ b/src/components/uploadFile/upload_yanchejianchaTuBiao.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-upload ref="imgUpload" v-loading="loadding" class="avatar-uploader" :headers="accessToken" :action="uploadFile"
+    <el-upload ref="imgUpload"  v-loading="loadding" class="avatar-uploader" :limit="limit"  :headers="accessToken" :action="uploadFile"
       :accept="accept" list-type="picture-card"  :file-list="files" :on-remove="removeImage"
       :on-preview="handlePictureCardPreview" :on-progress="uploadProgrees"
       :on-error="uploadError" :on-success="uploadImgSuccess_FuJian">
@@ -39,10 +39,10 @@
         type: String,
         default: '270px'
       },
-      // limit: {
-      //   type: Number,
-      //   default: ''
-      // },
+      limit: {
+        type: Number,
+        default: ''
+      },
       accept: {
         type: String,
         default: '.jpg,.jpeg,.png,.JPG,.JPEG,'
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index a72af42..3918590 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -69,16 +69,16 @@
 								name: "/marketingCard/index",
 								path: "/marketingCard/index",
 							},
-							{
-								alwaysShow: true,
-								component: "packageDetails",
-								meta: {
-									icon: "el-icon-help",
-									title: "礼包奖品明细",
-								},
-								name: "/marketingCard/packageDetails",
-								path: "/marketingCard/packageDetails",
-							},
+							// {
+							// 	alwaysShow: true,
+							// 	component: "packageDetails",
+							// 	meta: {
+							// 		icon: "el-icon-help",
+							// 		title: "礼包奖品明细",
+							// 	},
+							// 	name: "/marketingCard/packageDetails",
+							// 	path: "/marketingCard/packageDetails",
+							// },
 							{
 								alwaysShow: true,
 								component: "pickupCardSet",
diff --git a/src/router/index.js b/src/router/index.js
index e4c531d..097abd7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -50,15 +50,15 @@ export const constantRoutes = [
         noCache: true
       }
     },
-	{
-	  path: '/marketingCard/packageDetails',
-	  component: () => import('@/views/marketingCard/packageDetails.vue'),
-	  name: 'packageDetails',
-	  meta: {
-	    title: '礼包奖品明细',
-	    noCache: true
-	  }
-	},
+	// {
+	//   path: '/marketingCard/packageDetails',
+	//   component: () => import('@/views/marketingCard/packageDetails.vue'),
+	//   name: 'packageDetails',
+	//   meta: {
+	//     title: '礼包奖品明细',
+	//     noCache: true
+	//   }
+	// },
 	{
 	  path: '/marketingCard/pickupCardSet',
 	  component: () => import('@/views/marketingCard/pickupCardSet.vue'),
diff --git a/src/views/commodity/commodityAdd.vue b/src/views/commodity/commodityAdd.vue
index 8974186..35245b9 100644
--- a/src/views/commodity/commodityAdd.vue
+++ b/src/views/commodity/commodityAdd.vue
@@ -1,172 +1,211 @@
 <template>
-  <div>
-
-    <div class="tab-header webtop">
-      <!-- 标题 -->
-      <div>商品信息</div>
-      <!-- start 添加修改按钮 -->
-      <div>
-        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
-        <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
-      </div>
-      <!-- end 添加修改按钮 -->
-      <!-- end 详情按钮 -->
-    </div>
-
-    <div>
-
-      <el-card class="box-card">
-        <div class="item">
-          <span class="item_text">商品名称：</span>
-          <el-input v-model="formobj.industryName" placeholder="" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">项目行业说明：</span>
-          <el-input v-model="formobj.remarks" placeholder="" class="item_input" clearable />
-        </div>
-
-      </el-card>
-
-    </div>
-
-  </div>
+	<div>
+
+		<div class="tab-header webtop">
+			<!-- 标题 -->
+			<div>商品信息</div>
+			<!-- start 添加修改按钮 -->
+			<div>
+				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+				<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+			</div>
+			<!-- end 添加修改按钮 -->
+			<!-- end 详情按钮 -->
+		</div>
+
+		<div class="listconadd">
+
+			<el-card class="box-card">
+				<div class="item">
+					<span class="item_text">名称：</span>
+					<el-input v-model="formobj.name" placeholder="" class="item_input" clearable />
+				</div>
+				<div class="item">
+					<span class="item_text">编码：</span>
+					<el-input v-model="formobj.code" placeholder="" class="item_input" clearable
+						oninput="value=value.replace(/[^A-Za-z0-9]/g, '')" />
+				</div>
+				<div class="item">
+					<span class="item_text">条码：</span>
+					<el-input v-model="formobj.barcode" placeholder="" class="item_input" clearable
+						oninput="value=value.replace(/[^0-9]/g,'')" />
+				</div>
+				<div class="item">
+					<span class="item_text">价格：</span>
+					<el-input v-model="formobj.price" placeholder="" class="item_input" clearable
+						oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+				</div>
+				<div class="item">
+					<span class="item_text">单位：</span>
+					<el-input v-model="formobj.unitName" placeholder="" class="item_input" clearable />
+				</div>
+
+				<div class="item" style="margin-bottom: 100px;margin-top: 100px;">
+					<span class="item_text">图片：</span>
+					<upload style="margin-top: 20px;" class="item_input" ref="uploadImg2" v-model="imgList" :limit="1"
+						@change="backData" bucket="map" :upload-data="{ type: '0001' }"></upload>
+				</div>
+
+			</el-card>
+
+		</div>
+
+	</div>
 </template>
 
 <script>
-  import req from '@/api/dataDict/datadict'
-  export default {
-    data() {
-      return {
-        submitdisabled: false,
-        formobj: {
-          sid: '',
-          industryName: '',
-          remarks: ''
-        }
-      }
-    },
-    methods: {
-      saveOrUpdate() {
-        console.log('>>>>>>>>>saveOrUpdate', this.formobj)
-        if (this.formobj.sid) {
-          req.updateindustry(this.formobj)
-            .then(resp => {
-              if (resp.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: resp.msg
-                })
-                this.handleReturn('true')
-              } else {
-                // 根据resp.code进行异常情况处理
-              }
-            })
-            .catch(() => {})
-        } else {
-          req.saveindustry(this.formobj)
-            .then(resp => {
-              if (resp.success) {
-                this.$message({
-                  showClose: true,
-                  type: 'success',
-                  message: resp.msg
-                })
-                this.handleReturn('true')
-              } else {
-                // 根据resp.code进行异常情况处理
-              }
-            })
-            .catch(() => {})
-        }
-      },
-      handleReturn(isreload) {
-        if (isreload === 'true') this.$emit('reloadlist')
-        this.formobj = {
-          sid: '',
-          industryName: '',
-          remarks: ''
-        }
-        this.$emit('doback')
-      },
-
-      showAdd() {
-
-      },
-      showEdit(row) {
-        req.industryFetchBySid(row.sid)
-          .then(resp => {
-            if (resp.success) {
-              this.formobj = resp.data
-            }
-          })
-          .catch(e => {
-            this.formobj = row
-          })
-      }
-    }
-  }
+	import req from '@/api/commodity/commodity.js'
+	import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao.vue'
+
+	export default {
+		components: {
+			upload
+		},
+		data() {
+			return {
+				imgList: [
+
+
+				],
+				submitdisabled: false,
+				formobj: {
+					sid: "",
+					name: '',
+					code: '',
+					barcode: '',
+					price: "",
+					unitName: "",
+					picUrl: ""
+				}
+			}
+		},
+		methods: {
+			backData(value) {
+				console.log("backData》》》》", value)
+				console.log("imgList", this.imgList)
+
+
+				this.formobj.picUrl = this.imgList[0].url
+			},
+
+			saveOrUpdate() {
+				console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+				req.saveGoods(this.formobj)
+					.then(resp => {
+						if (resp.success) {
+							this.$message({
+								showClose: true,
+								type: 'success',
+								message: resp.msg
+							})
+							this.handleReturn('true')
+						} else {
+							// 根据resp.code进行异常情况处理
+						}
+					})
+					.catch(() => {})
+			},
+			handleReturn(isreload) {
+				if (isreload === 'true') this.$emit('reloadlist')
+				this.imgList = []
+				this.formobj = {
+					sid: "",
+					name: '',
+					code: '',
+					barcode: '',
+					price: "",
+					unitName: "",
+					picUrl: ""
+				}
+				this.$emit('doback')
+			},
+
+			showAdd() {
+				console.log(this.imgList, 88888888)
+			},
+			showEdit(row) {
+				req.goodsInit(row.sid)
+					.then(resp => {
+						if (resp.success) {
+							this.formobj = resp.data
+							this.imgList = []
+							this.imgList.push({
+								url: resp.data.picUrl
+							})
+
+						}
+					})
+					.catch(e => {
+						this.formobj = row
+						this.imgList = []
+						this.imgList.push({
+							url: formobj.picUrl
+						})
+					})
+			}
+		}
+	}
 </script>
 <style lang="scss">
-  .box-card {
-    margin-left: 60px;
-    margin-right: 60px;
-    min-width: 70%;
-    margin-top: 20px;
-
-    .item {
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-      margin-top: 15px;
-      height: 40px;
-      line-height: 40px;
-
-      .item_text {
-        flex: 0.8;
-        font-size: 18px;
-        text-align: right;
-      }
-
-      .item_input {
-        flex: 4;
-        font-size: 16px;
-        margin-left: 10px;
-        margin-right: 80px;
-      }
-
-      .item_left_input {
-        width: 20%;
-      }
-
-      .item_left_text {
-        height: 30px;
-        margin-left: 20px;
-        line-height: 30px;
-        color: #018AD2;
-        padding: 0px 15px;
-        border: 1.5px solid #018AD2;
-        border-radius: 5px;
-
-      }
-
-      .item_right {
-        flex: 1;
-        justify-items: center;
-
-        .item_right_list_text {
-          font-size: 16px;
-        }
-
-        .item_right_list_delect {
-          color: #5E94FF;
-          margin-left: 20px;
-          font-size: 16px;
-          text-decoration: underline;
-        }
-      }
-
-    }
-
-  }
-</style>
+	.box-card {
+		margin-left: 60px;
+		margin-right: 60px;
+		min-width: 70%;
+		margin-top: 20px;
+
+		.item {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin-top: 15px;
+			height: 40px;
+			line-height: 40px;
+
+			.item_text {
+				flex: 0.8;
+				font-size: 18px;
+				text-align: right;
+			}
+
+			.item_input {
+				flex: 4;
+				font-size: 16px;
+				margin-left: 10px;
+				margin-right: 80px;
+			}
+
+			.item_left_input {
+				width: 20%;
+			}
+
+			.item_left_text {
+				height: 30px;
+				margin-left: 20px;
+				line-height: 30px;
+				color: #018AD2;
+				padding: 0px 15px;
+				border: 1.5px solid #018AD2;
+				border-radius: 5px;
+
+			}
+
+			.item_right {
+				flex: 1;
+				justify-items: center;
+
+				.item_right_list_text {
+					font-size: 16px;
+				}
+
+				.item_right_list_delect {
+					color: #5E94FF;
+					margin-left: 20px;
+					font-size: 16px;
+					text-decoration: underline;
+				}
+			}
+
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/commodity/index.vue b/src/views/commodity/index.vue
index 67c04e9..2aac84c 100644
--- a/src/views/commodity/index.vue
+++ b/src/views/commodity/index.vue
@@ -39,9 +39,26 @@
 							</template>
 						</el-table-column>
 						<el-table-column prop="name" label="商品名称" align="center" />
-						<el-table-column prop="bankAccount" label="商品图片" align="center" />
-						<el-table-column prop="bankAccountNumber" label="价格" align="center" />
-						<el-table-column prop="bankAccountNumber" label="规格" align="center" />
+						<el-table-column label="商品图片" align="center">
+						  <template slot-scope="scope">
+							     <el-popover placement="left" trigger="click" width="300">
+							   <img :src="scope.row.picUrl" width="100%" />
+							  <img slot="reference" :src="scope.row.picUrl" :alt="scope.row.picUrl"
+							    style="max-height: 70px;max-width: 70px; padding: 5px" />
+								 </el-popover>
+						    <!-- <span v-for="(item,index) in scope.row.picUrl" :key="index">
+						      <el-popover placement="left" trigger="click" width="300">
+						        <img :src="item.url" width="100%" />
+						        <img slot="reference" :src="item.url" :alt="item.url"
+						          style="max-height: 70px;max-width: 70px; padding: 5px" />
+						      </el-popover>
+						    </span> -->
+						  </template>
+						</el-table-column>
+						<el-table-column prop="code" label="商品编码" align="center" />
+						<el-table-column prop="barcode" label="商品条码" align="center" />
+						<el-table-column prop="price" label="价格" align="center" />
+						<el-table-column prop="unitName" label="单位" align="center" />
 					</el-table>
 				</div>
 				<!-- End 项目列表 -->
@@ -137,7 +154,7 @@
 			},
 			loadList() {
 				this.tableLoading = true
-				req.brandListPage(this.queryParams).then((resp) => {
+				req.goodsListPage(this.queryParams).then((resp) => {
 					this.tableLoading = false
 					if (resp.success) {
 						const data = resp.data
@@ -185,7 +202,7 @@
 			},
 			toRelevancyInfo(row) {
 
-				const tip = '请确认是否删除所选记录?'
+				const tip = '请确认是否删除所选商品?'
 				this.$confirm(tip, '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
@@ -197,7 +214,7 @@
 						spinner: 'el-icon-loading',
 						background: 'rgba(0, 0, 0, 0.7)'
 					})
-					req.brandDelBySids(row.id).then((resp) => {
+					req.deleteGoods(row.sid).then((resp) => {
 						loading.close()
 						if (resp.success) {
 							this.$message({
diff --git a/src/views/marketingCard/index.vue b/src/views/marketingCard/index.vue
index 02409e3..42c6db8 100644
--- a/src/views/marketingCard/index.vue
+++ b/src/views/marketingCard/index.vue
@@ -1,8 +1,250 @@
 <template>
+	<div class="app-container">
+		<div v-show="viewState == 1">
+			<button-bar ref="btnbar" view-title="礼包列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+			<div class="main-content">
+				<div class="searchcon">
+					<el-button size="small" class="searchbtn" @click="clicksearchShow">
+						{{ searchxianshitit }}
+					</el-button>
+					<div v-show="isSearchShow" class="search">
+						<el-form :inline="true" class="tab-header">
+							<el-form-item label="礼包名称">
+								<el-input v-model="queryParams.params.name" placeholder="" clearable />
+							</el-form-item>
+
+						</el-form>
+						<div class="btn" style="text-align: center;">
+							<el-button type="primary" size="small" icon="el-icon-search"
+								@click="dosearch">查询</el-button>
+							<el-button type="primary" size="small" icon="el-icon-refresh"
+								@click="resetQuery">重置</el-button>
+						</div>
+					</div>
+				</div>
+				<!-- Start 项目列表头部 -->
+				<div class="listtop">
+					<div class="tit">礼包列表</div>
+				</div>
+				<!-- End 项目列表头部 -->
+				<!-- Start 项目列表 -->
+				<div class="">
+					<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+						<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+						<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+						<el-table-column label="操作" align="center" width="180">
+							<template slot-scope="scope">
+								<el-button type="primary" size="mini" @click="toDetail(scope.row)">详情</el-button>
+								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
+								<el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button>
+							</template>
+						</el-table-column>
+						<el-table-column prop="name" label="礼包名称" align="center" />
+						<el-table-column label="礼包图片" align="center">
+							<template slot-scope="scope">
+								<el-popover placement="left" trigger="click" width="300">
+									<img :src="scope.row.iconUrl" width="100%" />
+									<img slot="reference" :src="scope.row.iconUrl" :alt="scope.row.iconUrl"
+										style="max-height: 70px;max-width: 70px; padding: 5px" />
+								</el-popover>
+								<!-- <span v-for="(item,index) in scope.row.picUrl" :key="index">
+						      <el-popover placement="left" trigger="click" width="300">
+						        <img :src="item.url" width="100%" />
+						        <img slot="reference" :src="item.url" :alt="item.url"
+						          style="max-height: 70px;max-width: 70px; padding: 5px" />
+						      </el-popover>
+						    </span> -->
+							</template>
+						</el-table-column>
+						<el-table-column prop="boundaryPrice" label="边界金额" align="center" />
+						<el-table-column prop="dateStart" label="起始日期" align="center" />
+						<el-table-column prop="dateEnd" label="终止日期" align="center" />
+						<el-table-column prop="boundary" label="发放条件" align="center" />
+
+					</el-table>
+				</div>
+				<!-- End 项目列表 -->
+				<div class="pages">
+					<div class="tit" />
+					<!--  翻页  -->
+					<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+						:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+				</div>
+			</div>
+		</div>
+		<!-- End 查询和其列表部分 -->
+		<!-- 新增修改部分组件 -->
+		<divAdd v-show="viewState == 2|| viewState ==3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+		<divInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" @reloadlist="loadList" />
+	</div>
 </template>
 
 <script>
-</script>
+	import req from '@/api/marketingCard/marketingCard.js'
+	import ButtonBar from '@/components/ButtonBar'
+	import Pagination from '@/components/pagination'
+	import pageye from '@/components/pagination/pageye'
+	import divAdd from './indexAdd.vue'
+	import divInfo from './indexInfo.vue'
+	export default {
+		name: 'SupplierBankInfoIndex',
+		components: {
+			ButtonBar,
+			Pagination,
+			pageye,
+			divAdd,
+			divInfo
+		},
+		data() {
+			return {
+				btndisabled: false,
+				viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+				isSearchShow: false,
+				searchxianshitit: '显示查询条件',
+				tableLoading: false,
+				dataList: [],
+				btnList: [{
+						type: 'primary',
+						size: 'small',
+						icon: 'plus',
+						btnKey: 'toAdd',
+						btnLabel: '新增'
+					},
+					{
+						type: 'info',
+						size: 'small',
+						icon: 'cross',
+						btnKey: 'doClose',
+						btnLabel: '关闭'
+					}
+				],
+				queryParams: {
+					current: 1,
+					size: 10,
+					total: 0,
+					params: {
+						name: ''
+					}
+				},
+				sids: []
+			}
+		},
+		mounted() {
+			this.$refs['btnbar'].setButtonList(this.btnList)
+		},
+		created() {
+			this.loadList()
+		},
+		methods: {
+			// 搜索条件效果
+			clicksearchShow() {
+				this.isSearchShow = !this.isSearchShow
+				if (this.isSearchShow) {
+					this.searchxianshitit = '隐藏查询条件'
+				} else {
+					this.searchxianshitit = '显示查询条件'
+				}
+			},
+			btnHandle(btnKey) {
+				switch (btnKey) {
+					case 'toAdd':
+						this.toAdd()
+						break
+					case 'doClose':
+						this.doClose()
+						break
+					default:
+						break
+				}
+			},
+			loadList() {
+				this.tableLoading = true
+				req.giftBagListPage(this.queryParams).then((resp) => {
+					this.tableLoading = false
+					if (resp.success) {
+						const data = resp.data
+						this.queryParams.total = data.total
+						this.dataList = data.records
+					} else {
+						// 根据resp.code进行异常情况处理
+						this.dataList = []
+						this.queryParams.total = 0
+					}
+				}).catch(() => {
+					this.tableLoading = false
+				})
+			},
 
-<style>
+			// 序号
+			indexMethod(index) {
+				var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+				var pageindex = index + 1 + pagestart
+				return pageindex
+			},
+			dosearch() {
+				this.queryParams.current = 1
+				this.loadList()
+			},
+			resetQuery() {
+				this.queryParams = {
+					current: 1,
+					size: 10,
+					total: 0,
+					params: {
+						name: '',
+					}
+				}
+				this.loadList()
+			},
+			toAdd() {
+				this.viewState = 2
+				this.$refs['divadd'].showAdd()
+			},
+
+			toRelevancy(row) {
+				this.viewState = 3
+				this.$refs['divadd'].showEdit(row)
+			},
+			toDetail(row) {
+			  this.viewState = 4
+			  this.$refs['divInfo'].showAdd(row)
+			},
+			toRelevancyInfo(row) {
+
+				const tip = '请确认是否删除所选记录?'
+				this.$confirm(tip, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					const loading = this.$loading({
+						lock: true,
+						text: 'Loading',
+						spinner: 'el-icon-loading',
+						background: 'rgba(0, 0, 0, 0.7)'
+					})
+					req.deleteBag(row.sid).then((resp) => {
+						loading.close()
+						if (resp.success) {
+							this.$message({
+								type: 'success',
+								message: resp.msg,
+								showClose: true
+							})
+							this.loadList()
+						} else {
+							// 根据resp.code进行异常情况处理
+						}
+					}).catch(e => {
+						loading.close()
+					})
+				}).catch(() => {})
+			},
+			resetState() {
+				this.viewState = 1
+			}
+		}
+	}
+</script>
+<style scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/marketingCard/indexAdd.vue b/src/views/marketingCard/indexAdd.vue
new file mode 100644
index 0000000..8288881
--- /dev/null
+++ b/src/views/marketingCard/indexAdd.vue
@@ -0,0 +1,427 @@
+<template>
+	<div>
+
+		<div class="tab-header webtop">
+			<!-- 标题 -->
+			<div>礼包信息</div>
+			<!-- start 添加修改按钮 -->
+			<div>
+				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+				<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+			</div>
+			<!-- end 添加修改按钮 -->
+			<!-- end 详情按钮 -->
+		</div>
+
+		<div class="listconadd">
+
+			<el-form ref="dataForm" :model="formobj" label-position="top" label-width="190px" class="formadd">
+				<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+					<div>主体信息</div>
+				</div>
+				<el-row>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">礼包名称</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<el-input v-model="formobj.name" placeholder="" class="addinputw" style="width:100%"
+								clearable />
+						</el-form-item>
+					</el-col>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">边界金额</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<el-input v-model="formobj.boundaryPrice" placeholder="" class="addinputw"
+								style="width:100%" clearable
+								oninput="value=value.replace(/[^\d.]/g, '').replace(/\.{2,}/g, '.').replace('.', '$#$').replace(/\./g, '').replace('$#$', '.').replace(/^(\-)*(\d+)\.(\d\d).*$/, '$1$2.$3').replace(/^\./g, '')" />
+
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">起始日期</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<el-date-picker v-model="formobj.dateStart" type="date" style="width:100%"
+								value-format="yyyy-MM-dd" placeholder="选择日期">
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">终止日期</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<el-date-picker v-model="formobj.dateEnd" type="date" style="width:100%"
+								value-format="yyyy-MM-dd" placeholder="选择日期">
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">发放条件</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<el-input v-model="formobj.boundary" placeholder="" class="addinputw" style="width:100%"
+								clearable />
+						</el-form-item>
+					</el-col>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label"></span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<span></span>
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+				<el-row>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">备注信息</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<el-input v-model="formobj.remarks" placeholder="" class="addinputw" style="width:100%"
+								type="textarea" :rows="8" clearable />
+						</el-form-item>
+					</el-col>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">礼包图片</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<upload style="margin-top: 20px;margin-bottom: 20px;" class="addinputw" ref="uploadImg2"
+								v-model="imgList" :limit="1" @change="backData" bucket="map"
+								:upload-data="{ type: '0001' }"></upload>
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+
+				<el-collapse v-model="activeNames" style="margin-top: 20px;">
+					<el-collapse-item name="1">
+						<template slot="title">
+							商品列表<span class="span" @click.stop="add()">添加</span>
+						</template>
+						<el-table v-loading="listLoading" :data="formobj.goods" border style="width: 100%;"
+							:row-style="{height: '40px'}">
+							<!-- <el-table-column type="selection" align="center" width="50"/> -->
+							<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+							<el-table-column label="操作" wid align="center" width="150">
+								<template slot-scope="scope">
+									<el-button type="primary" size="mini"
+										@click="doGoodsDel(scope.row.goodsSid)">删除</el-button>
+								</template>
+							</el-table-column>
+							<el-table-column label="商品名称" prop="name" align="center" />
+							<el-table-column label="商品数量" prop="goodsNumber" align="center" />
+							<el-table-column label="商品价格" prop="price" align="center" />
+							<el-table-column label="商品单位" prop="unitName" align="center" />
+						</el-table>
+
+					</el-collapse-item>
+				</el-collapse>
+
+
+			</el-form>
+
+		</div>
+
+		<el-dialog title="添加商品" :visible.sync="editDialog" width="30%">
+			<table class="e-table" cellspacing="0">
+				<tr>
+					<td>商品名称</td>
+					<td> <!-- @change="changeParentSid" -->
+						<el-select v-model="GiftBagGood.goodsSid" filterable clearable placeholder="请选择"
+							style="width:100%" @change="goodsSelect">
+							<el-option v-for="item in goods" :key="item.sid" :label="item.name" :value="item.sid">
+							</el-option>
+						</el-select>
+					</td>
+				</tr>
+				<tr>
+					<td>商品数量</td>
+					<td>
+						<el-input v-model="GiftBagGood.goodsNumber" style="width:100%"
+							oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" @input="input"></el-input>
+					</td>
+				</tr>
+				<tr>
+					<td>商品价格</td>
+					<td>
+						<span style="width:100%">{{GiftBagGood.price}}</span>
+						<!-- <el-input v-model="" style="width:100%"></el-input> -->
+					</td>
+				</tr>
+				<tr>
+					<td>商品单位</td>
+					<td>
+						<span style="width:100%">{{GiftBagGood.unitName}}</span>
+						<!-- <el-input v-model="GiftBagGood.unitName" style="width:100%"></el-input> -->
+					</td>
+				</tr>
+			</table>
+			<div style="margin-top: 20px; text-align: center;">
+				<el-button type="primary" @click="save()">保 存</el-button>
+				<el-button @click="editDialog = false">关 闭</el-button>
+			</div>
+		</el-dialog>
+
+
+
+	</div>
+</template>
+
+<script>
+	import req from '@/api/marketingCard/marketingCard.js'
+	import upload from '@/components/uploadFile/upload_yanchejianchaTuBiao.vue'
+
+	export default {
+		components: {
+			upload
+		},
+		data() {
+			return {
+				editDialog: false,
+				listLoading: false,
+				activeNames: ['1'],
+				imgList: [],
+				submitdisabled: false,
+				formobj: {
+					sid: "",
+					name: '',
+					dateStart: '',
+					dateEnd: '',
+					boundaryPrice: "",
+					boundary: "",
+					remarks: "",
+					iconUrl: "",
+					goods: []
+				},
+				GiftBagGood: {
+					goodsSid: "",
+					goodsNumber: "",
+					name: "",
+					unitName: "",
+					price: "",
+
+				},
+				goods: []
+			}
+		},
+		created() {
+			this.getGoodList()
+		},
+		methods: {
+			doGoodsDel(sid) {
+				console.log("doGoodsDel》》》》", sid)
+
+				this.$confirm("是否确定删除此商品？", '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					const index = this.formobj.goods.filter((item) => item.sid === sid)
+
+					this.formobj.goods.splice(index, 1)
+				})
+			},
+			save() {
+				console.log("save》》》》", this.GiftBagGood)
+				if (!this.GiftBagGood.goodsSid) {
+					this.$message({
+						showClose: true,
+						type: 'warning',
+						message: '请选择商品'
+					})
+					return
+				}
+
+
+				if (!this.GiftBagGood.goodsNumber) {
+					this.$message({
+						showClose: true,
+						type: 'warning',
+						message: '请输入数量'
+					})
+					return
+				}
+
+
+				const choose = this.formobj.goods.filter((item) => item.goodsSid == this.GiftBagGood.goodsSid)
+				console.log(">>>>>>>>>addCangku", choose)
+				if (choose.length == 0) {
+					this.formobj.goods.push(this.GiftBagGood)
+
+					this.GiftBagGood = {
+						goodsSid: "",
+						goodsNumber: "",
+						name: "",
+						unitName: "",
+						price: "",
+
+					}
+					this.editDialog = false
+				} else {
+					this.$message({
+						showClose: true,
+						type: 'error',
+						message: "请勿重复添加商品!"
+					})
+					return
+				}
+
+
+			},
+			input(val) {
+				console.log("input》》》》", val)
+				this.GiftBagGood.goodsNumber = val
+			},
+			add() {
+				this.editDialog = true
+
+			},
+			getGoodList() {
+				req.getGoods().then(resp => {
+					console.log("getGoods》》》》", resp)
+					this.goods = resp.data
+
+
+				}).catch(() => {})
+			},
+			goodsSelect(val) {
+				console.log("goodsSelect》》》》", val)
+				const choose = this.goods.filter((item) => item.sid === val)
+				this.GiftBagGood.goodsSid = choose[0].sid
+				this.GiftBagGood.name = choose[0].name
+				this.GiftBagGood.unitName = choose[0].unitName
+				this.GiftBagGood.price = choose[0].price
+
+
+			},
+			indexMethod(index) {
+				return index + 1
+			},
+			backData(value) {
+				console.log("backData》》》》", value)
+				console.log("imgList", this.imgList)
+
+				this.formobj.iconUrl = this.imgList[0].url
+			},
+
+			saveOrUpdate() {
+				console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+				req.saveGiftBag(this.formobj)
+					.then(resp => {
+						if (resp.success) {
+							this.$message({
+								showClose: true,
+								type: 'success',
+								message: resp.msg
+							})
+							this.handleReturn('true')
+						} else {
+							// 根据resp.code进行异常情况处理
+						}
+					})
+					.catch(() => {})
+			},
+			handleReturn(isreload) {
+				if (isreload === 'true') this.$emit('reloadlist')
+				this.imgList = []
+				this.formobj = {
+					sid: "",
+					name: '',
+					dateStart: '',
+					dateEnd: '',
+					boundaryPrice: "",
+					boundary: "",
+					remarks: "",
+					iconUrl: "",
+					goods: []
+				}
+				this.$emit('doback')
+			},
+
+			showAdd() {
+
+			},
+			showEdit(row) {
+				req.giftBagInit(row.sid)
+					.then(resp => {
+						if (resp.success) {
+							this.formobj = resp.data
+							this.imgList = []
+							this.imgList.push({
+								url: resp.data.iconUrl
+							})
+
+						}
+					})
+					.catch(e => {
+						this.formobj = row
+						this.imgList = []
+						this.imgList.push({
+							url: formobj.iconUrl
+						})
+					})
+			}
+		}
+	}
+</script>
+<style scoped>
+	.trightb {
+		display: flex;
+		align-items: center;
+		text-align: center;
+		justify-content: center;
+	}
+
+	.trightb_item {
+		padding-top: 5px;
+	}
+
+	.span {
+		margin-left: 50px;
+		font-size: 15px;
+		font-weight: 400;
+	}
+
+	/deep/.el-collapse-item__header {
+		height: 40px;
+		padding: 10px;
+		font-weight: bold;
+		font-size: 20px;
+		text-align: left;
+		color: #ffffff;
+		background-color: #0294d7;
+	}
+
+	/deep/.el-collapse-item__content {
+		padding-bottom: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/marketingCard/indexInfo.vue b/src/views/marketingCard/indexInfo.vue
new file mode 100644
index 0000000..0fca57d
--- /dev/null
+++ b/src/views/marketingCard/indexInfo.vue
@@ -0,0 +1,242 @@
+<template>
+	<div>
+
+		<div class="tab-header webtop">
+			<!-- 标题 -->
+			<div>礼包信息</div>
+			<!-- start 添加修改按钮 -->
+			<div>
+				<!-- <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button> -->
+				<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+			</div>
+			<!-- end 添加修改按钮 -->
+			<!-- end 详情按钮 -->
+		</div>
+
+		<div class="listconadd">
+
+			<el-form ref="dataForm" :model="formobj" label-position="top" label-width="190px" class="formadd">
+				<div class="title" style="display: flex;align-items: center;justify-content: space-between;height:40px">
+					<div>主体信息</div>
+				</div>
+				<el-row>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">礼包名称</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<span slot="label">{{formobj.name}}</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">边界金额</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<span slot="label">{{formobj.boundaryPrice}}</span>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">起始日期</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<span slot="label">{{formobj.dateStart}}</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">终止日期</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<span slot="label">{{formobj.dateEnd}}</span>
+						</el-form-item>
+					</el-col>
+				</el-row>
+				<el-row>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">发放条件</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<span slot="label">{{formobj.boundary}}</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label"></span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<span></span>
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+				<el-row>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">备注信息</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<span slot="label">{{formobj.remarks}}</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="4" class="trightb">
+						<el-form-item class="trightb_item">
+							<span slot="label">礼包图片</span>
+						</el-form-item>
+					</el-col>
+					<el-col :span="8">
+						<el-form-item class="trightb_item">
+							<img :src="formobj.iconUrl" />
+						</el-form-item>
+					</el-col>
+				</el-row>
+
+
+				<el-collapse v-model="activeNames" style="margin-top: 20px;">
+					<el-collapse-item name="1" title="商品列表">
+						<!-- <template slot="title">
+							商品列表<span class="span" @click.stop="add()">添加</span>
+						</template> -->
+						<el-table v-loading="listLoading" :data="formobj.goods" border style="width: 100%;"
+							:row-style="{height: '40px'}">
+							<!-- <el-table-column type="selection" align="center" width="50"/> -->
+							<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+							<!-- <el-table-column label="操作" wid align="center" width="150">
+								<template slot-scope="scope">
+									<el-button type="primary" size="mini"
+										@click="doGoodsDel(scope.row.goodsSid)">删除</el-button>
+								</template>
+							</el-table-column> -->
+							<el-table-column label="商品名称" prop="name" align="center" />
+							<el-table-column label="商品数量" prop="goodsNumber" align="center" />
+							<el-table-column label="商品价格" prop="price" align="center" />
+							<el-table-column label="商品单位" prop="unitName" align="center" />
+						</el-table>
+
+					</el-collapse-item>
+				</el-collapse>
+
+
+			</el-form>
+
+		</div>
+	</div>
+</template>
+
+<script>
+	import req from '@/api/marketingCard/marketingCard.js'
+
+	export default {
+		data() {
+			return {
+				listLoading: false,
+				activeNames: ['1'],
+				submitdisabled: false,
+				formobj: {
+					sid: "",
+					name: '',
+					dateStart: '',
+					dateEnd: '',
+					boundaryPrice: "",
+					boundary: "",
+					remarks: "",
+					iconUrl: "",
+					goods: []
+				},
+			}
+		},
+		methods: {
+
+			handleReturn(isreload) {
+				if (isreload === 'true') this.$emit('reloadlist')
+				this.imgList = []
+				this.formobj = {
+					sid: "",
+					name: '',
+					dateStart: '',
+					dateEnd: '',
+					boundaryPrice: "",
+					boundary: "",
+					remarks: "",
+					iconUrl: "",
+					goods: []
+				}
+				this.$emit('doback')
+			},
+			indexMethod(index) {
+				return index + 1
+			},
+			showAdd(row) {
+					console.log("showAdd》》》》", row)
+				req.giftBagInit(row.sid)
+					.then(resp => {
+						if (resp.success) {
+							this.formobj = resp.data
+							this.imgList = []
+							this.imgList.push({
+								url: resp.data.iconUrl
+							})
+
+						}
+					})
+					.catch(e => {
+						this.formobj = row
+						this.imgList = []
+						this.imgList.push({
+							url: formobj.iconUrl
+						})
+					})
+			},
+		}
+	}
+</script>
+<style scoped>
+	.trightb {
+		display: flex;
+		align-items: center;
+		text-align: center;
+		justify-content: center;
+	}
+
+	.trightb_item {
+		padding-top: 5px;
+	}
+
+	.span {
+		margin-left: 50px;
+		font-size: 15px;
+		font-weight: 400;
+	}
+
+	/deep/.el-collapse-item__header {
+		height: 40px;
+		padding: 10px;
+		font-weight: bold;
+		font-size: 20px;
+		text-align: left;
+		color: #ffffff;
+		background-color: #0294d7;
+	}
+
+	/deep/.el-collapse-item__content {
+		padding-bottom: 0;
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/marketingCard/pickupCardSet.vue b/src/views/marketingCard/pickupCardSet.vue
index 02409e3..c35e409 100644
--- a/src/views/marketingCard/pickupCardSet.vue
+++ b/src/views/marketingCard/pickupCardSet.vue
@@ -1,8 +1,190 @@
 <template>
+	<div>
+
+		<div class="tab-header webtop">
+			<!-- 标题 -->
+			<div>提货卡管理</div>
+			<!-- start 添加修改按钮 -->
+			<div>
+				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">发行</el-button>
+				<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+			</div>
+			<!-- end 添加修改按钮 -->
+			<!-- end 详情按钮 -->
+		</div>
+
+		<div class="listconadd">
+
+			<el-card class="box-card">
+				<div class="item">
+					<span class="item_text">券卡数量：</span>
+					<el-input v-model="formobj.num" placeholder="" class="item_input"
+						oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" clearable />
+				</div>
+				<div class="item">
+					<span class="item_text">选择礼包：</span>
+					<el-select v-model="formobj.giftPackSid" filterable class="item_input" clearable placeholder="请选择"
+						style="width:100%" @change="giftPackSelect">
+						<el-option v-for="item in giftPackList" :key="item.sid" :label="item.name" :value="item.sid">
+						</el-option>
+					</el-select>
+				</div>
+
+
+			</el-card>
+
+		</div>
+
+	</div>
 </template>
 
 <script>
+	import req from '@/api/marketingCard/marketingCard.js'
+
+	export default {
+		data() {
+			return {
+				submitdisabled: false,
+				formobj: {
+					num: '',
+					giftPack: ""
+				},
+				giftPackList: []
+			}
+		},
+		created() {
+			this.giftBagList()
+		},
+		methods: {
+			giftBagList(){
+				req.giftBagList()
+					.then(resp => {
+						console.log('>>>>>>>>>giftBagList', resp.data)
+						this.giftPackList = resp.data
+					})
+					.catch(() => {})
+			},
+			giftPackSelect(val) {
+				console.log('>>>>>>>>>giftPackSelect', val)
+			},
+			saveOrUpdate() {
+				console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+				req.saveGoods(this.formobj)
+					.then(resp => {
+						if (resp.success) {
+							this.$message({
+								showClose: true,
+								type: 'success',
+								message: resp.msg
+							})
+							this.handleReturn('true')
+						} else {
+							// 根据resp.code进行异常情况处理
+						}
+					})
+					.catch(() => {})
+			},
+			handleReturn(isreload) {
+				if (isreload === 'true') this.$emit('reloadlist')
+				this.imgList = []
+				this.formobj = {
+					sid: "",
+					name: '',
+					code: '',
+					barcode: '',
+					price: "",
+					unitName: "",
+					picUrl: ""
+				}
+				this.$emit('doback')
+			},
+
+			showAdd() {
+				console.log(this.imgList, 88888888)
+			},
+			showEdit(row) {
+				req.goodsInit(row.sid)
+					.then(resp => {
+						if (resp.success) {
+							this.formobj = resp.data
+							this.imgList = []
+							this.imgList.push({
+								url: resp.data.picUrl
+							})
+
+						}
+					})
+					.catch(e => {
+						this.formobj = row
+						this.imgList = []
+						this.imgList.push({
+							url: formobj.picUrl
+						})
+					})
+			}
+		}
+	}
 </script>
+<style lang="scss">
+	.box-card {
+		margin-left: 60px;
+		margin-right: 60px;
+		min-width: 70%;
+		margin-top: 20px;
+
+		.item {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin-top: 15px;
+			height: 40px;
+			line-height: 40px;
+
+			.item_text {
+				flex: 0.8;
+				font-size: 18px;
+				text-align: right;
+			}
+
+			.item_input {
+				flex: 4;
+				font-size: 16px;
+				margin-left: 10px;
+				margin-right: 80px;
+			}
+
+			.item_left_input {
+				width: 20%;
+			}
+
+			.item_left_text {
+				height: 30px;
+				margin-left: 20px;
+				line-height: 30px;
+				color: #018AD2;
+				padding: 0px 15px;
+				border: 1.5px solid #018AD2;
+				border-radius: 5px;
+
+			}
+
+			.item_right {
+				flex: 1;
+				justify-items: center;
+
+				.item_right_list_text {
+					font-size: 16px;
+				}
+
+				.item_right_list_delect {
+					color: #5E94FF;
+					margin-left: 20px;
+					font-size: 16px;
+					text-decoration: underline;
+				}
+			}
+
+		}
 
-<style>
+	}
 </style>
\ No newline at end of file
diff --git a/src/views/pickupPoint/index.vue b/src/views/pickupPoint/index.vue
index 02409e3..0680c12 100644
--- a/src/views/pickupPoint/index.vue
+++ b/src/views/pickupPoint/index.vue
@@ -1,8 +1,230 @@
 <template>
+	<div class="app-container">
+		<div v-show="viewState == 1">
+			<button-bar ref="btnbar" view-title="提货点列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+			<div class="main-content">
+				<div class="searchcon">
+					<el-button size="small" class="searchbtn" @click="clicksearchShow">
+						{{ searchxianshitit }}
+					</el-button>
+					<div v-show="isSearchShow" class="search">
+						<el-form :inline="true" class="tab-header">
+							<el-form-item label="提货点名称">
+								<el-input v-model="queryParams.params.name" placeholder="" clearable />
+							</el-form-item>
+							
+						</el-form>
+						<div class="btn" style="text-align: center;">
+							<el-button type="primary" size="small" icon="el-icon-search"
+								@click="dosearch">查询</el-button>
+							<el-button type="primary" size="small" icon="el-icon-refresh"
+								@click="resetQuery">重置</el-button>
+						</div>
+					</div>
+				</div>
+				<!-- Start 项目列表头部 -->
+				<div class="listtop">
+					<div class="tit">提货点列表</div>
+				</div>
+				<!-- End 项目列表头部 -->
+				<!-- Start 项目列表 -->
+				<div class="">
+					<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :row-style="{height: '40px'}">
+						<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
+						<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
+						<el-table-column label="操作" align="center" width="180">
+							<template slot-scope="scope">
+								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">编辑</el-button>
+								<el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button>
+							</template>
+						</el-table-column>
+						<el-table-column prop="name" label="提货点名称" align="center" />
+						<!-- <el-table-column prop="code" label="提货点编号" align="center" /> -->
+						<el-table-column prop="phone" label="联系电话" align="center" />
+						<el-table-column prop="address" label="提货点地址" align="center" />
+						<el-table-column prop="businessHours" label="营业时间" align="center" />
+					</el-table>
+				</div>
+				<!-- End 项目列表 -->
+				<div class="pages">
+					<div class="tit" />
+					<!--  翻页  -->
+					<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
+						:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
+				</div>
+			</div>
+		</div>
+		<!-- 新增修改部分组件 -->
+		<divAdd v-show="viewState == 2|| viewState ==3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
+	</div>
 </template>
 
 <script>
-</script>
+	import req from '@/api/pickupPoint/pickupPoint.js'
+	import ButtonBar from '@/components/ButtonBar'
+	import Pagination from '@/components/pagination'
+	import pageye from '@/components/pagination/pageye'
+	import divAdd from './indexAdd.vue'
+	export default {
+		name: 'SupplierBankInfoIndex',
+		components: {
+			ButtonBar,
+			Pagination,
+			pageye,
+			divAdd
+		},
+		data() {
+			return {
+				btndisabled: false,
+				viewState: 1, // 1、列表 2、添加 3、修改 4、查看
+				isSearchShow: false,
+				searchxianshitit: '显示查询条件',
+				tableLoading: false,
+				dataList: [],
+				btnList: [
+					{
+						type: 'primary',
+						size: 'small',
+						icon: 'plus',
+						btnKey: 'toAdd',
+						btnLabel: '新增'
+					},
+					{
+						type: 'info',
+						size: 'small',
+						icon: 'cross',
+						btnKey: 'doClose',
+						btnLabel: '关闭'
+					}
+				],
+				queryParams: {
+					current: 1,
+					size: 10,
+					total: 0,
+					params: {
+						realName: '',
+						 mobile: '',
+						
+					}
+				},
+				sids: []
+			}
+		},
+		mounted() {
+			this.$refs['btnbar'].setButtonList(this.btnList)
+		},
+		created() {
+			this.loadList()
+		},
+		methods: {
+			// 搜索条件效果
+			clicksearchShow() {
+				this.isSearchShow = !this.isSearchShow
+				if (this.isSearchShow) {
+					this.searchxianshitit = '隐藏查询条件'
+				} else {
+					this.searchxianshitit = '显示查询条件'
+				}
+			},
+			btnHandle(btnKey) {
+				switch (btnKey) {
+					case 'toAdd':
+						this.toAdd()
+						break
+					case 'doClose':
+						this.doClose()
+						break
+					default:
+						break
+				}
+			},
+			loadList() {
+				this.tableLoading = true
+				req.storeListPage(this.queryParams).then((resp) => {
+					this.tableLoading = false
+					if (resp.success) {
+						const data = resp.data
+						this.queryParams.total = data.total
+						this.dataList = data.records
+					} else {
+						// 根据resp.code进行异常情况处理
+						this.dataList = []
+						this.queryParams.total = 0
+					}
+				}).catch(() => {
+					this.tableLoading = false
+				})
+			},
+		
+			// 序号
+			indexMethod(index) {
+				var pagestart = (this.queryParams.current - 1) * this.queryParams.size
+				var pageindex = index + 1 + pagestart
+				return pageindex
+			},
+			dosearch() {
+				this.queryParams.current = 1
+				this.loadList()
+			},
+			resetQuery() {
+				this.queryParams = {
+					current: 1,
+					size: 10,
+					total: 0,
+					params: {
+						name: '',
+					}
+				}
+				this.loadList()
+			},
+			toAdd() {
+				this.viewState = 2
+				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)
+			},
+			toRelevancyInfo(row) {
 
-<style>
+				const tip = '请确认是否删除所选提货点?'
+				this.$confirm(tip, '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				}).then(() => {
+					const loading = this.$loading({
+						lock: true,
+						text: 'Loading',
+						spinner: 'el-icon-loading',
+						background: 'rgba(0, 0, 0, 0.7)'
+					})
+					req.deleteStore(row.sid).then((resp) => {
+						loading.close()
+						if (resp.success) {
+							this.$message({
+								type: 'success',
+								message: resp.msg,
+								showClose: true
+							})
+							this.loadList()
+						} else {
+							// 根据resp.code进行异常情况处理
+						}
+					}).catch(e => {
+						loading.close()
+					})
+				}).catch(() => {})
+			},
+			resetState() {
+				this.viewState = 1
+			}
+		}
+	}
+</script>
+<style scoped>
 </style>
\ No newline at end of file
diff --git a/src/views/pickupPoint/indexAdd.vue b/src/views/pickupPoint/indexAdd.vue
new file mode 100644
index 0000000..b1559f8
--- /dev/null
+++ b/src/views/pickupPoint/indexAdd.vue
@@ -0,0 +1,172 @@
+<template>
+	<div>
+
+		<div class="tab-header webtop">
+			<!-- 标题 -->
+			<div>提货点信息</div>
+			<!-- start 添加修改按钮 -->
+			<div>
+				<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
+				<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+			</div>
+			<!-- end 添加修改按钮 -->
+			<!-- end 详情按钮 -->
+		</div>
+
+		<div class="listconadd">
+
+			<el-card class="box-card">
+				<div class="item">
+					<span class="item_text">名称：</span>
+					<el-input v-model="formobj.name" placeholder="" class="item_input" clearable />
+				</div>
+				<div class="item">
+					<span class="item_text">地址：</span>
+					<el-input v-model="formobj.address" placeholder="" class="item_input" clearable />
+				</div>
+				<div class="item">
+					<span class="item_text">电话：</span>
+					<el-input v-model="formobj.phone" placeholder="" class="item_input" clearable />
+				</div>
+				<div class="item">
+					<span class="item_text">营业时间：</span>
+					<el-input v-model="formobj.businessHours" placeholder="" class="item_input" clearable />
+				</div>
+
+
+			</el-card>
+
+		</div>
+
+	</div>
+</template>
+
+<script>
+	import req from '@/api/pickupPoint/pickupPoint.js'
+
+	export default {
+		data() {
+			return {
+				submitdisabled: false,
+				formobj: {
+					sid: "",
+					name: '',
+					address: '',
+					phone: '',
+					businessHours: "",
+				}
+			}
+		},
+		methods: {
+
+			saveOrUpdate() {
+				console.log('>>>>>>>>>saveOrUpdate', this.formobj)
+				req.saveStore(this.formobj)
+					.then(resp => {
+						if (resp.success) {
+							this.$message({
+								showClose: true,
+								type: 'success',
+								message: resp.msg
+							})
+							this.handleReturn('true')
+						} else {
+							// 根据resp.code进行异常情况处理
+						}
+					})
+					.catch(() => {})
+			},
+			handleReturn(isreload) {
+				if (isreload === 'true') this.$emit('reloadlist')
+				this.imgList = []
+				this.formobj = {
+					sid: "",
+					name: '',
+					address: '',
+					phone: '',
+					businessHours: "",
+				}
+				this.$emit('doback')
+			},
+
+			showAdd() {
+
+			},
+			showEdit(row) {
+				req.storeInit(row.sid)
+					.then(resp => {
+						if (resp.success) {
+							this.formobj = resp.data
+
+						}
+					})
+					.catch(e => {
+						this.formobj = row
+					})
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.box-card {
+		margin-left: 60px;
+		margin-right: 60px;
+		min-width: 70%;
+		margin-top: 20px;
+
+		.item {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			margin-top: 15px;
+			height: 40px;
+			line-height: 40px;
+
+			.item_text {
+				flex: 0.8;
+				font-size: 18px;
+				text-align: right;
+			}
+
+			.item_input {
+				flex: 4;
+				font-size: 16px;
+				margin-left: 10px;
+				margin-right: 80px;
+			}
+
+			.item_left_input {
+				width: 20%;
+			}
+
+			.item_left_text {
+				height: 30px;
+				margin-left: 20px;
+				line-height: 30px;
+				color: #018AD2;
+				padding: 0px 15px;
+				border: 1.5px solid #018AD2;
+				border-radius: 5px;
+
+			}
+
+			.item_right {
+				flex: 1;
+				justify-items: center;
+
+				.item_right_list_text {
+					font-size: 16px;
+				}
+
+				.item_right_list_delect {
+					color: #5E94FF;
+					margin-left: 20px;
+					font-size: 16px;
+					text-decoration: underline;
+				}
+			}
+
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/src/views/userInfo/index.vue b/src/views/userInfo/index.vue
index bb57576..e68af20 100644
--- a/src/views/userInfo/index.vue
+++ b/src/views/userInfo/index.vue
@@ -33,7 +33,7 @@
 				<!-- End 项目列表头部 -->
 				<!-- Start 项目列表 -->
 				<div class="">
-					<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%">
+					<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" :row-style="{height: '40px'}">
 						<!-- <el-table-column fixed width="50" type="selection" align="center" /> -->
 						<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
 						<!-- <el-table-column label="操作" align="center" width="180">
@@ -45,6 +45,8 @@
 						<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="wxMpOpenid" label="OpenId" align="center" />
 					</el-table>
 				</div>
 				<!-- End 项目列表 -->