订单详情优化

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

@@ -62,28 +62,28 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">订单编号：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">订单编号：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesOrderId!''}</label>
             </div>
-            <label class="form-label col-1 col-sm-1">交易号：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">交易号：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesDealCode!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">销售公司：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">销售公司：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.companyName!''}</label>
             </div>
-            <label class="form-label col-1 col-sm-1">店铺：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">店铺：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.storeName!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">是否支付：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">是否支付：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>
                 <#if order.salesPayStatus == 0>
                     未付款
@@ -92,8 +92,8 @@
                 </#if>
                 </label>
             </div>
-            <label class="form-label col-1 col-sm-1">是否发货：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">是否发货：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>
                     <#if order.salesShippingStatus == 0>
                         未发货
@@ -106,18 +106,18 @@
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">订单金额：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">订单金额（￥）：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesAmount/100!''}</label>
             </div>
-            <label class="form-label col-1 col-sm-1">支付金额：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">支付金额（￥）：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesPayMoney/100!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">付款方式：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">付款方式：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>
                     <#if order.salesPayType == 1>
                         微信支付
@@ -132,18 +132,18 @@
                     </#if>
                 </label>
             </div>
-            <label class="form-label col-1 col-sm-1">支付时间：</label>
-            <div class="formControls col-4 col-sm-4">
+            <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-1 col-sm-1"><#--发货时间：--></label>
-            <div class="formControls col-4 col-sm-4">
+            <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>
             </div>
-            <label class="form-label col-1 col-sm-1">邮费：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">邮费（￥）：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesShippingFee/100!''}</label>
             </div>
         </div>
@@ -156,50 +156,52 @@
             <div class="formControls col-10 col-sm-10">
             </div>
         </div>
-        <#--<div class="row cl">-->
-            <#--<label class="form-label col-1 col-sm-1">购买产品信息</label>-->
-            <#--<div class="formControls col-7 col-sm-7 text-c">-->
-                <#--<table class="table table-border table-bg table-bordered">-->
-                    <#--<tr class="text-c">-->
-                        <#--<th>产品名称</th>-->
-                        <#--<th>产品颜色</th>-->
-                        <#--<th>产品市场价</th>-->
-                        <#--<th>产品折扣价</th>-->
-                        <#--<th>产品数量</th>-->
-                    <#--</tr>-->
-                    <#--<#if order.salesOrderItemList?? &&  (order.salesOrderItemList?size > 0) >-->
-                        <#--<#list order.salesOrderItemList as item>-->
-                            <#--<tr class="text-c">-->
-                                <#--<td>${item.itemProductName!''}</td>-->
-                                <#--<td>${item.itemProductColor!''}</td>-->
-                                <#--<td>${item.itemProductPrice/100!''}</td>-->
-                                <#--<td>${item.itemProductDiscount/100!''}</td>-->
-                                <#--<td>${item.itemNum}</td>-->
-                            <#--</tr>-->
-                        <#--</#list>-->
-                    <#--</#if>-->
-                <#--</table>-->
-            <#--</div>-->
-        <#--</div>-->
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">收货人姓名：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">购买产品信息：</label>
+            <div class="formControls col-7 col-sm-7 text-c">
+                <table class="table table-border table-bg table-bordered">
+                    <tr class="text-c">
+                        <th>产品名称</th>
+                        <th>产品颜色</th>
+                        <#--<th>产品图片</th>-->
+                        <th>产品市场价（￥）</th>
+                        <th>产品折扣价（￥）</th>
+                        <th>产品数量</th>
+                    </tr>
+                    <#if order.salesOrderItemList?? &&  (order.salesOrderItemList?size > 0) >
+                        <#list order.salesOrderItemList as item>
+                            <tr class="text-c">
+                                <td>${item.itemProductName!''}</td>
+                                <td>${item.itemProductColor!''}</td>
+                                <#--<td>${item.itemProductPic!''}</td>-->
+                                <td>${item.itemProductPrice/100!''}</td>
+                                <td>${item.itemProductDiscount/100!''}</td>
+                                <td>${item.itemNum}</td>
+                            </tr>
+                        </#list>
+                    </#if>
+                </table>
+            </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>
             </div>
-            <label class="form-label col-1 col-sm-1">收货人电话：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">收货人电话：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesAddressTel!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">收货人地址：</label>
+            <label class="form-label col-2 col-sm-2">收货人地址：</label>
             <div class="formControls col-9 col-sm-9">
                 <label>${order.salesAddressInfo!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">快递公司：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">快递公司：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>
                 <#if order.salesPostFirm??>
                     <#if order.salesPostFirm == 'sto'>
@@ -240,18 +242,18 @@
                 </#if>
                 </label>
             </div>
-            <label class="form-label col-1 col-sm-1">快递单号：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">快递单号：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesPostNum!''}</label>
             </div>
         </div>
         <div class="row cl">
-            <label class="form-label col-1 col-sm-1">用户备注：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">用户备注：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${order.salesUserRemark!''}</label>
             </div>
-            <label class="form-label col-1 col-sm-1">创建时间：</label>
-            <div class="formControls col-4 col-sm-4">
+            <label class="form-label col-2 col-sm-2">创建时间：</label>
+            <div class="formControls col-3 col-sm-3">
                 <label>${(order.salesCreateTime?string("yyyy-MM-dd HH:mm:ss"))!''}</label>
             </div>
         </div>