开启 im开关

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

@@ -980,10 +980,10 @@ 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');
 
 			var chatInfoDto = { userPhone: $scope.param.phone, enUU: $scope.param.enUU };
 			ChatBusinessLayer.visitWebChat(chatInfoDto, 'LIST').then(function (gid) {

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

@@ -135,7 +135,7 @@ define([ 'common/query/chat', 'common/query/enterprise' ], function() {
 		 */
 		function contactWithOther(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;
 			if (!/^1\d{10}$/.test(phone)){

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

@@ -365,14 +365,14 @@
 			</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" ng-class="{ 'fa-comments': countData > 0, 'fa-comments-o': countData <= 0 }" aria-hidden="true" style="font-size: 18px;color: #FFFFFF;"></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

@@ -533,8 +533,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" >联系卖家</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].enuu, chat.UserType.STORE)">联系卖家</a>
+							<!--<a name="{{store.arr[0].id}}" href="javascript:void(0)" class="contact_btn" >联系卖家</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/order_detail.html

@@ -310,8 +310,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="联系卖家">联系卖家</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="联系卖家">联系卖家</a>-->
 						</span>
 					</dd>
 					<div ng-class="{'limit-3': !open}">

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

@@ -450,8 +450,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 href="javascript:void(0)" class="contact_btn" title="联系卖家">联系卖家</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="联系卖家">联系卖家</a>-->
 						</span>
 						</dd>
 						<dd class="oder_l" ng-repeat="detail in details">

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

@@ -118,7 +118,9 @@
                         <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 href="#" class="contact_btn" >联系卖家</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 href="#" class="contact_btn" >联系卖家</a></span>-->
                     </div>
                     <div class="logistics-content">
                         <div class="img"><img src="static/img/icon/member.png"  alt=""/></div>

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

@@ -360,8 +360,8 @@
 								&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-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}">

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

@@ -122,7 +122,7 @@
                     <div class="logistics-content">
                         <div class="img"><img src="static/img/icon/member.png"  alt=""/></div>
                         <div class="content">
-                            <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 href="#" class="contact-btn" >联系买家</a></p>
+                            <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 href="#" class="contact-btn" >联系买家</a>--></p>
                             <p ng-bind="purchase.buyPhone"></p>
                             <p>收货地址：<em ng-bind="address.area"></em></p>
                         </div>