From b15a3e66eeda3dfa1dd121b47430ec11a6c42b85 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 19 Sep 2020 16:10:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/view/shop_order/truck.html         | 30 ++++++++++-----------
 app/data/view/shop_truck_template/form.html |  2 +-
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/data/view/shop_order/truck.html b/app/data/view/shop_order/truck.html
index 3e9c88d6d..a24f4cf8d 100644
--- a/app/data/view/shop_order/truck.html
+++ b/app/data/view/shop_order/truck.html
@@ -1,4 +1,4 @@
-<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+<form class="layui-form layui-card margin-bottom-0" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
     <div class="layui-card-body padding-left-40">
         <fieldset>
             <legend><span class="layui-badge layui-bg-cyan">收货信息</span></legend>
@@ -62,17 +62,17 @@
         <button class="layui-btn" type='submit'>保存数据</button>
         <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定要取消编辑吗？" data-close>取消编辑</button>
     </div>
-</form>
-<script>
-    require(['pcasunzips'], function () {
-        (function (province, city, area) {
-            new PCAS("form_province", "form_city", "form_area", province, city, area);
-            window.form.render();
-        })('{$vo.address_province|default=""}', '{$vo.address_city|default=""}', '{$vo.address_area|default=""}');
-    });
-    $('[data-express-query]').on('click', function () {
-        (function (code, number) {
-            $.form.modal('{:url("truckQuery")}', {code: code, number: number}, '快递追踪查询')
-        })($('[data-truck-code]').val(), $('[data-truck-number]').val());
-    });
-</script>
\ No newline at end of file
+    <script>
+        require(['pcasunzips'], function () {
+            (function (province, city, area) {
+                new PCAS("form_province", "form_city", "form_area", province, city, area);
+                window.form.render();
+            })('{$vo.address_province|default=""}', '{$vo.address_city|default=""}', '{$vo.address_area|default=""}');
+        });
+        $('[data-express-query]').on('click', function () {
+            (function (code, number) {
+                $.form.modal('{:url("truckQuery")}', {code: code, number: number}, '快递追踪查询')
+            })($('[data-truck-code]').val(), $('[data-truck-number]').val());
+        });
+    </script>
+</form>
\ No newline at end of file
diff --git a/app/data/view/shop_truck_template/form.html b/app/data/view/shop_truck_template/form.html
index 44cf28bde..964101387 100644
--- a/app/data/view/shop_truck_template/form.html
+++ b/app/data/view/shop_truck_template/form.html
@@ -78,7 +78,7 @@
                 <textarea name="normal" class="layui-textarea layui-bg-gray">{{defs.rule}}</textarea>
                 <textarea name="content" class="layui-textarea layui-bg-gray">{{GetRuleData()}}</textarea>
             </label>
-            <div class="hr-line-dashed"></div>
+            <div class="hr-line-dashed margin-top-30"></div>
             {notempty name='vo.code'}<input type="hidden" name="code" value="{$vo.code}">{/notempty}
             <div class="layui-form-item text-center">
                 <button class="layui-btn" type='submit'>保存数据</button>