1:购物车及订单中心释放联系买卖家联系弹框。

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

@@ -530,7 +530,7 @@ define(["app/app", 'jquery-summernote'], function(app) {
 			angular.forEach($scope.carts, function (cart) {
 				if(cart.id != value.id) {
 					cart.contactSeller = false;
-				}
+				};
 			});
         };
         /**

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

@@ -545,7 +545,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>
@@ -601,9 +601,9 @@
 							<span>
 								<div class="btn-wrap">
 									<span class="number">
-										<a class="reduce" ng-disabled="cart.minusDisabled" ng-click="reduce(cart)">-</a>
-										<input type="text" ng-model="cart.number" ng-blur="blurNum(cart)">
-										<a class="add" ng-disabled="cart.addDisabled" ng-click="add(cart)">+</a>
+										<a class="reduce" ng-disabled="cart.minusDisabled || cart.status == 1" ng-click="reduce(cart)">-</a>
+										<input type="text" ng-disabled="cart.status == 1" ng-model="cart.number" ng-blur="blurNum(cart)">
+										<a class="add" ng-disabled="cart.addDisabled || cart.status == 1" ng-click="add(cart)">+</a>
 									</span>
 									<i ng-if="cart.status == 2" style="color: #f00; margin-left: 32px;">库存紧张</i>
 								</div>

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

@@ -608,6 +608,9 @@
 	.border-bt-16:nth-of-type(1){
 		border-top: none;
 	}
+	.closeContact:hover {
+		color: white;
+	}
 </style>
 <div class="user_right fr">
 	<!--订单中心-->
@@ -742,15 +745,15 @@
 						<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"><a ng-bind="purchase.buyentername"></a>&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>
+                                     <a class="closeContact" ng-click="purchase.active=false"><i class="fa fa-close fa-lg" aria-hidden="true"></i></a>
                                  </div>
                                  <div class="contact-buyer-info">
                                      <div class="company-name" ng-bind="::purchase.buyername || '买家姓名没获取到'"></div>