From e3b2d15567eddf73d3e2fd03c43bcb4dc4747662 Mon Sep 17 00:00:00 2001
From: gongfuxiang <2499232802@qq.com>
Date: Tue, 9 Oct 2018 01:11:08 +0800
Subject: [PATCH] order

---
 .../Application/Home/View/Default/Order/Detail.html  | 12 ++++++------
 .../Application/Home/View/Default/Order/Index.html   |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/service/Application/Home/View/Default/Order/Detail.html b/service/Application/Home/View/Default/Order/Detail.html
index faecb276f..3d3f93ea7 100644
--- a/service/Application/Home/View/Default/Order/Detail.html
+++ b/service/Application/Home/View/Default/Order/Detail.html
@@ -257,18 +257,18 @@
                             <div class="items-detail am-fl">￥{{$data.price}}</div>
                         </div>
                     </notempty>
-                    <notempty name="data.total_price">
-                        <div class="items">
-                            <div class="items-title am-fl">订单总价：</div>
-                            <div class="items-detail am-fl line-price">￥{{$data.total_price}}</div>
-                        </div>
-                    </notempty>
                     <notempty name="data.preferential_price">
                         <div class="items">
                             <div class="items-title am-fl">优惠金额：</div>
                             <div class="items-detail am-fl">-￥{{$data.preferential_price}}</div>
                         </div>
                     </notempty>
+                    <notempty name="data.total_price">
+                        <div class="items">
+                            <div class="items-title am-fl">订单总价：</div>
+                            <div class="items-detail am-fl line-price">￥{{$data.total_price}}</div>
+                        </div>
+                    </notempty>
                     <notempty name="data.pay_price">
                         <div class="items">
                             <div class="items-title am-fl">支付金额：</div>
diff --git a/service/Application/Home/View/Default/Order/Index.html b/service/Application/Home/View/Default/Order/Index.html
index 8933286ba..659d7e387 100755
--- a/service/Application/Home/View/Default/Order/Index.html
+++ b/service/Application/Home/View/Default/Order/Index.html
@@ -41,11 +41,11 @@
                     <td class="time">
                         <span>时间：</span>
                         <span class="am-form-group">
-                            <input type="text" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="<notempty name="params.time_start">{{$params.time_start}}</notempty>" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" /><i class="am-icon-calendar"></i>
+                            <input type="text" name="time_start" class="am-form-field am-input-sm am-radius Wdate" placeholder="起始时间" value="<notempty name="params.time_start">{{$params.time_start}}</notempty>" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
                         </span>
                         <em class="text-grey">~</em>
                         <span class="am-form-group">
-                            <input type="text" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="<notempty name="params.time_end">{{$params.time_end}}</notempty>" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" /><i class="am-icon-calendar"></i>
+                            <input type="text" name="time_end" class="am-form-field am-input-sm am-radius Wdate" placeholder="结束时间" value="<notempty name="params.time_end">{{$params.time_end}}</notempty>" pattern="^[0-9]{4}-[0-9]{2}-[0-9]{2}$" data-validation-message="日期格式有误" onclick="WdatePicker({firstDayOfWeek:1,dateFmt:'yyyy-MM-dd'})" autocomplete="off" /><i class="am-icon-calendar"></i>
                         </span>
                     </td>
                     <td class="price">