From 5a8bb0c1dde052c6c95d545f53ae27d42338529d Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Thu, 22 Sep 2022 17:57:35 +0800
Subject: [PATCH] fix

---
 src/main/resources/templates/febs/views/modules/order/orderList.html |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/templates/febs/views/modules/order/orderList.html b/src/main/resources/templates/febs/views/modules/order/orderList.html
index 29b9a14..b921561 100644
--- a/src/main/resources/templates/febs/views/modules/order/orderList.html
+++ b/src/main/resources/templates/febs/views/modules/order/orderList.html
@@ -42,10 +42,10 @@
                                 <div class="layui-inline">
                                     <label class="layui-form-label layui-form-label-sm">配送方式</label>
                                     <div class="layui-input-inline">
-                                        <select name="deliveryType">
+                                        <select name="isHome">
                                             <option value="">请选择</option>
-                                            <option value="1">自提</option>
-                                            <option value="2">快递</option>
+                                            <option value="1">送货上门</option>
+                                            <option value="2">自提</option>
                                         </select>
                                     </div>
                                 </div>
@@ -200,6 +200,7 @@
                     return;
                 }
                 window.location.href = ctx + "admin/order/exportOrderListOne?orderType=1&status=2&deliveryType=1&takeUniqueCode="+uniqueCodeValue;
+                $query.click();
             }
 
             if (event == 'exportDeliverTwo') {
@@ -295,6 +296,7 @@
                         {field: 'memberName', title: '购买人', minWidth: 120,align:'left'},
                         {field: 'memberPhone', title: '联系方式', minWidth: 120,align:'left'},
                         // {field: 'memberBindPhone', title: '联系方式', minWidth: 120,align:'left'},
+                        {field: 'goodsName', title: '商品', minWidth: 120,align:'left'},
                         {field: 'amount', title: '订单金额', minWidth: 120,align:'left'},
                         {field: 'leaderName', title: '团长', minWidth: 120,align:'left'},
                         {field: 'orderTime', title: '下单时间', minWidth: 200,align:'left'},
@@ -366,7 +368,7 @@
                 orderNo: $searchForm.find('input[name="orderNo"]').val().trim(),
                 payResult: $searchForm.find("select[name='payResult']").val(),
                 status: $searchForm.find("select[name='status']").val(),
-                deliveryType: $searchForm.find("select[name='deliveryType']").val(),
+                isHome: $searchForm.find("select[name='isHome']").val(),
                 uniqueCode: $searchForm.find("select[name='uniqueCode']").val(),
             };
         }

--
Gitblit v1.9.1