Home Explore Help
Register Sign In
usoft
/
platform-b2c
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'yc-imReplace-0420' into dev-mysql

yangc 7 years ago
parent
a46db85f50 f34aecd5a4
commit
4ad96627e9
21 changed files with 271 additions and 58 deletions
Split View Show Diff Stats
  1. 13 0
      src/main/java/com/uas/platform/b2c/common/account/controller/EnterpriseController.java
  2. 8 0
      src/main/java/com/uas/platform/b2c/common/account/service/EnterpriseService.java
  3. 23 8
      src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java
  4. 1 0
      src/main/webapp/WEB-INF/views/normal/user_center.html
  5. 1 0
      src/main/webapp/WEB-INF/views/normal/vendor_center.html
  6. 32 0
      src/main/webapp/resources/css/common/linkSaler.css
  7. 1 1
      src/main/webapp/resources/js/common/controllers/commonCtrls.js
  8. 28 16
      src/main/webapp/resources/js/common/module/chat_web_module.js
  9. 4 0
      src/main/webapp/resources/js/common/query/enterprise.js
  10. 4 4
      src/main/webapp/resources/view/common/sidebar.html
  11. 1 1
      src/main/webapp/resources/view/usercenter/forstore/bomDetail.html
  12. 15 1
      src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html
  13. 15 1
      src/main/webapp/resources/view/usercenter/forstore/buyer_order.html
  14. 15 1
      src/main/webapp/resources/view/usercenter/forstore/order_detail.html
  15. 16 2
      src/main/webapp/resources/view/usercenter/forstore/order_pay.html
  16. 2 2
      src/main/webapp/resources/view/usercenter/forstore/query_logistics.html
  17. 44 16
      src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html
  18. 1 1
      src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html
  19. 15 1
      src/main/webapp/resources/view/vendor/forstore/purchase_detail.html
  20. 15 1
      src/main/webapp/resources/view/vendor/forstore/vendor_delivery.html
  21. 17 2
      src/main/webapp/resources/view/vendor/forstore/vendor_order.html

+ 13 - 0
src/main/java/com/uas/platform/b2c/common/account/controller/EnterpriseController.java
View File 

@@ -340,4 +340,17 @@ public class EnterpriseController {
 
         }
 
         return auditApply;
 
     }
 
+
 
+
 
+	/**
 
+	 * 返回企业电话号码和管理员电话号码;
 
+	 * @param enuu
 
+	 */
 
+	@RequestMapping(value = "/{enuu}/tels", method = RequestMethod.GET)
 
+	public ResultMap getEntelAndAdmintel(@PathVariable Long enuu){
 
+		if (enuu == null) {
 
+			throw new IllegalArgumentException("企业uu没有传值！");
 
+		}
 
+		return enterpriseService.getEntelAndAdmintel(enuu);
 
+	}
 
 }

+ 8 - 0
src/main/java/com/uas/platform/b2c/common/account/service/EnterpriseService.java
View File 

@@ -74,4 +74,12 @@ public interface EnterpriseService {
 
 	Enterprise openVendor(Long enUU , boolean isRead , boolean isOpen);
 
 
 
+	/**
 
+	 * 根据传来的企业uu查找其entel和admin电话（验证营业执照）
 
+	 * @return 店铺信息
 
+	 */
 
+	ResultMap getEntelAndAdmintel(Long enUU);
 
+
 
+
 
+
 
 }

+ 23 - 8
src/main/java/com/uas/platform/b2c/common/account/service/impl/EnterpriseServiceImpl.java
View File 

@@ -15,26 +15,22 @@ import com.uas.platform.b2c.logistics.model.Receipt;
 
 import com.uas.platform.b2c.prod.store.dao.StoreInDao;
 
 import com.uas.platform.b2c.prod.store.model.EnterpriseSimple;
 
 import com.uas.platform.b2c.prod.store.model.StoreIn;
 
-import com.uas.platform.b2c.trade.aftersale.model.ReturnFB2c;
 
 import com.uas.platform.b2c.trade.support.CodeType;
 
 import com.uas.platform.b2c.trade.support.ResultMap;
 
 import com.uas.platform.core.exception.SystemException;
 
 import com.uas.platform.core.model.Status;
 
-import com.uas.sso.entity.UserSpaceDetail;
 
 import com.uas.sso.entity.UserSpaceView;
 
 import com.uas.sso.entity.UserView;
 
 import com.uas.sso.util.AccountUtils;
 
 import org.apache.commons.collections.CollectionUtils;
 
-import org.hibernate.loader.custom.Return;
 
-import org.springframework.beans.BeanUtils;
 
 import org.springframework.beans.factory.annotation.Autowired;
 
-import org.springframework.security.core.userdetails.UserDetails;
 
 import org.springframework.stereotype.Service;
 
-import org.springframework.ui.ModelMap;
 
 import org.springframework.util.StringUtils;
 
 
-import java.lang.reflect.Array;
 
-import java.util.*;
 
+import java.util.Arrays;
 
+import java.util.HashMap;
 
+import java.util.List;
 
+import java.util.Map;
 
 
 @Service
 
 public class EnterpriseServiceImpl implements EnterpriseService{
 
@@ -270,4 +266,23 @@ public class EnterpriseServiceImpl implements EnterpriseService{
 
 		Enterprise enterprise = enterpriseDao.save(existEnterprise);
 
 		return null;
 
 	}
 
+
 
+	@Override
 
+	public ResultMap getEntelAndAdmintel(Long enUU) {
 
+		ResultMap resultMap = new ResultMap();
 
+		HashMap<String, String> tels = new HashMap<>();
 
+		Enterprise enterprise = enterpriseDao.findOne(enUU);
 
+		if (enterprise != null && enterprise.getEnAdminuu() != null) {
 
+			UserBaseInfo userBaseInfo = userBaseInfoDao.findUserByUserUU(enterprise.getEnAdminuu());
 
+			if (!StringUtils.isEmpty(userBaseInfo.getUserTel())) {
 
+				tels.put("adminTel", userBaseInfo.getUserTel());
 
+			}
 
+		}
 
+		if (enterprise != null && !StringUtils.isEmpty(enterprise.getEnTel())) {
 
+			tels.put("entel", enterprise.getEnTel());
 
+			tels.put("enuu", enterprise.getUu()+"");
 
+		}
 
+		resultMap.setData(tels);
 
+		return resultMap;
 
+	}
 
 }

+ 1 - 0
src/main/webapp/WEB-INF/views/normal/user_center.html
View File 

@@ -23,6 +23,7 @@
 
 <link rel="stylesheet" type="text/css" href="static/lib/keyboard/css/softkeys-0.0.1.css">
 
 <link rel="stylesheet" href="static/lib/angular/ng-table.css">
 
     <link rel="stylesheet" href="static/css/commonComponent.css" />
 
+	<link rel="stylesheet" href="static/css/common/linkSaler.css" />
 
 </head>
 
 <body>

+ 1 - 0
src/main/webapp/WEB-INF/views/normal/vendor_center.html
View File 

@@ -20,6 +20,7 @@
 
 <link rel="stylesheet" href="static/lib/angular/ng-table.css">
 
 <link rel="stylesheet" type="text/css" href="static/lib/keyboard/css/softkeys-0.0.1.css">
 
 <link rel="stylesheet" href="static/css/commonComponent.css" />
 
+	<link rel="stylesheet" href="static/css/common/linkSaler.css" />
 
 </head>
 
 <body>
 
 	<!-- 消息提示框  Start-->

+ 32 - 0
src/main/webapp/resources/css/common/linkSaler.css
View File 

@@ -0,0 +1,32 @@
 
+
 
+.link-saler-box {
 
+    width: 289px;
 
+    height: auto;
 
+    min-height: auto;
 
+    border-radius: 2px;
 
+}
 
+.link-saler-box .title {
 
+    background-color: #4290f7;
 
+    height: 22px;
 
+    line-height: 22px;
 
+    margin-bottom: 20px;
 
+}
 
+.link-saler-box .content p {
 
+    line-height: 20px;
 
+    padding-top: 0;
 
+}
 
+.link-saler-box .content p i {
 
+    color: #4290f7;
 
+    margin-right: 4px;
 
+}
 
+.link-saler-box .content p span {
 
+    color: #f62d37;
 
+    width: auto !important;
 
+    float: none;
 
+}
 
+.link-saler-box .content a {
 
+    width: 78px !important;
 
+    background: #4290f7 !important;
 
+    margin: 18px 0 13px 0;
 
+    border-radius: 2px;
 
+}

+ 1 - 1
src/main/webapp/resources/js/common/controllers/commonCtrls.js
View File 

@@ -990,7 +990,7 @@ define([ 'app/app' ], function(app) {
 
 				if (data && data.data) {
 
 					$scope.userInfo = data.data;
 
 					$scope.param = ChatBusinessLayer.getParamsFromUserInfo(data.data);
 
-					accessRealTimeData($scope.param);
 
+					// accessRealTimeData($scope.param);
 
 				}
 
 			}, function () {
 
 			});

+ 28 - 16
src/main/webapp/resources/js/common/module/chat_web_module.js
View File 

@@ -30,10 +30,10 @@ define([ 'common/query/chat', 'common/query/enterprise' ], function() {
 
 				return;
 
 			});
 
 */
 
-			var promise = Enterprise.getEnterpriseAdminInfo({enuu : enUU}, {}).$promise;
 
+			var promise = Enterprise.getEnterPriseTelOrAdminTel({enuu : enUU}, {}).$promise;
 
 
 			return promise.then(function (data) {
 
-				return data.userTel;
 
+				return data.data.entel || data.data.adminTel;
 
 			}, function () {
 
 				return 0;
 
 			});
 
@@ -58,7 +58,7 @@ define([ 'common/query/chat', 'common/query/enterprise' ], function() {
 
 			return promise.then(function (enterprise) {
 
 				return {
 
 					enUU: enterprise.uu,
 
-					name: enterprise.enName
 
+					name: enterprise.ehnName
 
 				}
 
 			});
 
 		}
 
@@ -113,7 +113,7 @@ define([ 'common/query/chat', 'common/query/enterprise' ], function() {
 
 		this.getAdminInfo = getAdminInfo;
 
 	}]);
 
 
-	module.controller('ChatContactCtrl', ['$rootScope', 'ChatBusinessLayer', 'toaster','Enterprise', function ($rootScope, ChatBusinessLayer, toaster, Enterprise) {
 
+	module.controller('ChatContactCtrl', ['$rootScope', '$scope', 'ChatBusinessLayer', 'toaster','Enterprise', function ($rootScope, $scope, ChatBusinessLayer, toaster, Enterprise) {
 
 
 		var vm = this;
 
 		vm.param = {};
 
@@ -134,26 +134,38 @@ define([ 'common/query/chat', 'common/query/enterprise' ], function() {
 
 		 * @param userType	联系人用户类型
 
 		 */
 
 		function contactWithOther(phone, enUU, userType) {
 
-			//获得窗口的垂直位置
 
-			var iTop = (window.screen.availHeight - 30 - 780) / 2;
 
-			//获得窗口的水平位置
 
-			var iLeft = (window.screen.availWidth - 10 - 1030) / 2;
 
-			if (!/^1\d{10}$/.test(phone)){
 
-				ChatBusinessLayer.getAdminInfo(enUU).then(function (userTel) {
 
-					phone = userTel;
 
+			// //获得窗口的垂直位置
 
+			// var iTop = (window.screen.availHeight - 30 - 780) / 2;
 
+			// //获得窗口的水平位置
 
+			// var iLeft = (window.screen.availWidth - 10 - 1030) / 2;
 
+			// if (!/^1\d{10}$/.test(phone)){
 
+			if (!phone){
 
+				ChatBusinessLayer.getAdminInfo(enUU).then(function (tel) {
 
+					phone = tel;
 
 					/*if (!/^1\d{10}$/.test(phone)){
 
 						toaster.pop('warning', '该店铺暂无管理员电话号码！');
 
 						return;
 
 					}*/
 
-					console.log(phone, enUU, userType,iTop,iLeft);
 
-					startChat(phone,enUU,userType,iTop,iLeft);
 
+					openChatBox(phone);
 
+					// startChat(phone,enUU,userType,iTop,iLeft);
 
 				});
 
 			}else {
 
-                startChat(phone,enUU,userType,iTop,iLeft);
 
+				openChatBox(phone);
 
+                // startChat(phone,enUU,userType,iTop,iLeft);
 
 			}
 
 		}
 
 
-		var startChat= function (phone,enUU,userType,iTop,iLeft) {
 
+		$scope.showLinkBox = false;
 
+		var openChatBox = function (phone) {
 
+			$scope.phone = phone || '-';
 
+			$scope.showLinkBox = true;
 
+			console.log(phone);
 
+		}
 
+		$scope.setShowLinkBox = function (flag) {
 
+			$scope.showLinkBox = flag;
 
+		}
 
+
 
+		/*var startChat= function (phone,enUU,userType,iTop,iLeft) {
 
             if ($rootScope.newTab){
 
                 $rootScope.newTab.close();
 
             }
 
@@ -182,7 +194,7 @@ define([ 'common/query/chat', 'common/query/enterprise' ], function() {
 
                 toaster.pop('warning', '对方没有开通客服系统，请联系官方客服！');
 
             });
 
             $rootScope.newTab = newTab;
 
-        }
 
+        }*/
 
 
 	}]);

+ 4 - 0
src/main/webapp/resources/js/common/query/enterprise.js
View File 

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

+ 4 - 4
src/main/webapp/resources/view/common/sidebar.html
View File 

@@ -379,12 +379,12 @@
 
 			</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 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"/>-->
 
+	<!--	<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>&lt;!&ndash;ng-class="{ 'fa-comments': countData > 0, 'fa-comments-o': countData <= 0 }"&ndash;&gt;
 
+				<i class="remind-point" ng-if="countData > 0"></i>&lt;!&ndash;<img src="static/img/icon/talk.png"/>&ndash;&gt;
 
 			</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>-->
 
 		<!--<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>-->

+ 1 - 1
src/main/webapp/resources/view/usercenter/forstore/bomDetail.html
View File 

@@ -789,7 +789,7 @@
 
                                         <td width="186"><span>{{of.currency + of.unitPrice | currencyStr}}</span></td>
 
                                         <td width="195" ng-bind="of.produceDate || '-'"></td>
 
                                         <td width="221" class="operate">
 
-                                            <a href = "of.user.usertTel">联系卖家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
 
+                                            <a>联系卖家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
 
                                             <img ng-if="of.status == 202" src="static/img/seekPurchase/recieved.png" alt="" class="ng-scope">
 
                                             <span ng-if="seek.status != 202" ng-click="setShowUseFlag(true, of)">采纳报价</span>
 
                                         </td>

+ 15 - 1
src/main/webapp/resources/view/usercenter/forstore/buyer_cart.html
View File 

@@ -619,7 +619,21 @@
 
 							</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].storeEnterprise.enUU, chat.UserType.STORE)">联系卖家</a>
 
+							<div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
 
+							<a name="{{store.arr[0].id}}" href="javascript:void(0)" class="contact_btn" ng-click="chat.contactWithOther(null, store.arr[0].storeEnterprise.enUU, chat.UserType.STORE)">联系卖家</a>
 
+								<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
 
+									<div class="title">
 
+									  <i ng-click="setShowLinkBox(false)"></i>
 
+									</div>
 
+									<div class="content">
 
+									  <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与卖家在线沟通！</p>
 
+									  <p>卖家联系电话：<span ng-bind="phone"></span></p>
 
+									  <div>
 
+										<a ng-click="setShowLinkBox(false)">我知道了</a>
 
+									  </div>
 
+									</div>
 
+								  </div>
 
+							</div>
 
 							<!--<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">

+ 15 - 1
src/main/webapp/resources/view/usercenter/forstore/buyer_order.html
View File 

@@ -852,7 +852,21 @@
 
                         </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>
 
+							<div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
 
+                            	<a name="{{order.id}}" href="javascript:void(0)" class="contact_btn" ng-click="chat.contactWithOther(null, order.sellerenuu, chat.UserType.STORE)">联系卖家</a>
 
+								<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
 
+									<div class="title">
 
+									  <i ng-click="setShowLinkBox(false)"></i>
 
+									</div>
 
+									<div class="content">
 
+									  <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与卖家在线沟通！</p>
 
+									  <p>卖家联系电话：<span ng-bind="phone"></span></p>
 
+									  <div>
 
+										<a ng-click="setShowLinkBox(false)">我知道了</a>
 
+									  </div>
 
+									</div>
 
+								  </div>
 
+							</div>
 
 							<!--<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">

+ 15 - 1
src/main/webapp/resources/view/usercenter/forstore/order_detail.html
View File 

@@ -419,7 +419,21 @@
 
 								<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>
 
+                            <div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
 
+							    <a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-click="chat.contactWithOther(null, order.buyerenuu, chat.UserType.STORE)">联系卖家</a>
 
+								<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
 
+									<div class="title">
 
+									  <i ng-click="setShowLinkBox(false)"></i>
 
+									</div>
 
+									<div class="content">
 
+									  <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与卖家在线沟通！</p>
 
+									  <p>卖家联系电话：<span ng-bind="phone"></span></p>
 
+									  <div>
 
+										<a ng-click="setShowLinkBox(false)">我知道了</a>
 
+									  </div>
 
+									</div>
 
+								  </div>
 
+							</div>
 
 							<!--<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>

+ 16 - 2
src/main/webapp/resources/view/usercenter/forstore/order_pay.html
View File 

@@ -695,13 +695,27 @@
 
 						<span>物料编码</span>
 
 						<span>备注</span>
 
 					</dt>
 
-					<div ng-repeat="(key, details) in $$orderDetailsMap">
 
+					<div ng-repeat="(key, details) in $$orderDetailsMap track by $index">
 
 						<dd style="height: 50px; 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>
 
+							<div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
 
+								<a href="javascript:void(0)" class="contact_btn" title="联系卖家" ng-click="chat.contactWithOther(null, order.orderDetails[$index].supEnUU, chat.UserType.STORE)">联系卖家</a>
 
+								<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
 
+									<div class="title">
 
+									  <i ng-click="setShowLinkBox(false)"></i>
 
+									</div>
 
+									<div class="content">
 
+									  <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与卖家在线沟通！</p>
 
+									  <p>卖家联系电话：<span ng-bind="phone"></span></p>
 
+									  <div>
 
+										<a ng-click="setShowLinkBox(false)">我知道了</a>
 
+									  </div>
 
+									</div>
 
+								  </div>
 
+							</div>
 
 							<!--<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}}">

+ 2 - 2
src/main/webapp/resources/view/usercenter/forstore/query_logistics.html
View File 

@@ -199,7 +199,7 @@
 
                         <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>
 
+                        <span><img src="static/img/common/songguo.png"/><a href="#" class="contact_btn" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(null, 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>
 
@@ -267,7 +267,7 @@
 
                                 </p>
 
                                 <div class="empty-info">
 
                                     <p class="grey" ng-if="order.deliverytype == 1301">暂时获取不到物流信息，请到快递公司官网进行查询</p>
 
-                                    <p class="grey" ng-if="order.deliverytype != 1301">暂无物流信息，请<a style="color: #5078cb;" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(order.sellPhone, order.sellerenuu, chat.UserType.STORE)">联系卖家</a>咨询</p>
 
+                                    <p class="grey" ng-if="order.deliverytype != 1301">暂无物流信息，请<a style="color: #5078cb;" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther(null, order.sellerenuu, chat.UserType.STORE)">联系卖家</a>咨询</p>
 
                                     <!--<a href="user#/order"><i class="fa fa-mail-reply fa-xs"></i>返回上一页</a>-->
 
                                 </div>
 
                             </div>

+ 44 - 16
src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html
View File 

@@ -347,11 +347,11 @@
 
         top: 12px;
 
         right: -5px;
 
     }
 
-    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate a {
 
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate > div > a {
 
         color: #5078cb;
 
         font-size: 12px;
 
     }
 
-    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate span {
 
+    .seek-purchase .seek-purchase-content >table >tbody tr.expand-row table tbody tr td.operate > span {
 
         display: inline-block;
 
         width: 64px;
 
         height: 24px;
 
@@ -1102,7 +1102,21 @@
 
                                             </div>
 
                                         </td>
 
                                         <td width="186" class="operate">
 
-                                            <a href="javascript:void(0)" ng-controller="ChatContactCtrl as chat" ng-click="chat.contactWithOther('12345', go.enUU, chat.UserType.ENTERPRISE)">联系卖家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
 
+                                            <div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
 
+                                                <a href="javascript:void(0)" ng-click="chat.contactWithOther(null, go.enUU, chat.UserType.ENTERPRISE)">联系卖家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
 
+                                                <div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
 
+                                                    <div class="title">
 
+                                                        <i ng-click="setShowLinkBox(false)"></i>
 
+                                                    </div>
 
+                                                    <div class="content">
 
+                                                        <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与卖家在线沟通！</p>
 
+                                                        <p>卖家联系电话：<span ng-bind="phone"></span></p>
 
+                                                        <div>
 
+                                                            <a ng-click="setShowLinkBox(false)">我知道了</a>
 
+                                                        </div>
 
+                                                    </div>
 
+                                                </div>
 
+                                            </div>
 
                                             <span ng-click = "purchase(go, $index)">立即购买</span>
 
                                         </td>
 
                                     </tr>
 
@@ -1151,7 +1165,21 @@
 
                                         </td>
 
                                         <!--<td width="195" ng-bind="of.produceDate || '-'"></td>-->
 
                                         <td width="221" class="operate">
 
-                                            <a ng-click="setLinkBoxIndex($index)">联系卖家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
 
+                                            <div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
 
+                                                <a href="javascript:void(0)" ng-click="chat.contactWithOther(null, currentSeek.qutations[$index].enterprise.uu, chat.UserType.ENTERPRISE)">联系卖家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
 
+                                                <div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
 
+                                                    <div class="title">
 
+                                                        <i ng-click="setShowLinkBox(false)"></i>
 
+                                                    </div>
 
+                                                    <div class="content">
 
+                                                        <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与卖家在线沟通！</p>
 
+                                                        <p>卖家联系电话：<span ng-bind="phone"></span></p>
 
+                                                        <div>
 
+                                                            <a ng-click="setShowLinkBox(false)">我知道了</a>
 
+                                                        </div>
 
+                                                    </div>
 
+                                                </div>
 
+                                            </div>
 
 
                                             <img ng-if="of.agreed == 1" src="static/img/seekPurchase/recieved.png" alt="" class="ng-scope">
 
                                             <span ng-if="seek.agreed != 1" ng-click="adopt(of.id)">采纳报价</span>
 
@@ -1270,16 +1298,16 @@
 
             </div>
 
         </div>
 
     </div>
 
-    <div class="com-mall-del-box link-saler-box" ng-if="linkBoxIndex > -1">
 
-        <div class="title">
 
-            <i ng-click="setLinkBoxIndex(-1)"></i>
 
-        </div>
 
-        <div class="content">
 
-            <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与卖家在线沟通！</p>
 
-            <p>卖家联系电话：<span ng-bind="currentSeek.qutations[linkBoxIndex].userTel"></span></p>
 
-            <div>
 
-                <a ng-click="setLinkBoxIndex(-1)">我知道了</a>
 
-            </div>
 
-        </div>
 
-    </div>
 
+    <!--<div class="com-mall-del-box link-saler-box" ng-if="linkBoxIndex > -1">-->
 
+        <!--<div class="title">-->
 
+            <!--<i ng-click="setLinkBoxIndex(-1)"></i>-->
 
+        <!--</div>-->
 
+        <!--<div class="content">-->
 
+            <!--<p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与卖家在线沟通！</p>-->
 
+            <!--<p>卖家联系电话：<span ng-bind="currentSeek.qutations[linkBoxIndex].userTel || '-'"></span></p>-->
 
+            <!--<div>-->
 
+                <!--<a ng-click="setLinkBoxIndex(-1)">我知道了</a>-->
 
+            <!--</div>-->
 
+        <!--</div>-->
 
+    <!--</div>-->
 
 </div>

+ 1 - 1
src/main/webapp/resources/view/vendor/forstore/purchaseOffer.html
View File 

@@ -759,7 +759,7 @@
 
         </div>
 
         <div class="content">
 
             <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与买家在线沟通！</p>
 
-            <p>买家联系电话：<span ng-bind="(seekListData.content)[linkBoxIndex].userTel"></span></p>
 
+            <p>买家联系电话：<span ng-bind="seekListData.content[linkBoxIndex].userTel || '-'"></span></p>
 
             <div>
 
                 <a ng-click="setLinkBoxIndex(-1)">我知道了</a>
 
             </div>

+ 15 - 1
src/main/webapp/resources/view/vendor/forstore/purchase_detail.html
View File 

@@ -471,7 +471,21 @@
 
 								<!--<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>
 
+							<div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
 
+								<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-click="chat.contactWithOther(!purchase.buyerenuu ? purchase.buyPhone : null, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>
 
+								<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
 
+									<div class="title">
 
+									  <i ng-click="setShowLinkBox(false)"></i>
 
+									</div>
 
+									<div class="content">
 
+									  <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与买家在线沟通！</p>
 
+									  <p>买家联系电话：<span ng-bind="phone"></span></p>
 
+									  <div>
 
+										<a ng-click="setShowLinkBox(false)">我知道了</a>
 
+									  </div>
 
+									</div>
 
+								  </div>
 
+							</div>
 
 							<!--<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>

+ 15 - 1
src/main/webapp/resources/view/vendor/forstore/vendor_delivery.html
View File 

@@ -598,7 +598,21 @@
 
 								<!--<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>
 
+                            <div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
 
+                                <a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-click="chat.contactWithOther(!checkinvoice.buyerenuu ? checkinvoice.buyPhone : null, checkinvoice.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>
 
+								<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
 
+									<div class="title">
 
+									  <i ng-click="setShowLinkBox(false)"></i>
 
+									</div>
 
+									<div class="content">
 
+									  <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与买家在线沟通！</p>
 
+									  <p>买家联系电话：<span ng-bind="phone"></span></p>
 
+									  <div>
 
+										<a ng-click="setShowLinkBox(false)">我知道了</a>
 
+									  </div>
 
+									</div>
 
+								  </div>
 
+							</div>
 
 							<!--<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" >联系买家</a>-->
 
 						</span>
 
                     </dd>

+ 17 - 2
src/main/webapp/resources/view/vendor/forstore/vendor_order.html
View File 

@@ -1319,11 +1319,26 @@
 
 						<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">
 
-							<i ng-bind="purchase.buyentername" href="store/{{::purchase.storeid}}"></i>&nbsp;&nbsp;
 
+							<a ng-if="purchase.buyentername" ng-bind="purchase.buyentername" href="store/{{::purchase.storeid}}"></a>
 
+							<i ng-if="!purchase.buyentername" ng-bind="purchase.buyername"></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>
 
+							<div style="display: inline-block" ng-controller="ChatContactCtrl as chat">
 
+                            	<a name="{{purchase.id}}" href="javascript:void(0)" class="contact_btn" ng-click="chat.contactWithOther(!purchase.buyerenuu ? purchase.buyPhone : null, purchase.buyerenuu, chat.UserType.ENTERPRISE)">联系买家</a>
 
+								<div class="com-mall-del-box link-saler-box" ng-if="showLinkBox">
 
+									<div class="title">
 
+									  <i ng-click="setShowLinkBox(false)"></i>
 
+									</div>
 
+									<div class="content">
 
+									  <p><i class="fa fa-exclamation-circle"></i>抱歉，暂时无法与买家在线沟通！</p>
 
+									  <p>买家联系电话：<span ng-bind="phone"></span></p>
 
+									  <div>
 
+										<a ng-click="setShowLinkBox(false)">我知道了</a>
 
+									  </div>
 
+									</div>
 
+								  </div>
 
+							</div>
 
 							<!--<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">