订单样式调整

src/main/java/com/caimei/modules/order/service/NewOrderService.java

@@ -2431,7 +2431,7 @@ public class NewOrderService extends CrudService<NewOrderDao, NewOrder> {
                 //通过子订单ID查询子订单信息
                 NewShopOrder newShopOrder = newShopOrderDao.get(String.valueOf(shopOrderID));
                 if (null != newShopOrder) {
-                    shopOrderNoAndId += "<b style=\"font-size: 17px;\">"+newShopOrder.getShopOrderID()+"</b>"+"("+newShopOrder.getShopOrderNo()+")<br>";
+                    shopOrderNoAndId += "<b style=\"font-size: 15px;\">"+newShopOrder.getShopOrderID()+"</b>"+"("+newShopOrder.getShopOrderNo()+")<br>";
                     shopOrder.setFee(newShopOrder.getFee());
                     shopOrder.setShouldPayProduct(newShopOrder.getShouldPayProduct());
                     List<NewOrderProduct> pList = newOrderProductDao.findListByShopOrderID(shopOrderID);

src/main/webapp/WEB-INF/views/modules/order/newOrderList.jsp

@@ -252,7 +252,7 @@
     <c:forEach items="${page.list}" var="order">
         <%--颜色区分分期不分期订单以及终止订单--%>
         <ul class="spileOrder" data-id="${order.orderNo}">
-            <li><b style="font-size: 17px;">${order.orderID}</b>(${order.orderNo})</li>
+            <li><b style="font-size: 15px;">${order.orderID}</b>(${order.orderNo})</li>
             <li style="position: relative">${order.shopOrderNoAndId}</li>
             <li>
                 <c:if test="${order.orderType == 1}">

src/main/webapp/WEB-INF/views/modules/order/orderDetail.jsp

@@ -406,7 +406,7 @@
 <table class="order-details-heading">
     <tr>
         <td>下单时间: ${order.orderTime}</td>
-        <td>订单ID（订单编号）: <b style="font-size: 17px;">${order.orderID}</b>(${order.orderNo})</td>
+        <td>订单ID（订单编号）: <b style="font-size: 15px;">${order.orderID}</b>(${order.orderNo})</td>
         <td>返佣订单: ${(order.rebateOrder ne '0' || order.rebateFlag eq '1')?'是':'否'}</td>
     </tr>
     <tr>
@@ -828,7 +828,7 @@
 <c:forEach items="${order.newShopOrders}" var="shopOrder">
     <div class="order-rows">
         <span><label>下单时间：</label>${order.orderTime}</span>
-        <span><label>子订单ID（子订单编号)：</label><b style="font-size: 17px;">${shopOrder.shopOrderID}</b>(${shopOrder.shopOrderNo})</span>
+        <span><label>子订单ID（子订单编号)：</label><b style="font-size: 15px;">${shopOrder.shopOrderID}</b>(${shopOrder.shopOrderNo})</span>
         <span><label>子订单金额：</label><fmt:formatNumber
                 value="${order.onlinePayFlag eq 0?shopOrder.realPay:shopOrder.needPayAmount}" type="currency"/></span>
         <td style="position: relative;"><a class="operation-btn btn"