订单详情优化

watero-rst-web/src/main/webapp/WEB-INF/views/cm/salesOrder/sales_order_detail.ftl

@@ -64,7 +64,7 @@
         <div class="row cl">
             <label class="form-label col-2 col-sm-2">订单编号：</label>
             <div class="formControls col-3 col-sm-3">
-                <label>${order.salesOrderId!''}</label>
+                <label>${order.salesOrderId!'暂无订单编号'}</label>
             </div>
             <label class="form-label col-2 col-sm-2">交易号：</label>
             <div class="formControls col-3 col-sm-3">
@@ -116,35 +116,37 @@
             </div>
         </div>
         <div class="row cl">
+
+            <label class="form-label col-2 col-sm-2">邮费（￥）：</label>
+            <div class="formControls col-3 col-sm-3">
+                <label>${order.salesShippingFee/100!''}</label>
+            </div>
             <label class="form-label col-2 col-sm-2">付款方式：</label>
             <div class="formControls col-3 col-sm-3">
                 <label>
-                    <#if order.salesPayType == 1>
-                        微信支付
-                    <#elseif order.salesPayType == 2>
-                        现金支付
-                    <#elseif order.salesPayType == 3>
-                        已支付定金￥99
-                    <#elseif order.salesPayType == 4>
-                        刷卡支付
-                    <#elseif order.salesPayType == 5>
-                        支付宝支付
-                    </#if>
+                <#if order.salesPayType == 1>
+                    微信支付
+                <#elseif order.salesPayType == 2>
+                    现金支付
+                <#elseif order.salesPayType == 3>
+                    已支付定金￥99
+                <#elseif order.salesPayType == 4>
+                    刷卡支付
+                <#elseif order.salesPayType == 5>
+                    支付宝支付
+                </#if>
                 </label>
             </div>
-            <label class="form-label col-2 col-sm-2">支付时间：</label>
-            <div class="formControls col-3 col-sm-3">
-                <label>${(order.salesPayTime?string("yyyy-MM-dd HH:mm:ss"))!''}</label>
-            </div>
+
         </div>
         <div class="row cl">
-            <label class="form-label col-2 col-sm-2"><#--发货时间：--></label>
+            <label class="form-label col-2 col-sm-2">支付时间：</label>
             <div class="formControls col-3 col-sm-3">
-                <label>${(order.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!''}</label>
+                <label>${(order.salesPayTime?string("yyyy-MM-dd HH:mm:ss"))!''}</label>
             </div>
-            <label class="form-label col-2 col-sm-2">邮费（￥）：</label>
+            <label class="form-label col-2 col-sm-2">发货时间：</label>
             <div class="formControls col-3 col-sm-3">
-                <label>${order.salesShippingFee/100!''}</label>
+                <label>${(order.salesSendTime?string("yyyy-MM-dd HH:mm:ss"))!'暂未发货'}</label>
             </div>
         </div>
         <div class="row cl">
@@ -184,6 +186,15 @@
             </div>
         </div>
         <div class="row cl">
+            <label class="form-label col-3">
+                <div class="tit-2">
+                    邮寄信息
+                </div>
+            </label>
+            <div class="formControls col-10 col-sm-10">
+            </div>
+        </div>
+        <div class="row cl">
             <label class="form-label col-2 col-sm-2">收货人姓名：</label>
             <div class="formControls col-3 col-sm-3">
                 <label>${order.salesAddressName!''}</label>
@@ -244,7 +255,7 @@
             </div>
             <label class="form-label col-2 col-sm-2">快递单号：</label>
             <div class="formControls col-3 col-sm-3">
-                <label>${order.salesPostNum!''}</label>
+                <label>${order.salesPostNum!'暂无快递单号'}</label>
             </div>
         </div>
         <div class="row cl">