订单详情、结算、店铺关注、购物车加上联系卖家 买家弹框（订单结算、店铺关注卖家相关信息缺失）

src/main/webapp/resources/js/usercenter/controllers/forstore/order_detail_ctrl.js

@@ -60,6 +60,14 @@ define(['app/app'], function(app) {
 		/**
 		 * 确认当前订单所属状态
 		 */
+		// 联系卖家弹框
+		$scope.contactBNox = false;
+		$scope.contactSeller = function () {
+			$scope.contactBNox = !$scope.contactBNox;
+		};
+		$scope.closeBox = function () {
+			$scope.contactBNox = false;
+		};
 		$scope.stepStyle = function (status) {
 			if (!status || status == '') {
 				$scope.error('订单状态不能为空');

src/main/webapp/resources/js/usercenter/controllers/forstore/order_pay_ctrl.js

@@ -74,7 +74,6 @@ define(['app/app'], function(app) {
         $scope.togglePrice = function (detail) {
             detail.display = detail.display == 'block' ? 'none' : 'block';
         };
-
 		//获取订单的信息
 		var getOrderData = function() {
 			return Order.findStatusByOrderid({enOrderid : $stateParams.orderid}, function (response) {
@@ -134,7 +133,19 @@ define(['app/app'], function(app) {
 		};
 
 		getOrderData();
-
+		// 联系卖家弹框
+		$scope.contactBNox = false;
+		$scope.contactSeller = function (details) {
+			details.contactSeller = !details.contactSeller;
+			angular.forEach($scope.order.orderDetails, function (order) {
+				if(order.id != details.id) {
+					order.contactSeller = false;
+				}
+			});
+		};
+		$scope.closeBox = function () {
+			$scope.contactBNox = false;
+		};
 
 		/**
 		 * 获取买家收货地址信息

src/main/webapp/resources/js/usercenter/controllers/forstore/store_focus_ctrl.js

@@ -30,7 +30,18 @@ define(['app/app'], function(app) {
 			});
 		}
 		loadData();
-				
+        // 联系卖家弹框
+        $scope.contactSeller = function (item) {
+            item.contactBNox = !item.contactBNox;
+            angular.forEach($scope.store, function (store) {
+                if (store.id != item.id){
+                    store.contactBNox = false;
+                }
+            })
+        };
+        $scope.closeBox = function () {
+            $scope.contactBNox = false;
+        };
 		$scope.isBatch = false;	 // 是否批量标识
 		$scope.isChooseAll = false; // 是否全选标识
 		

src/main/webapp/resources/js/vendor/controllers/forstore/purchase_detail.js

@@ -45,7 +45,14 @@ define(['app/app'], function(app) {
 			});
 			return time;
 		};
-
+		// 联系卖家弹框
+		$scope.contactBNox = false;
+		$scope.contactSeller = function () {
+			$scope.contactBNox = !$scope.contactBNox;
+		};
+		$scope.closeBox = function () {
+			$scope.contactBNox = false;
+		};
 		/**
 		 * 确认当前采购单所属状态
 		 */

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

@@ -378,8 +378,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, .oder .oder_list dl dd.line01 .buyer-contact .contact-title a:hover {
+		color: white !important;
 	}
 
 	.buyer-contact .contact-buyer-info {
@@ -534,7 +534,7 @@
 						</span>
 						<span style="width: 22%; text-align: left; position: relative;"><img src="static/img/common/songguo.png">
 							<!--<a name="{{store.arr[0].id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(store.arr[0].sellPhone, store.arr[0].enuu, chat.UserType.STORE)">联系卖家</a>-->
-							<a name="{{store.arr[0].id}}" href="javascript:void(0)" class="contact_btn" >联系卖家</a>
+							<a name="{{store.arr[0].id}}" href="javascript:void(0)" class="contact_btn" ng-click="showContact(store.arr[0])">联系卖家</a>
 							<div name="{{store.arr[0].id}}" class="buyer-contact" ng-if="store.arr[0].contactSeller">
 									 <div class="contact-title">
 										 <a ng-click="store.arr[0].contactSeller = false"><i class="fa fa-close fa-lg" aria-hidden="true"></i></a>

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 {

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

@@ -219,6 +219,61 @@
 		width: 60px;
 		height: 60px;
 	}
+	/*联系买家*/
+	.contact-box{
+		position: absolute;
+		z-index: 2;
+		height: 210px;
+		opacity: 1;
+		background-color: white;
+		width: 600px;
+		top: 40px;
+		left: 200px;
+		border: 1px solid #E7E5E2;
+		-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
+		box-shadow: 0 5px 15px rgba(0,0,0,.5);
+	}
+	.contact-box .title{
+		height: 26px;
+		background-color: #5078cb;
+		text-align: right;
+		/*padding-right: 15px;*/
+		line-height: 26px;
+		color: #fff;
+	}
+	.contact-box .title i{
+		float: right;
+		margin: 7px 10px 0 0;
+	}
+	.contact-box .content{
+		width: 550px;
+		margin: 0 auto;
+		background-color: #5078cb;
+		color: #fff;
+		margin-top: 15px;
+		margin-bottom: 12px;
+		border-radius: 4px;
+		height: 150px;
+	}
+	.contact-box .content div{
+		padding: 0 15px;
+		line-height: 40px;
+	}
+	.contact-box .content .company-title{
+		text-align: center;
+		font-size: 18px;
+		padding-top: 15px;
+	}
+	.contact-box div.list{
+		text-align: left;
+		font-size: 14px;
+		padding-left: 15px;
+		padding-right: 15px;
+	}
+	.contact-box div.list em{
+		font-size: 14px;
+		color: #fff;
+	}
 </style>
 <div class="user_right fr">
 	<!--叮当详情-->
@@ -304,14 +359,27 @@
 						<span class="wd01">备注</span>
 					</dt>
 					<dd class="order-company">
-						<span style="white-space: nowrap; width: 100%; text-align: left; line-height: 50px;">
+						<span style="white-space: nowrap; width: 100%; text-align: left; line-height: 50px; position: relative;">
                             <i style="min-width: 300px; 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>
 							<img src="static/img/common/songguo.png" style="margin-right:0; ">
 							<!--<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.buyerTel, order.buyerenuu, chat.UserType.STORE)">联系卖家</a>-->
-							<a href="javascript:void(0)" class="contact_btn" title="联系卖家">联系卖家</a>
+							<a href="javascript:void(0)" class="contact_btn" title="联系卖家" 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">
+									<div class="company-title" ng-bind="::order.sellername">深圳市优软科技</div>
+									<div class="list">
+										<em>手机：<em ng-bind="::order.sellPhone || '暂无联系电话'">45413413131313</em></em>
+										<em style="margin-left: 60px;">邮箱：<em ng-bind="::order.sellEmail || '暂无电子邮箱'">45413413131313</em></em>
+									</div>
+									<div class="list">地址：
+										<em ng-bind="order.sellCompanyAddress || order.sellCompanyArea || '暂无地址信息'">1212314531455</em>
+									</div>
+								</div>
+							</div>
 						</span>
 					</dd>
 					<div ng-class="{'limit-3': !open}">

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

@@ -363,6 +363,61 @@
 	.oder_xq_list dl .price-step p a,.oder_xq_list dl .price-step p a:hover{
 		color: #5078cb;
 	}
+	/*联系买家*/
+	.contact-box{
+		position: absolute;
+		z-index: 2;
+		height: 210px;
+		opacity: 1;
+		background-color: white;
+		width: 600px;
+		top: 40px;
+		left: 200px;
+		border: 1px solid #E7E5E2;
+		-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
+		box-shadow: 0 5px 15px rgba(0,0,0,.5);
+	}
+	.contact-box .title{
+		height: 26px;
+		background-color: #5078cb;
+		text-align: right;
+		/*padding-right: 15px;*/
+		line-height: 26px;
+		color: #fff;
+	}
+	.contact-box .title i{
+		float: right;
+		margin: 7px 10px 0 0;
+	}
+	.contact-box .content{
+		width: 550px;
+		margin: 0 auto;
+		background-color: #5078cb;
+		color: #fff;
+		margin-top: 15px;
+		margin-bottom: 12px;
+		border-radius: 4px;
+		height: 150px;
+	}
+	.contact-box .content div{
+		padding: 0 15px;
+		line-height: 40px;
+	}
+	.contact-box .content .company-title{
+		text-align: center;
+		font-size: 18px;
+		padding-top: 15px;
+	}
+	.contact-box div.list{
+		text-align: left;
+		font-size: 14px;
+		padding-left: 15px;
+		padding-right: 15px;
+	}
+	.contact-box div.list em{
+		font-size: 14px;
+		color: #fff;
+	}
 </style>
 <!--右侧主体部分-->
 <div class="user_right fr" id="pay-cart">
@@ -447,12 +502,25 @@
 					</dt>
 					<div ng-repeat="(key, details) in $$orderDetailsMap">
 						<dd style="height: 50px; line-height: 50px;">
-                        <span style="white-space: nowrap; width: 100%; text-align: left; line-height: 50px;">
+                        <span style="white-space: nowrap; width: 100%; text-align: left; line-height: 50px; position: relative;">
                             &nbsp;&nbsp;<img src="static/img/user/images/shop_home01.png"/>
 							店铺：<a ng-href="store/{{details[0].storeid}}" ng-bind="::key" class="hover-color" target="_blank"></a>
 							<img src="static/img/common/songguo.png" style="margin-left: 110px; margin-right:0; ">
 							<!--<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.buyerTel, order.buyerenuu, chat.UserType.STORE)">联系卖家</a>-->
-							<a href="javascript:void(0)" class="contact_btn" title="联系卖家">联系卖家</a>
+							<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-click="contactSeller(details[0])">联系卖家</a>
+<div class="contact-box" ng-if="details[0].contactSeller">
+								<div class="title"><i class="fa fa-close fa-lg" ng-click="details[0].contactSeller = false"></i></div>
+								<div class="content">
+									<div class="company-title" ng-bind="order.sellername">深圳市优软科技</div>
+									<div class="list">
+										<em>手机：<em ng-bind="order.sellPhone || '暂无联系电话'">45413413131313</em></em>
+										<em style="margin-left: 60px;">邮箱：<em ng-bind="::order.sellEmail || '暂无电子邮箱'">45413413131313</em></em>
+									</div>
+									<div class="list">地址：
+										<em ng-bind="order.sellCompanyAddress || order.sellCompanyArea || '暂无地址信息'">1212314531455</em>
+									</div>
+								</div>
+							</div>
 						</span>
 						</dd>
 						<dd class="oder_l" ng-repeat="detail in details">

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

@@ -269,6 +269,61 @@
 		box-shadow: inset 0 1px 1px rgba(0,0,0,.075);
 		transition: border-color ease-in-out .15s,box-shadow ease-in-out .15s;
 	}
+	/*联系买家*/
+	.contact-box{
+		position: absolute;
+		z-index: 2;
+		height: 210px;
+		opacity: 1;
+		background-color: white;
+		width: 600px;
+		top: 40px;
+		left: 20px;
+		border: 1px solid #E7E5E2;
+		-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
+		box-shadow: 0 5px 15px rgba(0,0,0,.5);
+	}
+	.contact-box .title{
+		height: 26px;
+		background-color: #5078cb;
+		text-align: right;
+		/*padding-right: 15px;*/
+		line-height: 26px;
+		color: #fff;
+	}
+	.contact-box .title i{
+		float: right;
+		margin: 7px 10px 0 0;
+	}
+	.contact-box .content{
+		width: 550px;
+		margin: 0 auto;
+		background-color: #5078cb;
+		color: #fff;
+		margin-top: 15px;
+		margin-bottom: 12px;
+		border-radius: 4px;
+		height: 150px;
+	}
+	.contact-box .content div{
+		padding: 0 15px;
+		line-height: 40px;
+	}
+	.contact-box .content .company-title{
+		text-align: center;
+		font-size: 18px;
+		padding-top: 15px;
+	}
+	.contact-box div.list{
+		text-align: left;
+		font-size: 14px;
+		padding-left: 15px;
+		padding-right: 15px;
+	}
+	.contact-box div.list em{
+		font-size: 14px;
+		color: #fff;
+	}
 </style>
 <div class="user_right fr">
 	<div class="rt_menu" style="background-color:white">
@@ -306,9 +361,22 @@
 							<div ng-bind=item.storeName class="item-storeName"></div>
 						</a>
 						<i class="fa fa-trash fa-2x item-delete" ng-click="deleteById(item.id)" ng-hide="isBatch" title="取消关注" style="cursor: pointer"></i>
-						<div class="item-seller">
+						<div class="item-seller" style="position: relative;">
 							<img src="static/img/user/images/touxiang.png">
-							<a class="item-contact">联系卖家</a>
+							<a class="item-contact" ng-click="contactSeller(item)">联系卖家</a>
+							<div class="contact-box" ng-if="item.contactBNox">
+								<div class="title"><i class="fa fa-close fa-lg" ng-click="item.contactBNox = false"></i></div>
+								<div class="content">
+									<div class="company-title" ng-bind="item.storeName">深圳市优软科技</div>
+									<div class="list">
+										<em>手机：<em ng-bind="item.storeInfo.enterprise.enTel || '暂无联系电话'">45413413131313</em></em>
+										<em style="margin-left: 60px;">邮箱：<em ng-bind="item.storeInfo.enterprise.enFax || '暂无电子邮箱'">45413413131313</em></em>
+									</div>
+									<div class="list">地址：
+										<em ng-bind="item.storeInfo.enterprise.enAddress || '暂无地址信息'">1212314531455</em>
+									</div>
+								</div>
+							</div>
 						</div>
 						<div class="item-mark">
 							<div>公司介绍：

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

@@ -290,6 +290,63 @@
 		width: 60px;
 		height: 60px;
 	}
+	/*联系买家*/
+	.contact-box{
+		position: absolute;
+		z-index: 2;
+		height: 155px;
+		opacity: 1;
+		background-color: white;
+		width: 600px;
+		top: 40px;
+		left: 200px;
+		border: 1px solid #E7E5E2;
+		-webkit-box-shadow: 0 5px 15px rgba(0,0,0,.5);
+		box-shadow: 0 5px 15px rgba(0,0,0,.5);
+	}
+	.contact-box .title{
+		height: 26px;
+		background-color: #5078cb;
+		text-align: right;
+		/*padding-right: 15px;*/
+		line-height: 26px;
+		color: #fff;
+	}
+	.contact-box .title i{
+		float: right;
+		margin: 7px 10px 0 0;
+	}
+	.contact-box .content{
+		width: 550px;
+		margin: 0 auto;
+		background-color: #5078cb;
+		color: #fff;
+		margin-top: 15px;
+		margin-bottom: 12px;
+		border-radius: 4px;
+		height: 100px;
+	}
+	.contact-box .content div{
+		padding: 0 15px;
+		line-height: 40px;
+	}
+	.contact-box .content .company-title{
+		text-align: center;
+		font-size: 18px;
+	}
+	.contact-box div.list{
+		text-align: left;
+		font-size: 14px;
+		padding-left: 15px;
+		padding-right: 15px;
+	}
+	.contact-box div.list em{
+		font-size: 14px;
+		color: #fff;
+	}
+	.oder_xq_list dl span .contact_btn:hover{
+		color: #fff !important;
+	}
 </style>
 <div class="user_right fr">
 	<!--叮当详情-->
@@ -355,13 +412,26 @@
 					<!--<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;">
+						<span style="white-space: nowrap; width: 100%; text-align: left; line-height: 50px; position: relative;">
 							<i style="min-width: 315px; display: inline-block">
 								&nbsp;&nbsp;{{purchase.buyername}}<i ng-if="purchase.buyentername">&nbsp;&nbsp;|&nbsp;&nbsp;{{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)"></a>-->
 							</i>
 							<img src="static/img/common/songguo.png" style="margin-right:0; ">
 							<!--<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="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">
+									<div class="company-title" ng-bind="::purchase.buyername || '买家姓名没获取到'">深圳市优软科技</div>
+									<div class="list">
+										<em>手机：<em ng-bind="::purchase.buyPhone || '暂无联系电话'">45413413131313</em></em>
+										<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>-->
+									<!--</div>-->
+								</div>
+							</div>
 						</span>
 					</dd>
 					<div ng-class="{'limit-3': !open}">

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;
+	.sellOder .oder_list .buyer-contact .contact-title a, .sellOder .oder_list .buyer-contact .contact-title a:hover {
+		color: white !important;
 	}
 
 	.buyer-contact .contact-buyer-info {
@@ -746,12 +746,13 @@
 						<span style="    width: 16%;text-align: left;">日期：{{purchase.createtime | date: 'yyyy-MM-dd'}}</span>
 						<span style="width: 25%;text-align: left;">订单号：<a class="hover-col" href="vendor#/purchase/detail/{{purchase.purchaseid | EncryptionFilter}}" target="_blank"><em ng-bind="purchase.orderid"></em></a></span>
 						<span style="width: 30%; text-align: center;">
-                            <img src="static/img/user/images/shop_home.png"><a ng-bind="purchase.buyentername" href="store/{{::purchase.storeid}}"></a>&nbsp;&nbsp;
+                            <img src="static/img/user/images/shop_home.png">
+							<i ng-bind="purchase.buyentername" href="store/{{::purchase.storeid}}"></i>&nbsp;&nbsp;
                         </span>
 						<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>