取消订单弹框、提醒发货弹框、卖家订单联系买家弹框采用之前的弹框。

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

@@ -176,8 +176,8 @@
 		color: white;
 	}
 
-	.seller-contact .contact-title a, .seller-contact .contact-title a:hover {
-		color: white;
+	.oder .oder_list dl dd.line01 .seller-contact .contact-title a, .oder .oder_list dl dd.line01 .seller-contact .contact-title a:hover {
+		color: white !important;
 	}
 
 	.seller-contact .contact-seller-info {
@@ -314,8 +314,9 @@
 		height: 145px;
 		background-color: white;
 		font-size: 14px;
-		top: 300px;
-		left: 500px;
+		top: 50%;
+		left: 50%;
+		margin: -72.5px 0 0 -170px;
 		box-shadow: 1px 6px 5px #C0BCBA
 	}
 

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

@@ -259,7 +259,7 @@
 <div class="user_right fr">
 	<!--叮当详情-->
 	<div class="oder_detail" id="oder-detail">
-		<div class="logistics" ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315">
+		<div class="logistics" ng-if="order.status != 602 && order.status != 603 && order.status != 604 && order.status != 605 && order.status != 606 && order.status != 315" ng-cloak>
 			<ul>
 				<li ng-class="{ 'active' : (steps.step2 || steps.step3 || steps.step4 || steps.step5) }">
 					<p>拍下产品</p>
@@ -443,7 +443,7 @@
 		<!--物流信息-->
 		<div class="logistics_list01">
 			<div class="log_menu">
-				<span>物流信息<em style="color: #666;" ng-if="!logistics.companyName&& noLogisticInfoArray[order.status]">(暂无物流信息)</em>
+				<span>物流信息<em style="color: #666;" ng-if="!logistics.companyName&& noLogisticInfoArray[order.status]">（暂无物流信息）</em>
 					<b ng-if="logistics.companyName">物流公司：{{logistics.companyName.companyName || logistics.companyName || '空'}}&nbsp;&nbsp;&nbsp;物流单号：{{logistics.number || '空'}}</b>
 				</span>
 			</div>

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

@@ -605,7 +605,7 @@
 									<!--<option ng-switch-when="1301">上门自提</option>-->
 									<!--<option ng-switch-when="1302">上门自提</option>-->
 								</select>
-								<em ng-if="order.status != 501">物流配送</em>
+								<em ng-if="order.status != 501" class="color333">物流配送</em>
 								<!--<i>满1000元包邮，未满足的订单收取运费20元</i>-->
 							</span>
 							<span class="total-price">

src/main/webapp/resources/view/usercenter/modal/cancelOrder_modal.html

@@ -20,7 +20,8 @@
 		width: 440px !important;
 		position: fixed !important;
 		top: 150px !important;
-		left: 400px !important;
+		left: 50% !important;
+		margin-left: -200px;
 	}
 
 	a.cancle-close {

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

@@ -41,7 +41,7 @@
 		line-height: 30px;
 		color: #fff;
 		font-size: 14px;
-		margin-right: 5px;
+		/*margin-right: 5px;*/
 		float: right;
 	}
 	#oder-detail .oder_xq_list dl .change-price span:hover{
@@ -58,7 +58,7 @@
 	.oder_xq_list dl .change .change-price{
 		width: 100% !important;
 		margin-top: 0;
-		padding-right: 30px;
+		/*padding-right: 30px;*/
 	}
 	#oder-detail .oder_xq_list dl .change-price span:hover{
 		background: #3f7ae3;
@@ -66,6 +66,7 @@
 	}
 	#oder-detail .oder_xq_list dl .change-price span.off{
 		background: #fa5a02;
+		margin-right: 10px;
 	}
 	.oder_xq_list dl .price span i {
 		margin-right: 35px;
@@ -308,6 +309,9 @@
 		font-size: 12px;
 		color: #666;
 	}
+	#oder-detail .contact_btn:hover{
+		color: #fff !important;
+	}
 </style>
 <div class="user_right fr">
 	<!--叮当详情-->
@@ -492,7 +496,7 @@
 		<!--物流信息-->
 		<div class="logistics_list01">
 			<div class="log_menu">
-				<span>物流信息<em ng-hide="hasInfo" ng-if="purchase.status == 501 || purchase.status == 502 || purchase.status == 504 || purchase.status == 406 || purchase.status == 603">（暂无物流信息）</em>
+				<span>物流信息<em ng-hide="hasInfo" ng-if="purchase.status == 501 || purchase.status == 502 || purchase.status == 504 || purchase.status == 406 || purchase.status == 603" class="color666">（暂无物流信息）</em>
 					<b ng-if="logistics.companyName">物流公司：{{logistics.companyName || '空'}}&nbsp;&nbsp;&nbsp;物流单号：{{logistics.number || '空'}}</b>
 				</span>
 			</div>
@@ -509,7 +513,7 @@
 		</div>
 		<!--订单信息-->
 		<div class="logistics_list01">
-			<div class="log_menu"><span>发票信息<em ng-if="purchase.invoicetype==1207">（暂不开票）</em></span></div>
+			<div class="log_menu"><span>发票信息<em ng-if="purchase.invoicetype==1207" class="color666">（暂不开票）</em></span></div>
 			<div class="oder_xq clearfix" style="padding-bottom: 20px;" ng-if="purchase.invoicetype==1205 || purchase.invoicetype == 1206">
 				<p>
 					<b>发票类型：</b>

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

@@ -167,8 +167,8 @@
 		color: white;
 	}
 
-	.buyer-contact .contact-title a, .buyer-contact .contact-title a:hover {
-		color: white;
+	.oder .oder_list dl dd.line01 .buyer-contact .contact-title a i, .oder .oder_list dl dd.line01 .buyer-contact .contact-title a i:hover {
+		color: white !important;
 	}
 
 	.buyer-contact .contact-buyer-info {
@@ -859,7 +859,7 @@
 						<span style="position: relative;">
                             <img src="static/img/common/songguo.png">
                             <!--<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>-->
-							<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" >联系买家</a>
+							<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-click="contactBuyer(purchase)">联系买家</a>
                              <div name="{{purchase.id}}" class="buyer-contact" ng-if="purchase.active" ng-class="{true : 'buyer-contact-info', false : 'display-none'}[purchase.active]">
                                  <div class="contact-title">
                                      <a ng-click="purchase.active=false"><i class="fa fa-close fa-lg" aria-hidden="true"></i></a>