Browse Source

im bug修改1

wangdy 8 years ago
parent
commit
e2f6330ad7

+ 2 - 5
src/main/webapp/resources/js/common/controllers/commonCtrls.js

@@ -977,9 +977,6 @@ define([ 'app/app' ], function(app) {
 		}
 
 		function goWebChat() {
-            if ($rootScope.newTab){
-                $rootScope.newTab.close();
-            }
 			if (!$scope.userInfo) {
 				toaster.pop('error', '请先登录优软商城!');
 				return ;
@@ -994,7 +991,8 @@ define([ 'app/app' ], function(app) {
 			//获得窗口的水平位置
 			var iLeft = (window.screen.availWidth - 10 - 1030) / 2;
 			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};
@@ -1008,7 +1006,6 @@ define([ 'app/app' ], function(app) {
 				newTab.close();
 				toaster.pop('warning', '您还没有开通客服系统,请开通客服系统!');
 			});
-            $rootScope.newTab = newTab;
 		}
 	}]);
 

+ 4 - 2
src/main/webapp/resources/js/common/module/chat_web_module.js

@@ -157,8 +157,10 @@ define([ 'common/query/chat', 'common/query/enterprise' ], function() {
             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'),
-                chatInfoDto = {
+            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,

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

@@ -671,8 +671,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>

+ 2 - 2
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">

+ 3 - 2
src/main/webapp/resources/view/vendor/forstore/query_logistics.html

@@ -177,8 +177,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">

+ 2 - 2
src/main/webapp/resources/view/vendor/forstore/vendor_delivery.html

@@ -574,8 +574,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;">