处理买卖家详情页面排版

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

@@ -404,10 +404,10 @@
 						<!--</span>-->
 				<!--<b>订单号：{{order.orderid}}<em><font style="color: #333;">订单状态：</font>{{order.status | orderStatus}}</em></b>-->
 			<!--</span>-->
-			<span>
+			<span style="height:auto;">
 				订单信息 <a style="margin: 0 5px"></a>卖家：
-				<span style="white-space: nowrap;text-align: left;line-height: 24px;position: relative;border-bottom: 0px;height: 24px;width: 480px;margin-left: 0px;padding-left: 0px;">
-               <i style="min-width: 300px; display: inline-block">
+				<span style="white-space: nowrap;text-align: left;line-height: 24px;position: relative;border-bottom: 0px;height: 24px;width: 400px;margin-left: 0px;padding-left: 0px;">
+              				<i style="min-width: 280px; display: inline-block">
 								&nbsp;&nbsp;<img src="static/img/user/images/shop_home.png"/>
 								<a ng-href="store/{{order.orderDetails[0].storeid}}" ng-bind="order.storeName" class="hover-color" target="_blank"></a>
 							</i>
@@ -442,11 +442,20 @@
 								</div>
 							</div>
 						</span>
-				<b>
+				<b style="display: inline-block;width: 460px;" ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">
 					订单号：{{order.orderid}}
-					<em style="margin-right: 0;" ng-if="order.status != 603"><font class="color999">取消原因：</font>{{order.unavailableReason.reason}}</em>
-					<em style="margin-right: 0;" ng-if="order.status == 603"><font class="color999">取消原因：</font>超时未付款自动取消</em>
-					<em><font class="color999">订单状态：</font>{{order.status | orderStatus}}</em>
+					<em style="display: inline-block;width: 230px;overflow: hidden;vertical-align: top;margin: 0;line-height: 25px;padding-top:10px;">
+						<em><font class="color999">订单状态：</font>{{order.status | orderStatus}}</em>
+					</em>
+				</b>
+				<b style="display: inline-block;width: 460px;" ng-if="order.status == 602 || order.status == 603 || order.status == 604 || order.status == 605 || order.status == 606 || order.status == 315">
+					订单号：{{order.orderid}}
+					<em style="display: inline-block;width: 230px;overflow: hidden;vertical-align: top;margin: 0;line-height: 25px;padding-top:10px;">
+						<em><font class="color999">订单状态：</font>{{order.status | orderStatus}}</em>
+						<em style="margin-right: 0;" ng-if="order.status != 603"><font class="color999">取消原因：</font>{{order.unavailableReason.reason}}</em>
+						<br/>
+						<em style="margin-right: 0;" ng-if="order.status == 603"><font class="color999">取消原因：</font>超时未付款自动取消</em>
+					</em>
 				</b>
 
 			</span>
@@ -470,7 +479,12 @@
 		<!--订单信息-->
 		<div class="logistics_list01" ng-class="{'status': order.status == 602 || order.status == 603 || order.status == 604 || order.status == 605 || order.status == 606 || order.status == 315}">
 			<div class="log_menu" ng-if="!acceptGoods">
-				<span ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">订单信息<b>订单号：{{order.orderid}}<em><font style="color: #333;">订单状态：</font>{{order.status | orderStatus}}</em></b></span>
+				<span ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">
+					订单信息
+					<b>订单号：{{order.orderid}}
+						<em><font style="color: #333;">订单状态：</font>{{order.status | orderStatus}}</em>
+					</b>
+				</span>
 				<span ng-if="order.status == 602 || order.status == 603 || order.status == 604 || order.status == 605 || order.status == 606 || order.status == 315">
 					<i class="f14" ng-if="!acceptGoods">订单号：{{order.orderid}}</i>
 					<b>

src/main/webapp/resources/view/vendor/forstore/purchase_detail.html

@@ -49,7 +49,7 @@
 		cursor: pointer;
 	}
 	.oder_xq_list dl .change{
-		height: 70px;
+		height: auto;
 	}
 	.oder_xq_list dl .change span{
 		height: 40px;
@@ -276,6 +276,7 @@
 	}
 	.log_menu span{
 		margin-left: 11px;
+		height:auto;
 	}
 	.text-area{
 		width: 120px;
@@ -359,10 +360,77 @@
 		 display: none;
 	 }
 </style>
+<style>
+	label {
+		margin-bottom: 0px;
+	}
+	.com-check-radio input[type='radio'] + label {
+		top: 14px !important;
+	}
+	.sendGoodsList {
+		padding: 0 25px;
+	}
+	.sendGoodsList:after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.sendGoodsList li {
+		float: left;
+		width: 50%;
+	}
+	.sendGoodsList li .clearfix {
+		display: inline-block;
+		line-height: 40px;
+	}
+	.sendGoodsList li .clearfix:after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.sendGoodsList li .clearfix div {
+		float: left;
+		font-size: 14px;
+	}
+	.order_btn {
+		float: right;
+		padding-bottom: 40px;
+	}
+	.order_btn:after {
+		clear: both;
+		content: ' ';
+		zoom: 1;
+		display: block;
+		visibility: hidden;
+	}
+	.order_btn div {
+		width: 120px;
+		height: 34px;
+		line-height: 34px;
+		color: #fff;
+		font-size: 16px;
+		border-radius: 4px;
+		text-align: center;
+		float: left;
+		cursor: pointer;
+	}
+	.order_btn div:last-child {
+		background: #aaaaaa;
+		margin-left: 30px;
+		margin-right: 16px;
+	}
+	.order_btn div:first-child {
+		background: #5078cb;
+	}
+</style>
 <div class="user_right fr">
 	<!--叮当详情-->
 	<div class="oder_detail"  id="oder-detail">
-		<!--<div class="logistics">
+		<div class="logistics" style="margin-bottom:10px;" ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">
 			<ul>
 				<li ng-class="{ 'active' : (steps.step2 || steps.step3 || steps.step4 || steps.step5) }">
 					<p>待付款</p>
@@ -390,54 +458,16 @@
 					<p ng-bind="steps.time5 | date : 'yyyy-MM-dd HH:mm:ss'"></p>
 				</li>
 			</ul>
-		</div>-->
-		<!--订单信息-->
-		<div class="logistics_list01 clearfix" style="margin-top: 0;">
+		</div>
+
+		<!-- 订单信息 -->
+		<div class="logistics_list01 clearfix" style="margin-bottom: 10px;">
 			<div class="log_menu">
-				<!--<span>订单信息<b>订单号：{{purchase.orderid}} <em><font style="color: #333; margin-left: 20px">订单状态：</font>{{purchase.status | purchaseStatus}}</em></b></span>-->
-				<span ng-if="purchase.status != 602 && purchase.status != 603 && purchase.status != 604 && purchase.status != 605 && purchase.status != 606 && purchase.status != 315">订单信息<b>订单号：{{purchase.orderid}}<em style="margin-left: 25px;"><font style="color: #333;">订单状态：</font>{{purchase.status | purchaseStatus}}</em></b></span>
-				<span ng-if="purchase.status == 602 || purchase.status == 603 || purchase.status == 604 || purchase.status == 605 || purchase.status == 606 || purchase.status == 315">
-					<i class="f14">订单号：{{purchase.orderid}}</i>
-					<b>
-						<em style="margin-right: 25px;" ng-if="purchase.status != 603"><font class="color999">取消原因：</font>{{purchase.unavailableReason.reason}}</em>
-						<em style="margin-right: 25px;" ng-if="purchase.status == 603"><font class="color999">取消原因：</font>超时未付款自动取消</em>
-						<em><font class="color999">订单状态：</font>{{purchase.status | purchaseStatus}}</em>
-					</b>
-				</span>
-			</div>
-			<div class="oder_xq clearfix" style="background: #f8f8f8; width: 98%;">
-				<p>
-					<b>收货人：</b>
-					<span ng-bind="address.name">王子鑫</span>
-				</p>
-				<p>
-					<b>收货地址：</b>
-					<span>{{address.area}}&nbsp;{{address.detailAddress}}</span>
-				</p>
-				<p>
-					<b>联系电话：</b>
-					<span ng-bind="address.tel">13526395698</span>
-				</p>
-			</div>
-			<!--订单列表-->
-			<div class="oder_xq_list">
-				<dl class="clearfix">
-					<dt>
-						<span class="wd02">产品信息</span>
-						<span class="wd01">交期(天)</span>
-						<span class="wd01">单价</span>
-						<span style="width: 10%;">数量</span>
-						<span class="wd01">小计</span>
-						<!--<span class="wd01">物料编码</span>-->
-						<span class="wd01">备注</span>
-					</dt>
-					<!--<dd>-->
-					<!--<span style="width: 100%; text-align: left; padding-left: 20px;" class="ng-binding"><img src="static/img/user/images/shop_home01.png">{{purchase.buyentername}}</span>-->
-					<!--</dd>-->
-					<dd class="order-company">
-						<span style="white-space: nowrap; width: 100%; text-align: left; line-height: 50px; position:relative;">
-							<i style="min-width: 315px; display: inline-block">
-								<i ng-bind="purchase.buyername" style="color: #333; margin-left: 20px;"></i>
+				<span style="white-space: nowrap; width: 50%; text-align: left; line-height: 50px; position:relative;border:none;height:auto;">
+					订单信息 <a style="margin: 0 10px"></a>卖家：
+							<i style="min-width: 270px; display: inline-block">
+								<img src="static/img/user/images/shop_home.png"/>
+								<i ng-bind="purchase.buyername" style="color: #333;"></i>
                                 <i style="color: #999; margin: 0 5px;" ng-if="purchase.buyentername">|</i>
                                 <i ng-bind="purchase.buyentername"></i>
 								<!--<a ng-if="purchase.pu_buyentername" name="{{purchase.id}}" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">|{{purchase.pu_buyentername}}</a>-->
@@ -458,7 +488,7 @@
 									</div>
 								  </div>
 							</div>
-							<!--<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-click="contactSeller()">联系买家</a>-->
+					<!--<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-click="contactSeller()">联系买家</a>-->
 							<div class="contact-box" ng-if="contactBNox">
 								<div class="title"><i class="fa fa-close fa-lg" ng-click="closeBox()"></i></div>
 								<div class="content">
@@ -468,12 +498,78 @@
 										<em style="margin-left: 60px;">邮箱：<em ng-bind="::purchase.buyEmail || '暂无电子邮箱'">45413413131313</em></em>
 									</div>
 									<!--<div class="list">地址：-->
-										<!--<em ng-bind="order.sellCompanyAddress || order.sellCompanyArea || '暂无地址信息'">1212314531455</em>-->
+									<!--<em ng-bind="order.sellCompanyAddress || order.sellCompanyArea || '暂无地址信息'">1212314531455</em>-->
 									<!--</div>-->
 								</div>
 							</div>
 						</span>
-					</dd>
+				<b style="display: inline-block;width: 450px;vertical-align: top;">
+					<!--<span>-->
+						<!--<b>订单号：{{purchase.orderid}} -->
+							<!--<em><font style="color: #333; margin-left: 20px">订单状态：</font>{{purchase.status | purchaseStatus}}</em>-->
+						<!--</b>-->
+					<!--</span>-->
+					<span ng-if="purchase.status != 602 && purchase.status != 603 && purchase.status != 604 && purchase.status != 605 && purchase.status != 606 && purchase.status != 315">
+						<b>订单号：{{purchase.orderid}}<em style="margin-left: 25px;"><font style="color: #333;">订单状态：</font>{{purchase.status | purchaseStatus}}</em></b>
+					</span>
+					<span ng-if="purchase.status == 602 || purchase.status == 603 || purchase.status == 604 || purchase.status == 605 || purchase.status == 606 || purchase.status == 315">
+					<i class="f14">订单号：{{purchase.orderid}}</i>
+					<b style="display:inline-block;line-height: 25px;padding-top:10px;vertical-align:top;">
+						<em><font class="color999">订单状态：</font>{{purchase.status | purchaseStatus}}</em>
+						<br/>
+						<em>
+							<em style="margin-right: 25px;" ng-if="purchase.status != 603"><font class="color999">取消原因：</font>{{purchase.unavailableReason.reason}}</em>
+							<em style="margin-right: 25px;" ng-if="purchase.status == 603"><font class="color999">取消原因：</font>超时未付款自动取消</em>
+						</em>
+					</b>
+					</span>
+				</b>
+			</div>
+			<div class="sendGoodsList">
+				<li ng-repeat="item in sendGoodsList">
+					<label class="com-check-radio"   ng-click="ChooseSendGoodsItem(item, $index, $event)">
+						<input type="radio" name="autoMonth" name="date" ng-checked="CheckId === 'autoMonth'+$index">
+						<label style="vertical-align: top"  name="autoMonth" ></label>
+						<div class="clearfix">
+							<div style="color: #666">发货单：</div><div style="color: #333">{{item}}</div>
+						</div>
+					</label>
+				</li>
+			</div>
+		</div>
+		<!--订单明细-->
+		<div class="log_menu">
+			<span>订单明细</span>
+		</div>
+		<div class="logistics_list01 clearfix" style="margin-top: 0;padding-bottom:10px;">
+			<!--<div class="log_menu">-->
+				<!--&lt;!&ndash;<span>订单信息<b>订单号：{{purchase.orderid}} <em><font style="color: #333; margin-left: 20px">订单状态：</font>{{purchase.status | purchaseStatus}}</em></b></span>&ndash;&gt;-->
+				<!--<span ng-if="purchase.status != 602 && purchase.status != 603 && purchase.status != 604 && purchase.status != 605 && purchase.status != 606 && purchase.status != 315">订单信息<b>订单号：{{purchase.orderid}}<em style="margin-left: 25px;"><font style="color: #333;">订单状态：</font>{{purchase.status | purchaseStatus}}</em></b></span>-->
+				<!--<span ng-if="purchase.status == 602 || purchase.status == 603 || purchase.status == 604 || purchase.status == 605 || purchase.status == 606 || purchase.status == 315">-->
+					<!--<i class="f14">订单号：{{purchase.orderid}}</i>-->
+					<!--<b>-->
+						<!--<em style="margin-right: 25px;" ng-if="purchase.status != 603"><font class="color999">取消原因：</font>{{purchase.unavailableReason.reason}}</em>-->
+						<!--<em style="margin-right: 25px;" ng-if="purchase.status == 603"><font class="color999">取消原因：</font>超时未付款自动取消</em>-->
+						<!--<em><font class="color999">订单状态：</font>{{purchase.status | purchaseStatus}}</em>-->
+					<!--</b>-->
+				<!--</span>-->
+			<!--</div>-->
+
+			<!--订单列表-->
+			<div class="oder_xq_list" style="paddding:0;">
+				<dl class="clearfix">
+					<dt>
+						<span class="wd02">产品信息</span>
+						<span class="wd01">交期(天)</span>
+						<span class="wd01">单价</span>
+						<span style="width: 10%;">数量</span>
+						<span class="wd01">小计</span>
+						<!--<span class="wd01">物料编码</span>-->
+						<span class="wd01">备注</span>
+					</dt>
+					<!--<dd>-->
+					<!--<span style="width: 100%; text-align: left; padding-left: 20px;" class="ng-binding"><img src="static/img/user/images/shop_home01.png">{{purchase.buyentername}}</span>-->
+					<!--</dd>-->
 					<div ng-class="{'limit-3': !open}" style="width: 100%; margin: 0 auto; overflow: hidden;">
 						<dd class="oder_l" ng-repeat="detail in purchase.purchaseDetails">
 						<span class="wd02">
@@ -597,6 +693,25 @@
 					</dd>
 				</dl>
 			</div>
+			<div class="oder_xq clearfix" style="background: #f8f8f8; width: 98%;">
+				<p>
+					<b>收货人：</b>
+					<span ng-bind="address.name">王子鑫</span>
+				</p>
+				<p>
+					<b>收货地址：</b>
+					<span>{{address.area}}&nbsp;{{address.detailAddress}}</span>
+				</p>
+				<p>
+					<b>联系电话：</b>
+					<span ng-bind="address.tel">13526395698</span>
+				</p>
+			</div>
+			<div class="order_btn" ng-if="acceptGoods && orderStatus">
+				<div ng-click="goBack()" style="background:#aaaaaa">取消</div>
+				<div ng-click="ensureAccept()" style="background:#5078cb">确认收货</div>
+			</div>
+			<!--<div style="clear: both"></div>-->
 			<style>
 				.direct-collection{
 					width: 734px;
@@ -895,7 +1010,7 @@
 				<em style="font-size: 14px; color:#999;line-height: 70px;">暂无物流信息</em>
 			</div>
 		</div>
-		<!--订单信息-->
+		<!--发票信息-->
 		<div class="logistics_list01">
 			<div class="log_menu"><span>发票信息</span></div>
 			<div class="oder_xq clearfix" style="padding-bottom: 20px;" ng-if="purchase.invoicetype==1205 || purchase.invoicetype == 1206">