diff --git a/public/components/common/editHousekeepingServ/editHousekeepingServ.js b/public/components/common/editHousekeepingServ/editHousekeepingServ.js
index db9a75acf..ccff0553e 100644
--- a/public/components/common/editHousekeepingServ/editHousekeepingServ.js
+++ b/public/components/common/editHousekeepingServ/editHousekeepingServ.js
@@ -162,7 +162,7 @@
                     vc.toast(vc.validate.errInfo);
                     return;
                 }
-                $that.editHousekeepingServInfo.shopId=vc.getCurrentCommunity().shopId;
+                //$that.editHousekeepingServInfo.shopId=vc.getCurrentCommunity().shopId;
                 vc.http.apiPost(
                     '/housekeepingServ/updateHousekeepingServ',
                     JSON.stringify(vc.component.editHousekeepingServInfo),
@@ -192,7 +192,7 @@
                         page: 1,
                         row: 50,
                         typeCd:1001,
-                        shopId:vc.getCurrentCommunity().shopId
+                        //shopId:vc.getCurrentCommunity().shopId
                     }
                 };
 
diff --git a/public/components/common/editProduct/editProduct.js b/public/components/common/editProduct/editProduct.js
index 6423d407d..5d28ff22c 100644
--- a/public/components/common/editProduct/editProduct.js
+++ b/public/components/common/editProduct/editProduct.js
@@ -166,7 +166,7 @@
                     return;
                 }
 
-                $that.editProductInfo.shopId = vc.getCurrentCommunity().shopId;
+                //$that.editProductInfo.shopId = vc.getCurrentCommunity().shopId;
 
                 vc.http.apiPost(
                     '/product/updateProduct',
@@ -226,7 +226,7 @@
                     params: {
                         page:1,
                         row:50,
-                        shopId:vc.getCurrentCommunity().shopId
+                        //shopId:vc.getCurrentCommunity().shopId
                     }
                 };
                 //发送get请求
diff --git a/public/pages/admin/housekeepingSjServManage/housekeepingSjServManage.html b/public/pages/admin/housekeepingSjServManage/housekeepingSjServManage.html
index 36f09b7fe..c12348b17 100644
--- a/public/pages/admin/housekeepingSjServManage/housekeepingSjServManage.html
+++ b/public/pages/admin/housekeepingSjServManage/housekeepingSjServManage.html
@@ -16,12 +16,12 @@
                                     v-model="housekeepingServManageInfo.conditions.servName" class=" form-control">
                             </div>
                         </div>
-                        <div class="col-sm-3">
+                        <!--<div class="col-sm-3">
                             <div class="form-group">
                                 <input type="text" placeholder="请选择上架日期"
                                     v-model="housekeepingServManageInfo.conditions.createTime" class=" form-control servSjtmentTime">
                             </div>
-                        </div>
+                        </div>-->
                         <div class="col-sm-4">
                             <div class="form-group">
                                 <select class="custom-select" v-model="housekeepingServManageInfo.conditions.hktId">
@@ -129,7 +129,7 @@
 
 
     <div v-bind:class="{no_display:housekeepingServManageInfo.componentShow != 'editHousekeepingServ'}">
-        <vc:create path="goods/editHousekeepingServ"></vc:create>
+        <vc:create path="common/editHousekeepingServ"></vc:create>
     </div>
-    <vc:create path="goods/deleteHousekeepingServ"></vc:create>
+    <vc:create path="common/deleteHousekeepingServ"></vc:create>
 </div>
\ No newline at end of file
diff --git a/public/pages/admin/housekeepingSjServManage/housekeepingSjServManage.js b/public/pages/admin/housekeepingSjServManage/housekeepingSjServManage.js
index 3c99159e9..ea4d775ad 100644
--- a/public/pages/admin/housekeepingSjServManage/housekeepingSjServManage.js
+++ b/public/pages/admin/housekeepingSjServManage/housekeepingSjServManage.js
@@ -18,6 +18,7 @@
                     repairWay: '',
                     servName: '',
                     hktId: '',
+                    state: '2002',
                     createTime: ''
                     //shopId:vc.getCurrentCommunity().shopId
 
@@ -87,7 +88,7 @@
                 );
             },
             _initservSjtmentTimeInfo: function () {
-                vc.component.housekeepingServManageInfo.conditions.createTime = vc.dateTimeFormat(new Date().getTime());
+
                 $('.servSjtmentTime').datetimepicker({
                     language: 'zh-CN',
                     fontAwesome: 'fa',
diff --git a/public/pages/admin/productSjManage/productSjManage.html b/public/pages/admin/productSjManage/productSjManage.html
index 2116e82e7..7d32a6880 100644
--- a/public/pages/admin/productSjManage/productSjManage.html
+++ b/public/pages/admin/productSjManage/productSjManage.html
@@ -16,12 +16,12 @@
                                     class=" form-control">
                             </div>
                         </div>
-                        <div class="col-sm-3">
+                        <!--<div class="col-sm-3">
                             <div class="form-group">
                                 <input type="text" placeholder="请选择上架日期"
                                     v-model="productManageInfo.conditions.createTime" class=" form-control productSjtmentTime">
                             </div>
-                        </div>                    
+                        </div>-->                    
                         <div class="col-sm-1">
                             <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryProductMethod()">
                                 <i class="glyphicon glyphicon-search"></i> 查询
@@ -39,6 +39,16 @@
             <div class="ibox">
                 <div class="ibox-title">
                     <h5>上架商品</h5>
+                    <div class="ibox-tools" style="top:10px;">
+                        <button type="button" class="btn btn-primary btn-sm"
+                            v-on:click="_listProductsToDay()">
+                            <i class="glyphicon glyphicon-plus"></i>
+                            今日上架服务
+                        </button>
+                        <button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
+                            v-on:click="_listProductsAll()"> 所有上架服务
+                        </button>
+                    </div>
                 </div>
                 <div class="ibox-content">
 
@@ -100,9 +110,9 @@
     </div>
 
     <div v-bind:class="{no_display:productManageInfo.componentShow != 'editProduct'}">
-        <vc:create path="goods/editProduct"></vc:create>
+        <vc:create path="common/editProduct"></vc:create>
     </div>
-    <vc:create path="goods/deleteProduct"></vc:create>
+    <vc:create path="common/deleteProduct"></vc:create>
     
 
 </div>
\ No newline at end of file
diff --git a/public/pages/admin/productSjManage/productSjManage.js b/public/pages/admin/productSjManage/productSjManage.js
index 0c2dd578d..1db09a1da 100644
--- a/public/pages/admin/productSjManage/productSjManage.js
+++ b/public/pages/admin/productSjManage/productSjManage.js
@@ -15,7 +15,7 @@
                 componentShow: 'productManage',
                 conditions: {
                     categoryId: '',
-                    state: '',
+                    state: '2002',
                     prodName: '',
                     keyword: '',
                     barCode: '',
@@ -65,7 +65,7 @@
                 );
             },
             _initservSjtmentTimeInfo: function () {
-                vc.component.productManageInfo.conditions.createTime = vc.dateTimeFormat(new Date().getTime());
+
                 $('.productSjtmentTime').datetimepicker({
                     language: 'zh-CN',
                     fontAwesome: 'fa',
@@ -83,11 +83,11 @@
             },
             _listProductsToDay: function(){
                 vc.component.productManageInfo.conditions.createTime = vc.dateTimeFormat(new Date().getTime());
-                vc.component._listHousekeepingServs(DEFAULT_PAGE, DEFAULT_ROWS);
+                vc.component._listProducts(DEFAULT_PAGE, DEFAULT_ROWS);
             },
             _listProductsAll: function(){
                 vc.component.productManageInfo.conditions.createTime = '';
-                vc.component._listHousekeepingServs(DEFAULT_PAGE, DEFAULT_ROWS);
+                vc.component._listProducts(DEFAULT_PAGE, DEFAULT_ROWS);
             },
             _openAddProductModal: function () {
                 //vc.emit('addProduct', 'openAddProductModal', {});