diff --git a/.env.production b/.env.production
index aea0345..0e5f539 100644
--- a/.env.production
+++ b/.env.production
@@ -2,7 +2,7 @@
 ENV = 'production'
 
 # base api
-VUE_APP_BASE_API = '/mallapi'
+VUE_APP_BASE_API = '/lpkapi'
 
 ## 配置 正式接口地址
 VUE_APP_URL = ""
diff --git a/.gitignore b/.gitignore
index eb35fb3..d3dfa06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ package-lock.json
 yarn.lock
 
 yyth-ui/
+yythmall-ui/
diff --git a/src/views/commodity/index.vue b/src/views/commodity/index.vue
index 78ff90a..33874da 100644
--- a/src/views/commodity/index.vue
+++ b/src/views/commodity/index.vue
@@ -1,103 +1,121 @@
 <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>
+  <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="toRelevancy(scope.row)">编辑</el-button>
-								<!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
-							</template>
-						</el-table-column>
-						<el-table-column label="小程序自选商品" align="center" width="140">
-						  <template slot-scope="scope">
-						    <el-switch
-						      v-model="scope.row.useTo"
-						      active-text="是"
-						      inactive-text="否"
-						      active-value="1"
-						      inactive-value="2"
-						      @change="enableChange1(scope.row.sid,scope.row.useTo)"
-						    />
-						  </template>
-						</el-table-column>
-						<el-table-column label="小程序是否上架" align="center" width="140">
-						  <template slot-scope="scope">
-						    <el-switch
-						      v-model="scope.row.isAppletGrounding"
-						      active-text="上架"
-						      inactive-text="下架"
-						      active-value="1"
-						      inactive-value="2"
-						      @change="enableChange2(scope.row.sid,scope.row.isAppletGrounding)"
-						    />
-						  </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.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-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="toRelevancy(scope.row)">编辑</el-button>
+                <!-- <el-button type="primary" size="mini" @click="toRelevancyInfo(scope.row)">删除</el-button> -->
+              </template>
+            </el-table-column>
+            <el-table-column label="小程序自选商品" align="center" width="140">
+              <template slot-scope="scope">
+                <el-switch
+                  v-model="scope.row.useTo"
+                  active-text="是"
+                  inactive-text="否"
+                  active-value="1"
+                  inactive-value="2"
+                  @change="enableChange1(scope.row.sid,scope.row.useTo)"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column label="商品上架" align="center" width="140">
+              <template slot-scope="scope">
+                <el-switch
+                  v-model="scope.row.isAppletGrounding"
+                  active-text="上架"
+                  inactive-text="下架"
+                  active-value="1"
+                  inactive-value="2"
+                  @change="enableChange2(scope.row.sid,scope.row.isAppletGrounding)"
+                />
+              </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.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 项目列表 -->
-				<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" />
-	</div>
+              </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 项目列表 -->
+        <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" />
+  </div>
 </template>
 
 <script>
@@ -193,7 +211,7 @@
 					this.tableLoading = false
 				})
 			},
-		
+
 			// 序号
 			indexMethod(index) {
 				var pagestart = (this.queryParams.current - 1) * this.queryParams.size
@@ -210,7 +228,7 @@
 					size: 10,
 					total: 0,
 					params: {
-						name: '',
+						name: ''
 					}
 				}
 				this.loadList()
@@ -229,7 +247,6 @@
 				this.$refs['divadd'].showEdit(row)
 			},
 			toRelevancyInfo(row) {
-
 				const tip = '请确认是否删除所选商品?'
 				this.$confirm(tip, '提示', {
 					confirmButtonText: '确定',
@@ -298,4 +315,4 @@
 	}
 </script>
 <style scoped>
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/order/allDistributionCount.vue b/src/views/order/allDistributionCount.vue
index a849630..c76d0e9 100644
--- a/src/views/order/allDistributionCount.vue
+++ b/src/views/order/allDistributionCount.vue
@@ -24,6 +24,16 @@
 
 							</el-form-item>
 
+							<el-form-item label="卡券类型">
+								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
+									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+										:value="item.sid">
+									</el-option>
+								</el-select>
+							</el-form-item>
+
+
 						</el-form>
 						<div class="btn" style="text-align: center;">
 							<el-button type="primary" size="small" icon="el-icon-search"
@@ -48,7 +58,7 @@
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column> -->
-							<el-table-column prop="cardType" label="卡券类型" align="center" />
+						<el-table-column prop="cardType" label="卡券类型" align="center" />
 						<el-table-column prop="reserveDate" label="预约日期" align="center" />
 						<el-table-column prop="goodsName" label="商品名称" align="center" />
 						<el-table-column prop="goodsNumber" label="数量(份)" align="center" />
@@ -117,10 +127,29 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						store: ""
+						store: "",
+						cardType: ""
 					},
 				},
-				giftPackList: []
+				giftPackList: [],
+				cardTypeList: [{
+						text: "全部",
+						sid: ""
+					},
+					{
+						text: "家庭卡",
+						sid: "1"
+					},
+					{
+						text: "亲情卡",
+						sid: "2"
+					},
+					{
+						text: "企业卡",
+						sid: "3"
+					},
+
+				]
 			}
 		},
 		mounted() {
@@ -128,7 +157,7 @@
 		},
 		created() {
 			this.getAllStore()
-			this.loadList()
+			// this.loadList()
 		},
 		methods: {
 			//改变单行蓝色和绿色
@@ -180,7 +209,10 @@
 				console.log('>>>>>>>>>giftPackSelect', val)
 				this.page.params.store = val
 			},
-
+			cardTypeSelect(val) {
+				console.log('>>>>>>>>>cardTypeSelect', val)
+				this.page.params.cardType = val
+			},
 			getAllStore() {
 				req.getAllStore().then((resp) => {
 					if (resp.success) {
@@ -225,7 +257,8 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						store: ""
+						store: "",
+						cardType: ""
 					},
 				}
 				this.loadList()
diff --git a/src/views/order/distributionCount.vue b/src/views/order/distributionCount.vue
index 6ee8284..36766c8 100644
--- a/src/views/order/distributionCount.vue
+++ b/src/views/order/distributionCount.vue
@@ -39,6 +39,15 @@
 									</el-option>
 								</el-select>
 							</el-form-item>
+							<el-form-item label="卡券类型">
+								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
+									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+										:value="item.sid">
+									</el-option>
+								</el-select>
+							</el-form-item>
+
 
 						</el-form>
 						<div class="btn" style="text-align: center;">
@@ -64,7 +73,7 @@
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column> -->
-							<el-table-column prop="cardType" label="卡券类型" align="center" />
+						<el-table-column prop="cardType" label="卡券类型" align="center" />
 						<el-table-column prop="reserveDate" label="预约日期" align="center" />
 						<el-table-column prop="bankName" label="所属支行" align="center" />
 						<el-table-column prop="store" label="提货地点" align="center" />
@@ -151,11 +160,30 @@
 						startDate: "",
 						endDate: "",
 						store: "",
-						bankSid: ""
+						bankSid: "",
+						cardType: ""
 					},
 				},
 				giftPackList: [],
 				bankList: [],
+				cardTypeList: [{
+						text: "全部",
+						sid: ""
+					},
+					{
+						text: "家庭卡",
+						sid: "1"
+					},
+					{
+						text: "亲情卡",
+						sid: "2"
+					},
+					{
+						text: "企业卡",
+						sid: "3"
+					},
+
+				]
 			}
 		},
 		mounted() {
@@ -163,7 +191,7 @@
 		},
 		created() {
 			this.getAllStore()
-			this.loadList()
+			// this.loadList()
 			this.getBankList()
 		},
 		methods: {
@@ -230,7 +258,10 @@
 				console.log('>>>>>>>>>bankSelect', val)
 				this.page.params.bankSid = val
 			},
-
+			cardTypeSelect(val) {
+				console.log('>>>>>>>>>cardTypeSelect', val)
+				this.page.params.cardType = val
+			},
 			getAllStore() {
 				req.getAllStore().then((resp) => {
 					if (resp.success) {
@@ -276,7 +307,8 @@
 						startDate: "",
 						endDate: "",
 						store: "",
-						bankSid: ""
+						bankSid: "",
+						cardType: ""
 					},
 				}
 				this.loadList()
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 4b36484..f67d115 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -40,6 +40,17 @@
 									</el-option>
 								</el-select>
 							</el-form-item>
+							
+							
+							<el-form-item label="卡券类型">
+								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
+									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+										:value="item.sid">
+									</el-option>
+								</el-select>
+							</el-form-item>
+							
 
 						</el-form>
 						<div class="btn" style="text-align: center;">
@@ -139,11 +150,31 @@
 						startDate: "",
 						endDate: "",
 						store: "",
-						bankSid:""
+						bankSid:"",
+						cardType:""
 					},
 				},
 				giftPackList: [],
 				bankList: [],
+				cardTypeList:[
+					{
+						text :"全部",
+						sid:""
+					},
+					{
+						text :"家庭卡",
+						sid:"1"
+					},
+					{
+						text :"亲情卡",
+						sid:"2"
+					},
+					{
+						text :"企业卡",
+						sid:"3"
+					},
+					
+				]
 			}
 		},
 		mounted() {
@@ -151,7 +182,7 @@
 		},
 		created() {
 			this.getAllStore()
-			this.loadList()
+			// this.loadList()
 			this.getBankList()
 		},
 		methods: {
@@ -206,6 +237,10 @@
 				console.log('>>>>>>>>>bankSelect', val)
 				this.page.params.bankSid = val
 			},
+			cardTypeSelect(val){
+				console.log('>>>>>>>>>cardTypeSelect', val)
+				this.page.params.cardType = val
+			},
 			getAllStore() {
 				req.getAllStore().then((resp) => {
 					if (resp.success) {
@@ -251,7 +286,8 @@
 						startDate: "",
 						endDate: "",
 						store: "",
-						bankSid:""
+						bankSid:"",
+						cardType:""
 					},
 				}
 				this.loadList()
diff --git a/src/views/order/subBranch.vue b/src/views/order/subBranch.vue
index 30c8f14..79ca59c 100644
--- a/src/views/order/subBranch.vue
+++ b/src/views/order/subBranch.vue
@@ -33,6 +33,16 @@
 								</el-select>
 							</el-form-item>
 
+							<el-form-item label="卡券类型">
+								<el-select v-model="page.params.cardType" filterable class="item_input" clearable
+									placeholder="请选择" style="width:100%" @change="cardTypeSelect">
+									<el-option v-for="item in cardTypeList" :key="item.text" :label="item.text"
+										:value="item.sid">
+									</el-option>
+								</el-select>
+							</el-form-item>
+
+
 						</el-form>
 						<div class="btn" style="text-align: center;">
 							<el-button type="primary" size="small" icon="el-icon-search"
@@ -57,7 +67,7 @@
 								<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">明细</el-button>
 							</template>
 						</el-table-column> -->
-							<el-table-column prop="cardType" label="卡券类型" align="center" />
+						<el-table-column prop="cardType" label="卡券类型" align="center" />
 						<el-table-column prop="reserveDate" label="预约日期" align="center" />
 						<el-table-column prop="bankName" label="支行名称" align="center" />
 						<el-table-column prop="goodsName" label="商品名称" align="center" />
@@ -131,10 +141,29 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						bankSid: ""
+						bankSid: "",
+						cardType: ""
 					},
 				},
-				bankList: []
+				bankList: [],
+				cardTypeList: [{
+						text: "全部",
+						sid: ""
+					},
+					{
+						text: "家庭卡",
+						sid: "1"
+					},
+					{
+						text: "亲情卡",
+						sid: "2"
+					},
+					{
+						text: "企业卡",
+						sid: "3"
+					},
+
+				]
 			}
 		},
 		mounted() {
@@ -142,7 +171,7 @@
 		},
 		created() {
 			this.getAllStore()
-			this.loadList()
+			// this.loadList()
 		},
 		methods: {
 
@@ -195,7 +224,10 @@
 				console.log('>>>>>>>>>bankSelect', val)
 				this.page.params.bankSid = val
 			},
-
+			cardTypeSelect(val) {
+				console.log('>>>>>>>>>cardTypeSelect', val)
+				this.page.params.cardType = val
+			},
 			getAllStore() {
 				req2.bankSelect()
 					.then(resp => {
@@ -244,7 +276,8 @@
 					params: {
 						startDate: "",
 						endDate: "",
-						bankSid: ""
+						bankSid: "",
+						cardType: ""
 					},
 				}
 				this.loadList()
diff --git a/vue.config.js b/vue.config.js
index afff35a..8d63002 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -24,7 +24,7 @@ module.exports = {
    *在大多数情况下，请使用“/”！！！
    *详细信息：https://cli.vuejs.org/config/#publicpath
    */
-  publicPath: process.env.NODE_ENV === 'production' ? '/mall/' : '/',
+  publicPath: process.env.NODE_ENV === 'production' ? '/lpk/' : '/',
   outputDir: 'yythmall-ui',
   assetsDir: 'static',
   lintOnSave: process.env.NODE_ENV === 'development',