diff --git a/src/api/pickupPoint/pickupPoint.js b/src/api/pickupPoint/pickupPoint.js
index 5977d08..f3243eb 100644
--- a/src/api/pickupPoint/pickupPoint.js
+++ b/src/api/pickupPoint/pickupPoint.js
@@ -1,6 +1,14 @@
 import request from '@/utils/request'
 
 export default {
+	
+	// 获取支行选择列表
+	bankSelect: function(data) {
+		return request({
+			url: '/lpkbank/listAll',
+			method: 'get'
+		});
+	},
 
 	// 获取提货点列表
 	storeListPage: function(data) {
@@ -42,6 +50,6 @@ export default {
 		});
 	},
 
-
+	
 }
 
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 6436afa..f15d906 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -122,6 +122,16 @@
 						name: "/pickupPoint/index",
 						path: "/pickupPoint/index"
 					},
+					{
+						alwaysShow: true,
+						component: "network",
+						meta: {
+							icon: "el-icon-menu",
+							title: "支行管理",
+						},
+						name: "/network/index",
+						path: "/network/index"
+					},
 					{
 						alwaysShow: true,
 						component: "commodity",
@@ -157,7 +167,27 @@
 							component: "distributionCount",
 							meta: {
 								icon: "el-icon-help",
-								title: "配货统计",
+								title: "网点配货统计",
+							},
+							name: "/order/distributionCount",
+							path: "/order/distributionCount",
+						},
+						{
+							alwaysShow: true,
+							component: "distributionCount",
+							meta: {
+								icon: "el-icon-help",
+								title: "支行配货统计",
+							},
+							name: "/order/distributionCount",
+							path: "/order/distributionCount",
+						},
+						{
+							alwaysShow: true,
+							component: "distributionCount",
+							meta: {
+								icon: "el-icon-help",
+								title: "总配货统计",
 							},
 							name: "/order/distributionCount",
 							path: "/order/distributionCount",
@@ -186,16 +216,7 @@
 					name: "/print/index",
 					path: "/print/index"
 				}
-				// {
-				// 	alwaysShow: true,
-				// 	component: "network",
-				// 	meta: {
-				// 		icon: "el-icon-menu",
-				// 		title: "网点管理",
-				// 	},
-				// 	name: "/network/index",
-				// 	path: "/network/index"
-				// },
+				
 				// {
 				// 	alwaysShow: true,
 				// 	component: "statisticalReport",
diff --git a/src/router/index.js b/src/router/index.js
index 4d2f596..c4e7a6d 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -133,6 +133,21 @@ export const constantRoutes = [
         }
       },]
   },
+  {
+    path: '/network',
+    component: Layout,
+    redirect: '/network/index',
+    children: [{
+        path: '/network/index',
+        component: () =>
+          import('@/views/network/index.vue'),
+        name: 'index',
+        meta: {
+          title: '支行管理'
+        }
+      },]
+  },
+  
   {
     path: '/commodity',
     component: Layout,
@@ -165,9 +180,26 @@ export const constantRoutes = [
           import('@/views/order/distributionCount.vue'),
         name: 'distributionCount',
         meta: {
-          title: '配货统计'
+          title: '网点配货统计'
         }
-      },]
+      },{
+        path: '/order/distributionCount',
+        component: () =>
+          import('@/views/order/distributionCount.vue'),
+        name: 'distributionCount',
+        meta: {
+          title: '支行配货统计'
+        }
+      },
+	  {
+	    path: '/order/distributionCount',
+	    component: () =>
+	      import('@/views/order/distributionCount.vue'),
+	    name: 'distributionCount',
+	    meta: {
+	      title: '总配货统计'
+	    }
+	  }]
   },{
     path: '/statisticalReport',
     component: Layout,
@@ -215,21 +247,7 @@ export const constantRoutes = [
       },]
   },
   
-  // {
-  //   path: '/network',
-  //   component: Layout,
-  //   redirect: '/network/index',
-  //   children: [{
-  //       path: '/network/index',
-  //       component: () =>
-  //         import('@/views/network/index.vue'),
-  //       name: 'index',
-  //       meta: {
-  //         title: '网点管理'
-  //       }
-  //     },]
-  // },
-  
+
   ...codemenu,
   {
     path: '/404',
diff --git a/src/views/marketingCard/index.vue b/src/views/marketingCard/index.vue
index cac3751..b5a0544 100644
--- a/src/views/marketingCard/index.vue
+++ b/src/views/marketingCard/index.vue
@@ -36,10 +36,23 @@
 							<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>
+								<!-- <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.isEnable"
+						      active-text="上架"
+						      inactive-text="下架"
+						      active-value="1"
+						      inactive-value="0"
+						      @change="enableChange(scope.row.sid,scope.row.isEnable)"
+						    />
+						  </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">
@@ -247,6 +260,22 @@
 			},
 			resetState() {
 				this.viewState = 1
+			},
+			enableChange(sid, state) {
+				console.log('sid', sid)
+				console.log('state', state)
+				req.updateIsEnable(sid, state).then((resp) => {
+					if (resp.success) {
+						this.$message({
+							type: 'success',
+							message: '状态已更新',
+							showClose: true
+						})
+					} else { // 根据resp.code进行异常情况处理
+					}
+				}).catch(e => {
+					console.log(e)
+				})
 			}
 		}
 	}
diff --git a/src/views/network/index.vue b/src/views/network/index.vue
index 286e8cd..1f10c11 100644
--- a/src/views/network/index.vue
+++ b/src/views/network/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class="app-container">
 		<div v-show="viewState == 1">
-			<button-bar ref="btnbar" view-title="网点列表" :btndisabled="btndisabled" @btnhandle="btnHandle" />
+			<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">
@@ -9,7 +9,7 @@
 					</el-button>
 					<div v-show="isSearchShow" class="search">
 						<el-form :inline="true" class="tab-header">
-							<el-form-item label="网点名称">
+							<el-form-item label="支行名称">
 								<el-input v-model="queryParams.params.name" placeholder="" clearable />
 							</el-form-item>
 							
@@ -24,7 +24,7 @@
 				</div>
 				<!-- Start 项目列表头部 -->
 				<div class="listtop">
-					<div class="tit">网点列表</div>
+					<div class="tit">支行列表</div>
 				</div>
 				<!-- End 项目列表头部 -->
 				<!-- Start 项目列表 -->
@@ -38,11 +38,11 @@
 								<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="shortName" label="网点简称" align="center" />
+						<el-table-column prop="name" label="支行名称" align="center" />
+						<el-table-column prop="shortName" label="支行简称" align="center" />
 						<el-table-column prop="linker" label="联系人" align="center" />
 						<el-table-column prop="linkPhone" label="联系电话" align="center" />
-						<el-table-column prop="address" label="网点地址" align="center" />
+						<el-table-column prop="address" label="支行地址" align="center" />
 						
 					</el-table>
 				</div>
@@ -191,7 +191,7 @@
 			},
 			toRelevancyInfo(row) {
 
-				const tip = '请确认是否删除所选网点?'
+				const tip = '请确认是否删除所选支行?'
 				this.$confirm(tip, '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
diff --git a/src/views/order/distributionCount.vue b/src/views/order/distributionCount.vue
index 1f61de7..66146df 100644
--- a/src/views/order/distributionCount.vue
+++ b/src/views/order/distributionCount.vue
@@ -49,7 +49,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%" :cell-style="cell">
 						<!-- <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="120">
@@ -59,7 +59,19 @@
 						</el-table-column> -->
 						<el-table-column prop="reserveDate" label="预约日期" align="center" />
 						<el-table-column prop="store" label="提货门店" align="center" />
-						<el-table-column prop="goodsInfo" label="商品明细" align="center" />
+						<!-- <el-table-column prop="goodsInfo" label="商品明细" align="center" /> -->
+						
+						  <el-table-column label="商品明细" align="center"  >
+						    <!-- 分行显示 -->
+						    <template slot-scope="scope">
+								<div v-for="(item,index) in scope.row.goods" style="width: 100%;height: 100%;">
+										<div style="width: 100%;padding:10px"
+										:style="{'border-bottom':(index!=scope.row.goods.length-1?'1px solid #DFE6EC':'none')}">{{item}}</div>
+								</div>
+							
+						    </template>
+						  </el-table-column>
+						
 					</el-table>
 				</div>
 				<!-- End 项目列表 -->
@@ -138,6 +150,12 @@
 			this.loadList()
 		},
 		methods: {
+			 //改变单行蓝色和绿色
+			        cell({row , column , rowIndex , columnIndex}){
+			          if(columnIndex==3){
+			            return 'padding: 0px'
+			          }
+			        },
 			// 搜索条件效果
 			clicksearchShow() {
 				this.isSearchShow = !this.isSearchShow
@@ -273,4 +291,7 @@
 	}
 </script>
 <style scoped>
+	::v-deep .el-table .cell {
+		padding:  0px 	;
+	}
 </style>
\ No newline at end of file
diff --git a/src/views/pickupPoint/index.vue b/src/views/pickupPoint/index.vue
index 93d8189..ad81157 100644
--- a/src/views/pickupPoint/index.vue
+++ b/src/views/pickupPoint/index.vue
@@ -1,88 +1,70 @@
 <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="100">
-              <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.isEnable"
-                  active-text="可用"
-                  inactive-text="禁用"
-                  active-value="1"
-                  inactive-value="0"
-                  @change="enableChange(scope.row.sid,scope.row.isEnable)"
-                />
-              </template>
-            </el-table-column>
-            <el-table-column prop="name" label="提货点名称" align="center" width="200" />
-            <!-- <el-table-column prop="code" label="提货点编号" align="center" /> -->
-            <el-table-column prop="phone" label="联系电话" align="center" width="120" />
-            <el-table-column prop="address" label="提货点地址" align="center" />
-            <el-table-column prop="businessHours" label="营业时间" align="center" width="200" />
-            <el-table-column prop="sort" label="排序" align="center" width="80" />
-          </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>
+	<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="100">
+							<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.isEnable" active-text="可用" inactive-text="禁用"
+									active-value="1" inactive-value="0"
+									@change="enableChange(scope.row.sid,scope.row.isEnable)" />
+							</template>
+						</el-table-column>
+						<el-table-column prop="name" label="提货点名称" align="center" width="250" />
+						<el-table-column prop="phone" label="联系电话" align="center" width="150" />
+						<el-table-column prop="address" label="提货点地址" align="center" />
+						<el-table-column prop="bankName" label="所属支行" width="250" align="center" />
+						<el-table-column prop="businessHours" label="营业时间" align="center" width="200" />
+						<el-table-column prop="sort" label="排序" align="center" width="80" />
+					</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>
@@ -107,8 +89,7 @@
 				searchxianshitit: '显示查询条件',
 				tableLoading: false,
 				dataList: [],
-				btnList: [
-					{
+				btnList: [{
 						type: 'primary',
 						size: 'small',
 						icon: 'plus',
@@ -205,8 +186,8 @@
 				this.$refs['divadd'].showAdd()
 			},
 			doClose() {
-        this.$store.dispatch('tagsView/delView', this.$route)
-        this.$router.go(-1)
+				this.$store.dispatch('tagsView/delView', this.$route)
+				this.$router.go(-1)
 			},
 			toRelevancy(row) {
 				this.viewState = 3
@@ -248,22 +229,21 @@
 			enableChange(sid, state) {
 				console.log('sid', sid)
 				console.log('state', state)
-        req.updateIsEnable(sid, state).then((resp) => {
-          if (resp.success) {
-            this.$message({
-              type: 'success',
-              message: '状态已更新',
-              showClose: true
-              })
-              } else { // 根据resp.code进行异常情况处理
-              }
-        }).catch(e => {
-          console.log(e)
-        })
+				req.updateIsEnable(sid, state).then((resp) => {
+					if (resp.success) {
+						this.$message({
+							type: 'success',
+							message: '状态已更新',
+							showClose: true
+						})
+					} else { // 根据resp.code进行异常情况处理
+					}
+				}).catch(e => {
+					console.log(e)
+				})
 			}
 		}
 	}
 </script>
 <style scoped>
-</style>
-
+</style>
\ No newline at end of file
diff --git a/src/views/pickupPoint/indexAdd.vue b/src/views/pickupPoint/indexAdd.vue
index 64bb7f1..576b646 100644
--- a/src/views/pickupPoint/indexAdd.vue
+++ b/src/views/pickupPoint/indexAdd.vue
@@ -1,55 +1,63 @@
 <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.linker" 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>
-        <div class="item">
-          <span class="item_text">排序：</span>
-          <el-input v-model="formobj.sort" placeholder="" class="item_input" clearable />
-        </div>
-        <div class="item">
-          <span class="item_text">经纬度：</span>
-          <el-input v-model="formobj.lonAndLat" 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.address" placeholder="" class="item_input" clearable />
+				</div>
+				<div class="item">
+					<span class="item_text">联系人：</span>
+					<el-input v-model="formobj.linker" 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>
+				<div class="item">
+					<span class="item_text">排序：</span>
+					<el-input v-model="formobj.sort" placeholder="" class="item_input" clearable />
+				</div>
+				<div class="item">
+					<span class="item_text">经纬度：</span>
+					<el-input v-model="formobj.lonAndLat" placeholder="经纬度,以逗号分隔" class="item_input" clearable />
+				</div>
+				<div class="item">
+					<span class="item_text">所属支行：</span>
+					<el-select v-model="formobj.bankName" filterable class="item_input" clearable placeholder="请选择"
+						style="width:100%" @change="bankSelect">
+						<el-option v-for="item in bankList" :key="item.name" :label="item.name" :value="item.sid">
+						</el-option>
+					</el-select>
+				</div>
+
+			</el-card>
+
+		</div>
+
+	</div>
 </template>
 
 <script>
@@ -68,10 +76,25 @@
 					sort: 0,
 					linker: '',
 					picUrl: '',
-					lonAndLat: ''
-				}
+					lonAndLat: '',
+					bankName: "",
+					bankSid: ""
+				},
+				bankList: []
 			}
 		},
+		created() {
+			req.bankSelect()
+				.then(resp => {
+					console.log('>>>>>>>>>bankSelect', resp)
+
+					this.bankList = resp.data
+
+					console.log('>>>>>>>>>bankSelect', this.bankList)
+				})
+				.catch(() => {})
+
+		},
 		methods: {
 
 			saveOrUpdate() {
@@ -103,7 +126,9 @@
 					sort: 0,
 					linker: '',
 					picUrl: '',
-					lonAndLat: ''
+					lonAndLat: '',
+					bankName: "",
+					bankSid: ""
 				}
 				this.$emit('doback')
 			},
@@ -121,6 +146,9 @@
 					.catch(e => {
 						this.formobj = row
 					})
+			},
+			bankSelect(val) {
+				this.formobj.bankSid = val
 			}
 		}
 	}
@@ -187,4 +215,4 @@
 		}
 
 	}
-</style>
+</style>
\ No newline at end of file