|
|
@@ -23,6 +23,10 @@
|
|
|
.ladderPrice:hover .list{display:block}
|
|
|
.ladderPrice .list span{margin:0 20px;width:60px;text-align:center;display:inline-block}
|
|
|
.ladderPrice .list span.price{color:red}
|
|
|
+ ul.couponContent:after{content:"";display:table;clear:both}
|
|
|
+ ul.couponContent li{float:left;list-style:none;list-style-position:inside;border:1px solid #eee;margin:20px 20px 20px 0;width:300px;padding:10px}
|
|
|
+ ul.couponContent label{display:flex;align-items:center}
|
|
|
+ ul.couponContent span{display:inline-block;width:100%;padding:2px}
|
|
|
</style>
|
|
|
</head>
|
|
|
<body>
|
|
|
@@ -166,7 +170,7 @@
|
|
|
<input ${empty order.orderID?'style="display:none"':''} id="shopSelected" class="btn btn-primary" type="button" value="添加商品" onclick="showShopSelect('iframe:${ctx}/bulkpurchase/purchaseProduct/list?flag=1${order.orderSubmitType eq 6 ? '&priceType=normal' : ''}')" />
|
|
|
<input ${empty order.orderID?'':'style="display:none"'} id="shopSelected1" class="btn btn-primary" type="button" onclick="alertx('请您先选择会所！')" value="添加商品" />
|
|
|
</c:if>
|
|
|
- <label style="display: block;margin-top: 20px;font-family: 'Microsoft YaHei';font-size: 15px;font-weight: bold; text-decoration: none;border-bottom: 2px solid #050202">订单商品<label style="color: red;margin-left: 20px">注：如果使用折扣，不能同时享受促销优惠</label></label>
|
|
|
+ <div style="margin-top:20px;font-size:15px;border-bottom:2px solid #050202"><b>订单商品</b><span style="color:red;margin-left:20px">注：如果使用折扣，不能同时享受促销优惠</span></div>
|
|
|
<%int idx=0 ;%>
|
|
|
<!-- idx 在页面上记录商品循环时候的index -->
|
|
|
<c:forEach items="${order.newShopOrders}" var="shopOrder">
|
|
|
@@ -311,6 +315,16 @@
|
|
|
<input type="hidden" id="product_index" value="<%=idx%>">
|
|
|
<br>
|
|
|
<br>
|
|
|
+ <!-- 优惠券 -->
|
|
|
+ <div id="couponBox">
|
|
|
+ <div style="margin-top:20px;font-size:15px;border-bottom:2px solid #050202"><b>优惠券</b><input id="redeemCoupons" class="btn btn-primary" type="button" onclick="alertx('请您先选择会所！')" value="兑换优惠券" style="padding:1px 10px;margin:2px 30px;"></div>
|
|
|
+ <!-- $('input[name=clubCouponId]:checked').val() -->
|
|
|
+ <ul class="couponContent">
|
|
|
+ <li><label><input type="radio" name="clubCouponId" value="0"><span class="couponDesc">不使用优惠券</span></label></li>
|
|
|
+ </ul>
|
|
|
+ </div>
|
|
|
+ <br>
|
|
|
+ <br>
|
|
|
<table id="orderPrice" class="table table-striped table-bordered table-condensed">
|
|
|
<thead>
|
|
|
<tr>
|
|
|
@@ -337,6 +351,8 @@
|
|
|
</span>元
|
|
|
<from:hidden path="promotionFullReduction" />
|
|
|
</td>
|
|
|
+ <td style="text-align:right;">优惠券抵扣：</td>
|
|
|
+ <td><span class="couponPrice">0.00</span>元<from:hidden path="promotionFullReduction" /></td>
|
|
|
<td>商品总数</td>
|
|
|
<td><span class="productCount">${empty order.productCount?'0':(order.productCount)}</span>
|
|
|
<from:hidden path="productCount" />
|
|
|
@@ -357,7 +373,7 @@
|
|
|
<input type="button" onclick="setProductTotalFee()" value="确认折扣">
|
|
|
</td>
|
|
|
<td>运费</td>
|
|
|
- <td class="freeDesc" id="freeDesc">
|
|
|
+ <td class="freeDesc" id="freeDesc" colspan="3">
|
|
|
<form:select id="freePostFlag" path="freePostFlag" class="required" onchange="setFreight()" disabled="${empty order.orderID || order.status eq 0? false:true}">
|
|
|
<form:option value="0" label="包邮" />
|
|
|
<form:option value="1" label="不包邮" />
|
|
|
@@ -380,7 +396,7 @@
|
|
|
<from:hidden path="payTotalFee" />
|
|
|
</td>
|
|
|
<td>余额</td>
|
|
|
- <td>
|
|
|
+ <td colspan="3">
|
|
|
<input id="useBalancePayFee" type="checkbox" ${empty order.orderID || order.status eq 0? '': "disabled='disabled'"} ${empty order.orderID || (order.status eq 0 && order.balancePayFee eq 0)? '': 'checked'} onchange="setProductTotalFee()" />使用账户余额
|
|
|
<br>（可用余额￥<span id="availableBalance">0.00</span>，当前使用￥<span class="balancePayFee">0.00</span>，剩余￥<span id="surplusBalance">0.00</span>）
|
|
|
<from:hidden path="balancePayFee" value="${empty order.balancePayFee ?'0.00':(order.balancePayFee)}" cssClass="input-small number" />
|
|
|
@@ -392,10 +408,6 @@
|
|
|
<fmt:formatNumber value="${empty order.payableAmount?'0.00':(order.payableAmount)}" pattern="#0.00" />
|
|
|
</span>元</td>
|
|
|
<from:hidden path="payableAmount" />
|
|
|
- <td>
|
|
|
- </td>
|
|
|
- <td>
|
|
|
- </td>
|
|
|
</tr>
|
|
|
</table>
|
|
|
<br>
|
chao