修改买家确认订单页内容排版

src/main/webapp/resources/view/usercenter/forstore/order_pay.html

@@ -617,63 +617,6 @@
 				<span>4，评论</span>
 			</div>
 		</div>
-		<div class="adress_list">
-			<div class="pay_com"><span>确认收货地址</span></div>
-			<ul id="address" class="clearfix address" ng-if="sendAddress.length != 0" ng-class="{'inital' : !expand}">
-				<li class="clearfix" ng-repeat="address in sendAddress" ng-click="selectAdd(address)" ng-class="{'active' : payment.address.id == address.id}">
-					<!--<h4 ng-bind="address.company"></h4>-->
-					<p class="">{{address.area}}, {{address.detailAddress}}</p>
-					<span class="adderss-name">{{address.tel}} &nbsp;&nbsp;{{address.name}}（收）<a ng-if="order.status == 501" href="javascript:void(0)" ng-click="addShippingAddress(address, $index)"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;编辑</a></span>
-					<em ng-if="address.num ==1">默认地址</em>
-				</li>
-			</ul>
-			<div class="f14 notice margin-top-20 margin-bottom-10 text-center" ng-if="sendAddress.length == 0">您还没有添加收货地址信息，请先新增收货地址信息</div>
-			<div class="pay_add">
-				<a class="add_adr fl" ng-click="addShippingAddress()" ng-if="order.status == 501 && sendAddress.length < 20"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;新增地址</a>
-				<a class="add_adr fr" ng-click="toggleAddress()" ng-if="sendAddress.length/3 > 1"><b ng-if="expand">隐藏地址</b><b ng-if="!expand">显示地址</b></a>
-			</div>
-		</div>
-		<!--发票订单详情-->
-		<div class="pay_oder_xq">
-			<div class="pay_com">
-				<span>发票信息详情
-					<!--<a ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&order.status == 501"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<em ng-if="!bill.name">新增发票</em><em ng-if="bill.name">修改发票</em></a>-->
-					<span ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&order.status == 501"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<button ng-if="!bill.name">新增发票</button><button ng-if="bill.name">修改发票</button></span>
-				</span>
-			</div>
-			<p class="bill-radio" ng-if="order.status == '501'">
-				<span  ng-click="selectBill('1207')">
-					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1207'"/>
-					<label></label><em>暂不开票</em>
-				</span>
-				<span  ng-click="selectBill('1206')" ng-hide="storeArray.length == 1 && hideNormal">
-					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1206'"/>
-					<label></label><em>增值税普通发票</em>
-				</span>
-				<span ng-click="selectBill('1205')">
-					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1205'"/>
-					<label></label><em>增值税专用发票</em>
-				</span>
-				<b ng-if="order.invoicetype == '1206' && hideNormal">因存在部分寄售产品，寄售产品默认仅提供增值税专票</b>
-			</p>
-			<div class="pay_oder_xq_list no-need-bill f14" ng-if="order.invoicetype=='1207'">
-			</div>
-			<div class="pay_oder_xq_list no-need-bill notice" ng-if="order.invoicetype!='1207' && !bill.name">
-				还没有对应的发票信息，请新增相应的发票信息
-			</div>
-			<div class="pay_oder_xq_list" ng-if="order.invoicetype&&order.invoicetype != '1207'&&bill.name">
-				<p><em>发票类型：</em><span ng-bind="order.invoicetype | billTypeFilter "></span></p>
-				<p><em>发票抬头：</em><span ng-bind="bill.head || '空'"></span></p>
-				<p ng-if="order.invoicetype == '1205'"><em>单位地址：</em><span ng-bind="bill.companyAddress || '空'"></span></p>
-				<p ng-if="order.invoicetype == '1205'"><em>单位电话：</em><span ng-bind="bill.companyPhone || '空'"></span></p>
-				<p ng-if="order.invoicetype == '1205'"><em>税务登记号：</em><span ng-bind="bill.companyTaxNumber || '空'"></span></p>
-				<p ng-if="order.invoicetype == '1205'"><em>开户银行：</em><span ng-bind="bill.bankName || '空'"></span></p>
-				<p ng-if="order.invoicetype == '1205'"><em>开户银行账户：</em><span ng-bind="bill.bankAccount || '空'"></span></p>
-				<p><em>收票人：</em><span ng-bind="bill.name || '空'"></span></p>
-				<p><em>联系电话：</em><span ng-bind="bill.telephone || '空'"></span></p>
-				<p><em>详细地址：</em><span>{{bill.area}}, {{bill.detailAddress}}</span></p>
-			</div>
-		</div>
 		<!--确认订单信息-->
 		<div class="sure_oder">
 			<div class="pay_com"><span style="border-bottom: none">确认订单信息</span></div>
@@ -921,8 +864,74 @@
 							<!--</span>-->
 						<!--</div>-->
 					</div>
+
+				</dl>
+			</div>
+		</div>
+		<!-- 确认收货地址 -->
+		<div class="adress_list">
+			<div class="pay_com"><span>确认收货地址</span></div>
+			<ul id="address" class="clearfix address" ng-if="sendAddress.length != 0" ng-class="{'inital' : !expand}">
+				<li class="clearfix" ng-repeat="address in sendAddress" ng-click="selectAdd(address)" ng-class="{'active' : payment.address.id == address.id}">
+					<!--<h4 ng-bind="address.company"></h4>-->
+					<p class="">{{address.area}}, {{address.detailAddress}}</p>
+					<span class="adderss-name">{{address.tel}} &nbsp;&nbsp;{{address.name}}（收）<a ng-if="order.status == 501" href="javascript:void(0)" ng-click="addShippingAddress(address, $index)"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;编辑</a></span>
+					<em ng-if="address.num ==1">默认地址</em>
+				</li>
+			</ul>
+			<div class="f14 notice margin-top-20 margin-bottom-10 text-center" ng-if="sendAddress.length == 0">您还没有添加收货地址信息，请先新增收货地址信息</div>
+			<div class="pay_add">
+				<a class="add_adr fl" ng-click="addShippingAddress()" ng-if="order.status == 501 && sendAddress.length < 20"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;新增地址</a>
+				<a class="add_adr fr" ng-click="toggleAddress()" ng-if="sendAddress.length/3 > 1"><b ng-if="expand">隐藏地址</b><b ng-if="!expand">显示地址</b></a>
+			</div>
+		</div>
+		<!--发票订单详情-->
+		<div class="pay_oder_xq">
+			<div class="pay_com">
+				<span>发票信息详情
+					<!--<a ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&order.status == 501"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<em ng-if="!bill.name">新增发票</em><em ng-if="bill.name">修改发票</em></a>-->
+					<span ng-click="modifyInvoice(bill)" ng-if="order.invoicetype!='1207'&&order.status == 501"><i class="fa fa-plus-square" aria-hidden="true"></i>&nbsp;<button ng-if="!bill.name">新增发票</button><button ng-if="bill.name">修改发票</button></span>
+				</span>
+			</div>
+			<p class="bill-radio" ng-if="order.status == '501'">
+				<span  ng-click="selectBill('1207')">
+					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1207'"/>
+					<label></label><em>暂不开票</em>
+				</span>
+				<span  ng-click="selectBill('1206')" ng-hide="storeArray.length == 1 && hideNormal">
+					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1206'"/>
+					<label></label><em>增值税普通发票</em>
+				</span>
+				<span ng-click="selectBill('1205')">
+					<input type="radio"  name="bill" ng-checked="order.invoicetype == '1205'"/>
+					<label></label><em>增值税专用发票</em>
+				</span>
+				<b ng-if="order.invoicetype == '1206' && hideNormal">因存在部分寄售产品，寄售产品默认仅提供增值税专票</b>
+			</p>
+			<div class="pay_oder_xq_list no-need-bill f14" ng-if="order.invoicetype=='1207'">
+			</div>
+			<div class="pay_oder_xq_list no-need-bill notice" ng-if="order.invoicetype!='1207' && !bill.name">
+				还没有对应的发票信息，请新增相应的发票信息
+			</div>
+			<div class="pay_oder_xq_list" ng-if="order.invoicetype&&order.invoicetype != '1207'&&bill.name">
+				<p><em>发票类型：</em><span ng-bind="order.invoicetype | billTypeFilter "></span></p>
+				<p><em>发票抬头：</em><span ng-bind="bill.head || '空'"></span></p>
+				<p ng-if="order.invoicetype == '1205'"><em>单位地址：</em><span ng-bind="bill.companyAddress || '空'"></span></p>
+				<p ng-if="order.invoicetype == '1205'"><em>单位电话：</em><span ng-bind="bill.companyPhone || '空'"></span></p>
+				<p ng-if="order.invoicetype == '1205'"><em>税务登记号：</em><span ng-bind="bill.companyTaxNumber || '空'"></span></p>
+				<p ng-if="order.invoicetype == '1205'"><em>开户银行：</em><span ng-bind="bill.bankName || '空'"></span></p>
+				<p ng-if="order.invoicetype == '1205'"><em>开户银行账户：</em><span ng-bind="bill.bankAccount || '空'"></span></p>
+				<p><em>收票人：</em><span ng-bind="bill.name || '空'"></span></p>
+				<p><em>联系电话：</em><span ng-bind="bill.telephone || '空'"></span></p>
+				<p><em>详细地址：</em><span>{{bill.area}}, {{bill.detailAddress}}</span></p>
+			</div>
+		</div>
+		<!-- 付款金额 -->
+		<div class="sure_oder" style="margin-top: 10px">
+			<div class="oder_xq_list">
+				<dl>
 					<dd class="pay_price">
-						<div>
+						<div style="background: rgba(0,0,0,0)">
 							<h4>总计:
 								<em ng-bind="order.ensurePrice | formateNumber : 2 | currencySysmbol : order.currency.substring(0,3) "></em>
 
@@ -953,12 +962,12 @@
 							<input type="hidden" name="sign" value={{ysepayRequest.sign}}>
 						</form>
 						<p>
-							<span class="style01" style="width: 220px; margin-left: 610px;">付款方式:
-								<select class="select" ng-model="order.paytype">
-									<option value="1102">在线支付</option>
-									<option value="1103">线下支付</option>
-								</select>
-							</span>
+									<span class="style01" style="width: 220px; margin-left: 610px;">付款方式:
+										<select class="select" ng-model="order.paytype">
+											<option value="1102">在线支付</option>
+											<option value="1103">线下支付</option>
+										</select>
+									</span>
 							<a ng-click="confirmPay()">提交订单</a></p>
 						<p class="bulb-remind"><img src="static/img/user/bulb.png" alt="">若价格变动，请在订单提交后联系卖家改价</p>
 					</dd>