diff --git a/app/data/controller/ShopOrder.php b/app/data/controller/ShopOrder.php
index 8150850b7..b98b8f9da 100644
--- a/app/data/controller/ShopOrder.php
+++ b/app/data/controller/ShopOrder.php
@@ -23,7 +23,6 @@ class ShopOrder extends Controller
      * 订单数据管理
      * @auth true
      * @menu true
-     * @return \think\admin\helper\QueryHelper
      * @throws \think\db\exception\DataNotFoundException
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
diff --git a/app/data/controller/ShopOrderSend.php b/app/data/controller/ShopOrderSend.php
index c6fefd521..bc46859c4 100644
--- a/app/data/controller/ShopOrderSend.php
+++ b/app/data/controller/ShopOrderSend.php
@@ -18,7 +18,7 @@ class ShopOrderSend extends Controller
     private $table = 'ShopOrder';
 
     /**
-     * 订单发货管理
+     * 订单数据管理
      * @auth true
      * @menu true
      * @throws \think\db\exception\DataNotFoundException
@@ -27,12 +27,60 @@ class ShopOrderSend extends Controller
      */
     public function index()
     {
-        $this->title = '订单发货管理';
+        $this->title = '订单数据管理';
+        // 状态数据统计
+        $this->total = ['t0' => 0, 't1' => 0, 't2' => 0, 't3' => 0, 't4' => 0, 't5' => 0, 'ta' => 0];
+        $this->app->db->name($this->table)->fieldRaw('status,count(1) total')->group('status')->select()->map(function ($vo) {
+            $this->total["t{$vo['status']}"] = $vo['total'];
+            $this->total["ta"] += $vo['total'];
+        });
+        // 订单列表查询
         $query = $this->_query($this->table);
-        if (is_numeric($this->type = input('type', 'all'))) {
-            $query->equal('status#type');
+        $query->equal('status,payment_type,payment_status');
+        $query->dateBetween('create_at,payment_datetime,cancel_datetime,truck_datetime,truck_send_datetime');
+        $query->like('order_no,truck_name,truck_phone,truck_province|truck_area|truck_address#address,truck_send_no,truck_send_name');
+        // 会员搜索查询
+        $db = $this->_query('DataMember')->like('phone#member_phone,nickname#member_nickname')->db();
+        if ($db->getOptions('where')) $query->whereRaw("mid in {$db->fieldRaw('id')->buildSql()}");
+        // 推荐人搜索查询
+        $db = $this->_query('DataMember')->like('phone#from_phone,nickname#from_nickname')->db();
+        if ($db->getOptions('where')) $query->whereRaw("from in {$db->fieldRaw('id')->buildSql()}");
+        // 列表选项卡
+        if (is_numeric($this->type = trim(input('type', 'ta'), 't'))) {
+            $query->where(['status' => $this->type]);
+        }
+        // 分页排序处理
+        if (input('output') === 'json') {
+            $result = $query->order('id desc')->page(true, false);
+            $this->success('获取数据列表成功', $result);
+        } else {
+            $query->order('id desc')->page();
+        }
+    }
+
+    /**
+     * 订单列表处理
+     * @param array $data
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     */
+    protected function _index_page_filter(array &$data)
+    {
+        $mids = array_unique(array_merge(array_column($data, 'mid'), array_column($data, 'from')));
+        $mems = $this->app->db->name('DataMember')->whereIn('id', $mids)->column('*', 'id');
+        $query = $this->app->db->name('ShopOrderItem')->where(['status' => 1, 'deleted' => 0]);
+        $items = $query->whereIn('order_no', array_unique(array_column($data, 'order_no')))->select()->toArray();
+        foreach ($data as &$vo) {
+            $vo['items'] = [];
+            $vo['member'] = $mems[$vo['mid']] ?? [];
+            $vo['fromer'] = $mems[$vo['from']] ?? [];
+            foreach ($items as $item) {
+                if ($vo['order_no'] === $item['order_no']) {
+                    $vo['items'][] = $item;
+                }
+            }
         }
-        $query->order('id desc')->page();
     }
 
 }
\ No newline at end of file
diff --git a/app/data/view/shop_order/express.html b/app/data/view/shop_order/express.html
index 8e7d4c5c5..82bcdcb86 100644
--- a/app/data/view/shop_order/express.html
+++ b/app/data/view/shop_order/express.html
@@ -71,7 +71,7 @@
     });
     $('[data-express-query]').on('click', function () {
         (function (code, number) {
-            $.form.modal('{:url("expressQuery")}', {code: code, number: number}, '快递追踪查询')
+            $.form.modal('{:url("truckQuery")}', {code: code, number: number}, '快递追踪查询')
         })($('[data-truck-code]').val(), $('[data-truck-number]').val());
     });
 </script>
\ No newline at end of file
diff --git a/app/data/view/shop_order/index.html b/app/data/view/shop_order/index.html
index 9d0aafdde..b2001cc0d 100644
--- a/app/data/view/shop_order/index.html
+++ b/app/data/view/shop_order/index.html
@@ -72,7 +72,7 @@
                     {else}
                     <span class="layui-badge layui-bg-blue">{$vo.truck_send_name|default='--'}</span>
                     <a data-title="{$vo.truck_send_name}（{$vo.truck_send_no}）" data-tips-text="快递追踪查询"
-                       data-modal="{:url('expressQuery')}?code={$vo.truck_send_code}&number={$vo.truck_send_no}"
+                       data-modal="{:url('truckQuery')}?code={$vo.truck_send_code}&number={$vo.truck_send_no}"
                        class="layui-badge layui-bg-orange margin-left-5">{$vo.truck_send_no|default='--'}</a>
                     {/if}
                     {if $vo.status eq 3}
diff --git a/app/data/view/shop_order_send/index.html b/app/data/view/shop_order_send/index.html
index 59cdd45a7..b2001cc0d 100644
--- a/app/data/view/shop_order_send/index.html
+++ b/app/data/view/shop_order_send/index.html
@@ -3,8 +3,8 @@
 {block name="content"}
 <div class="layui-tab layui-tab-card">
     <ul class="layui-tab-title notselect">
-        {foreach ['all'=>'全部订单','2'=>'待支付的订单','3'=>'待发货的订单','4'=>'待收货的订单','5'=>'已完成的订单','0'=>'已取消的订单'] as $k=>$v}
-        {if isset($type) and $type eq $k.''}
+        {foreach ['ta'=>'全部订单','t2'=>'待支付的订单','t3'=>'待发货的订单','t4'=>'待收货的订单','t5'=>'已完成的订单','t0'=>'已取消的订单'] as $k=>$v}
+        {if isset($type) and 't'.$type eq $k}
         <li data-open="{:url('index')}?type={$k}" class="layui-this">{$v} <sup class="layui-badge absolute border-radius">{$total[$k]??0}</sup></li>
         {else}
         <li data-open="{:url('index')}?type={$k}">{$v} <sup class="layui-badge absolute border-radius">{$total[$k]??0}</sup></li>
@@ -34,10 +34,10 @@
                 </td>
                 <td class="nowrap relative">
                     <div>
-                        <img data-tips-image style="width:35px;height:35px" src="{$vo.from_member.headimg|default='__ROOT__/static/theme/img/headimg.png'}" class="margin-right-5" alt="img">
+                        <img data-tips-image style="width:35px;height:35px" src="{$vo.fromer.headimg|default='__ROOT__/static/theme/img/headimg.png'}" class="margin-right-5" alt="img">
                         <div class="inline-block text-middle sub-span-blue">
-                            推荐会员：{$vo.from_member.nickname|default='--'}<br>
-                            推荐手机：<span>{$vo.from_member.phone|default='--'}</span>{notempty name='vo.from_member.vip_level'} [ <b class="color-red">VIP{$vo.from_member.vip_level}</b> ] <b class="color-red">{$vo.from_member.vip_title}</b>{/notempty}<br>
+                            推荐会员：{$vo.fromer.nickname|default='--'}<br>
+                            推荐手机：<span>{$vo.fromer.phone|default='--'}</span>{notempty name='vo.fromer.vip_level'} [ <b class="color-red">VIP{$vo.fromer.vip_level}</b> ] <b class="color-red">{$vo.fromer.vip_title}</b>{/notempty}<br>
                         </div>
                     </div>
                     <div>
@@ -70,29 +70,29 @@
                     发货状态：{if empty($vo.truck_send_code)}
                     <span class="layui-badge layui-bg-black">未发货</span>
                     {else}
-                    <span class="layui-badge layui-bg-blue">{$vo.express_company_title|default='--'}</span>
-                    <a data-title="{$vo.express_company_title}（{$vo.express_send_no}）" data-tips-text="快递追踪查询"
-                       data-modal="{:url('expressQuery')}?code={$vo.express_company_code}&number={$vo.express_send_no}"
-                       class="layui-badge layui-bg-gray margin-left-5">{$vo.express_send_no|default='--'}</a>
+                    <span class="layui-badge layui-bg-blue">{$vo.truck_send_name|default='--'}</span>
+                    <a data-title="{$vo.truck_send_name}（{$vo.truck_send_no}）" data-tips-text="快递追踪查询"
+                       data-modal="{:url('truckQuery')}?code={$vo.truck_send_code}&number={$vo.truck_send_no}"
+                       class="layui-badge layui-bg-orange margin-left-5">{$vo.truck_send_no|default='--'}</a>
                     {/if}
                     {if $vo.status eq 3}
-                    <a class=" margin-left-5" data-title="填写订单信息" data-modal="{:url('express')}?id={$vo.id}">填写发货</a>
-                    <!--{if auth('cancel')}-->
-                    <a class=" margin-left-5" data-confirm="确认要取消并创建退款申请吗？" data-load="{:url('cancel')}?order_no={$vo.order_no}">取消并退款</a>
-                    <!--{/if}-->
+                    <a class="margin-left-5" data-title="填写订单信息" data-modal="{:url('express')}?order_no={$vo.order_no}">填写发货</a>
                     {elseif $vo.status eq 4}
-                    <a class=" margin-left-5" data-title="修改发货信息" data-modal="{:url('express')}?id={$vo.id}">修改发货</a>
+                    <a class="margin-left-5" data-title="修改发货信息" data-modal="{:url('express')}?order_no={$vo.order_no}">修改发货</a>
                     {/if}
+                    <!--{if auth('cancel') and in_array($vo.status, [1,2])}-->
+                    <a class="margin-left-5" data-confirm="确认要取消订单吗？" data-load="{:url('cancel')}?order_no={$vo.order_no}">取消订单</a>
+                    <!--{/if}-->
                     <br>
-                    发货时间：{$vo.truck_express_datetime|format_datetime}<br>
+                    发货时间：{$vo.truck_send_datetime|format_datetime}<br>
                 </td>
                 <td class="nowrap">
-                    {foreach $vo.list as $g}
+                    {foreach $vo.items as $item}
                     <div>
-                        <b class="color-blue">{$g.stock_sales|default=0}件</b>
+                        <b class="color-blue">{$item.stock_sales|default=0}件</b>
                         <b class="color-red">x</b>
-                        <b class="color-blue">{$g.price_market+0}元 </b>
-                        {$g.goods_name|default=''} <span class="color-green">( {$g.goods_spec|think_show_goods_spec})</span>
+                        <b class="color-blue">{$item.price_market+0}元 </b>
+                        {$item.goods_name|default=''} <span class="color-green">( {$item.goods_spec|think_show_goods_spec})</span>
                     </div>
                     {/foreach}
                 </td>
diff --git a/app/data/view/shop_order_service/index.html b/app/data/view/shop_order_service/index.html
index 6412ca940..201cf4560 100644
--- a/app/data/view/shop_order_service/index.html
+++ b/app/data/view/shop_order_service/index.html
@@ -72,7 +72,7 @@
                     {else}
                     <span class="layui-badge layui-bg-blue">{$vo.express_company_title|default='--'}</span>
                     <a data-title="{$vo.express_company_title}（{$vo.express_send_no}）" data-tips-text="快递追踪查询"
-                       data-modal="{:url('expressQuery')}?code={$vo.express_company_code}&number={$vo.express_send_no}"
+                       data-modal="{:url('truckQuery')}?code={$vo.express_company_code}&number={$vo.express_send_no}"
                        class="layui-badge layui-bg-gray margin-left-5">{$vo.express_send_no|default='--'}</a>
                     {/eq}
                     {if $vo.status eq 3}