From 0028bdbcd0532b7f4e7416e6884c190bdff36b82 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Fri, 18 Sep 2020 18:29:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/controller/ShopGoodsStock.php        |  19 ----
 app/data/service/OrderService.php             |   6 +-
 app/data/view/config/slider.html              |  36 +++----
 app/data/view/news_item/select.html           |   2 +-
 app/data/view/news_mark/form.html             |   3 +
 app/data/view/shop_goods/formstyle.html       |   3 +-
 app/data/view/shop_goods/index_search.html    |  15 ++-
 app/data/view/shop_goods/select.html          |   2 +-
 app/data/view/shop_goods_cate/index.html      |   3 +-
 app/data/view/shop_goods_mark/form.html       |   4 +-
 app/data/view/shop_goods_mark/select.html     |   2 +-
 app/data/view/shop_goods_stock/form.html      |  10 --
 app/data/view/shop_goods_stock/index.html     |  10 --
 app/data/view/shop_order/index_search.html    | 101 +++++++++---------
 app/data/view/shop_order_send/index.html      |   4 +-
 .../view/shop_order_send/index_search.html    |  95 ++++++++--------
 .../view/shop_order_service/index_search.html |  82 ++++++--------
 .../view/shop_truck_company/index_search.html |  17 ++-
 .../shop_truck_template/index_search.html     |  14 +--
 19 files changed, 189 insertions(+), 239 deletions(-)
 delete mode 100644 app/data/controller/ShopGoodsStock.php
 delete mode 100644 app/data/view/shop_goods_stock/form.html
 delete mode 100644 app/data/view/shop_goods_stock/index.html

diff --git a/app/data/controller/ShopGoodsStock.php b/app/data/controller/ShopGoodsStock.php
deleted file mode 100644
index 0ed6cc71b..000000000
--- a/app/data/controller/ShopGoodsStock.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-namespace app\data\controller;
-
-use think\admin\Controller;
-
-/**
- * 商品库存管理
- * Class ShopGoodsStock
- * @package app\data\controller
- */
-class ShopGoodsStock extends Controller
-{
-    /**
-     * 绑定数据表
-     * @var string
-     */
-    private $table = 'ShopGoodsStock';
-}
\ No newline at end of file
diff --git a/app/data/service/OrderService.php b/app/data/service/OrderService.php
index 32e1b6fb9..ddc24b25c 100644
--- a/app/data/service/OrderService.php
+++ b/app/data/service/OrderService.php
@@ -73,9 +73,9 @@ class OrderService extends Service
         $items = $query->withoutField('id,mid,status,deleted,create_at')->whereIn('order_no', $nos)->select()->toArray();
         foreach ($data as &$vo) {
             $vo['sales'] = 0;
-            $vo['fromer'] = $members[$vo['from']] ?? new \stdClass();
-            $vo['member'] = $members[$vo['mid']] ?? new \stdClass();
-            $vo['truck'] = $trucks[$vo['order_no']] ?? new \stdClass();
+            $vo['member'] = $members[$vo['mid']] ?? [];
+            $vo['fromer'] = $members[$vo['from']] ?? [];
+            $vo['truck'] = $trucks[$vo['order_no']] ?? [];
             $vo['items'] = [];
             foreach ($items as $item) {
                 if ($vo['order_no'] === $item['order_no']) {
diff --git a/app/data/view/config/slider.html b/app/data/view/config/slider.html
index a123706aa..9b840bf1d 100644
--- a/app/data/view/config/slider.html
+++ b/app/data/view/config/slider.html
@@ -2,10 +2,10 @@
 
 {block name="content"}
 <div class="think-box-shadow">
-    <form onsubmit="return false;" id="SliderForm" class='layui-form' autocomplete="off" style="width:750px">
+    <form onsubmit="return false;" id="DataForm" class='layui-form' autocomplete="off" style="width:750px">
         <div class="text-center font-s14 font-w7">{$title|default='图片数据管理'}<span class="color-desc font-s12">（建议尺寸：690px  250px）</span></div>
         <div class="hr-line-dashed"></div>
-        <div class="padding-bottom-15" data-slider-box>
+        <div class="padding-bottom-15" data-rule-list>
             <div class="layui-form-item text-center">
                 <a data-item-add class="layui-btn layui-btn-primary">添加图片</a>
             </div>
@@ -18,22 +18,22 @@
 </div>
 
 <div data-item-tpl class="layui-hide">
-    <div class="layui-form-item padding-left-40 margin-left-40" data-slider-item>
+    <div class="layui-form-item padding-left-40 margin-left-40" data-rule-item>
         <div class="layui-input-inline nowrap" style="width:120px">
             <input data-upload-image name="img[]" type="hidden">
         </div>
         <label class="layui-input-inline nowrap relative margin-bottom-5" style="width:300px">
-            <b class="notselect color-green">图片名称 </b>
+            <b class="notselect color-green margin-right-5">图片名称</b>
             <input class="layui-input inline-block" style="width:240px" name="name[]" value="#" required placeholder="请输入图片名称">
             <a data-item-up class="layui-btn layui-btn-primary"><i class="layui-icon layui-icon-up margin-0"></i></a>
             <a data-item-dn class="layui-btn layui-btn-primary"><i class="layui-icon layui-icon-down margin-0"></i></a>
             <a data-item-rm class="layui-btn layui-btn-primary"><i class="layui-icon layui-icon-close margin-0"></i></a>
         </label>
         <label class="layui-input-inline nowrap relative margin-bottom-5" style="width:300px">
-            <b class="notselect color-green">跳转规则 </b>
+            <b class="notselect color-green margin-right-5">跳转规则</b>
             <input class="layui-input inline-block" style="width:240px" name="rule[]" value="#" required placeholder="请输入跳转规则">
-            <a data-prefix="NEWS" data-item-page="{:url('data/news_item/select')}" class="layui-btn layui-btn-primary">选择文章</a>
-            <a data-prefix="GOODS" data-item-page="{:url('data/shop_goods/select')}" class="layui-btn layui-btn-primary">选择商品</a>
+            <a data-prefix="NEWS" data-rule-page="{:url('data/news_item/select')}" class="layui-btn layui-btn-primary">选择文章</a>
+            <a data-prefix="GOODS" data-rule-page="{:url('data/shop_goods/select')}" class="layui-btn layui-btn-primary">选择商品</a>
             <span class="help-block block notselect">若要跳转页面，请选择对应的数据或填写跳转的 URL 地址，不跳转请填写“#”号占位。</span>
         </label>
     </div>
@@ -44,7 +44,7 @@
 </label>
 
 <style>
-    [data-item-page] {
+    [data-rule-page] {
         margin-top: -3px;
         margin-left: 5px;
     }
@@ -64,32 +64,32 @@
         });
         /*! 初始化上传插件 */
         (function initUpload() {
-            $('[data-slider-box] input[data-upload-image]').map(function () {
+            $('[data-rule-list] input[data-upload-image]').map(function () {
                 if (!$(this).attr('inited')) $(this).attr('inited', true).uploadOneImage();
             });
             setTimeout(initUpload, 100);
         })();
         /*! 数据选项操作 */
-        $('[data-slider-box]').on('click', '[data-item-page]', function ($that) {
-            $that = $(this), top.setCheckValue = function (value) {
+        $('[data-rule-list]').on('click', '[data-rule-page]', function ($that) {
+            $that = $(this), top.setItemValue = function (value) {
                 $that.prevAll('input').val(($that.data('prefix') + '#{v}').replace('{v}', value));
             };
             $.form.iframe($(this).data('item-page'), $that.data('title') || $that.text(), ['930px', '600px']);
         }).on('click', '[data-item-add]', function () {
             addItem();
         }).on('click', '[data-item-rm]', function () {
-            $(this).parents('[data-slider-item]').remove();
+            $(this).parents('[data-rule-item]').remove();
         }).on('click', '[data-item-up]', function () {
-            var item = $(this).parents('[data-slider-item]');
-            var prev = item.prev('[data-slider-item]');
+            var item = $(this).parents('[data-rule-item]');
+            var prev = item.prev('[data-rule-item]');
             if (item.index() > 0) item.insertBefore(prev);
         }).on('click', '[data-item-dn]', function () {
-            var item = $(this).parents('[data-slider-item]');
-            var next = item.next('[data-slider-item]');
+            var item = $(this).parents('[data-rule-item]');
+            var next = item.next('[data-rule-item]');
             if (next) item.insertAfter(next);
         });
         /*! 表单提交处理 */
-        $('form#SliderForm').vali(function (ret) {
+        $('form#DataForm').vali(function (ret) {
             var idx, data = [];
             for (idx in ret.img) {
                 if (!ret.img[idx]) return $.msg.tips('请上传展示图片哦！');
@@ -107,7 +107,5 @@
             $.form.reInit();
         }, 100);
     }
-
 </script>
-
 {/block}
\ No newline at end of file
diff --git a/app/data/view/news_item/select.html b/app/data/view/news_item/select.html
index 0f9c8ecf4..4f1a8ae2f 100644
--- a/app/data/view/news_item/select.html
+++ b/app/data/view/news_item/select.html
@@ -48,7 +48,7 @@
     $(function () {
         $.form.reInit(), layui.form.render();
         $('[data-item]').on('click', function () {
-            top.setCheckValue(this.getAttribute('data-item') || '');
+            top.setItemValue(this.getAttribute('data-item') || '');
             parent.layer.close(parent.layer.getFrameIndex(window.name));
         });
     });
diff --git a/app/data/view/news_mark/form.html b/app/data/view/news_mark/form.html
index 42c3890cb..34dd17c7e 100644
--- a/app/data/view/news_mark/form.html
+++ b/app/data/view/news_mark/form.html
@@ -2,10 +2,13 @@
     <div class="layui-card-body padding-left-40">
         <label class="layui-form-item relative block">
             <span class="color-green font-w7">标签名称</span>
+            <span class="color-desc margin-left-5">Mark Name</span>
             <input class="layui-input" required placeholder="请输入标签名称" name="title" value="{$vo.title|default=''}"/>
+            <span class="help-block"><b>必填，</b>请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字</span>
         </label>
         <div class="layui-form-item relative block">
             <span class="color-green font-w7">标签描述</span>
+            <span class="color-desc margin-left-5">Mark Remark</span>
             <label class="relative block">
                 <textarea class="layui-textarea" placeholder="请输入文档描述" name="desc">{$vo.desc|default=''}</textarea>
             </label>
diff --git a/app/data/view/shop_goods/formstyle.html b/app/data/view/shop_goods/formstyle.html
index fde67f074..227aa52b5 100644
--- a/app/data/view/shop_goods/formstyle.html
+++ b/app/data/view/shop_goods/formstyle.html
@@ -3,9 +3,10 @@
         width: 260px;
         height: 100px;
         padding: 15px 20px;
-        display:inline-block;
+        display: inline-block;
         margin: 0 15px 15px 0;
     }
+
     .inner-input {
         width: 80px;
         height: 14px;
diff --git a/app/data/view/shop_goods/index_search.html b/app/data/view/shop_goods/index_search.html
index b99859988..7891161e9 100644
--- a/app/data/view/shop_goods/index_search.html
+++ b/app/data/view/shop_goods/index_search.html
@@ -15,7 +15,7 @@
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">商品标签</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <select class="layui-select" name="mark" lay-search>
                     <option value="">-- 全部标签 --</option>
                     {foreach $marks as $mark}{if input('mark','') eq $mark}
@@ -24,11 +24,11 @@
                     <option value="{$mark}">{$mark}</option>
                     {/if}{/foreach}
                 </select>
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">商品分类</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <select class="layui-select" name="cate" lay-search>
                     <option value="">-- 全部分类 --</option>
                     {foreach $clist as $cate}{if input('cate','') eq $cate.id}
@@ -37,21 +37,20 @@
                     <option {$cate.sat} value="{$cate.id}">{$cate.spl}{$cate.name|default=''}</option>
                     {/if}{/foreach}
                 </select>
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">销售状态</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <select class="layui-select" name="status">
                     {foreach [''=>'- 全部状态 -','1'=>'销售中商品','0'=>'已下架商品'] as $k=>$v}
                     {if input('status','-') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
                     <option value="{$k}">{$v}</option>
-                    {/if}
-                    {/foreach}
+                    {/if}{/foreach}
                 </select>
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
diff --git a/app/data/view/shop_goods/select.html b/app/data/view/shop_goods/select.html
index bec981584..b80ff5598 100644
--- a/app/data/view/shop_goods/select.html
+++ b/app/data/view/shop_goods/select.html
@@ -61,7 +61,7 @@
 <script>
     layui.form.render();
     $('[data-item]').on('click', function () {
-        top.setCheckValue(this.getAttribute('data-item') || '');
+        top.setItemValue(this.getAttribute('data-item') || '');
         parent.layer.close(parent.layer.getFrameIndex(window.name));
     });
 </script>
diff --git a/app/data/view/shop_goods_cate/index.html b/app/data/view/shop_goods_cate/index.html
index 2e3a5ee84..6166970f3 100644
--- a/app/data/view/shop_goods_cate/index.html
+++ b/app/data/view/shop_goods_cate/index.html
@@ -24,8 +24,7 @@
                 <button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button>
             </th>
             <th class='text-center'></th>
-            <th></th>
-            <th colspan="2"></th>
+            <th colspan="3"></th>
         </tr>
         </thead>
         <tbody>
diff --git a/app/data/view/shop_goods_mark/form.html b/app/data/view/shop_goods_mark/form.html
index 95a944dae..4b9d5b8ff 100644
--- a/app/data/view/shop_goods_mark/form.html
+++ b/app/data/view/shop_goods_mark/form.html
@@ -2,13 +2,13 @@
     <div class="layui-card-body padding-left-40">
         <label class="layui-form-item relative block">
             <span class="color-green font-w7">标签名称</span>
-            <span class="color-desc margin-left-5">Label Name</span>
+            <span class="color-desc margin-left-5">Mark Name</span>
             <input class="layui-input" required placeholder="请输入标签名称" name="name" value="{$vo.name|default=''}">
             <span class="help-block"><b>必填，</b>请填写分类名称（如：系统管理），建议字符不要太长，一般4-6个汉字</span>
         </label>
         <div class="layui-form-item relative block">
             <span class="color-green font-w7">标签描述</span>
-            <span class="color-desc margin-left-5">Label Remark</span>
+            <span class="color-desc margin-left-5">Mark Remark</span>
             <label class="relative block">
                 <textarea class="layui-textarea" placeholder="请输入标签描述" name="remark">{$vo.remark|default=''}</textarea>
             </label>
diff --git a/app/data/view/shop_goods_mark/select.html b/app/data/view/shop_goods_mark/select.html
index 63b955744..2d21808cb 100644
--- a/app/data/view/shop_goods_mark/select.html
+++ b/app/data/view/shop_goods_mark/select.html
@@ -31,7 +31,7 @@
     $(function () {
         layui.form.render();
         $('[data-article]').on('click', function () {
-            if (top.setItemId) top.setItemId(this.getAttribute('data-item') || '');
+            if (top.setItemValue) top.setItemValue(this.getAttribute('data-item') || '');
             parent.layer.close(parent.layer.getFrameIndex(window.name));
         });
         $.form.reInit($('[data-select-container]'));
diff --git a/app/data/view/shop_goods_stock/form.html b/app/data/view/shop_goods_stock/form.html
deleted file mode 100644
index 566549bdf..000000000
--- a/app/data/view/shop_goods_stock/form.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/app/data/view/shop_goods_stock/index.html b/app/data/view/shop_goods_stock/index.html
deleted file mode 100644
index 566549bdf..000000000
--- a/app/data/view/shop_goods_stock/index.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/app/data/view/shop_order/index_search.html b/app/data/view/shop_order/index_search.html
index b396c95a8..82167abdd 100644
--- a/app/data/view/shop_order/index_search.html
+++ b/app/data/view/shop_order/index_search.html
@@ -3,43 +3,43 @@
     <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">会员手机</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="member_phone" value="{:input('member_phone')}" placeholder="请输入会员手机" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">会员昵称</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="member_nickname" value="{:input('member_nickname')}" placeholder="请输入会员昵称" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">推荐手机</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="from_phone" value="{:input('from_phone')}" placeholder="请输入会员手机" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">推荐昵称</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="from_nickname" value="{:input('from_nickname')}" placeholder="请输入会员昵称" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">订单单号</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="order_no" value="{:input('order_no')}" placeholder="请输入订单单号" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">发货单号</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="truck_send_number" value="{:input('truck_send_number')}" placeholder="请输入发货单号" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">订单状态</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <select class="layui-select" name="status">
                     {foreach [''=>'- 全部订单 -','2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
                     {if input('status') eq $k.''}
@@ -48,11 +48,11 @@
                     <option value="{$k}">{$v}</option>
                     {/if}{/foreach}
                 </select>
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">付款状态</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <select class="layui-select" name="payment_status">
                     {foreach [''=>'- 全部订单 -','0'=>'未支付的订单','1'=>'已支付的订单'] as $k=>$v}
                     {if input('payment_status') eq $k.''}
@@ -62,61 +62,64 @@
                     {/if}
                     {/foreach}
                 </select>
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">下单时间</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at')}" placeholder="请选择下单时间" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">支付时间</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input data-date-range name="payment_datetime" value="{:input('payment_datetime')}" placeholder="请选择支付时间" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货姓名</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="truck_address_name" value="{:input('truck_address_name')}" placeholder="请输入收货姓名" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货手机</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="truck_address_phone" value="{:input('truck_address_phone')}" placeholder="请输入收货手机" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货地址</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="truck_address_content" value="{:input('truck_address_content')}" placeholder="请输入收货省份" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-            <button type="button" data-form-export="{:url('index')}?type={$type|default=''}" class="layui-btn layui-btn-primary"><i class="layui-icon layui-icon-export"></i> 导 出</button>
+            <button type="submit" class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+            <button type="button" data-form-export="{:url('index')}?type={$type|default=''}" class="layui-btn layui-btn-primary">
+                <i class="layui-icon layui-icon-export"></i> 导 出
+            </button>
         </div>
     </form>
-    <script>
-        window.form.render();
-        require(['excel'], function (excel) {
-            excel.bind(function (data) {
-                data.forEach(function (item, index) {
-                    data[index] = [
-                        item.order_no,
-                        item.member.phone,
-                        item.member.username || item.member.nickname || '',
-                        item.payment_code || '',
-                        item.payment_status ? '已支付' : '未支付',
-                        item.payment_amount || '0.00',
-                        item.payment_datetime || '',
-                    ];
-                });
-                data.unshift(['订单单号', '会员手机', '会员姓名', '支付单号', '支付状态', '支付金额', '支付时间']);
-                return data;
-            }, '订单记录导出');
-        });
-    </script>
-</fieldset>
\ No newline at end of file
+</fieldset>
+
+<script>
+    window.form.render();
+    require(['excel'], function (excel) {
+        excel.bind(function (data) {
+            data.forEach(function (item, index) {
+                data[index] = [
+                    item.order_no,
+                    item.member.phone,
+                    item.member.username || item.member.nickname || '',
+                    item.payment_code || '',
+                    item.payment_status ? '已支付' : '未支付',
+                    item.payment_amount || '0.00',
+                    item.payment_datetime || '',
+                ];
+            });
+            data.unshift(['订单单号', '会员手机', '会员姓名', '支付单号', '支付状态', '支付金额', '支付时间']);
+            return data;
+        }, '会员订单记录');
+    });
+</script>
\ No newline at end of file
diff --git a/app/data/view/shop_order_send/index.html b/app/data/view/shop_order_send/index.html
index b8e8bbdc8..cabd42c4e 100644
--- a/app/data/view/shop_order_send/index.html
+++ b/app/data/view/shop_order_send/index.html
@@ -51,9 +51,9 @@
                     {else}
                     <span class="layui-badge layui-bg-blue">{$vo.company_name|default='--'}</span>
                     <a data-title="{$vo.company_name}（{$vo.send_number}）" data-tips-text="快递追踪查询"
-                       data-modal="{:url('truckQuery')}?code={$vo.send_number}&number={$vo.send_number}"
+                       data-modal="{:url('shop_order/truckQuery')}?code={$vo.company_code}&number={$vo.send_number}"
                        class="layui-badge layui-bg-orange margin-left-5">{$vo.send_number|default='--'}</a>
-                    <div class="margin-top-5">于 {$vo.send_datetime|format_datetime} 发货！<br></div>
+                    <div class="margin-top-5">于 <b>{$vo.send_datetime|format_datetime} 发货！</b></div>
                     {/if}
                 </td>
                 <td class="color-desc">
diff --git a/app/data/view/shop_order_send/index_search.html b/app/data/view/shop_order_send/index_search.html
index 6f046a4e4..b03ddc9cc 100644
--- a/app/data/view/shop_order_send/index_search.html
+++ b/app/data/view/shop_order_send/index_search.html
@@ -3,31 +3,31 @@
     <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">会员手机</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="member_phone" value="{:input('member_phone')}" placeholder="请输入会员手机" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">会员昵称</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="member_nickname" value="{:input('member_nickname')}" placeholder="请输入会员昵称" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">订单单号</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="order_no" value="{:input('order_no')}" placeholder="请输入订单单号" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">发货单号</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="truck_number" value="{:input('truck_number')}" placeholder="请输入发货单号" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">发货状态</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <select class="layui-select" name="status">
                     {foreach [''=>'- 全部订单 -','0'=>'已取消的订单','1'=>'待发货的订单','2'=>'已发货的订单'] as $k=>$v}
                     {if input('status') eq $k.''}
@@ -36,65 +36,66 @@
                     <option value="{$k}">{$v}</option>
                     {/if}{/foreach}
                 </select>
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">提交时间</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input data-date-range name="address_datetime" value="{:input('address_datetime')}" placeholder="请选择提交时间" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">发货时间</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input data-date-range name="send_datetime" value="{:input('send_datetime')}" placeholder="请选择发货时间" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货姓名</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="address_name" value="{:input('address_name')}" placeholder="请输入收货姓名" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货手机</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="address_phone" value="{:input('address_phone')}" placeholder="请输入收货手机" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">配送地址</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="address_content" value="{:input('address_content')}" placeholder="请输入配送地址" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
-            {if auth('export')}
-            <button type="button" data-form-export="{:url('index')}?type={$type|default=''}" class="layui-btn layui-btn-primary"><i class="layui-icon layui-icon-export"></i> 导 出</button>
-            {/if}
+            <button type="submit" class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+            <button type="button" data-form-export="{:url('index')}?type={$type|default=''}" class="layui-btn layui-btn-primary">
+                <i class="layui-icon layui-icon-export"></i> 导 出
+            </button>
         </div>
     </form>
-    <script>
-        window.form.render();
-        require(['excel'], function (excel) {
-            excel.bind(function (data) {
-                data.forEach(function (item, index) {
-                    data[index] = [
-                        item.order_no, item.member.phone,
-                        item.member.username || item.member.nickname || '',
-                        item.address_name || '', item.address_phone || '',
-                        item.address_province || '', item.address_city || '', item.address_area || '',
-                        item.address_content || '', item.address_datetime || '',
-                        item.company_name || '', item.send_number || '', item.send_datetime || '',
-                    ];
-                });
-                data.unshift([
-                    '订单单号', '会员手机', '会员姓名', '收货人姓名', '收货人手机', '配送省份', '配送城市',
-                    '配送区域', '配送详细地址', '提交时间', '快递公司', '配送单号', '发货时间'
-                ]);
-                return data;
-            }, '订单发货数据');
-        });
-    </script>
-</fieldset>
\ No newline at end of file
+</fieldset>
+
+<script>
+    window.form.render();
+    require(['excel'], function (excel) {
+        excel.bind(function (data) {
+            data.forEach(function (item, index) {
+                data[index] = [
+                    item.order_no, item.member.phone,
+                    item.member.username || item.member.nickname || '',
+                    item.address_name || '', item.address_phone || '',
+                    item.address_province || '', item.address_city || '', item.address_area || '',
+                    item.address_content || '', item.address_datetime || '',
+                    item.company_name || '', item.send_number || '', item.send_datetime || '',
+                ];
+            });
+            data.unshift([
+                '订单单号', '会员手机', '会员姓名', '收货人姓名', '收货人手机', '配送省份', '配送城市',
+                '配送区域', '配送详细地址', '提交时间', '快递公司', '配送单号', '发货时间'
+            ]);
+            return data;
+        }, '订单发货记录');
+    });
+</script>
\ No newline at end of file
diff --git a/app/data/view/shop_order_service/index_search.html b/app/data/view/shop_order_service/index_search.html
index fe6c708b7..2b7b67bc1 100644
--- a/app/data/view/shop_order_service/index_search.html
+++ b/app/data/view/shop_order_service/index_search.html
@@ -3,115 +3,113 @@
     <form class="layui-form layui-form-pane form-search" action="{:request()->url()}" onsubmit="return false" method="get" autocomplete="off">
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">会员手机</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="member_phone" value="{:input('member_phone')}" placeholder="请输入会员手机" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">会员昵称</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="member_nickname" value="{:input('member_nickname')}" placeholder="请输入会员昵称" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">推荐手机</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="agent_phone" value="{:input('agent_phone')}" placeholder="请输入会员手机" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">推荐昵称</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="agent_nickname" value="{:input('agent_nickname')}" placeholder="请输入会员昵称" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">订单单号</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="order_no" value="{:input('order_no')}" placeholder="请输入订单单号" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">发货单号</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="express_send_no" value="{:input('express_send_no')}" placeholder="请输入发货单号" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">订单状态</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <select class="layui-select" name="status">
                     {foreach [''=>'- 全部订单 -','2'=>'待付款','3'=>'待发货','4'=>'已发货','5'=>'已完成'] as $k=>$v}
                     {if input('status') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
                     <option value="{$k}">{$v}</option>
-                    {/if}
-                    {/foreach}
+                    {/if}{/foreach}
                 </select>
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">付款状态</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <select class="layui-select" name="pay_state">
                     {foreach [''=>'- 全部订单 -','0'=>'未支付的订单','1'=>'已支付的订单'] as $k=>$v}
                     {if input('pay_state') eq $k.''}
                     <option selected value="{$k}">{$v}</option>
                     {else}
                     <option value="{$k}">{$v}</option>
-                    {/if}
-                    {/foreach}
+                    {/if}{/foreach}
                 </select>
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">下单时间</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at')}" placeholder="请选择下单时间" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">支付时间</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input data-date-range name="pay_datetime" value="{:input('pay_datetime')}" placeholder="请选择支付时间" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货姓名</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="express_name" value="{:input('express_name')}" placeholder="请输入收货姓名" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货手机</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="express_phone" value="{:input('express_phone')}" placeholder="请输入收货手机" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货省份</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="express_province" value="{:input('express_province')}" placeholder="请输入收货省份" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货城市</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="express_city" value="{:input('express_city')}" placeholder="请输入收货城市" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">收货区域</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="express_area" value="{:input('express_area')}" placeholder="请输入收货区域" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">详细地址</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="express_address" value="{:input('express_address')}" placeholder="请输入详细地址" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
@@ -120,16 +118,4 @@
             {/if}
         </div>
     </form>
-    <script>
-        window.form.render();
-    </script>
-    {if auth('export')}
-    <script>
-        $('[data-export-list]').on('click', function () {
-            $.form.load('{:url("export")}?type={$type|default=""}', $(this).parents('form').serialize(), 'get', function (ret) {
-                if (ret.code > 0) return $.loadQueue(ret.data), false;
-            })
-        });
-    </script>
-    {/if}
 </fieldset>
\ No newline at end of file
diff --git a/app/data/view/shop_truck_company/index_search.html b/app/data/view/shop_truck_company/index_search.html
index d7c0b0756..94d06545a 100644
--- a/app/data/view/shop_truck_company/index_search.html
+++ b/app/data/view/shop_truck_company/index_search.html
@@ -3,26 +3,25 @@
     <form class="layui-form layui-form-pane form-search" action="{:url('')}" onsubmit="return false" method="get" autocomplete="off">
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">快递名称</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="name" value="{:input('name','')}" placeholder="请输入快递名称" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">快递编码</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="code" value="{:input('code','')}" placeholder="请输入快递编码" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">添加时间</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择添加时间" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>
     </form>
-</fieldset>
-
-<script>form.render()</script>
+    <script>form.render()</script>
+</fieldset>
\ No newline at end of file
diff --git a/app/data/view/shop_truck_template/index_search.html b/app/data/view/shop_truck_template/index_search.html
index 10e847c8a..b4ae831b0 100644
--- a/app/data/view/shop_truck_template/index_search.html
+++ b/app/data/view/shop_truck_template/index_search.html
@@ -3,26 +3,26 @@
     <form class="layui-form layui-form-pane form-search" action="{:url('')}" onsubmit="return false" method="get" autocomplete="off">
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">模板编号</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="code" value="{:input('code','')}" placeholder="请输入模板编号" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">模板名称</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input name="name" value="{:input('name','')}" placeholder="请输入模板名称" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <label class="layui-form-label">添加时间</label>
-            <div class="layui-input-inline">
+            <label class="layui-input-inline">
                 <input data-date-range name="create_at" value="{:input('create_at','')}" placeholder="请选择添加时间" class="layui-input">
-            </div>
+            </label>
         </div>
         <div class="layui-form-item layui-inline">
             <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
         </div>
     </form>
+    <script>form.render()</script>
 </fieldset>
 
-<script>form.render()</script>