修改订单优惠券

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

@@ -97,7 +97,7 @@
             -webkit-border-radius: 5px;
             -moz-border-radius: 5px;
             border-radius: 5px;
-            z-index: 999;
+            z-index: 100001;
             display: none;
         }
 

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

@@ -47,7 +47,7 @@
         .order-rows .supplier-img{width:100px}
         .operation-wrapper{position:relative}
         .operation-btn{cursor:pointer}
-        .operation-block{background:#fff;width:125px;position:absolute;left:35px;top:30px;padding:10px;border:1px solid #666;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;z-index:999;display:none}
+        .operation-block{background:#fff;width:125px;position:absolute;left:35px;top:30px;padding:10px;border:1px solid #666;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;z-index:100001;display:none}
         .operation-block a{display:block;padding:3px 0}
         .print-wrapper{display:inline-block}
         .supplier-product-name,.supplier-product-alias{width:200px;line-height:20px}

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

@@ -352,7 +352,7 @@
             <from:hidden path="promotionFullReduction" />
         </td>
         <td style="text-align:right;">优惠券抵扣：</td>
-        <td><span class="couponPrice">0.00</span>元<from:hidden path="promotionFullReduction" /></td>
+        <td><span class="couponPrice">0.00</span>元 <from:hidden path="couponAmount"/> </td>
         <td>商品总数</td>
         <td><span class="productCount">${empty order.productCount?'0':(order.productCount)}</span>
             <from:hidden path="productCount" />

src/main/webapp/static/modules/bulkpurchase/orderForm.js

@@ -315,6 +315,8 @@ function getUserCoupons(userId) {
     $.get($("#ctx").val() + "/order/clubCouponList?userId="+userId, function(data) {
         if (data.code * 1 === 0) {
             totalCoupons = data.couponList;
+            // 展示可选优惠券列表
+            getShownCouponList();
         }
     })
 }
@@ -446,6 +448,7 @@ $("#couponBox").on("change", "input[name=clubCouponId]", function(){
             couponPrice = item.couponAmount;
         }
     });
+    $("#couponAmount").val(couponPrice);
     // 重新计算总价
     setOrderFee();
 });