From 3d0c98be8015a58e9da60abe5884ba965ffb4438 Mon Sep 17 00:00:00 2001
From: shiyj1101 <1098226878@qq.com>
Date: Fri, 2 Jul 2021 16:35:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=AE=A2=E5=8D=95=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../editHousekeepingServ.html                 |  8 +++---
 .../common/editProduct/editProduct.html       |  4 +--
 .../common/editProduct/editProduct.js         |  2 +-
 .../storeOrderCartManage.html                 | 27 ++++++++++---------
 .../storeOrderCartManage.js                   | 26 +++++++++++++++++-
 5 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/public/components/common/editHousekeepingServ/editHousekeepingServ.html b/public/components/common/editHousekeepingServ/editHousekeepingServ.html
index 1cc475398..a54852d55 100644
--- a/public/components/common/editHousekeepingServ/editHousekeepingServ.html
+++ b/public/components/common/editHousekeepingServ/editHousekeepingServ.html
@@ -28,7 +28,7 @@
             </div>
             <label class="col-sm-1 col-form-label text-right">家政类型</label>
             <div class="col-sm-5">
-              <select class="custom-select" disabled="disabled" v-model="editHousekeepingServInfo.hktId">
+              <select style="color:#101111" class="custom-select" disabled="disabled" v-model="editHousekeepingServInfo.hktId">
                 <option selected disabled value="">必填，请选择家政类型</option>
                 <option v-for="(item,index) in editHousekeepingServInfo.housekeepingTypes" :value="item.hktId">
                   {{item.hktName}}</option>
@@ -48,7 +48,7 @@
           <div class="form-group row">
             <label class="col-sm-1 col-form-label text-right">上架状态</label>
             <div class="col-sm-5">
-              <select class="custom-select" disabled="disabled" v-model="editHousekeepingServInfo.state">
+              <select style="color:#101111" class="custom-select" disabled="disabled" v-model="editHousekeepingServInfo.state">
                 <option selected disabled value="">必填，请选择上架状态</option>
                 <option value="1001">未上架</option>
                 <option value="2002">上架</option>
@@ -56,7 +56,7 @@
             </div>
             <label class="col-sm-1 col-form-label text-right">派单方式</label>
             <div class="col-sm-5">
-              <select class="custom-select" disabled="disabled" v-model="editHousekeepingServInfo.repairWay">
+              <select style="color:#101111" class="custom-select" disabled="disabled" v-model="editHousekeepingServInfo.repairWay">
                 <option selected disabled value="">必填，请选择派单方式</option>
                 <option value="100">抢单</option>
                 <option value="200">指派</option>
@@ -67,7 +67,7 @@
           <div class="form-group row">
             <label class="col-sm-1 col-form-label text-right">回访方式</label>
             <div class="col-sm-5">
-              <select class="custom-select" disabled="disabled" v-model="editHousekeepingServInfo.returnVisitFlag">
+              <select style="color:#101111" class="custom-select" disabled="disabled" v-model="editHousekeepingServInfo.returnVisitFlag">
                 <option selected disabled value="">必填，请选择回访方式</option>
                 <option value="001">都不回访</option>
                 <option value="002">已评价不回访</option>
diff --git a/public/components/common/editProduct/editProduct.html b/public/components/common/editProduct/editProduct.html
index e3c830479..55abc793b 100644
--- a/public/components/common/editProduct/editProduct.html
+++ b/public/components/common/editProduct/editProduct.html
@@ -17,7 +17,7 @@
             </div>
             <label class="col-sm-1 col-form-label text-right">商品分组</label>
             <div class="col-sm-5">
-              <select class="custom-select" disabled="disabled" v-model="editProductInfo.categoryId">
+              <select style="color:#101111" class="custom-select" disabled="disabled" v-model="editProductInfo.categoryId">
                 <option selected disabled value="">必填，请选择商品分组</option>
                 <option v-for="(item,index) in productManageInfo.productCategorys" :value="item.categoryId">
                   {{item.categoryName}}</option>
@@ -167,7 +167,7 @@
           <div class="form-group row">
             <label class="col-sm-1 col-form-label text-right">商品状态</label>
             <div class="col-sm-11">
-              <select class="custom-select" disabled="disabled" v-model="editProductInfo.state">
+              <select style="color:#101111" class="custom-select" disabled="disabled" v-model="editProductInfo.state">
                 <option selected disabled value="">选填，请选择状态</option>
                 <option value="1001">未上架</option>
                 <option value="2002">上架</option>
diff --git a/public/components/common/editProduct/editProduct.js b/public/components/common/editProduct/editProduct.js
index 83ebc7106..ca10cef44 100644
--- a/public/components/common/editProduct/editProduct.js
+++ b/public/components/common/editProduct/editProduct.js
@@ -137,7 +137,7 @@
                     }
                 };
                 //发送get请求
-                vc.http.apiGet('/productCategory/queryProductCategory',
+                vc.http.apiGet('/productCategory/queryAdminProductCategory',
                     param,
                     function (json, res) {
                         let _productCategoryManageInfo = JSON.parse(json);
diff --git a/public/pages/admin/storeOrderCartManage/storeOrderCartManage.html b/public/pages/admin/storeOrderCartManage/storeOrderCartManage.html
index 5a63f21f8..b212e63cf 100755
--- a/public/pages/admin/storeOrderCartManage/storeOrderCartManage.html
+++ b/public/pages/admin/storeOrderCartManage/storeOrderCartManage.html
@@ -35,6 +35,17 @@
                                        v-model="storeOrderCartManageInfo.conditions.prodName" class=" form-control">
                             </div>
                         </div>
+                        <div class="col-sm-4">
+                            <div class="form-group">
+                                <select class="custom-select" v-model="storeOrderCartManageInfo.conditions.shopId">
+                                    <option selected disabled value="">请选择商铺</option>
+                                    <option :value="item.shopId" v-for="(item,index) in storeOrderCartManageInfo.shops">
+                                        {{item.shopName}}
+                                    </option>
+                                  </select>
+                            </div>
+                        </div>
+
                         <div class="col-sm-2">
                             <button type="button" class="btn btn-primary btn-sm"
                                     v-on:click="_queryOrdersMethod()">
@@ -68,7 +79,7 @@
                             <th class="text-center">支付金额</th>
                             <th class="text-center">订单状态</th>
                             <th class="text-center">创建时间</th>
-                            <th class="text-right">操作</th>
+                            
                         </tr>
                         </thead>
                         <tbody>
@@ -81,16 +92,6 @@
                             <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">
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_openSendOrderCartModel(order)">发货
-                                    </button>
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_openOrderDetailModel(order)">订单详情
-                                    </button>
-                                </div>
-                            </td>
                         </tr>
                         </tbody>
                         <tfoot>
@@ -107,7 +108,7 @@
             </div>
         </div>
     </div>
-    <div id="storeOrderCartModal" class="modal" tabindex="-1" role="dialog">
+    <!--<div id="storeOrderCartModal" class="modal" tabindex="-1" role="dialog">
         <div class="modal-dialog" role="document">
             <div class="modal-content">
                 <div class="modal-header">
@@ -136,6 +137,6 @@
                 </div>
             </div>
         </div>
-    </div>
+    </div>-->
 
 </div>
diff --git a/public/pages/admin/storeOrderCartManage/storeOrderCartManage.js b/public/pages/admin/storeOrderCartManage/storeOrderCartManage.js
index 7ca42d806..77f755584 100755
--- a/public/pages/admin/storeOrderCartManage/storeOrderCartManage.js
+++ b/public/pages/admin/storeOrderCartManage/storeOrderCartManage.js
@@ -9,9 +9,11 @@
                 total: 0,
                 records: 1,
                 orderDetail: false,
+                shops:[],
                 conditions: {
                     cartId: '',
                     state: '',
+                    shopId: '',
                     prodName: ''
                 },
                 address: {
@@ -24,6 +26,7 @@
         },
         _initMethod: function () {
             vc.component._listOrders(DEFAULT_PAGE, DEFAULT_ROWS);
+            vc.component._listOrderShops(DEFAULT_PAGE, DEFAULT_ROWS);
         },
         _initEvent: function () {
             vc.on('storeOrderCartManage', 'goBack', function (_param) {
@@ -44,7 +47,7 @@
                     params: vc.component.storeOrderCartManageInfo.conditions
                 };
                 //发送get请求
-                vc.http.apiGet('/storeOrder/queryStoreOrderCart',
+                vc.http.apiGet('/storeOrder/queryAdminStoreOrderCart',
                     param,
                     function (json, res) {
                         var _storeOrderCartManageInfo = JSON.parse(json);
@@ -74,6 +77,27 @@
                     }
                 );
             },
+            _listOrderShops:function(_page, _rows){
+                var param = {
+                    params: {
+                        page: _page,
+                        row: _rows,
+                    }
+                };
+
+               //发送get请求
+               vc.http.apiGet('/shop/queryShopsByAdmin',
+                    param,
+                    function(json,res){
+                    var _shopManageInfo=JSON.parse(json);
+                    vc.component.storeOrderCartManageInfo.total = _shopManageInfo.total;
+                    vc.component.storeOrderCartManageInfo.records = _shopManageInfo.records;
+                    vc.component.storeOrderCartManageInfo.shops = _shopManageInfo.data;
+                    },function(errInfo,error){
+                    console.log('请求失败处理');
+                    }
+                );
+            },
             _queryOrdersMethod: function () {
                 vc.component._listOrders(DEFAULT_PAGE, DEFAULT_ROWS);
             },