Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

src/main/java/com/uas/platform/b2c/common/account/controller/EnterpriseController.java

@@ -3,9 +3,8 @@ package com.uas.platform.b2c.common.account.controller;
 import com.uas.account.entity.UserSpaceDetail;
 import com.uas.account.util.AccountUtils;
 import com.uas.platform.b2c.common.account.model.Enterprise;
-import com.uas.platform.b2c.common.account.model.FormEnterprise;
-import com.uas.platform.b2c.common.account.model.User;
 import com.uas.platform.b2c.common.account.model.UserBaseInfo;
+import com.uas.platform.b2c.common.account.model.FormEnterprise;
 import com.uas.platform.b2c.common.account.service.EnterpriseService;
 import com.uas.platform.b2c.core.support.SystemSession;
 import com.uas.platform.b2c.prod.store.service.StoreInService;
@@ -52,6 +51,16 @@ public class EnterpriseController {
 		}
 	}
 
+	/**
+	 * 根据UU获取管理员信息
+	 * @param enuu 企业uu号
+	 * @return 完整的企业信息
+	 */
+	@RequestMapping(value = "/{enuu}/admin", method = RequestMethod.GET)
+	public UserBaseInfo getEnterpriseAdminInfo(@PathVariable Long enuu){
+		return enterpriseService.getEnterpriseAdminInfo(enuu);
+	}
+
 	/**
 	 * 修改企业基本资料
 	 *

src/main/java/com/uas/platform/b2c/common/account/service/EnterpriseService.java

@@ -4,6 +4,7 @@ import com.uas.platform.b2c.common.account.controller.EnterpriseController;
 import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.common.account.model.FormEnterprise;
 import com.uas.platform.b2c.common.account.model.User;
+import com.uas.platform.b2c.common.account.model.UserBaseInfo;
 import com.uas.platform.b2c.trade.support.ResultMap;
 
 import java.util.List;
@@ -19,6 +20,8 @@ public interface EnterpriseService {
 	 * @return List<EnterpriseUas>
 	 */
 	List<Enterprise> getEnterpriseInfos(List<Long> enuus);
+
+	public UserBaseInfo getEnterpriseAdminInfo(Long uu);
 	
 	// 得到企业是否有需要结算单据状态
 	public Enterprise getReceiptStatus(Enterprise enter);

src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java

@@ -56,6 +56,11 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 		return enterpriseDao.findByUus(enuus);
 	}
 
+	@Override
+	public UserBaseInfo getEnterpriseAdminInfo(Long uu) {
+		return userBaseInfoDao.findUserByUserUU(enterpriseDao.findByUu(uu).getEnAdminuu());
+	}
+
 	@Override
 	public Enterprise getReceiptStatus(Enterprise enter) {
 		List<Receipt> receipts = receiptDao.findBySellerenuu(enter.getUu());

src/main/java/com/uas/platform/b2c/trade/presale/model/Cart.java

@@ -1,8 +1,10 @@
 package com.uas.platform.b2c.trade.presale.model;
 
+import com.uas.platform.b2c.common.account.model.Enterprise;
 import com.uas.platform.b2c.core.utils.NumberUtil;
 import com.uas.platform.b2c.prod.commodity.model.Goods;
 import com.uas.platform.b2c.prod.commodity.model.GoodsSimple;
+import com.uas.platform.b2c.prod.store.model.StoreIn;
 import com.uas.platform.b2c.prod.store.model.StoreType;
 import com.uas.platform.b2c.trade.presale.status.cartStatus;
 import com.uas.platform.core.model.Status;
@@ -148,6 +150,13 @@ public class Cart {
 	@Column(name = "cart_store_uuid")
 	private String storeUuid;
 
+	/**
+	 * 店铺企业信息
+	 */
+	@OneToOne(cascade = { CascadeType.REFRESH }, fetch = FetchType.EAGER)
+	@JoinColumn(name = "cart_store_uuid", referencedColumnName = "st_uuid" ,insertable = false, updatable = false)
+	private StoreIn storeEnterprise;
+
 	/**
 	 * 店铺名称
 	 */
@@ -556,6 +565,14 @@ public class Cart {
 		return this;
 	}
 
+	public StoreIn getStoreEnterprise() {
+		return storeEnterprise;
+	}
+
+	public void setStoreEnterprise(StoreIn storeEnterprise) {
+		this.storeEnterprise = storeEnterprise;
+	}
+
 	@Override
 	public String toString() {
 		return "Cart [id=" + id + ", uu=" + uu + ", enuu=" + enuu + ", uuid=" + uuid + ", batchCode=" + batchCode

src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -956,7 +956,7 @@ define([ 'app/app' ], function(app) {
 	}]);
 
 	// Web Chat侧边栏的Controller
-	app.controller('WebChatCtrl', ['$scope', '$interval', 'AuthenticationService', 'ChatBusinessLayer', 'toaster', function($scope, $interval, AuthenticationService, ChatBusinessLayer, toaster) {
+	app.controller('WebChatCtrl', ['$scope', '$interval', 'AuthenticationService', 'ChatBusinessLayer', 'toaster','$rootScope', function($scope, $interval, AuthenticationService, ChatBusinessLayer, toaster ,$rootScope) {
 		$scope.userInfo = null;
 		$scope.countData = 0;
 		$scope.goWebChat = goWebChat;
@@ -975,6 +975,12 @@ define([ 'app/app' ], function(app) {
 		}
 
 		function accessRealTimeData(param) {
+			//先调一次
+            ChatBusinessLayer.accessUnreadMessageCount(param).then(function (count) {
+                $scope.countData = count;
+            }, function () {
+                $scope.countData = 0;
+            });
 			$interval(function () {
 				ChatBusinessLayer.accessUnreadMessageCount(param).then(function (count) {
 					$scope.countData = count;
@@ -995,12 +1001,16 @@ define([ 'app/app' ], function(app) {
 			}
 
 			//获得窗口的垂直位置
-			var iTop = (window.screen.availHeight - 30 - 600) / 2;
+			var iTop = (window.screen.availHeight - 30 - 780) / 2;
 			//获得窗口的水平位置
 			var iLeft = (window.screen.availWidth - 10 - 1030) / 2;
-			var newTab = window.open('', '即时对话框', 'height=600, width=1030, top=' + iTop + ', left=' + iLeft + ', toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no');
-
+			var newTab = window.open('', '即时对话框', 'height=750, width=1000, top=' + iTop + ', left=' + iLeft + ', toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no');
+			newTab.close();
+            var newTab = window.open('', '即时对话框', 'height=750, width=1000, top=' + iTop + ', left=' + iLeft + ', toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no');
 			var chatInfoDto = { userPhone: $scope.param.phone, enUU: $scope.param.enUU };
+			if (!chatInfoDto.enUU){
+				chatInfoDto = {userPhone: $scope.param.phone};
+			}
 			ChatBusinessLayer.visitWebChat(chatInfoDto, 'LIST').then(function (gid) {
 				console.log(gid);
 				//newTab.location.href = 'http://192.168.253.31:20220/chat/visit?gid=' + gid;

src/main/webapp/resources/js/common/module/chat_web_module.js

@@ -19,6 +19,25 @@ define([ 'common/query/chat', 'common/query/enterprise' ], function() {
 			}
 			return param;
 		}
+
+		function getAdminInfo(enUU) {
+			/*Enterprise.getEnterpriseAdminInfo({enuu : enUU}, function(data) {
+				var phone = data.userTel;
+				if (!/^1\d{10}$/.test(phone)){
+					return phone;
+				}
+			},function(response) {
+				return;
+			});
+*/
+			var promise = Enterprise.getEnterpriseAdminInfo({enuu : enUU}, {}).$promise;
+
+			return promise.then(function (data) {
+				return data.userTel;
+			}, function () {
+				return 0;
+			});
+		}
 		
 		function accessUnreadMessageCount(param) {
 			var promise = Chat.countUnReadSessionsWhenUserQuery(param, {}).$promise;
@@ -51,10 +70,10 @@ define([ 'common/query/chat', 'common/query/enterprise' ], function() {
 		 * @param type			聊天类型
 		 */
 		function visitWebChat(chatInfoDto, type) {
-			if (!chatInfoDto || !type || !chatInfoDto.enUU || (type === 'CHAT' && !chatInfoDto.otherEnUU)) return {};
+			if (!chatInfoDto || !type || (type === 'CHAT' && !chatInfoDto.otherEnUU)) return {};
 			chatInfoDto.type = type;
 
-			var promise = getEnterpriseInfo(chatInfoDto.enUU).then(function (enterprise) {
+			var promise = getEnterpriseInfo(chatInfoDto.enUU ? chatInfoDto.enUU : 0).then(function (enterprise) {
 				if (enterprise && enterprise.enUU) {
 					chatInfoDto.enterprise = enterprise;
 				} else {
@@ -91,9 +110,10 @@ define([ 'common/query/chat', 'common/query/enterprise' ], function() {
 		this.visitWebChat = visitWebChat;
 		this.getParamsFromUserInfo = getParamsFromUserInfo;
 		this.accessUnreadMessageCount = accessUnreadMessageCount;
+		this.getAdminInfo = getAdminInfo;
 	}]);
 
-	module.controller('ChatContactCtrl', ['$rootScope', 'ChatBusinessLayer', 'toaster', function ($rootScope, ChatBusinessLayer, toaster) {
+	module.controller('ChatContactCtrl', ['$rootScope', 'ChatBusinessLayer', 'toaster','Enterprise', function ($rootScope, ChatBusinessLayer, toaster, Enterprise) {
 
 		var vm = this;
 		vm.param = {};
@@ -114,30 +134,56 @@ define([ 'common/query/chat', 'common/query/enterprise' ], function() {
 		 * @param userType	联系人用户类型
 		 */
 		function contactWithOther(phone, enUU, userType) {
-			console.log(phone, enUU, userType);
 			//获得窗口的垂直位置
-			var iTop = (window.screen.availHeight - 30 - 600) / 2;
+			var iTop = (window.screen.availHeight - 30 - 780) / 2;
 			//获得窗口的水平位置
 			var iLeft = (window.screen.availWidth - 10 - 1030) / 2;
-			var newTab = window.open('', '即时对话框', 'height=600, width=1030, top=' + iTop + ', left=' + iLeft + ', toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no'),
-				chatInfoDto = {
-				userPhone: vm.param.phone,
-				enUU: vm.param.enUU,
-				userType: userType == vm.UserType.STORE ? vm.UserType.ENTERPRISE : vm.UserType.STORE,
-				toPhone: phone,
-				otherEnUU: enUU,
-				otherUserType: userType
-			};
-			ChatBusinessLayer.visitWebChat(chatInfoDto, 'CHAT').then(function (gid) {
-				//newTab.location.href = 'http://192.168.253.31:20220/chat/visit?gid='  gid;
-				newTab.location.href = 'http://im.ubtob.com/chat/visit?gid=' + gid;
-			}, function (error) {
-				console.log(error);
-				newTab.close();
-				toaster.pop('warning', '对方没有开通客服系统，请联系官方客服！');
-			});
+			if (!/^1\d{10}$/.test(phone)){
+				ChatBusinessLayer.getAdminInfo(enUU).then(function (userTel) {
+					phone = userTel;
+					/*if (!/^1\d{10}$/.test(phone)){
+						toaster.pop('warning', '该店铺暂无管理员电话号码！');
+						return;
+					}*/
+					console.log(phone, enUU, userType,iTop,iLeft);
+					startChat(phone,enUU,userType,iTop,iLeft);
+				});
+			}else {
+                startChat(phone,enUU,userType,iTop,iLeft);
+			}
 		}
 
+		var startChat= function (phone,enUU,userType,iTop,iLeft) {
+            if ($rootScope.newTab){
+                $rootScope.newTab.close();
+            }
+            var newTab = window.open('', '即时对话框', 'height=750, width=1000, top=' + iTop + ', left=' + iLeft + ', toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no');
+            newTab.close();
+            var newTab = window.open('', '即时对话框', 'height=750, width=1000, top=' + iTop + ', left=' + iLeft + ', toolbar=no, menubar=no, scrollbars=no, resizable=no, location=no, status=no');
+			var chatInfoDto = {
+                    userPhone: vm.param.phone,
+                    enUU: vm.param.enUU,
+                    userType: userType == vm.UserType.STORE ? vm.UserType.ENTERPRISE : vm.UserType.STORE,
+                    toPhone: phone,
+                    otherEnUU: enUU,
+                    otherUserType: userType
+                };
+            ChatBusinessLayer.visitWebChat(chatInfoDto, 'CHAT').then(function (gid) {
+                if (!gid || gid == ''){
+                    newTab.close();
+                    toaster.pop('warning', '您暂未开通聊天帐号！');
+                    return;
+                }
+                //newTab.location.href = 'http://192.168.253.121:20220/chat/visit?gid=' +  gid;
+                newTab.location.href = 'http://im.ubtob.com/chat/visit?gid=' + gid;
+            }, function (error) {
+                console.log(error);
+                newTab.close();
+                toaster.pop('warning', '对方没有开通客服系统，请联系官方客服！');
+            });
+            $rootScope.newTab = newTab;
+        }
+
 	}]);
 
 });

src/main/webapp/resources/js/common/query/enterprise.js

@@ -152,6 +152,10 @@ define([ 'angular', 'ui-bootstrap', 'ngResource' ], function(angular) {
             getEnterpriseDetailInfo : {
                 url : 'basic/enterprise/:enuu/detailInfo',
                 method : 'GET'
+            },
+            getEnterpriseAdminInfo : {
+                url : 'basic/enterprise/:enuu/admin',
+                method : 'GET'
             },
 			getAllUsersByEnuu : {
 				url : 'basic/user/enterprise/info',

src/main/webapp/resources/view/common/sidebar.html

@@ -335,6 +335,16 @@
         position: relative;
         z-index: 10;
     }
+	#sidebar .remind-point {
+		width: 8px;
+		height: 8px;
+		display: block;
+		border-radius: 100%;
+		background: red;
+		position: relative;
+		top: -31px;
+		right: -27px;
+	}
 </style>
 <div id="sidebar">
 	<ul class="sidebar-content">
@@ -365,14 +375,16 @@
 			</div>
 		</li>
 		<!-- TODO huxz IM暂时不放出 -->
-		<!--<li ng-controller="WebChatCtrl">
-			<a href="javascript:void(0)" ng-click="goWebChat()" style="width: 36px; height: 38px; line-height: 30px;"><i class="fa" ng-class="{ 'fa-comments': countData > 0, 'fa-comments-o': countData <= 0 }" aria-hidden="true" style="font-size: 18px;color: #FFFFFF;"></i>&lt;!&ndash;<img src="static/img/icon/talk.png"/>&ndash;&gt;</a>
+		<li ng-controller="WebChatCtrl">
+			<a href="javascript:void(0)" ng-click="goWebChat()" style="width: 36px; height: 38px; line-height: 30px;"><i class="fa fa-comments-o" aria-hidden="true" style="font-size: 18px;color: #FFFFFF;"></i><!--ng-class="{ 'fa-comments': countData > 0, 'fa-comments-o': countData <= 0 }"-->
+				<i class="remind-point" ng-if="countData > 0"></i><!--<img src="static/img/icon/talk.png"/>-->
+			</a>
 			<div class="massage sidebar-menu" style="width: 100px;" title="优软客服">优软互联<em><span ng-if="userInfo">(<span ng-bind="countData || 0 | number"></span>)</span></em></div>
-		</li>-->
-		<!--<li ng-controller="ScrollToTopCtrl">
+		</li>
+		<li ng-controller="ScrollToTopCtrl">
 			<a href="javascript:void(0)" ng-click="scrollToTop()"><img src="static/img/icon/top.png"/></a>
 			<div class="sidebar-menu" style="width: 100px">返回顶部</div>
-		</li>-->
+		</li>
 	</ul>
 </div>
 <div id="sidebar" style="height: 76px;bottom: 10px;top: inherit;">

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

@@ -583,8 +583,8 @@
 							</a>
 						</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" ng-click="showContact(store.arr[0])">联系卖家</a>
+							<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].storeEnterprise.enUU, chat.UserType.STORE)">联系卖家</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

@@ -785,8 +785,8 @@
                         </span>
 						<span style="position: relative; width: 10%;">
                             <img src="static/img/common/songguo.png"/>
-                            <!--<a name="{{order.id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.sellPhone, order.sellerenuu, chat.UserType.STORE)">联系卖家</a>-->
-							<a name="{{order.id}}" href="javascript:void(0)" class="contact_btn" ng-click="contactSeller(order)">联系卖家</a>
+                            <a name="{{order.id}}" href="javascript:void(0)" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.sellPhone, order.sellerenuu, chat.UserType.STORE)">联系卖家</a>
+							<!--<a name="{{order.id}}" href="javascript:void(0)" class="contact_btn" ng-click="contactSeller(order)">联系卖家</a>-->
                              <div name="{{order.id}}" class="seller-contact" ng-if="order.active" ng-class="{true : 'seller-contact-info', false : 'display-none'}[order.active]">
                                  <div class="contact-title">
                                      <a ng-click="order.active=false"><i class="fa fa-close fa-lg" aria-hidden="true"></i></a>

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

@@ -413,8 +413,8 @@
 								<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="联系卖家" ng-click="contactSeller()">联系卖家</a>
+							<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="联系卖家" 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">

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

@@ -695,8 +695,8 @@
                             &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 class="contact_btn" title="联系卖家" name="{{key}}" ng-click="contactSeller(key)">联系卖家</a>
+							<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 class="contact_btn" title="联系卖家" name="{{key}}" ng-click="contactSeller(key)">联系卖家</a>-->
 							<!--<a class="contact_btn" title="联系卖家" ng-click="contactSeller(details[0])">联系卖家</a>-->
 							<div class="contact-box" ng-if="storeContactInfos[key].contactSeller" name="{{key}}">
 								<div class="title"><i class="fa fa-close fa-lg" ng-click="storeContactInfos[key].contactSeller = false"></i></div>

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

@@ -199,8 +199,8 @@
                         <span style="margin-right: 0;">订单号：</span>
                         <span style="margin-left: 0; margin-right: 30px;" ng-bind="order.orderid"></span>
                         <span style="margin-right: 0px;"><img src="static/img/user/images/shop_home.png" />&nbsp;<a ng-bind="order.storeName" style="margin-left: 0;margin-right: 20px;" href="store/{{::order.storeid}}" target="_blank"></a></span>
-                        <span><img src="static/img/common/songguo.png"/><!--<a href="#" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.sellPhone, order.sellerenuu, chat.UserType.STORE)">联系卖家</a>-->
-                            <a class="contact_btn" ng-click="contactSeller()">联系卖家</a>
+                        <span><img src="static/img/common/songguo.png"/><a href="#" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.sellPhone, order.sellerenuu, chat.UserType.STORE)">联系卖家</a>
+                            <!--<a 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">

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

@@ -465,8 +465,8 @@
 								<!--<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>-->
 							</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" ng-click="contactSeller()">联系买家</a>
+							<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" 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">

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

@@ -205,8 +205,9 @@
                     <div class="logistics-content">
                         <div class="img"><img src="static/img/icon/member.png"  alt=""/></div>
                         <div class="content" style="position: relative;">
-                            <p><span ng-bind="purchase.buyername"></span> &nbsp;<em ng-show="purchase.buyentername">|</em>&nbsp; <em class="name" ng-bind="purchase.buyentername"></em><img src="static/img/common/songguo.png" /><!--<a href="#" class="contact-btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>-->
-                            <a class="contact_btn" ng-click="contactSeller()">联系买家</a>
+                            <p><span ng-bind="purchase.buyername"></span> &nbsp;<em ng-show="purchase.buyentername">|</em>&nbsp; <em class="name" ng-bind="purchase.buyentername"></em><img src="static/img/common/songguo.png" />
+                                <a href="#" class="contact-btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(purchase.buyPhone, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>
+                            <!--<a 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">

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

@@ -599,8 +599,8 @@
 								<!--<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>-->
 							</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-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>-->
 						</span>
                     </dd>
                     <div ng-class="{'limit-3': !open}" style="width: 100%; margin: 0 auto; overflow: hidden;">

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

@@ -573,7 +573,7 @@
 								</div>
 							</div>
 							<div class="content">
-								<p class="title">价格梯度</p>
+								<p class="title">梯度/pcs</p>
 								<div class="input-list" ng-repeat="price in goods.prices">
 									<p>
 										<span><input ng-disabled="$index == 0" type="number" class="wid42 form-control"  placeholder="数量" ng-model="price.start" ng-blur="changePriceStart(goods, $index)" ng-pattern="/^[0-9]*$/"/></span>

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

@@ -579,7 +579,7 @@
                         <th width="220">产品信息</th>
                         <th width="115">包装/生产日期</th>
                         <th width="140">库存</th>
-                        <th width="105">数量</th>
+                        <th width="105">梯度/pcs</th>
                         <th ng-if="onsale.currency == 'USD'" width="116">单价<b style="font-size: 12px;font-weight: 600">($)</b></th>
                         <th ng-if="onsale.currency == 'RMB'" width="116">单价<b style="font-size: 12px;font-weight: 600">(￥)</b></th>
                         <th width="120">交期</th>

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

@@ -1229,8 +1229,8 @@
                         </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" ng-click="contactBuyer(purchase)">联系买家</a>
+                            <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" 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>
@@ -1246,7 +1246,7 @@
                                      <textarea class="send-message" placeholder="给买家发送站内消息"></textarea>
                                  </div>
                                  <div style="display: none;" class="send-button"><a class="send">发送</a></div>
-                            </div>
+                            </div>-->
                         </span>
 						<span class="print-icon" style="width: 8%;">
 							<a title="打印订单"><i class="fa fa-print fa-lg"></i></a>

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

@@ -361,7 +361,7 @@
                                     <th width="150" style="padding-left: 10px;">器件属性</th>
                                     <th width="150">产品固有属性</th>
                                     <th width="200">产品自定义属性</th>
-                                    <th width="100">数量</th>
+                                    <th width="100">梯度/pcs</th>
                                     <th width="100">单价(<em ng-bind="batch.currency == 'RMB' ? '￥' : '$'"></em>)</th>
                                     <th width="70">操作</th>
                                 </tr>
@@ -373,9 +373,9 @@
                                         <span ng-bind="$index+1"></span>
                                     </td>
                                     <td style="padding-left: 10px;">
-                                        <div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.b2cBranden || '空'}}" ng-bind="batchCommodity.brandNameEn || '空'"></em></div>
+                                        <div class="text-more">品牌：&nbsp;<em title="{{batchCommodity.brandNameEn || '空'}}" ng-bind="batchCommodity.brandNameEn || '空'"></em></div>
                                         <div class="text-more">类目：&nbsp;<em title="{{batchCommodity.kindName || '空'}}" ng-bind="batchCommodity.kindName || '空'"></em></div>
-                                        <div class="text-more">型号：&nbsp;<em title="{{batchCommodity.b2cCode || '空'}}" ng-bind="batchCommodity.code || '空'"></em></div>
+                                        <div class="text-more">型号：&nbsp;<em title="{{batchCommodity.code || '空'}}" ng-bind="batchCommodity.code || '空'"></em></div>
                                     </td>
                                     <td>
                                         <!--<div>类型：&nbsp;<span ng-bind="batchCommodity.original == 1311 ? '现货' : '呆滞库存' "></span></div>-->