diff --git a/public/components/admin/addStoreInfo/addStoreInfo.html b/public/components/admin/addStoreInfo/addStoreInfo.html
index 884e77b57..2609087d7 100644
--- a/public/components/admin/addStoreInfo/addStoreInfo.html
+++ b/public/components/admin/addStoreInfo/addStoreInfo.html
@@ -17,6 +17,25 @@
            <input v-model="addStoreInfoInfo.name"                   type="text" placeholder="必填，请填写商户名称" class="form-control">
          </div>
 </div>
+<div class="form-group row">
+  <label class="col-sm-2 col-form-label text-right">便民类型</label>
+  <div class="col-sm-3">
+    <select class="custom-select" v-model="addStoreInfoInfo.convenienceMenusId">
+      <option selected disabled value="">必填，请选择类型</option>
+      <option v-for="(item,index) in storeInfoManageInfo.menuInfos" :value="item.convenienceMenusId">
+        {{item.name}}</option>
+  </select>
+  </div>
+</div>
+<div class="form-group row">
+  <label class="col-sm-2 col-form-label text-right">是否显示</label>
+  <div class="col-sm-3">
+      <select class="custom-select" v-model="addStoreInfoInfo.isShow">
+          <option selected disabled value="">必填，请选择是否显示</option>
+          <option value="Y">是</option>
+          <option value="N">否</option>
+      </select> </div>
+</div>
 <div class="form-group row">
          <label class="col-sm-2 col-form-label text-right">图片地址</label>
          <div class="col-sm-10">
diff --git a/public/components/admin/addStoreInfo/addStoreInfo.js b/public/components/admin/addStoreInfo/addStoreInfo.js
index 8077b41c2..50d1b09ef 100644
--- a/public/components/admin/addStoreInfo/addStoreInfo.js
+++ b/public/components/admin/addStoreInfo/addStoreInfo.js
@@ -9,6 +9,8 @@
             addStoreInfoInfo:{
                 storeInfoId:'',
                 name:'',
+                convenienceMenusId:'',
+                isShow:'',
                 icon:'',
                 tel:'',
                 site:'',
@@ -206,6 +208,8 @@
             clearAddStoreInfoInfo:function(){
                 vc.component.addStoreInfoInfo = {
                                             name:'',
+                                            convenienceMenusId:'',
+                                            isShow:'',
                                             icon:'',
                                             tel:'',
                                             site:'',
diff --git a/public/components/admin/editStoreInfo/editStoreInfo.html b/public/components/admin/editStoreInfo/editStoreInfo.html
index 05e8fdde2..e8f9d6d50 100644
--- a/public/components/admin/editStoreInfo/editStoreInfo.html
+++ b/public/components/admin/editStoreInfo/editStoreInfo.html
@@ -17,6 +17,25 @@
            <input v-model="editStoreInfoInfo.name"                   type="text" placeholder="必填，请填写商户名称" class="form-control">
          </div>
 </div>
+<div class="form-group row">
+  <label class="col-sm-2 col-form-label text-right">便民类型</label>
+  <div class="col-sm-3">
+    <select class="custom-select" v-model="editStoreInfoInfo.convenienceMenusId">
+      <option selected disabled value="">必填，请选择类型</option>
+      <option v-for="(item,index) in storeInfoManageInfo.menuInfos" :value="item.convenienceMenusId">
+        {{item.name}}</option>
+  </select>
+  </div>
+</div>
+<div class="form-group row">
+  <label class="col-sm-2 col-form-label text-right">是否显示</label>
+  <div class="col-sm-3">
+      <select class="custom-select" v-model="editStoreInfoInfo.isShow">
+          <option selected disabled value="">必填，请选择是否显示</option>
+          <option value="Y">是</option>
+          <option value="N">否</option>
+      </select> </div>
+</div>
 <div class="form-group row">
          <label class="col-sm-2 col-form-label text-right">图片地址</label>
          <div class="col-sm-10">
diff --git a/public/components/admin/editStoreInfo/editStoreInfo.js b/public/components/admin/editStoreInfo/editStoreInfo.js
index 232c4dc8d..a3d318583 100644
--- a/public/components/admin/editStoreInfo/editStoreInfo.js
+++ b/public/components/admin/editStoreInfo/editStoreInfo.js
@@ -5,6 +5,8 @@
             editStoreInfoInfo:{
                 storeInfoId:'',
                 name:'',
+                convenienceMenusId:'',
+                isShow:'',
                 icon:'',
                 tel:'',
                 site:'',
@@ -204,6 +206,8 @@
                 vc.component.editStoreInfoInfo= {
                   storeInfoId:'',
                     name:'',
+                    convenienceMenusId:'',
+                    isShow:'',
                     icon:'',
                     tel:'',
                     site:'',
diff --git a/public/pages/admin/storeInfoManage/storeInfoManage.html b/public/pages/admin/storeInfoManage/storeInfoManage.html
index 86f3cc0f1..d3db2b928 100644
--- a/public/pages/admin/storeInfoManage/storeInfoManage.html
+++ b/public/pages/admin/storeInfoManage/storeInfoManage.html
@@ -13,7 +13,25 @@
                 <div class="col-sm-4" >
                             <div class="form-group">
                                 <input type="text" placeholder="请输入商户名称" v-model="storeInfoManageInfo.conditions.name" class=" form-control">
-                            </div>                        </div>
+                            </div>    
+                        
+                        </div>
+
+                        <div class="col-sm-3">
+                            <div class="form-group">
+                                <select class="custom-select" v-model="storeInfoManageInfo.conditions.convenienceMenusId">
+                                    <option value="">请选择便民种类</option>
+                                    <option :value="item.convenienceMenusId" v-for="(item,index) in storeInfoManageInfo.menuInfos">
+                                        {{item.name}}</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-sm-3">
+                            <select class="custom-select" v-model="storeInfoManageInfo.conditions.isShow">
+                                <option selected value="">请选择是否显示</option>
+                                <option value="Y">是</option>
+                                <option value="N">否</option>
+                            </select> </div>
                             <div class="col-sm-1">
                                 <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryStoreInfoMethod()">
                                     <i class="glyphicon glyphicon-search"></i> 查询
@@ -54,11 +72,10 @@
                                                         <th class="text-center">商户信息ID</th>
                             <th class="text-center">商户名称</th>
                             <th class="text-center">图片地址</th>
-                            
                             <th class="text-center">商户电话</th>
                             <th class="text-center">商户位置</th>
                             <th class="text-center">显示序号</th>
-                            <th class="text-center">工作时间</th>
+                            <th class="text-center">是否显示</th>
                             <th class="text-center">操作</th>
 
 
@@ -75,7 +92,7 @@
                             <td class="text-center">{{storeInfo.tel}}</td>
                             <td class="text-center">{{storeInfo.site}}</td>
                             <td class="text-center">{{storeInfo.seq}}</td>
-                            <td class="text-center">{{storeInfo.workTime}}</td>
+                            <td class="text-center">{{storeInfo.isShow == 'Y'?'是':'否'}}</td>
                             <td class="text-center"><div class="btn-group">
                                     <button class="btn-white btn btn-xs" v-on:click="_openEditStoreInfoModel(storeInfo)">修改</button>
                                 </div>
diff --git a/public/pages/admin/storeInfoManage/storeInfoManage.js b/public/pages/admin/storeInfoManage/storeInfoManage.js
index 3006c03e1..1d549661d 100644
--- a/public/pages/admin/storeInfoManage/storeInfoManage.js
+++ b/public/pages/admin/storeInfoManage/storeInfoManage.js
@@ -8,6 +8,7 @@
         data:{
             storeInfoManageInfo:{
                 storeInfos:[],
+                menuInfos:[],
                 total:0,
                 records:1,
                 moreCondition:false,
@@ -15,12 +16,15 @@
                 componentShow:'storeInfoManage',
                 conditions:{
                     name:'',
+                    isShow:'',
+                    convenienceMenusId:'',
 
                 }
             }
         },
         _initMethod:function(){
             vc.component._listStoreInfos(DEFAULT_PAGE, DEFAULT_ROWS);
+            vc.component._listConvenienceMenuss(DEFAULT_PAGE, 50);
         },
         _initEvent:function(){
             
@@ -33,6 +37,26 @@
             });
         },
         methods:{
+            _listConvenienceMenuss:function(_page, _rows){
+                vc.component.storeInfoManageInfo.conditions.page = _page;
+                vc.component.storeInfoManageInfo.conditions.row = _rows;
+                
+                var param = {
+                    params:vc.component.storeInfoManageInfo.conditions
+               };
+
+               //发送get请求
+               vc.http.apiGet('/convenienceMenus/queryConvenienceMenus',
+                             param,
+                             function(json,res){
+                                var _convenienceMenusManageInfo=JSON.parse(json);
+                                vc.component.storeInfoManageInfo.menuInfos = _convenienceMenusManageInfo.data;
+                             },function(errInfo,error){
+                                console.log('请求失败处理');
+                             }
+                           );
+            },
+
             _listStoreInfos:function(_page, _rows){
 
                 vc.component.storeInfoManageInfo.conditions.page = _page;