Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/order_list.ftl

@@ -351,10 +351,10 @@
                         var salesOrder = data.returnMsg.salesOrderList[i];
 
                         var productsHtml = '';
-                        var salesOrderItem = salesOrder.salesOrderItemList
+                        var salesOrderItem = salesOrder.salesOrderItemList;
                         for(var j=0;j<salesOrderItem.length;j++){
-                            var item = interceptToString(salesOrderItem[j].itemProductName) + "*" + salesOrderItem[j].itemNum;
-                                productsHtml += '<span class="label label-success radius" title="'+ salesOrderItem[j].itemProductName +'*'+ salesOrderItem[j].itemNum +'">' + item + '</span>';
+                            var item = interceptToString(salesOrderItem[j].itemProductName) +'('+salesOrderItem[j].itemProductColor+ ")*" + salesOrderItem[j].itemNum;
+                                productsHtml += '<span class="label label-success radius" title="'+ salesOrderItem[j].itemProductName +'('+salesOrderItem[j].itemProductColor+')*'+ salesOrderItem[j].itemNum +'">' + item + '</span>';
                         }
                         var time = formatDate(new Date(salesOrder.salesCreateTime),"yyyy-MM-dd");
                         var orderStatus = null;