diff --git a/public/pages/admin/storeOrderCartManage/storeOrderCartManage.html b/public/pages/admin/storeOrderCartManage/storeOrderCartManage.html
index ee0250f96..2bfb56e30 100644
--- a/public/pages/admin/storeOrderCartManage/storeOrderCartManage.html
+++ b/public/pages/admin/storeOrderCartManage/storeOrderCartManage.html
@@ -13,22 +13,27 @@
                         <div class="col-sm-4">
                             <div class="form-group">
                                 <input type="text" placeholder="订单编号"
-                                       v-model="storeOrderCartManageInfo.conditions.oId" class=" form-control">
+                                       v-model="storeOrderCartManageInfo.conditions.cartId" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <select class="custom-select" v-model="storeOrderCartManageInfo.conditions.orderTypeCd">
-                                    <option value="">请选择订单类型</option>
-                                    <option value="Q">查询单</option>
-                                    <option value="D">受理单</option>
+                                <select class="custom-select" v-model="storeOrderCartManageInfo.conditions.state">
+                                    <option value="">请选择状态</option>
+                                    <option value="1001">未购买</option>
+                                    <option value="2002">待发货</option>
+                                    <option value="3003">待收货</option>
+                                    <option value="4004">待评价</option>
+                                    <option value="5005">申请退款</option>
+                                    <option value="6006">退货成功</option>
+                                    <option value="7007">已退款</option>       	
                                 </select>
                             </div>
                         </div>
                         <div class="col-sm-3">
                             <div class="form-group">
-                                <input type="text" placeholder="appid"
-                                       v-model="storeOrderCartManageInfo.conditions.appId" class=" form-control">
+                                <input type="text" placeholder="请输入商品名称"
+                                       v-model="storeOrderCartManageInfo.conditions.prodName" class=" form-control">
                             </div>
                         </div>
                         <div class="col-sm-2">
@@ -65,17 +70,17 @@
                             <th class="text-center">支付金额</th>
                             <th class="text-center">订单状态</th>
                             <th class="text-center">创建时间</th>
-                            <th class="text-center">操作</th>
+                            <th class="text-right">操作</th>
                         </tr>
                         </thead>
                         <tbody>
                         <tr v-for="order in storeOrderCartManageInfo.orderCarts">
-                            <td class="text-center">{{order.appId}}</td>
-                            <td class="text-center">{{order.oId}}</td>
-                            <td class="text-center">{{order.orderTypeCdName}}</td>
-                            <td class="text-center">{{order.extTransactionId}}</td>
-                            <td class="text-center">{{order.requestTime}}</td>
-                            <td class="text-center">{{order.userName}}</td>
+                            <td class="text-center">{{order.cartId}}</td>
+                            <td class="text-center">{{order.prodName}}</td>
+                            <td class="text-center">{{order.createTime}}</td>
+                            <td class="text-center">{{order.personName}}</td>
+                            <td class="text-center">{{order.payPrice}}</td>
+                            <td class="text-center">{{order.stateName}}</td>
                             <td class="text-center">{{order.createTime}}</td>
                             <td class="text-right">
                                 <div class="btn-group">
@@ -84,7 +89,6 @@
                                     </button>
                                 </div>
                             </td>
-
                         </tr>
                         </tbody>
                         <tfoot>
diff --git a/public/pages/admin/storeOrderCartManage/storeOrderCartManage.js b/public/pages/admin/storeOrderCartManage/storeOrderCartManage.js
index 3a6d053fc..974711c15 100644
--- a/public/pages/admin/storeOrderCartManage/storeOrderCartManage.js
+++ b/public/pages/admin/storeOrderCartManage/storeOrderCartManage.js
@@ -10,10 +10,9 @@
                 records:1,
                 orderDetail:false,
                 conditions:{
-                    oId:'',
-                    extTransactionId:'',
-                    orderTypeCd:'',
-                    appId:'',
+                    cartId:'',
+                    state:'',
+                    prodName:''
                 }
             }
         },
@@ -36,17 +35,13 @@
                     params:vc.component.storeOrderCartManageInfo.conditions
                };
                //发送get请求
-               vc.http.get('cstoreOrderCartManage',
-                            'list',
+               vc.http.apiGet('/storeOrder/queryStoreOrderCart',
                              param,
                              function(json,res){
                                 var _storeOrderCartManageInfo=JSON.parse(json);
                                 vc.component.storeOrderCartManageInfo.total = _storeOrderCartManageInfo.total;
                                 vc.component.storeOrderCartManageInfo.records = _storeOrderCartManageInfo.records;
-                                vc.component.storeOrderCartManageInfo.orderCarts = _storeOrderCartManageInfo.corderDataVos;
-                                vc.component.storeOrderCartManageInfo.orderCarts.map(item=>{
-                                    item.requestTime=item.requestTime.substring(0,4)+"-"+item.requestTime.substring(4,6)+"-"+item.requestTime.substring(6,8)+"  "+item.requestTime.substring(8,10)+":"+item.requestTime.substring(10,12)+":"+item.requestTime.substring(12,14)
-                                })
+                                vc.component.storeOrderCartManageInfo.orderCarts = _storeOrderCartManageInfo.data;
                                 vc.emit('pagination','init',{
                                      total:vc.component.storeOrderCartManageInfo.records,
                                      currentPage:_page